From nobody Mon Apr 13 04:39:46 2026 X-Original-To: dev-commits-src-main@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 4fvF7Q65QKz6YFmH for ; Mon, 13 Apr 2026 04:39:46 +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 4fvF7Q43QXz43H8 for ; Mon, 13 Apr 2026 04:39:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776055186; 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=La/1bFa5SL2NzSUNDfX/a6JMVwpqW5sm31ryHFtfsHPF0NnDWWVyy77hX9J0/cyWhITpCp fLXEwMWPcNrzXwBKfQk4xy5XUpIDsmdFeVzISAAasxjr4z2KdGj8ulxmMEgWKeda+74rca 5C4Ll8dUk2JhXpU69jDCSqpjpWn2J0iwgnNX2Zc2sX5nS46VfLL/K10aAXnvHPVAH1iZCG GiJ5VMtSMTe9M6qVIKytF1ptDyDrJUAfJJmK3B84hhgYhcL6jANb1r4EyM/q4T8S+U6r/H 34tm6yN+RSZ5SoKqh3nxapKw8D7cJPD04vNZH5vn+ZgHmX4YKB4OBKXg4K74YQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776055186; a=rsa-sha256; cv=none; b=qKdKTd+M9cA480kxdY0EpFNvvxqErbo81sRPnpGKoxuURU/SckBqfCx1hkyj1Via1tzqQa MN+eoLvMHHZwUmip9t59H6mhRowvFC2Gywoae+R2xz4pA2SSP0Ibw4BO4E7rl0U3zeOxhY Xdkrkkz1VTxzfRortt4MlwBBD235YECfNyVyEqgLKoaevUG1QftEpqKl22S/121iMm9IgY 6Ky6v77sry/EXwaKy8XmZ4FpknhKqjb2eo8EHGH9S9DuEBjE2vKNoHegQ/0l8oKDMqqEMg rF9ZHSVBTYgwjs9AfL5HpnAj6QQDC/qMBi2qk4HGIj9uMmp+RGnCArMPyiJ9sg== 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=1776055186; 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=TdTQEL2/2qHkwvOrlwFEmLlfbaU6cXVxjfSKbOwQerwgL0Ss36Gg3FjTdh1JCiluO1AMs8 NLSr0xi8KvBi0VHvddQr867ERfV9Pk8qkZ3b/if37FJ6Z/Lb55oFAaF/JVOqw2OEywuPTV zOf8egquvg2bOPyD9JF/w5V0FQ5qugOi2KQFNsq06WKC/3rhrf+jppn6nrmMd9xkQqc+Dn bw77OO3Z67bEb7jFWVu2uz5gY6lGewOTNbR3SxvjmsnUUhQ67ca9vO8NpxAxGlnadyJMCQ gcsoLCTOwAdL/WlKi+Xdh7gSqCiUEZL4EbLhY7XUBSKKNY2p434xoYFKQHcNpw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvF7Q3XqBzpKn for ; Mon, 13 Apr 2026 04:39:46 +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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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);