* [PATCH bpf-next v2] bpf/devmap: convert remaining READ_ONCE() to rcu_dereference_check()
@ 2021-06-29 9:39 Toke Høiland-Jørgensen
2021-06-30 0:08 ` Martin KaFai Lau
2021-07-01 7:30 ` patchwork-bot+netdevbpf
0 siblings, 2 replies; 3+ messages in thread
From: Toke Høiland-Jørgensen @ 2021-06-29 9:39 UTC (permalink / raw)
To: bpf, netdev
Cc: Martin KaFai Lau, Hangbin Liu, Jesper Dangaard Brouer,
Magnus Karlsson, Paul E . McKenney, Jakub Kicinski,
Toke Høiland-Jørgensen, kernel test robot
There were a couple of READ_ONCE()-invocations left-over by the devmap RCU
conversion. Convert these to rcu_dereference_check() as well to avoid
complaints from sparse.
v2:
- Use rcu_dereference_check()
Fixes: 782347b6bcad ("xdp: Add proper __rcu annotations to redirect map entries")
Reported-by: kernel test robot <lkp@intel.com>
Reviewed-by: Paul E. McKenney <paulmck@kernel.org>
Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
---
kernel/bpf/devmap.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/kernel/bpf/devmap.c b/kernel/bpf/devmap.c
index 2f6bd75cd682..e4ebe70cf201 100644
--- a/kernel/bpf/devmap.c
+++ b/kernel/bpf/devmap.c
@@ -558,7 +558,8 @@ int dev_map_enqueue_multi(struct xdp_buff *xdp, struct net_device *dev_rx,
if (map->map_type == BPF_MAP_TYPE_DEVMAP) {
for (i = 0; i < map->max_entries; i++) {
- dst = READ_ONCE(dtab->netdev_map[i]);
+ dst = rcu_dereference_check(dtab->netdev_map[i],
+ rcu_read_lock_bh_held());
if (!is_valid_dst(dst, xdp, exclude_ifindex))
continue;
@@ -654,7 +655,8 @@ int dev_map_redirect_multi(struct net_device *dev, struct sk_buff *skb,
if (map->map_type == BPF_MAP_TYPE_DEVMAP) {
for (i = 0; i < map->max_entries; i++) {
- dst = READ_ONCE(dtab->netdev_map[i]);
+ dst = rcu_dereference_check(dtab->netdev_map[i],
+ rcu_read_lock_bh_held());
if (!dst || dst->dev->ifindex == exclude_ifindex)
continue;
--
2.32.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH bpf-next v2] bpf/devmap: convert remaining READ_ONCE() to rcu_dereference_check()
2021-06-29 9:39 [PATCH bpf-next v2] bpf/devmap: convert remaining READ_ONCE() to rcu_dereference_check() Toke Høiland-Jørgensen
@ 2021-06-30 0:08 ` Martin KaFai Lau
2021-07-01 7:30 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: Martin KaFai Lau @ 2021-06-30 0:08 UTC (permalink / raw)
To: Toke Høiland-Jørgensen
Cc: bpf, netdev, Hangbin Liu, Jesper Dangaard Brouer,
Magnus Karlsson, Paul E . McKenney, Jakub Kicinski,
kernel test robot
On Tue, Jun 29, 2021 at 11:39:07AM +0200, Toke Høiland-Jørgensen wrote:
> There were a couple of READ_ONCE()-invocations left-over by the devmap RCU
> conversion. Convert these to rcu_dereference_check() as well to avoid
> complaints from sparse.
>
> v2:
> - Use rcu_dereference_check()
Acked-by: Martin KaFai Lau <kafai@fb.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH bpf-next v2] bpf/devmap: convert remaining READ_ONCE() to rcu_dereference_check()
2021-06-29 9:39 [PATCH bpf-next v2] bpf/devmap: convert remaining READ_ONCE() to rcu_dereference_check() Toke Høiland-Jørgensen
2021-06-30 0:08 ` Martin KaFai Lau
@ 2021-07-01 7:30 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-07-01 7:30 UTC (permalink / raw)
To: =?utf-8?b?VG9rZSBIw7hpbGFuZC1Kw7hyZ2Vuc2VuIDx0b2tlQHJlZGhhdC5jb20+?=
Cc: bpf, netdev, kafai, liuhangbin, brouer, magnus.karlsson, paulmck,
kuba, lkp
Hello:
This patch was applied to bpf/bpf.git (refs/heads/master):
On Tue, 29 Jun 2021 11:39:07 +0200 you wrote:
> There were a couple of READ_ONCE()-invocations left-over by the devmap RCU
> conversion. Convert these to rcu_dereference_check() as well to avoid
> complaints from sparse.
>
> v2:
> - Use rcu_dereference_check()
>
> [...]
Here is the summary with links:
- [bpf-next,v2] bpf/devmap: convert remaining READ_ONCE() to rcu_dereference_check()
https://git.kernel.org/bpf/bpf/c/0fc4dcc13f09
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-07-01 7:30 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-29 9:39 [PATCH bpf-next v2] bpf/devmap: convert remaining READ_ONCE() to rcu_dereference_check() Toke Høiland-Jørgensen
2021-06-30 0:08 ` Martin KaFai Lau
2021-07-01 7:30 ` patchwork-bot+netdevbpf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).