From nobody Mon May 4 16:51:15 2026 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 4g8SMm0GMJz6brF9 for ; Mon, 04 May 2026 16:51:16 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g8SMl4tXwz3w2Z for ; Mon, 04 May 2026 16:51:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777913475; 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=LSpXu69i5n8TN8uRYy3nu/ZLz/SMNLRAN+ITcVmdlG0=; b=ofYd4HkwheI+/jO4ZwTyL+RqtS6oXO6Ib6OE+oSlY4fVh50UiyPGJZwBCf/WQw4pQIeUOz XD3HD7vjGT131bgooVVeFMe6GOUsMko91JmarN2UbohIf6XT7NhZgk5ha3kkBS8t8bnU4r kNvXR6V+fsBD5S549k3K6Ue/gqdxdNvF6f2iaCSxqcuNIVd1cXbk14vPZTk0l25YSrwo2t ed9M21rOVut8+IesUr4KS4wdXP9BaOs7YEmGv659FdYcSRxYcek8q5VplDcCMOZm51m+PV cH/GeDx024/fcsKbd9l1vM8jbvKcwN87nAsXY01XKw/zvbSPchZ6UVSos9aqzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777913475; a=rsa-sha256; cv=none; b=ggg8H6BFpMEBN4+hWRxThXTi9vVUNweqDDrmpUI6vsRWaRUdV9DrmcGNrT2m9psNOvAbRf usMO50qsquHNU5ahH413sxPaYtoWif2SDNM/qh4UA/AyfjXZvI6lEwlo9id81vE2K55Cjh n5G9zX/xbV8S6yg0mrNnV9YJ07gekJlNwScaI7zWZyz0/YBW7FbQsrmMepG8FYUS+3DMsg FkgERQfpcqmrbVbC4WW/yQyz1e0v/lFPOyFd4aa7JB7i1mWpFBWjhryPaLXFPlu3BlbmkD WbsbXg4HMfKHoTGddBZ0cV2NJtIIklW4q3TgxZBbu9BGQNnXqOwz0CXKBbyHzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777913475; 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=LSpXu69i5n8TN8uRYy3nu/ZLz/SMNLRAN+ITcVmdlG0=; b=MN1c7PmRV2jbtOg1PuxzXLYhNQdcUZoidJLa03dnMd5TsWOrXLpTFzrMBLHmEjQNx+ltyx smCCusgKxetJbPWZxpjc9AY/NCbFdcOFxeROBklIE0Ufah7QQqjx50zgLOF27+H6mYhC9d M0UZSelFXhn/oiLQHqLvgsd3QQ1CpnSMzPSGpxWfQzpo3BxV6sKQySgE7ndz3yejV1Bshm UVGjLQEGLB+ZRVhR2aT02KII4qG2+HRISWWm0s1qi4V+ijaQ/JFN5olXvsBfOQDNePXmlP cmEy8vNyxeTAXKfgZC9aMjXHR9yhuAiOufgPikfN17lF0JupmeP4Qqku56vzBA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8SMl4TYWzCb7 for ; Mon, 04 May 2026 16:51:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25b3d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 04 May 2026 16:51:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: e7063f1d8b5d - stable/14 - ifnet: vnet_if_return(): Avoid unnecessary recursive acquisition of ifnet_detach_sxlock 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e7063f1d8b5db637fdedc6a66abccc0efd76d9c7 Auto-Submitted: auto-generated Date: Mon, 04 May 2026 16:51:15 +0000 Message-Id: <69f8ce83.25b3d.6acee854@gitrepo.freebsd.org> The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=e7063f1d8b5db637fdedc6a66abccc0efd76d9c7 commit e7063f1d8b5db637fdedc6a66abccc0efd76d9c7 Author: Zhenlei Huang AuthorDate: 2026-04-13 04:38:43 +0000 Commit: Zhenlei Huang CommitDate: 2026-05-04 16:49:41 +0000 ifnet: vnet_if_return(): Avoid unnecessary recursive acquisition of ifnet_detach_sxlock vnet_if_return() will be invocked by vnet_sysuninit() on vnet destructing, while the lock ifnet_detach_sxlock has been acquired in vnet_destroy() already. With this change the order of locking is more clear. There should be no functional change. Reviewed by: pouria Fixes: 868bf82153e8 if: avoid interface destroy race MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D56288 (cherry picked from commit f1fae67afbb13a41d488d0e0ec66b1805925019c) (cherry picked from commit ccfc2d91304e88aafc0ca0e13e0f8b5a156d2a01) --- sys/net/if.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net/if.c b/sys/net/if.c index 1d6b2f7b9461..c4c2df61dd1d 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -491,6 +491,8 @@ vnet_if_return(const void *unused __unused) i = 0; + /* The lock has already been aquired in vnet_destroy() */ + sx_assert(&ifnet_detach_sxlock, SX_XLOCKED); /* * We need to protect our access to the V_ifnet tailq. Ordinarily we'd * enter NET_EPOCH, but that's not possible, because if_vmove() calls @@ -519,9 +521,7 @@ vnet_if_return(const void *unused __unused) IFNET_WUNLOCK(); for (int j = 0; j < i; j++) { - sx_xlock(&ifnet_detach_sxlock); if_vmove(pending[j], pending[j]->if_home_vnet); - sx_xunlock(&ifnet_detach_sxlock); } free(pending, M_IFNET);