From nobody Mon Apr 13 04:39:46 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 4fvF7X3KWsz6YFmT for ; Mon, 13 Apr 2026 04:39:52 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fvF7X1R3Lz43HP for ; Mon, 13 Apr 2026 04:39:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776055192; 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=ipHD4o1kVaIYViQbVt8h2rJW/sZrCrgHdlyL2E6lMZY=; b=GY9vWMayrb/l48FQIrFxfOf0O7zPKw4v37/LoIE6N5W87DqLPoWmL/mdltzFPSEYlynKpv 1KYfMXvHt2B9nDeWlmhPEqgC9OESCivjTkeqlBuUch6vIzpYlRzTJQ1Rq5ToFpATdocvhu 03erFryE2PXp7dqmMbWedHS1lW58ilBv2AU6wj1gkYWyJiUDHIiKScXpzkeUoCIvPttdkV M1jNbd0bMhkw+c4/yYaoudRkJc6WiCaO60cP08fguua9PChW2dsK8dfR59PacDffiYzuyj rIDqbSAR3vq5CMaer7ThldGY7zxtg7UhRcZeqdd03aVizX2dtBCCx2tqQ+lcFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776055192; a=rsa-sha256; cv=none; b=cVEFRljte8ggkWT2kBY4ETVZKPFjYh0p1/qI9GUh8D/drxnCsoo5mN9h2GKe9bZ7q954Fd rpfT4F0qQVYib7yogfygRrC280oleBSrtuh8Hgoy4jG7UPi/ffTVm0nFzxasZOlYeZ7mX4 Vs+NcEKB6zlPyd9vv+8GfzoNb4E8dYLrXjqtcO3r2NyMs2zrJ4iaSsoi5rtyrVlrjnL5J3 qzXTTSKN1Pt0Y748BGqmn7t7dfweD4LH7DNLWejokRuvr4I8/WxzG3EseZv64u7sBqqghI QLK598M9QC5Vxak8xZAADB3S/JQpMTHKvTif8AdfXni5gG1qwz1AqrM2Jh1agQ== 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=1776055192; 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=ipHD4o1kVaIYViQbVt8h2rJW/sZrCrgHdlyL2E6lMZY=; b=BrrPaPzdkrtStGUabZPqaVoMdSU8IYTIbnATYrANoXZZHDtIha+iG00szBokyBy2sgUg7j hKbi9RAFVmaRd5IfEp1DQ7xPWpSIYY9ZdIEli1CIOJm54BuvUhksir29FM1uKgMX3cQBhC fG1GakvnGRlCWIJV6EeMl0j4EK05RW59yayxz3uKE8IWVeKb7Mp1yfQYOc7Dl7XNd5qISL nPDc6Kdx2a7ACumFAIDaPyorlhM4Rs4J1OudEK5AySKht6WujQeTNLteJ3kxhfze+tVHJ2 REWXNASOjGNYrI21PS6MxgQWRbtEQeR2iy7OIJ+209lX6xiob6ryJtZCj19VuQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvF7W5lHvzpNW for ; Mon, 13 Apr 2026 04:39:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20358 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Apr 2026 04:39:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: f1fae67afbb1 - main - 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 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/main X-Git-Reftype: branch X-Git-Commit: f1fae67afbb13a41d488d0e0ec66b1805925019c Auto-Submitted: auto-generated Date: Mon, 13 Apr 2026 04:39:46 +0000 Message-Id: <69dc7392.20358.24e77fa1@gitrepo.freebsd.org> The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=f1fae67afbb13a41d488d0e0ec66b1805925019c commit f1fae67afbb13a41d488d0e0ec66b1805925019c Author: Zhenlei Huang AuthorDate: 2026-04-13 04:38:43 +0000 Commit: Zhenlei Huang CommitDate: 2026-04-13 04:38:43 +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 --- 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 519b23750b52..73138716cf46 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -479,6 +479,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 @@ -507,9 +509,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);