Netdev List
 help / color / mirror / Atom feed
From: Eric Dumazet <edumazet@kernel.org>
To: "David S . Miller" <davem@davemloft.net>,
	Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
	Willem de Bruijn <willemb@google.com>
Cc: Simon Horman <horms@kernel.org>,
	netdev@vger.kernel.org, Eric Dumazet <edumazet@kernel.org>
Subject: [PATCH net-next] net/packet: wait for a single RCU grace period in packet_release()
Date: Wed, 18 Nov 2026 22:14:39 +0100	[thread overview]
Message-ID: <20261118211439.1453635-1-edumazet@kernel.org> (raw)

Closing an AF_PACKET socket waits for one RCU grace period per ring
in packet_set_ring(), then for another one at the end of
packet_release(). A socket with an rx ring (libpcap, tcpdump) pays for
two grace periods, a socket with both rx and tx rings for three.

All the RCU unpublishing is done at the beginning of packet_release(),
when unregister_prot_hook() removes the socket from the ptype lists or
from its fanout group. Nothing is unpublished after that point:

- When closing, packet_set_ring() finds the socket not running and
  does not touch the hooks.

- fanout_release() only clears po->fanout and unlinks the group from
  fanout_list, both under fanout_mutex. If it drops the last reference
  on the group, all members have already been unlinked, so the fanout
  hook was removed by __fanout_unlink().

Call fanout_release() and synchronize_net() right after the socket has
been detached, before the rings are torn down, and skip the wait in
packet_set_ring() when closing. That single grace period covers the
rings, po->rollover and the fanout group.

The setsockopt() path of packet_set_ring() is unchanged.

Average close() duration over 20 sockets bound to lo, in a 4 vCPU
virtme-ng guest:

                         before      after
  no ring                7.86 ms    7.76 ms
  rx ring                8.01 ms    4.01 ms
  tx ring                8.00 ms    4.00 ms
  rx + tx rings         11.96 ms    4.00 ms
  rx + tx rings, fanout 12.02 ms    4.01 ms

Tested with tools/testing/selftests/net/run_afpackettests
(psock_fanout, psock_tpacket, txring_overwrite) on a kernel without
KASAN or lockdep.

Signed-off-by: Eric Dumazet <edumazet@kernel.org>
---
 net/packet/af_packet.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 6ace2a5b2d177e3de89361a3092536a8f6c5e00a..96c5216a9d6b47700da682d864368eead8572297 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -3224,6 +3224,15 @@ static int packet_release(struct socket *sock)
 
 	packet_flush_mclist(sk);
 
+	f = fanout_release(sk);
+
+	/* The socket is no longer reachable from the receive path:
+	 * unregister_prot_hook() removed it from the ptype lists and
+	 * from its fanout group, if any. Wait once for packets currently
+	 * being received, this covers the rings, po->rollover and @f.
+	 */
+	synchronize_net();
+
 	lock_sock(sk);
 	if (po->rx_ring.pg_vec) {
 		memset(&req_u, 0, sizeof(req_u));
@@ -3236,10 +3245,6 @@ static int packet_release(struct socket *sock)
 	}
 	release_sock(sk);
 
-	f = fanout_release(sk);
-
-	synchronize_net();
-
 	kfree(po->rollover);
 	if (f) {
 		fanout_release_data(f);
@@ -4674,7 +4679,9 @@ static int packet_set_ring(struct sock *sk, union tpacket_req_u *req_u,
 
 	spin_unlock(&po->bind_lock);
 
-	synchronize_net();
+	/* packet_release() already detached the socket and waited. */
+	if (!closing)
+		synchronize_net();
 
 	err = -EBUSY;
 	mutex_lock(&po->pg_vec_lock);
-- 
2.53.0


                 reply	other threads:[~2026-11-18 21:14 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20261118211439.1453635-1-edumazet@kernel.org \
    --to=edumazet@kernel.org \
    --cc=davem@davemloft.net \
    --cc=horms@kernel.org \
    --cc=kuba@kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    --cc=willemb@google.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