From: "Toke Høiland-Jørgensen" <toke@redhat.com>
To: bpf@vger.kernel.org, netdev@vger.kernel.org
Cc: "Martin KaFai Lau" <kafai@fb.com>,
"Hangbin Liu" <liuhangbin@gmail.com>,
"Jesper Dangaard Brouer" <brouer@redhat.com>,
"Magnus Karlsson" <magnus.karlsson@gmail.com>,
"Paul E . McKenney" <paulmck@kernel.org>,
"Jakub Kicinski" <kuba@kernel.org>,
"Toke Høiland-Jørgensen" <toke@redhat.com>,
"Guy Tzalik" <gtzalik@amazon.com>,
"Saeed Bishara" <saeedb@amazon.com>
Subject: [PATCH bpf-next v5 07/19] ena: remove rcu_read_lock() around XDP program invocation
Date: Thu, 24 Jun 2021 18:05:57 +0200 [thread overview]
Message-ID: <20210624160609.292325-8-toke@redhat.com> (raw)
In-Reply-To: <20210624160609.292325-1-toke@redhat.com>
The ena driver has rcu_read_lock()/rcu_read_unlock() pairs around XDP
program invocations. However, the actual lifetime of the objects referred
by the XDP program invocation is longer, all the way through to the call to
xdp_do_flush(), making the scope of the rcu_read_lock() too small. This
turns out to be harmless because it all happens in a single NAPI poll
cycle (and thus under local_bh_disable()), but it makes the rcu_read_lock()
misleading.
Rather than extend the scope of the rcu_read_lock(), just get rid of it
entirely. With the addition of RCU annotations to the XDP_REDIRECT map
types that take bh execution into account, lockdep even understands this to
be safe, so there's really no reason to keep it around.
Cc: Guy Tzalik <gtzalik@amazon.com>
Cc: Saeed Bishara <saeedb@amazon.com>
Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
---
drivers/net/ethernet/amazon/ena/ena_netdev.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/net/ethernet/amazon/ena/ena_netdev.c b/drivers/net/ethernet/amazon/ena/ena_netdev.c
index 3bb0e66b2c7e..44ef6b88f715 100644
--- a/drivers/net/ethernet/amazon/ena/ena_netdev.c
+++ b/drivers/net/ethernet/amazon/ena/ena_netdev.c
@@ -382,7 +382,6 @@ static int ena_xdp_execute(struct ena_ring *rx_ring, struct xdp_buff *xdp)
struct xdp_frame *xdpf;
u64 *xdp_stat;
- rcu_read_lock();
xdp_prog = READ_ONCE(rx_ring->xdp_bpf_prog);
if (!xdp_prog)
@@ -439,8 +438,6 @@ static int ena_xdp_execute(struct ena_ring *rx_ring, struct xdp_buff *xdp)
ena_increase_stat(xdp_stat, 1, &rx_ring->syncp);
out:
- rcu_read_unlock();
-
return verdict;
}
--
2.32.0
next prev parent reply other threads:[~2021-06-24 16:06 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-24 16:05 [PATCH bpf-next v5 00/19] Clean up and document RCU-based object protection for XDP and TC BPF Toke Høiland-Jørgensen
2021-06-24 16:05 ` [PATCH bpf-next v5 01/19] rcu: Create an unrcu_pointer() to remove __rcu from a pointer Toke Høiland-Jørgensen
2021-06-24 16:05 ` [PATCH bpf-next v5 02/19] doc: Clarify and expand RCU updaters and corresponding readers Toke Høiland-Jørgensen
2021-06-24 16:05 ` [PATCH bpf-next v5 03/19] doc: Give XDP as example of non-obvious RCU reader/updater pairing Toke Høiland-Jørgensen
2021-06-24 16:05 ` [PATCH bpf-next v5 04/19] bpf: allow RCU-protected lookups to happen from bh context Toke Høiland-Jørgensen
2021-06-24 16:05 ` [PATCH bpf-next v5 05/19] xdp: add proper __rcu annotations to redirect map entries Toke Høiland-Jørgensen
2021-06-24 16:05 ` [PATCH bpf-next v5 06/19] sched: remove unneeded rcu_read_lock() around BPF program invocation Toke Høiland-Jørgensen
2021-06-24 16:05 ` Toke Høiland-Jørgensen [this message]
2021-06-24 16:05 ` [PATCH bpf-next v5 08/19] bnxt: remove rcu_read_lock() around XDP " Toke Høiland-Jørgensen
2021-06-24 16:05 ` [PATCH bpf-next v5 09/19] thunderx: " Toke Høiland-Jørgensen
2021-06-24 16:06 ` [PATCH bpf-next v5 10/19] freescale: " Toke Høiland-Jørgensen
2021-06-24 16:06 ` [PATCH bpf-next v5 11/19] net: intel: " Toke Høiland-Jørgensen
2021-06-24 16:06 ` [PATCH bpf-next v5 12/19] marvell: " Toke Høiland-Jørgensen
2021-06-24 16:06 ` [PATCH bpf-next v5 13/19] mlx4: " Toke Høiland-Jørgensen
2021-06-24 16:06 ` [PATCH bpf-next v5 14/19] nfp: " Toke Høiland-Jørgensen
2021-06-24 16:06 ` [PATCH bpf-next v5 15/19] qede: " Toke Høiland-Jørgensen
2021-06-24 16:06 ` [PATCH bpf-next v5 16/19] sfc: " Toke Høiland-Jørgensen
2021-06-24 16:06 ` [PATCH bpf-next v5 17/19] netsec: " Toke Høiland-Jørgensen
2021-06-24 16:06 ` [PATCH bpf-next v5 18/19] stmmac: " Toke Høiland-Jørgensen
2021-06-24 16:06 ` [PATCH bpf-next v5 19/19] net: ti: " Toke Høiland-Jørgensen
2021-06-24 18:00 ` [PATCH bpf-next v5 00/19] Clean up and document RCU-based object protection for XDP and TC BPF patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210624160609.292325-8-toke@redhat.com \
--to=toke@redhat.com \
--cc=bpf@vger.kernel.org \
--cc=brouer@redhat.com \
--cc=gtzalik@amazon.com \
--cc=kafai@fb.com \
--cc=kuba@kernel.org \
--cc=liuhangbin@gmail.com \
--cc=magnus.karlsson@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=paulmck@kernel.org \
--cc=saeedb@amazon.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).