From nobody Fri Sep 29 00:29:17 2023 X-Original-To: dev-commits-src-branches@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 4RxWSF3lXBz4vqfw; Fri, 29 Sep 2023 00:29:17 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RxWSF2vN6z3bbX; Fri, 29 Sep 2023 00:29:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695947357; 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=c/0Efs0+4uLSJgiZxUPhACC83+Ku/eZa/teCW3ivgiA=; b=oI+fLMuK+Hn5v7736kMdpgVl8V/VW1z08eBbPeSovaFZhmSgpBAV6/2fUi4KYTNn5nkDh6 DKxja9CyIpq8QZW0ShRwNgEAxu/kB97AisrDYPKURWtYMpy6I5pmWPLPKqxDOsNO0B/PuT eta/JJp+/DglRZIueOustCe/PjGqX5nlDmxRoS/7WiWgrjdCeApL7iHp2Kr3Zn/vJ97kZw 07H6FoE8aexVALawNyzxKpyKwLE28YxRdHkSlOv8xdFTKEYLZtwXlgi4ivvljNWvwPNzck FaTmslhuO8b83bBtBBmveP/qzaSsaoz5yRBS3XZkGDdZxAWXb+Z8aeXh9/OCSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695947357; a=rsa-sha256; cv=none; b=NSlaUYayLQJP54/yr8rjrzAGa7cBlH+o+iiuLxv9WVG0z2GSwlvHAbhsBHIz58MbLxq2ep xqQ4aIhD1jgDjJ5Ka/zKpNhreQcBFt765gCwybrpnM5A82J36ZpWn/HubDfKlyLN/baRb2 AZN+vDFsIbgSkaehcyhqG8A42ahV7mU4V0mx9/eli0P1Lw3rkq0jG7wuNqb+x7lSYYg5Hf XlyvK58CNCa4pQ/UeUF9dzozvF9S4ziX9bdEjksBgRR067Sh2f4mNX7wNC/nhhjklLBXFg iIYLRA70APz8l+ylUPA3C9E3sKLG8xFa2TMR/e68MXbxlOzOoa5RkPR+Za17vA== 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=1695947357; 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=c/0Efs0+4uLSJgiZxUPhACC83+Ku/eZa/teCW3ivgiA=; b=e75DdUIRXBXxYShX1A9sDR5JUihKT+I76v6IiQE9Ccg5QDRtxOXM4fy6Sgfr0GwoXP3nJ8 U2bOdr5KZgBrrOBh/zKEI4wmyJeuk7CKKqFvxu8VN3Kf/XUedSw9vFqpr7P9rUBszHITsj niWCff5aTn/WqtBJtRddXwAk7RuFalGmxPIOBbbuhZ6uP0j+bdvfJV5NioBYu/kudGnH8/ Q1Fgsg/gZpMPYMomU83We5b/zHRTJ3jP1ouBj5anH+3UJuM5vA7XkxbTaldumvpSlYYGFQ QjTKAKxWjwj8IJlDBP9boD/psnQ9KKM6Y2RXln6U+ac988uq/1V7hMnoQmvt8g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RxWSF1wbnzjmD; Fri, 29 Sep 2023 00:29:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38T0THPu072804; Fri, 29 Sep 2023 00:29:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38T0THXD072801; Fri, 29 Sep 2023 00:29:17 GMT (envelope-from git) Date: Fri, 29 Sep 2023 00:29:17 GMT Message-Id: <202309290029.38T0THXD072801@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 9aa0bb1e9113 - stable/14 - Assert that ifnet_detach_sxlock is held where needed. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9aa0bb1e911373541ecd039fc54270c08e2cffbe Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=9aa0bb1e911373541ecd039fc54270c08e2cffbe commit 9aa0bb1e911373541ecd039fc54270c08e2cffbe Author: Dag-Erling Smørgrav AuthorDate: 2023-09-08 10:06:01 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-29 00:28:18 +0000 Assert that ifnet_detach_sxlock is held where needed. Sponsored by: NetApp, Inc. Sponsored by: Klara, Inc. Reviewed by: kp Differential Revision: https://reviews.freebsd.org/D41770 (cherry picked from commit 9a071e4e576490370f26307405f12200218dec54) --- sys/net/if.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/net/if.c b/sys/net/if.c index fd4db49a658d..0128fb8039ee 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -1128,6 +1128,8 @@ if_detach_internal(struct ifnet *ifp, bool vmove) shutdown = VNET_IS_SHUTTING_DOWN(ifp->if_vnet); #endif + sx_assert(&ifnet_detach_sxlock, SX_XLOCKED); + /* * At this point we know the interface still was on the ifnet list * and we removed it so we are in a stable state.