From nobody Fri Jul 5 15:45:22 2024 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 4WFyX23XM9z5PlD5; Fri, 05 Jul 2024 15:45: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WFyX225kLz4KTD; Fri, 5 Jul 2024 15:45:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720194322; 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=nRYLVqFVp4DuTJchpCaKubcc66nsbe0Tqq1juL45HbI=; b=hnjqP6zj/5HcwtnwYE/cVvnn5g1J4ilxVRypNp6O+YocLhknZb2owPpV6y+aJTjp1WKfkn Rt0VLlSsO1EFQ7UBdJXScFWoL8U1UEB7cu/iUDNP+8Oa9c811KNeeaW3WAHIfnxw606rPK 7ebYiPi3wy+T3NykhS9N/4rPz5KS2Kj4Uicat8+uXN6+gfbygIgMpS63obeEvex3+bNdNC 1xoXANOj711qBnVUQcg0Xv9DDUvgzWMSpk9Uz1qGxukiqi6RdfY+LcunuTTtrZ2J8khyMT hQj7v0ndOZqGDFcUxmksygZGyoI/y2iQ9fwxhAAFvBkkUG9qUKDGpt5pQA/5sw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720194322; a=rsa-sha256; cv=none; b=HWMOlgIsyHBKFmCcGyyGysSX9R6POoza43wrtV0438/TeK4PVNl9mON4sNe2iZZ5FjR/Yq 5JW8HgEw2wDdnvDbYJD6HCgauRNJVhkRQCfgq45BkRK94JI+I5vVFpzsIBo03XW3Mx4skS 8YQ07HrEcv5r4Rs3j99Qqr9zb3AOwAl0yjkKlMdXSIFoF9KqlS/vO64+7TBelxQZZTGByt Q3WqwoPRIHHo8sYfPlH4NqNsz/Xv4Tuc68fI3suvDAvxTpID9AcNhyPNFR5kzoJlzrs/Mw 22KLud+jbVvG4v44V7Ae3YMP0uzg3WrIk/Ma9nhrRnQZScy+epYzrwDNwmNqNA== 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=1720194322; 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=nRYLVqFVp4DuTJchpCaKubcc66nsbe0Tqq1juL45HbI=; b=JGX64xO7xhB7sEGfqFzAONfc4VCbU+zz+F4gDCwi6O62BOhRLVgn7tfElOyQebTohwmNU5 mGu/wLhuSVVAgvB+JgM/ecl4/QY1ppsBXfz8Q/iXbQuX1M8I0G7fdwUYA3/GYAtTvEb7VK mAuDJm/YIoJ4cbMAEu+ZRaHXR6BNlqAY3a124lNAbt0vNgtUHfbvOrc/fT7UlopYHxO69Y lkHCxwq2m3FTi1RCbZDinBSJnjnbAcWN7XH/IxcDAQbgWN6gNLUC9HcBgvmc8m9XCOv7bQ ENH8i1+0iIeplipom6xOduotKVjyrPtX12GbxTqODTjb8fI3pFciimTrHXUtrA== 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 4WFyX21jdnz132P; Fri, 5 Jul 2024 15:45:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 465FjMv0048993; Fri, 5 Jul 2024 15:45:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 465FjMCV048990; Fri, 5 Jul 2024 15:45:22 GMT (envelope-from git) Date: Fri, 5 Jul 2024 15:45:22 GMT Message-Id: <202407051545.465FjMCV048990@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: ea9ed799ebdf - stable/13 - ifnet: Use NET_EPOCH_WAIT() macro 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/13 X-Git-Reftype: branch X-Git-Commit: ea9ed799ebdf895e1e029cfffdf8499dc7b36782 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=ea9ed799ebdf895e1e029cfffdf8499dc7b36782 commit ea9ed799ebdf895e1e029cfffdf8499dc7b36782 Author: Zhenlei Huang AuthorDate: 2024-06-24 09:57:14 +0000 Commit: Zhenlei Huang CommitDate: 2024-07-05 15:43:44 +0000 ifnet: Use NET_EPOCH_WAIT() macro This makes it easier to grep the usage. Reviewed by: kp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45715 (cherry picked from commit 71f8fbf9bda43e3ca2f26d0499b7a88d0f2f7352) (cherry picked from commit 338bb091008f32fda5cdd8cf9484fa942fa0937c) --- 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 4de0cbcb985c..850d1030a16e 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -1170,7 +1170,7 @@ if_detach_internal(struct ifnet *ifp, int vmove, struct if_clone **ifcp) * At this point we know the interface still was on the ifnet list * and we removed it so we are in a stable state. */ - epoch_wait_preempt(net_epoch_preempt); + NET_EPOCH_WAIT(); /* * Ensure all pending EPOCH(9) callbacks have been executed. This @@ -1615,7 +1615,7 @@ _if_delgroup_locked(struct ifnet *ifp, struct ifg_list *ifgl, } IFNET_WUNLOCK(); - epoch_wait_preempt(net_epoch_preempt); + NET_EPOCH_WAIT(); EVENTHANDLER_INVOKE(group_change_event, groupname); if (freeifgl) { EVENTHANDLER_INVOKE(group_detach_event, ifgl->ifgl_group);