From nobody Fri Dec 5 16:37:56 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 4dNH9d2q8nz6J5WR for ; Fri, 05 Dec 2025 16:37:57 +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 4dNH9c6Sffz3Bmq for ; Fri, 05 Dec 2025 16:37:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764952676; 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=Q7BzMgeL8QVj1pQaJgQN4ogxSX4GM/NOKUEJpN1Fz0Q=; b=f93TvzxucU2wmrHcqFiUzo3zeonr/4kHmGqfzfrclqDnasSVfUDMAtxDyGOOla+SZKAOAx iUhaLg3JKxvUe0UkCPDCx+jIEjFIQGPgOI5WM33hSK2faDs/1qOHVsacz7f8Z8Sf3AZHZw oRk/Ko5gMUpawRPrU0V+maggpQcKMxKH8/oFxpmzZvj9taaCMUK9UCK9sE7gRVtpQARgDA xSS1ul0fn5v65ruJMAzpHbmE4MPWvNROwBfOkMLarZr3xcdH1xZMP98uexIu6GIhZsl/Q5 cFoRCRSMMV6IZLIBPYvsXpoKWtK0UFw+L1ABTDVA8X0oB1/wX4sfgKdElgz44w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764952676; 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=Q7BzMgeL8QVj1pQaJgQN4ogxSX4GM/NOKUEJpN1Fz0Q=; b=InnKVffTnx5zx+FIiWx/ipPcQ8nHIqGaNkBrNVHNDp2laap/G6qY6DLnTJpu//v97gWcQX tu1aQuOoqNFvE18wKeMaatD7zE23UnIxMeWatm4uhlBQPXOolk6MdYtpW33QCdemZEI5KA bR9ddlOlRoN1ii955J63dm4RZLzzPrsQb8yl0ApPky1qDFbx+leUUqwBd67+Y6lK8KOZag 5P0H2kliC52he8OxHFgnwWCjJFqQ5Sm440XAg3zSkCsyV+kq1Ysibs7nKNgBQxDeN2Daeo yEvo6SqyWPtJRkWg4W12Wadlm3deM1tvsjfSOJb6G8/m/ArjKiZY3VNt1NdyAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764952676; a=rsa-sha256; cv=none; b=v9J4Q3KXF3+qoAMrWGuAld0p4daLwmUS/UiTtyQc6viMSuX9XJa4H7EN3+gGPVoLEoy7EX 7jWeYB/o11xJlfLAGUXyByjCD6MSKYaPEDfMhyHSQozBSU3bMcahjXUJc+nqfLdC12CP8x CGCCYgNxTSGmn4WcluFhwLsh+f5kSbJKATNtrHLlUfcIHft9zqug7xc+Ae5bR/bPIaHvzQ MrFVTKk/D7ekAkgwwlLGL/dHMyMWx7ev49UysxUDENE/p7YmPh4P5/em+NF4BeNZ3daRMK BwFwuEw2nN0cosrUFKWpi9Hp13drWmlwequTDALguodYb077AL8XPLOEZ59Q5A== 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 4dNH9c5Qb9z397 for ; Fri, 05 Dec 2025 16:37:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b0c2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 05 Dec 2025 16:37:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 59062fd0b2f1 - main - netinet6: use IF_ADDR_LOCK instead of IF_AFDATA_LOCK 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: 59062fd0b2f1a159a94f97cd05a76f66eb40837c Auto-Submitted: auto-generated Date: Fri, 05 Dec 2025 16:37:56 +0000 Message-Id: <69330a64.3b0c2.29fd282@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=59062fd0b2f1a159a94f97cd05a76f66eb40837c commit 59062fd0b2f1a159a94f97cd05a76f66eb40837c 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 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. --- sys/netinet6/scope6.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/sys/netinet6/scope6.c b/sys/netinet6/scope6.c index 08702a2e81ab..a683ebdec956 100644 --- a/sys/netinet6/scope6.c +++ b/sys/netinet6/scope6.c @@ -137,6 +137,10 @@ scope6_ioctl(u_long cmd, caddr_t data, struct ifnet *ifp) } } +/* + * XXXGL: The use of IF_ADDR_WLOCK (previously it was IF_AFDATA_LOCK) in this + * function is quite strange. + */ static int scope6_set(struct ifnet *ifp, struct scope6_id *idlist) { @@ -144,11 +148,11 @@ scope6_set(struct ifnet *ifp, struct scope6_id *idlist) int error = 0; struct scope6_id *sid = NULL; - IF_AFDATA_WLOCK(ifp); + IF_ADDR_WLOCK(ifp); sid = SID(ifp); if (!sid) { /* paranoid? */ - IF_AFDATA_WUNLOCK(ifp); + IF_ADDR_WUNLOCK(ifp); return (EINVAL); } @@ -171,7 +175,7 @@ scope6_set(struct ifnet *ifp, struct scope6_id *idlist) */ if (i == IPV6_ADDR_SCOPE_INTFACELOCAL && idlist->s6id_list[i] != ifp->if_index) { - IF_AFDATA_WUNLOCK(ifp); + IF_ADDR_WUNLOCK(ifp); return (EINVAL); } @@ -187,7 +191,7 @@ scope6_set(struct ifnet *ifp, struct scope6_id *idlist) * consistency for safety in later use. */ NET_EPOCH_EXIT(et); - IF_AFDATA_WUNLOCK(ifp); + IF_ADDR_WUNLOCK(ifp); return (EINVAL); } NET_EPOCH_EXIT(et); @@ -201,7 +205,7 @@ scope6_set(struct ifnet *ifp, struct scope6_id *idlist) sid->s6id_list[i] = idlist->s6id_list[i]; } } - IF_AFDATA_WUNLOCK(ifp); + IF_ADDR_WUNLOCK(ifp); return (error); }