From nobody Wed Dec 17 22:06:09 2025 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 4dWntt6X5Jz6LWVR for ; Wed, 17 Dec 2025 22:06:14 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dWntt62gXz3MX7 for ; Wed, 17 Dec 2025 22:06:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766009174; 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=DrkoGaGF7GoTAgCImq6jdp2Oqy1Ylej1cNHchwKeVB0=; b=CLVMDQ39bSsoTxwJ9pQvjyJ7v9xLicDCQjtzfXhHw5+MrOnLnAmh+MtcBPkiQUf83SBUIu z7SgBqOTXxdZCWPVBGfmbkobm8Xqw2rwzx5n/+zbkkpGgzHTUXYkDVM4RdfSuz5RPIxGbi lGWcD3QN8F+Xza+l6MlLW3zZMvxGq+aio7dHSxSlngWR8kziQ43RKRhWznbXHVhCf7As88 9mhdJm5hzxlncNzRYKgeGvvk2IRA/LWMkUy+SFy0CpJPfT0/jweXZz72EdaZMX79WajBe4 87iAj30EEYuEWQPm76pG8t39Dvwz9cP+uucr86GDmlYENllbnxWZZr7L7SqfMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766009174; 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=DrkoGaGF7GoTAgCImq6jdp2Oqy1Ylej1cNHchwKeVB0=; b=UXAJ9q0x5/CDV5KS41XerLlARQxwGgMXw6/5rDHxx8SjqI3l8BIOO3Q2AXBeq0xJOjtsLv Nj+aXmBjH1Q2jy61cf+60uJLvgiUKPFmO/p6hC44YYLYDAAub065yR39BAXdlA93XvnsNX DGUgOC9tDq0vvfTq/SkyYnhHh27c7pEZ+tLInZzfbavReKfy2bqcwyDx6fKIgJ6wFzDT59 I2nauXbSqq3J8KCiQKZ2m8oHZ+MalrXD57WOp4bCGiuKbEoSS3j/uGE/GRMF0dPdDYA8V8 xpLDWf2W6Lx1GkSZs5Cem/jEtqyuTY8eCf+Cb2Sj7Fg9gRSGWP+kS5dF29FATg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766009174; a=rsa-sha256; cv=none; b=Nz3PqQu2vQvlupeOACIFWgCBeBzHmtvWF11TrHZwKvAp853exP6eFL6yAGBQZZ0EKGu4i0 4tmUI5xYIcFu8qVEDpj+KBAdPFvogdDc08Ypx1tAnHK7A8POG7UabLlGfCV795xmKP/a8e 62IOSaR3w5Dwi8Bnm0t6/dEHGdhvBlxFMM81wdrGIZrrd3jYXowf+xal9wEKlHV2pRkNsJ A8biwZTh371PpR3Tw+3EpdTtmBVPPq48mztuoBO6lQqTjdQ4d+mCRR2CtoqBW1Aqg5Agni oOHiFWzIYM4CM6zuck4Bm7dt8Wft4TYXGY/Ybxj/SWsTIKnTWDF3p0KM0aYVuA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dWntt5QCvz194K for ; Wed, 17 Dec 2025 22:06:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 474a6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 17 Dec 2025 22:06:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 104827151e2a - main - ng_iface: don't recursively enter epoch in the rcvdata method 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 104827151e2abc7fe6fb9bf59a12b443657d1506 Auto-Submitted: auto-generated Date: Wed, 17 Dec 2025 22:06:09 +0000 Message-Id: <69432951.474a6.4ba2dd23@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=104827151e2abc7fe6fb9bf59a12b443657d1506 commit 104827151e2abc7fe6fb9bf59a12b443657d1506 Author: Gleb Smirnoff AuthorDate: 2025-12-17 22:05:53 +0000 Commit: Gleb Smirnoff CommitDate: 2025-12-17 22:05:53 +0000 ng_iface: don't recursively enter epoch in the rcvdata method Reviewed by: p.mousavizadeh_protonmail.com, zlei Differential Revision: https://reviews.freebsd.org/D54241 --- sys/netgraph/ng_iface.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys/netgraph/ng_iface.c b/sys/netgraph/ng_iface.c index fbe89e13474b..aa150719dbf9 100644 --- a/sys/netgraph/ng_iface.c +++ b/sys/netgraph/ng_iface.c @@ -680,7 +680,6 @@ ng_iface_rcvdata(hook_p hook, item_p item) const priv_p priv = NG_NODE_PRIVATE(NG_HOOK_NODE(hook)); const iffam_p iffam = get_iffam_from_hook(priv, hook); struct ifnet *const ifp = priv->ifp; - struct epoch_tracker et; struct mbuf *m; int isr; @@ -723,9 +722,7 @@ ng_iface_rcvdata(hook_p hook, item_p item) random_harvest_queue(m, sizeof(*m), RANDOM_NET_NG); M_SETFIB(m, ifp->if_fib); CURVNET_SET(ifp->if_vnet); - NET_EPOCH_ENTER(et); netisr_dispatch(isr, m); - NET_EPOCH_EXIT(et); CURVNET_RESTORE(); return (0); }