| Message ID | 157879666276.8200.5529955400195897154.stgit@john-Precision-5820-Tower |
|---|---|
| State | Changes Requested |
| Delegated to: | BPF Maintainers |
| Headers | show |
| Series | xdp devmap improvements cleanup | expand |
On Sat, Jan 11, 2020 at 06:37:42PM -0800, John Fastabend wrote: > Now that we depend on rcu_call() and synchronize_rcu() to also wait > for preempt_disabled region to complete the rcu read critical section > in __dev_map_flush() is no longer required. Except in a few special > cases in drivers that need it for other reasons. > > These originally ensured the map reference was safe while a map was > also being free'd. And additionally that bpf program updates via > ndo_bpf did not happen while flush updates were in flight. But flush > by new rules can only be called from preempt-disabled NAPI context. > The synchronize_rcu from the map free path and the rcu_call from the > delete path will ensure the reference there is safe. So lets remove > the rcu_read_lock and rcu_read_unlock pair to avoid any confusion > around how this is being protected. > > If the rcu_read_lock was required it would mean errors in the above > logic and the original patch would also be wrong. > > Now that we have done above we put the rcu_read_lock in the driver > code where it is needed in a driver dependent way. I think this > helps readability of the code so we know where and why we are > taking read locks. Most drivers will not need rcu_read_locks here > and further XDP drivers already have rcu_read_locks in their code > paths for reading xdp programs on RX side so this makes it symmetric > where we don't have half of rcu critical sections define in driver > and the other half in devmap. > > Fixes: 0536b85239b84 ("xdp: Simplify devmap cleanup") > Signed-off-by: John Fastabend <john.fastabend@gmail.com> > --- > drivers/net/veth.c | 6 +++++- > drivers/net/virtio_net.c | 8 ++++++-- > kernel/bpf/devmap.c | 5 +++-- > 3 files changed, 14 insertions(+), 5 deletions(-) > > diff --git a/drivers/net/veth.c b/drivers/net/veth.c > index a552df3..184e1b4 100644 > --- a/drivers/net/veth.c > +++ b/drivers/net/veth.c > @@ -377,6 +377,7 @@ static int veth_xdp_xmit(struct net_device *dev, int n, > unsigned int max_len; > struct veth_rq *rq; > > + rcu_read_lock(); > if (unlikely(flags & ~XDP_XMIT_FLAGS_MASK)) { > ret = -EINVAL; > goto drop; > @@ -418,11 +419,14 @@ static int veth_xdp_xmit(struct net_device *dev, int n, > if (flags & XDP_XMIT_FLUSH) > __veth_xdp_flush(rq); > > - if (likely(!drops)) > + if (likely(!drops)) { > + rcu_read_unlock(); > return n; > + } > > ret = n - drops; > drop: > + rcu_read_unlock(); > atomic64_add(drops, &priv->dropped); > > return ret; > diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c > index 4d7d5434..2c11f82 100644 > --- a/drivers/net/virtio_net.c > +++ b/drivers/net/virtio_net.c > @@ -498,12 +498,16 @@ static int virtnet_xdp_xmit(struct net_device *dev, > void *ptr; > int i; > > + rcu_read_lock(); > + > /* Only allow ndo_xdp_xmit if XDP is loaded on dev, as this > * indicate XDP resources have been successfully allocated. > */ > xdp_prog = rcu_dereference(rq->xdp_prog); We could convert that rcu_dereference to rcu_access_pointer so that we don't need the rcu critical section here at all. Actually this was suggested some time ago by David Ahern during the initial discussion around this code. Not sure why we didn't change it. Veth is also checking the xdp prog presence and it is doing that via rcu_access_pointer so such conversion would make it more common, no? xdp_prog is only check against NULL, so quoting the part of comment from rcu_access_pointer: "This is useful when the value of this pointer is accessed, but the pointer is not dereferenced, for example, when testing an RCU-protected pointer against NULL." > - if (!xdp_prog) > + if (!xdp_prog) { > + rcu_read_unlock(); > return -ENXIO; > + } > > sq = virtnet_xdp_sq(vi); > > @@ -552,7 +556,7 @@ static int virtnet_xdp_xmit(struct net_device *dev, > sq->stats.xdp_tx_drops += drops; > sq->stats.kicks += kicks; > u64_stats_update_end(&sq->stats.syncp); > - > + rcu_read_unlock(); > return ret; > } > > diff --git a/kernel/bpf/devmap.c b/kernel/bpf/devmap.c > index f0bf525..d0ce2e2 100644 > --- a/kernel/bpf/devmap.c > +++ b/kernel/bpf/devmap.c > @@ -372,16 +372,17 @@ static int bq_xmit_all(struct xdp_bulk_queue *bq, u32 flags) > * from NET_RX_SOFTIRQ. Either way the poll routine must complete before the > * net device can be torn down. On devmap tear down we ensure the flush list > * is empty before completing to ensure all flush operations have completed. > + * When drivers update the bpf program they may need to ensure any flush ops > + * are also complete. Using synchronize_rcu or call_rcu will suffice for this > + * because both wait for napi context to exit. > */ > void __dev_map_flush(void) > { > struct list_head *flush_list = this_cpu_ptr(&dev_map_flush_list); > struct xdp_bulk_queue *bq, *tmp; > > - rcu_read_lock(); > list_for_each_entry_safe(bq, tmp, flush_list, flush_node) > bq_xmit_all(bq, XDP_XMIT_FLUSH); > - rcu_read_unlock(); > } > > /* rcu_read_lock (from syscall and BPF contexts) ensures that if a delete and/or >
John Fastabend <john.fastabend@gmail.com> writes: > Now that we depend on rcu_call() and synchronize_rcu() to also wait > for preempt_disabled region to complete the rcu read critical section > in __dev_map_flush() is no longer required. Except in a few special > cases in drivers that need it for other reasons. > > These originally ensured the map reference was safe while a map was > also being free'd. And additionally that bpf program updates via > ndo_bpf did not happen while flush updates were in flight. But flush > by new rules can only be called from preempt-disabled NAPI context. > The synchronize_rcu from the map free path and the rcu_call from the > delete path will ensure the reference there is safe. So lets remove > the rcu_read_lock and rcu_read_unlock pair to avoid any confusion > around how this is being protected. > > If the rcu_read_lock was required it would mean errors in the above > logic and the original patch would also be wrong. > > Now that we have done above we put the rcu_read_lock in the driver > code where it is needed in a driver dependent way. I think this > helps readability of the code so we know where and why we are > taking read locks. Most drivers will not need rcu_read_locks here > and further XDP drivers already have rcu_read_locks in their code > paths for reading xdp programs on RX side so this makes it symmetric > where we don't have half of rcu critical sections define in driver > and the other half in devmap. > > Fixes: 0536b85239b84 ("xdp: Simplify devmap cleanup") > Signed-off-by: John Fastabend <john.fastabend@gmail.com> Acked-by: Toke Høiland-Jørgensen <toke@redhat.com>
On Mon, Jan 13, 2020 at 07:25:51PM -0800, John Fastabend wrote: > Maciej Fijalkowski wrote: > > On Sat, Jan 11, 2020 at 06:37:42PM -0800, John Fastabend wrote: > > > Now that we depend on rcu_call() and synchronize_rcu() to also wait one last thing since you'll be sending a v3, s/rcu_call/call_rcu. > > > for preempt_disabled region to complete the rcu read critical section > > > in __dev_map_flush() is no longer required. Except in a few special > > > cases in drivers that need it for other reasons. > > > > > > These originally ensured the map reference was safe while a map was > > > also being free'd. And additionally that bpf program updates via > > > ndo_bpf did not happen while flush updates were in flight. But flush > > > by new rules can only be called from preempt-disabled NAPI context. > > > The synchronize_rcu from the map free path and the rcu_call from the > > > delete path will ensure the reference there is safe. So lets remove > > > the rcu_read_lock and rcu_read_unlock pair to avoid any confusion > > > around how this is being protected. > > > > > > If the rcu_read_lock was required it would mean errors in the above > > > logic and the original patch would also be wrong. > > > > > > Now that we have done above we put the rcu_read_lock in the driver > > > code where it is needed in a driver dependent way. I think this > > > helps readability of the code so we know where and why we are > > > taking read locks. Most drivers will not need rcu_read_locks here > > > and further XDP drivers already have rcu_read_locks in their code > > > paths for reading xdp programs on RX side so this makes it symmetric > > > where we don't have half of rcu critical sections define in driver > > > and the other half in devmap. > > > > > > Fixes: 0536b85239b84 ("xdp: Simplify devmap cleanup") > > > Signed-off-by: John Fastabend <john.fastabend@gmail.com> > > > --- > > [...] > > > > diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c > > > index 4d7d5434..2c11f82 100644 > > > --- a/drivers/net/virtio_net.c > > > +++ b/drivers/net/virtio_net.c > > > @@ -498,12 +498,16 @@ static int virtnet_xdp_xmit(struct net_device *dev, > > > void *ptr; > > > int i; > > > > > > + rcu_read_lock(); > > > + > > > /* Only allow ndo_xdp_xmit if XDP is loaded on dev, as this > > > * indicate XDP resources have been successfully allocated. > > > */ > > > xdp_prog = rcu_dereference(rq->xdp_prog); > > > > We could convert that rcu_dereference to rcu_access_pointer so that we > > don't need the rcu critical section here at all. Actually this was > > suggested some time ago by David Ahern during the initial discussion > > around this code. Not sure why we didn't change it. > > Makes sense I'll send a v3 with a middle patch to do this and then drop > this segment. Great :) > > > > > Veth is also checking the xdp prog presence and it is doing that via > > rcu_access_pointer so such conversion would make it more common, no? > > veth derefernces rcv netdevice and this accesses it. The logic to > drop the rcu here is less obvious to me. At least I would have to > study it closely. Veth does two rcu derefs in the veth_xmit, one for netdev and one for xdp_prog and I was referring to a xdp_prog deref which is done via rcu_access_pointer. So yeah we need to keep the rcu section in there but I was just making an argument for having the rcu_access_pointer on the virtio_net side. > > > > > xdp_prog is only check against NULL, so quoting the part of comment from > > rcu_access_pointer: > > "This is useful when the value of this pointer is accessed, but the pointer > > is not dereferenced, for example, when testing an RCU-protected pointer > > against NULL." > > +1 thanks it does make the cleanup nicer.
Maciej Fijalkowski wrote: > On Sat, Jan 11, 2020 at 06:37:42PM -0800, John Fastabend wrote: > > Now that we depend on rcu_call() and synchronize_rcu() to also wait > > for preempt_disabled region to complete the rcu read critical section > > in __dev_map_flush() is no longer required. Except in a few special > > cases in drivers that need it for other reasons. > > > > These originally ensured the map reference was safe while a map was > > also being free'd. And additionally that bpf program updates via > > ndo_bpf did not happen while flush updates were in flight. But flush > > by new rules can only be called from preempt-disabled NAPI context. > > The synchronize_rcu from the map free path and the rcu_call from the > > delete path will ensure the reference there is safe. So lets remove > > the rcu_read_lock and rcu_read_unlock pair to avoid any confusion > > around how this is being protected. > > > > If the rcu_read_lock was required it would mean errors in the above > > logic and the original patch would also be wrong. > > > > Now that we have done above we put the rcu_read_lock in the driver > > code where it is needed in a driver dependent way. I think this > > helps readability of the code so we know where and why we are > > taking read locks. Most drivers will not need rcu_read_locks here > > and further XDP drivers already have rcu_read_locks in their code > > paths for reading xdp programs on RX side so this makes it symmetric > > where we don't have half of rcu critical sections define in driver > > and the other half in devmap. > > > > Fixes: 0536b85239b84 ("xdp: Simplify devmap cleanup") > > Signed-off-by: John Fastabend <john.fastabend@gmail.com> > > --- [...] > > diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c > > index 4d7d5434..2c11f82 100644 > > --- a/drivers/net/virtio_net.c > > +++ b/drivers/net/virtio_net.c > > @@ -498,12 +498,16 @@ static int virtnet_xdp_xmit(struct net_device *dev, > > void *ptr; > > int i; > > > > + rcu_read_lock(); > > + > > /* Only allow ndo_xdp_xmit if XDP is loaded on dev, as this > > * indicate XDP resources have been successfully allocated. > > */ > > xdp_prog = rcu_dereference(rq->xdp_prog); > > We could convert that rcu_dereference to rcu_access_pointer so that we > don't need the rcu critical section here at all. Actually this was > suggested some time ago by David Ahern during the initial discussion > around this code. Not sure why we didn't change it. Makes sense I'll send a v3 with a middle patch to do this and then drop this segment. > > Veth is also checking the xdp prog presence and it is doing that via > rcu_access_pointer so such conversion would make it more common, no? veth derefernces rcv netdevice and this accesses it. The logic to drop the rcu here is less obvious to me. At least I would have to study it closely. > > xdp_prog is only check against NULL, so quoting the part of comment from > rcu_access_pointer: > "This is useful when the value of this pointer is accessed, but the pointer > is not dereferenced, for example, when testing an RCU-protected pointer > against NULL." +1 thanks it does make the cleanup nicer.
diff --git a/drivers/net/veth.c b/drivers/net/veth.c index a552df3..184e1b4 100644 --- a/drivers/net/veth.c +++ b/drivers/net/veth.c @@ -377,6 +377,7 @@ static int veth_xdp_xmit(struct net_device *dev, int n, unsigned int max_len; struct veth_rq *rq; + rcu_read_lock(); if (unlikely(flags & ~XDP_XMIT_FLAGS_MASK)) { ret = -EINVAL; goto drop; @@ -418,11 +419,14 @@ static int veth_xdp_xmit(struct net_device *dev, int n, if (flags & XDP_XMIT_FLUSH) __veth_xdp_flush(rq); - if (likely(!drops)) + if (likely(!drops)) { + rcu_read_unlock(); return n; + } ret = n - drops; drop: + rcu_read_unlock(); atomic64_add(drops, &priv->dropped); return ret; diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 4d7d5434..2c11f82 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -498,12 +498,16 @@ static int virtnet_xdp_xmit(struct net_device *dev, void *ptr; int i; + rcu_read_lock(); + /* Only allow ndo_xdp_xmit if XDP is loaded on dev, as this * indicate XDP resources have been successfully allocated. */ xdp_prog = rcu_dereference(rq->xdp_prog); - if (!xdp_prog) + if (!xdp_prog) { + rcu_read_unlock(); return -ENXIO; + } sq = virtnet_xdp_sq(vi); @@ -552,7 +556,7 @@ static int virtnet_xdp_xmit(struct net_device *dev, sq->stats.xdp_tx_drops += drops; sq->stats.kicks += kicks; u64_stats_update_end(&sq->stats.syncp); - + rcu_read_unlock(); return ret; } diff --git a/kernel/bpf/devmap.c b/kernel/bpf/devmap.c index f0bf525..d0ce2e2 100644 --- a/kernel/bpf/devmap.c +++ b/kernel/bpf/devmap.c @@ -372,16 +372,17 @@ static int bq_xmit_all(struct xdp_bulk_queue *bq, u32 flags) * from NET_RX_SOFTIRQ. Either way the poll routine must complete before the * net device can be torn down. On devmap tear down we ensure the flush list * is empty before completing to ensure all flush operations have completed. + * When drivers update the bpf program they may need to ensure any flush ops + * are also complete. Using synchronize_rcu or call_rcu will suffice for this + * because both wait for napi context to exit. */ void __dev_map_flush(void) { struct list_head *flush_list = this_cpu_ptr(&dev_map_flush_list); struct xdp_bulk_queue *bq, *tmp; - rcu_read_lock(); list_for_each_entry_safe(bq, tmp, flush_list, flush_node) bq_xmit_all(bq, XDP_XMIT_FLUSH); - rcu_read_unlock(); } /* rcu_read_lock (from syscall and BPF contexts) ensures that if a delete and/or
Now that we depend on rcu_call() and synchronize_rcu() to also wait for preempt_disabled region to complete the rcu read critical section in __dev_map_flush() is no longer required. Except in a few special cases in drivers that need it for other reasons. These originally ensured the map reference was safe while a map was also being free'd. And additionally that bpf program updates via ndo_bpf did not happen while flush updates were in flight. But flush by new rules can only be called from preempt-disabled NAPI context. The synchronize_rcu from the map free path and the rcu_call from the delete path will ensure the reference there is safe. So lets remove the rcu_read_lock and rcu_read_unlock pair to avoid any confusion around how this is being protected. If the rcu_read_lock was required it would mean errors in the above logic and the original patch would also be wrong. Now that we have done above we put the rcu_read_lock in the driver code where it is needed in a driver dependent way. I think this helps readability of the code so we know where and why we are taking read locks. Most drivers will not need rcu_read_locks here and further XDP drivers already have rcu_read_locks in their code paths for reading xdp programs on RX side so this makes it symmetric where we don't have half of rcu critical sections define in driver and the other half in devmap. Fixes: 0536b85239b84 ("xdp: Simplify devmap cleanup") Signed-off-by: John Fastabend <john.fastabend@gmail.com> --- drivers/net/veth.c | 6 +++++- drivers/net/virtio_net.c | 8 ++++++-- kernel/bpf/devmap.c | 5 +++-- 3 files changed, 14 insertions(+), 5 deletions(-)