From nobody Thu Apr 30 09:53:21 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 4g5qHQ2KJsz6bWGv for ; Thu, 30 Apr 2026 09:53:22 +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 4g5qHQ0clSz3DSJ for ; Thu, 30 Apr 2026 09:53:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777542802; 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=ro2nM463B6paDu6HGMT9bOGiDL4XlCBusjN/6Gl6K8M=; b=U9z8i3+gLUlbgReKVwC1hZ6pV1sIIRcRT/5SPAUnM5fN2pIC6ef+XEEyC/K7Vwwc9w0NHy diY72PuwwC1K+H1KeOPJHBTi1BsVAZ4Ivn95YQwlq0jQ4V34xszCCjnjN2CAPkq2ObMdoQ P9aNL30a+IBMTIDel9wvpSeJIrH2Z/oK3bmX5gJS/vNC6uJGGOncsMEb524CHKnLUumAw2 Ur5KKiDz3XzHglgC3bEPPfZqsCuejpmk78bNztaCGOd9IQUeh+qYMBS469q5Iowj3m4Inu LNCiUQDp353yO0NJGm89WQiLtHd0PdXoUD2QsDddMpfc7D6vaJmb+5NmITQjJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777542802; a=rsa-sha256; cv=none; b=UyDopaxshB8DJZfAh01617MBwwLU45AS9j91yc5UOVmRQabjlSxWt7IEgdlOEH4ys7/JgQ lXK/xxel4bVxvpZ4MIFdrO+crm8JJfrMHuuB9hKc/wLDXT+OgZDD/rAoR1TYrR3ksmelwv Smsm3o3930sQ8L/jxRTQ9MrdUBAVY89YPayx+Ze89acCr2WGGUNqWkBGLsEUMtTZBxpraX S+pmnjSdmRKD08arPlpb4ABxSYYB9Sy9mqwxE1AlOPnjhdbBzPZhVJZPnc7ubWxO5t2Ges +Umg1+xhLdIBvyUj+JcTCIgyTu3zmabvFd+uM99+l4UM4zwJkA2Vp3GeVFo9jQ== 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=1777542802; 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=ro2nM463B6paDu6HGMT9bOGiDL4XlCBusjN/6Gl6K8M=; b=OtKR8htPSHbO/4VHopTdTbQqL1s1UIQrGWg44o84z8+Yu00dcMASCUy89PBrUhf/0rT/3H oPDQ8FHA4u/kKom587kZSGv0StLh2HfraZjJbrGc/aH+Yk0FxnlrMaJKr/ZKCauP+yiip3 NZoRqRMYCmTBN8OBIklwyy7iDQenNOvn5zCnd8akxcAegQe+cMXr4bxZCAw9iJFrmPcwLW fnrXg1iUSBX5dAaYiHFN7wddnJAi4II4UlyMlZ9eQNsIz/gKM3e0QXu2uYgJhpfNpgFxYA jnJIJlXxHQJz+o4UCmKSmrt9VwJF0M6t/8pPUk7lYGvf0Td3cLcFuMqv14JDBQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g5qHQ04RNz1L8F for ; Thu, 30 Apr 2026 09:53:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 466f4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 30 Apr 2026 09:53:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: ccfc2d91304e - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: ccfc2d91304e88aafc0ca0e13e0f8b5a156d2a01 Auto-Submitted: auto-generated Date: Thu, 30 Apr 2026 09:53:21 +0000 Message-Id: <69f32691.466f4.735e6be3@gitrepo.freebsd.org> The branch stable/15 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=ccfc2d91304e88aafc0ca0e13e0f8b5a156d2a01 commit ccfc2d91304e88aafc0ca0e13e0f8b5a156d2a01 Author: Zhenlei Huang AuthorDate: 2026-04-13 04:38:43 +0000 Commit: Zhenlei Huang CommitDate: 2026-04-30 09:52:00 +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) --- 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 75ef79738010..7424da5ccf6d 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -489,6 +489,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 @@ -517,9 +519,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);