netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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>,
	"Sunil Goutham" <sgoutham@marvell.com>,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH bpf-next v2 06/16] thunderx: remove rcu_read_lock() around XDP program invocation
Date: Tue, 15 Jun 2021 16:54:45 +0200	[thread overview]
Message-ID: <20210615145455.564037-7-toke@redhat.com> (raw)
In-Reply-To: <20210615145455.564037-1-toke@redhat.com>

The thunderx 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: Sunil Goutham <sgoutham@marvell.com>
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
---
 drivers/net/ethernet/cavium/thunder/nicvf_main.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_main.c b/drivers/net/ethernet/cavium/thunder/nicvf_main.c
index c33b4e837515..1d752815c69a 100644
--- a/drivers/net/ethernet/cavium/thunder/nicvf_main.c
+++ b/drivers/net/ethernet/cavium/thunder/nicvf_main.c
@@ -555,9 +555,10 @@ static inline bool nicvf_xdp_rx(struct nicvf *nic, struct bpf_prog *prog,
 	xdp_prepare_buff(&xdp, hard_start, data - hard_start, len, false);
 	orig_data = xdp.data;
 
-	rcu_read_lock();
+	/* This code is invoked within a single NAPI poll cycle and thus under
+	 * local_bh_disable(), which provides the needed RCU protection.
+	 */
 	action = bpf_prog_run_xdp(prog, &xdp);
-	rcu_read_unlock();
 
 	len = xdp.data_end - xdp.data;
 	/* Check if XDP program has changed headers */
-- 
2.31.1


  parent reply	other threads:[~2021-06-15 14:55 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-15 14:54 [PATCH bpf-next v2 00/16] Clean up and document RCU-based object protection for XDP_REDIRECT Toke Høiland-Jørgensen
2021-06-15 14:54 ` [PATCH bpf-next v2 01/16] rcu: Create an unrcu_pointer() to remove __rcu from a pointer Toke Høiland-Jørgensen
2021-06-15 14:54 ` [PATCH bpf-next v2 02/16] bpf: allow RCU-protected lookups to happen from bh context Toke Høiland-Jørgensen
2021-06-15 14:54 ` [PATCH bpf-next v2 03/16] xdp: add proper __rcu annotations to redirect map entries Toke Høiland-Jørgensen
2021-06-17 19:41   ` Martin KaFai Lau
2021-06-17 21:13     ` Toke Høiland-Jørgensen
2021-06-15 14:54 ` [PATCH bpf-next v2 04/16] ena: remove rcu_read_lock() around XDP program invocation Toke Høiland-Jørgensen
2021-06-15 14:54 ` [PATCH bpf-next v2 05/16] bnxt: " Toke Høiland-Jørgensen
2021-06-15 14:54 ` Toke Høiland-Jørgensen [this message]
2021-06-15 14:54 ` [PATCH bpf-next v2 07/16] freescale: " Toke Høiland-Jørgensen
2021-06-16 14:58   ` Camelia Alexandra Groza
2021-06-15 14:54 ` [PATCH bpf-next v2 08/16] net: intel: " Toke Høiland-Jørgensen
2021-06-15 14:54 ` [PATCH bpf-next v2 09/16] marvell: " Toke Høiland-Jørgensen
2021-06-15 14:54 ` [PATCH bpf-next v2 10/16] mlx4: " Toke Høiland-Jørgensen
2021-06-15 14:54 ` [PATCH bpf-next v2 11/16] nfp: " Toke Høiland-Jørgensen
2021-06-15 14:54 ` [PATCH bpf-next v2 12/16] qede: " Toke Høiland-Jørgensen
2021-06-15 14:54 ` [PATCH bpf-next v2 13/16] sfc: " Toke Høiland-Jørgensen
2021-06-15 14:54 ` [PATCH bpf-next v2 14/16] netsec: " Toke Høiland-Jørgensen
2021-06-15 14:54 ` [PATCH bpf-next v2 15/16] stmmac: " Toke Høiland-Jørgensen
2021-06-15 14:54 ` [PATCH bpf-next v2 16/16] net: ti: " Toke Høiland-Jørgensen

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=20210615145455.564037-7-toke@redhat.com \
    --to=toke@redhat.com \
    --cc=bpf@vger.kernel.org \
    --cc=brouer@redhat.com \
    --cc=kafai@fb.com \
    --cc=kuba@kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=liuhangbin@gmail.com \
    --cc=magnus.karlsson@gmail.com \
    --cc=netdev@vger.kernel.org \
    --cc=paulmck@kernel.org \
    --cc=sgoutham@marvell.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).