From nobody Fri Dec 5 16:37:57 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dNH9f1tYgz6J5Qq for ; Fri, 05 Dec 2025 16:37:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dNH9d6hTRz3Bq3 for ; Fri, 05 Dec 2025 16:37:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764952678; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GQ2xdM5FCA2ZWnx04xqTFN9wGquKqXKPeK1j3lv3x3Y=; b=C7qb0y7FyXNgi1dCaYQjXHROX17BBG1yNp8tNssCh5Ek/6gbwTK4FpT6n5/oPaawIDwX+W HUH/pY+QPV33yLQQ6ZlcbiyWrklOrKZVy66kxs0P4RZzhXAPlRYeJ/0HRnFv8QuYuvSHfb GYZ6fixq5mu8grqHMUxwnOu6eoI3W22ajHuieMSjdN6ndLnmL0Mbatv6J4DFGb01z5Ggu4 1DyzuP1GxNOFiM5PG4LjddibJlYN2ZN0k4/qeOBTdda5+A2mhye7XlJxluhn7Dp0+eTOJK LmLZvufrpoMt1Op54+sueng4m91Qz4jTf/1oGW9aR1DmkBKPm24UYukBOKapEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764952678; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GQ2xdM5FCA2ZWnx04xqTFN9wGquKqXKPeK1j3lv3x3Y=; b=oeNOb1vvOYYgEwGSPsnKzsUZj/zR4Sc77x3URVIpSW/XeuQdevMzKlXGNXnH4Yw/lqWDvX ZUkSjedPKCs+WvtFs3CfzIGW2DZPSTTso+tFm2lWml5p4UhzzL/+DG/N+gSeS5hgTXL445 /r3vQy7Y6c2Dw6szaMjBIe6WTPxQaqkWLcZ821EQrszBwnDqJidDalAdGUTj1S1KYnZ8/B InjByMlL02NiJNdLJQl7ghcDU0GPIF67Ih+v5v5cvV/LksoHbwD1QnyJGKW4EAPnebio/q QCwD1aXLJE+1QpBMVqj9/GPSWMzyb0+OzC0XyX6ptbMxs0YQzOpUthOg0x/1dA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764952678; a=rsa-sha256; cv=none; b=E7hgaaMoVXYURW8HvMo2MFY2hYwcawQyeve7yHHa9ektPl2YIV1fSl4g19n9R8AtQWJYc/ ZA00YAk/7umWP+hiTXn+Ny2MgFYbTcQU+6LpYQnfGr3Au6jzbddppz3T2Y/yv6rscmWYkf zpIZtbODATAM4PRPxb2l8CUj/etPp88ghCuX7qIntWBOmBw2fWiaZcdpco1TZ9oZhJeNRP k4DyzxQWcM03RzJF4L4xP88h4geL6CbgI4kzqOe//pg0pp9fHrPE0KpolQ1RlTwAJELgtu tm18M+q+/1g0/KgpTcSWG3Jd7k4OfZ0t0rO5yuvKrIfLAnLaBj3FhMATw/zisQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dNH9d65rQz2QY for ; Fri, 05 Dec 2025 16:37:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b8b0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 05 Dec 2025 16:37:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 8291ea8761c2 - main - netinet6: use IF_ADDR_LOCK instead of IF_AFDATA_LOCK in defrtr_ipv6_only_ifp List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8291ea8761c2d686d43f14c08ec0e644673b28f3 Auto-Submitted: auto-generated Date: Fri, 05 Dec 2025 16:37:57 +0000 Message-Id: <69330a65.3b8b0.13348106@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=8291ea8761c2d686d43f14c08ec0e644673b28f3 commit 8291ea8761c2d686d43f14c08ec0e644673b28f3 Author: Gleb Smirnoff AuthorDate: 2025-12-05 16:29:00 +0000 Commit: Gleb Smirnoff CommitDate: 2025-12-05 16:29:00 +0000 netinet6: use IF_ADDR_LOCK instead of IF_AFDATA_LOCK in defrtr_ipv6_only_ifp It is not clear what exactly this function is locking against. Seems like just use some generic interface lock. The IF_AFDATA_LOCK goes away soon together with if_afdata[], so put at least something in its place. Note that this code is dead anyway (#ifdef EXPERIMENTAL). --- sys/netinet6/nd6_rtr.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/sys/netinet6/nd6_rtr.c b/sys/netinet6/nd6_rtr.c index 224cd7e56b4d..7bbba30a3a21 100644 --- a/sys/netinet6/nd6_rtr.c +++ b/sys/netinet6/nd6_rtr.c @@ -253,6 +253,9 @@ nd6_rs_input(struct mbuf *m, int off, int icmp6len) * interface to see whether they are all advertising the "S" * (IPv6-Only) flag. If they do set, otherwise unset, the * interface flag we later use to filter on. + * + * XXXGL: The use of IF_ADDR_WLOCK (previously it was IF_AFDATA_LOCK) in this + * function is quite strange. */ static void defrtr_ipv6_only_ifp(struct ifnet *ifp) @@ -276,9 +279,9 @@ defrtr_ipv6_only_ifp(struct ifnet *ifp) ipv6_only = false; ND6_RUNLOCK(); - IF_AFDATA_WLOCK(ifp); + IF_ADDR_WLOCK(ifp); ipv6_only_old = ND_IFINFO(ifp)->flags & ND6_IFF_IPV6_ONLY; - IF_AFDATA_WUNLOCK(ifp); + IF_ADDR_WUNLOCK(ifp); /* If nothing changed, we have an early exit. */ if (ipv6_only == ipv6_only_old) @@ -312,12 +315,12 @@ defrtr_ipv6_only_ifp(struct ifnet *ifp) } #endif - IF_AFDATA_WLOCK(ifp); + IF_ADDR_WLOCK(ifp); if (ipv6_only) ND_IFINFO(ifp)->flags |= ND6_IFF_IPV6_ONLY; else ND_IFINFO(ifp)->flags &= ~ND6_IFF_IPV6_ONLY; - IF_AFDATA_WUNLOCK(ifp); + IF_ADDR_WUNLOCK(ifp); #ifdef notyet /* Send notification of flag change. */ @@ -328,9 +331,9 @@ static void defrtr_ipv6_only_ipf_down(struct ifnet *ifp) { - IF_AFDATA_WLOCK(ifp); + IF_ADDR_WLOCK(ifp); ND_IFINFO(ifp)->flags &= ~ND6_IFF_IPV6_ONLY; - IF_AFDATA_WUNLOCK(ifp); + IF_ADDR_WUNLOCK(ifp); } #endif /* EXPERIMENTAL */