From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.210.199 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793221133; b=FtJaqLdYPWBcDv3GwqwMx1QJhguxavZDWY2jHibGwFa3oWfqFWg8gxwEPiYj9NCCNmTI D7ARq4qrOZDrG1n8jZKB5XGtSSqZGbKYlMijfWE0pFZHpnQlk0Jvba8/hjatxKoHM5vQ/ cK3i3EP7pfO8IXh1ZCuaBgB2xZ6smvEOIJ4I6FbBiah3dAgtmBiV0LG7ROzONjEAiX18P cwzALVIWBeXbRDs9+OYaZDaodd+snSaa8EA45BcBGry229pONGmux88FCrFcb79Z/u3eq MQpF4imwhkg/qxxx1tzh4oJt9joyZNQ4tnN65e6hYgo6u+jSQdlbMXZfvoanvUujJ5A== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793221133; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Received:Date:In-Reply-To: Mime-Version:References:Message-ID:Subject:From:To:Cc:Content-Type; bh=EMvfX+w/imGbeoue0PMLqqC2Q+H4NEqIgtrLB+LMmtc=; b=jzBEWtCHbVWcF8nLmtJCKCvZ7CFbaIg5CFl4Y6ABUSjzW7AqM+t9/t/qsnHvGDTJPs9j J8lNZqlABn2nXdBu4dtT2fsjs3tAEazaNcv3hPlhZqpFjwc250VOJhIkIogNOs9YWfPT5 SqkdbIj0CUutYTaSZ6T7mTmNw/ZyA5eAECrDrnx0tF87zCkBzMg6lBRfbh+TZggZOBBpz nL9bDusOoYanqHpoxRlr9RnUGua6hVn89Zm4fW6d7jtzqr9YTJ91GnibiL5XsAMjjg+X5 gIy3TZOk+2EGFC8ubnsip6kT9jjCVn5ZaA/WhK/4UuO6iEDNKwBf1j8B6rSiHn5+hSg== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=google.com; spf=pass smtp.mailfrom=flex--kuniyu.bounces.google.com; dkim=pass header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20260707 header.b=irCKny6R; arc=none smtp.remote-ip=209.85.210.199 Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ECD51606A31E for ; Wed, 28 Oct 2026 20:58:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org ECD51606A31E Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--kuniyu.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20260707 header.b=irCKny6R Received: by mail-pf1-f199.google.com with SMTP id d2e1a72fcca58-8a01ea9e318so1870435b3a.2 for ; Wed, 28 Oct 2026 13:58:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20260707; t=1793221131; x=1793825931; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=EMvfX+w/imGbeoue0PMLqqC2Q+H4NEqIgtrLB+LMmtc=; b=irCKny6RSSpBYJiJlE0CN4zyNxU/pHyKH+Qk7JZqL+zDEl4n/TRua+NuZEGNQ4VjkY 8Iwpw6gGG/qOa/AT2SmLQS1yOdrtHRSytuabu7733svZyDGKEw33lBs5OcxjvwiD5jfI Erel6sbloJpWvQICUZdo2g4U9pXcZVXOjXa16QEvg9XRDVvyCVy26A2KGveDP83vCF/r wlKJ9A3V4l9TgW/kCLCtPPNvu8qW/kFzjv45wTG07wA4QzSxcFeY0JJF3dt22kLlhLn8 HSWy0G0CVi5CCOueusrhx5svOEjfFPzjy7Ljm1Vt5QZxCzq6d+Gv2tSh/8SyrY3QAWsV qzzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793221131; x=1793825931; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=EMvfX+w/imGbeoue0PMLqqC2Q+H4NEqIgtrLB+LMmtc=; b=O4v0sidobLS5w5y3GnVhnmDCdp1zavBT6xcmT4XLHhOBuEJ2S2+Nm1sUHXIlajaKt8 dWrWF/mfQr1iM/L7Df4HyJ6Smb38sOQ7/AcN+VHBnIh2HZIYds4tqROQqhqZUhHULrLy CQc5dgyCTZJFRcTde2CnZvF5c0RyFgjiX4/+qIrybOZWtC3oisK9XdNUM5IIO7FykKF2 5lcIkwtnvduMwaC9ok3q/J4DusyBYCLKZVLUA3izVNRUtBeCFqd6BGWSV1vCi+VuQ7UZ iHKeinQxC2yVvdDEYvDloE3+hgXrBju2gSovla3fzzefOanfB11Be/nUqVRKZ+SeDBC5 rjPQ== X-Forwarded-Encrypted: i=1; AKwUvBz6i2x+K71W1fx1sK2+TSV+C5Qohs5sLwn1TCA6TEm7idOauiqtllyC3okzFkOz/Icx2QYKn54=@vger.kernel.org X-Gm-Message-State: AFq9FYLa/IETDRxbuAI60pc4ACLd+bEPO6VWLZ1IJ1psSWL9BKA6/b0p rM3x8c+Js57EtKjgPUGxLKYFkzIsy5XnrtvJqDVKx9YD0KkgWUwCsqEftIr4+8KivDcNe4EmfFA TAupKeg== X-Received: from pfux11.prod.google.com ([2002:a05:6a00:bcb:b0:891:240a:3bb3]) (user=kuniyu job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:189e:b0:8a5:a8a2:95a0 with SMTP id d2e1a72fcca58-8a6e8d7bc89mr3013096b3a.52.1793221130992; Wed, 28 Oct 2026 13:58:50 -0700 (PDT) Date: Wed, 28 Oct 2026 20:58:50 +0000 In-Reply-To: X-Mailing-List: netdev@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list Mime-Version: 1.0 References: <20261026003804.61923-1-imv4bel@gmail.com> <20261026003804.61923-3-imv4bel@gmail.com> Message-ID: Subject: Re: [PATCH net v4 2/2] inet: restore refcount ordering for lockless ehash walks From: Kuniyuki Iwashima To: Hyunwoo Kim Cc: edumazet@kernel.org, ncardwell@google.com, davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, horms@kernel.org, martin.lau@linux.dev, john.fastabend@gmail.com, weiwan@google.com, sd@queasysnail.net, jiayuan.chen@linux.dev, netdev@vger.kernel.org, stable@vger.kernel.org Content-Type: text/plain; charset="us-ascii" On Wed, 28 Oct 2026 12:29:10 +0900, Hyunwoo Kim wrote: > On Wed, Oct 28, 2026 at 02:13:15AM +0000, Kuniyuki Iwashima wrote: > > On Mon, 26 Oct 2026 09:37:45 +0900, Hyunwoo Kim wrote: > > > Before commit fb041bb7c0a9 ("locking/refcount: Consolidate implementations > > > of refcount_t"), default builds implemented refcount_inc_not_zero() using > > > atomic_add_unless(), which provided full memory ordering on success. The > > > commit removed that ordering on weakly ordered architectures, allowing > > > validation after a successful reference acquisition in lockless ehash > > > walks to be reordered before it. > > > > > > Use refcount_inc_not_zero_acquire() in the IPv4 and IPv6 established > > > > Does bpf_sk_assign() need it too ? > > > > If the socket is taken from lookup helper, it's safe, but what > > happens if the pointer is taken from BTF (27e5203bd9c5), e.g. > > tp->inet_conn.icsk_accept_queue.rskq_accept_head ? > > Yeah the same ordering issue remains when the pointer is obtained from > BTF without a reference. Fixes: 27e5203bd9c5. > > However, I think this is better handled in a separate follow-up patch. > What do you think? I think it can be just squashed given 27e5203bd9c5 exist in the oldest LTS 5.10. > > > > > > > > lookups and in inet_twsk_purge(), where the network namespace is validated > > > again after taking a reference. Use refcount_set_release() when setting > > > refcounts in the SYN cookie, TCP Fast Open, request migration, and > > > TIME_WAIT paths. Keep the existing TIME_WAIT smp_wmb(), which separately > > > orders the refcount store before ehash publication. > > > > > > Fixes: fb041bb7c0a9 ("locking/refcount: Consolidate implementations of refcount_t") > > > Cc: stable@vger.kernel.org > > > Signed-off-by: Hyunwoo Kim > > > --- > > > net/ipv4/inet_connection_sock.c | 6 +++--- > > > net/ipv4/inet_hashtables.c | 2 +- > > > net/ipv4/inet_timewait_sock.c | 4 ++-- > > > net/ipv4/syncookies.c | 2 +- > > > net/ipv4/tcp_fastopen.c | 2 +- > > > net/ipv6/inet6_hashtables.c | 2 +- > > > 6 files changed, 9 insertions(+), 9 deletions(-) > > > > > > diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c > > > index bd0bad96c93c3..837cb91e5b173 100644 > > > --- a/net/ipv4/inet_connection_sock.c > > > +++ b/net/ipv4/inet_connection_sock.c > > > @@ -1056,8 +1056,8 @@ static void reqsk_timer_handler(struct timer_list *t) > > > * hold another count to prevent use-after-free and > > > * call reqsk_put() just before return. > > > */ > > > - refcount_set(&nreq->rsk_refcnt, 2 + 1); > > > timer_setup(&nreq->rsk_timer, reqsk_timer_handler, TIMER_PINNED); > > > + refcount_set_release(&nreq->rsk_refcnt, 2 + 1); > > > reqsk_queue_migrated(&inet_csk(nsk)->icsk_accept_queue, req); > > > > > > req = nreq; > > > @@ -1441,7 +1441,7 @@ struct sock *inet_csk_complete_hashdance(struct sock *sk, struct sock *child, > > > goto child_put; > > > } > > > > > > - refcount_set(&nreq->rsk_refcnt, 1); > > > + refcount_set_release(&nreq->rsk_refcnt, 1); > > > if (inet_csk_reqsk_queue_add(sk, nreq, child)) { > > > __NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPMIGRATEREQSUCCESS); > > > reqsk_migrate_reset(req); > > > @@ -1494,7 +1494,7 @@ void inet_csk_listen_stop(struct sock *sk) > > > if (nsk) { > > > nreq = inet_reqsk_clone(req, nsk); > > > if (nreq) { > > > - refcount_set(&nreq->rsk_refcnt, 1); > > > + refcount_set_release(&nreq->rsk_refcnt, 1); > > > > > > rcu_read_lock(); > > > if (inet_csk_reqsk_queue_add(nsk, nreq, child)) { > > > diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c > > > index 58d54965036a2..7ffa9171d6de1 100644 > > > --- a/net/ipv4/inet_hashtables.c > > > +++ b/net/ipv4/inet_hashtables.c > > > @@ -550,7 +550,7 @@ struct sock *__inet_lookup_established(const struct net *net, > > > if (sk->sk_hash != hash) > > > continue; > > > if (likely(inet_match(net, sk, acookie, ports, dif, sdif))) { > > > - if (unlikely(!refcount_inc_not_zero(&sk->sk_refcnt))) > > > + if (unlikely(!refcount_inc_not_zero_acquire(&sk->sk_refcnt))) > > > goto out; > > > if (unlikely(hlist_nulls_unhashed_lockless(&sk->sk_nulls_node) || > > > !inet_match(net, sk, acookie, ports, dif, > > > diff --git a/net/ipv4/inet_timewait_sock.c b/net/ipv4/inet_timewait_sock.c > > > index d4c781a0667fe..74ff40d42e56b 100644 > > > --- a/net/ipv4/inet_timewait_sock.c > > > +++ b/net/ipv4/inet_timewait_sock.c > > > @@ -141,7 +141,7 @@ void inet_twsk_hashdance_schedule(struct inet_timewait_sock *tw, > > > * Also note that after this point, we lost our implicit reference > > > * so we are not allowed to use tw anymore. > > > */ > > > - refcount_set(&tw->tw_refcnt, 3); > > > + refcount_set_release(&tw->tw_refcnt, 3); > > > > > > /* Ensure tw_refcnt has been set before tw is published. > > > * smp_wmb() provides the necessary memory barrier to enforce this > > > @@ -328,7 +328,7 @@ void inet_twsk_purge(struct inet_hashinfo *hashinfo) > > > if (check_net(sock_net(sk))) > > > continue; > > > > > > - if (unlikely(!refcount_inc_not_zero(&sk->sk_refcnt))) > > > + if (unlikely(!refcount_inc_not_zero_acquire(&sk->sk_refcnt))) > > > continue; > > > > > > if (check_net(sock_net(sk))) { > > > diff --git a/net/ipv4/syncookies.c b/net/ipv4/syncookies.c > > > index 6440305615378..4b2d2713653b7 100644 > > > --- a/net/ipv4/syncookies.c > > > +++ b/net/ipv4/syncookies.c > > > @@ -205,7 +205,7 @@ struct sock *tcp_get_cookie_sock(struct sock *sk, struct sk_buff *skb, > > > child = icsk->icsk_af_ops->syn_recv_sock(sk, skb, req, dst, > > > NULL, &own_req, NULL); > > > if (child) { > > > - refcount_set(&req->rsk_refcnt, 1); > > > + refcount_set_release(&req->rsk_refcnt, 1); > > > sock_rps_save_rxhash(child, skb); > > > > > > if (rsk_drop_req(req)) { > > > diff --git a/net/ipv4/tcp_fastopen.c b/net/ipv4/tcp_fastopen.c > > > index 471c78be55137..e40477b6b5549 100644 > > > --- a/net/ipv4/tcp_fastopen.c > > > +++ b/net/ipv4/tcp_fastopen.c > > > @@ -364,7 +364,7 @@ static struct sock *tcp_fastopen_create_child(struct sock *sk, > > > tcp_reset_xmit_timer(child, ICSK_TIME_RETRANS, > > > req->timeout, false); > > > > > > - refcount_set(&req->rsk_refcnt, 2); > > > + refcount_set_release(&req->rsk_refcnt, 2); > > > > > > sk_mark_napi_id_set(child, skb); > > > > > > diff --git a/net/ipv6/inet6_hashtables.c b/net/ipv6/inet6_hashtables.c > > > index aa5fa1dd062f7..1eea584d80df8 100644 > > > --- a/net/ipv6/inet6_hashtables.c > > > +++ b/net/ipv6/inet6_hashtables.c > > > @@ -105,7 +105,7 @@ struct sock *__inet6_lookup_established(const struct net *net, > > > continue; > > > if (!inet6_match(net, sk, saddr, daddr, ports, dif, sdif)) > > > continue; > > > - if (unlikely(!refcount_inc_not_zero(&sk->sk_refcnt))) > > > + if (unlikely(!refcount_inc_not_zero_acquire(&sk->sk_refcnt))) > > > goto out; > > > > > > if (unlikely(hlist_nulls_unhashed_lockless(&sk->sk_nulls_node) || > > > -- > > > 2.43.0 > > >