From nobody Sat Oct 10 19:14:05 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 4j2D1B1GrGz6vhmQ for ; Sat, 10 Oct 2026 19:14:06 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4j2D1B09NJz3CG1 for ; Sat, 10 Oct 2026 19:14:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791659646; 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=hkRPVkS3TCvTYb9a2LXODe5h19YUOAROXjrXtLBpShk=; b=lU178zhYdBrYI/Cj1LNHjTXGWkZTpNCHZxfjmoBrtWUMcEJk9bjSbXmKRqRor0+xHH3XYx SIm9dmUpM3h/+wtcl5h1uvyrgW57XOgJL3RljY2+0Cpro/12COpN0g3nLDWK0c2ZExvPOC 2HewTHngnLMPpQ1tV/RNdHZVIiuld+NazrQXmK3m3WPgY1Rvc+/72eIMLP9ZhED1dBSzKf ikAGGFgPmexeo9iwmuXZQTcgvt0R01Ap4PY4bAHJCdk/v18pr6Yb1cBivwTy4ZwUhSJZ3l NgKSyK8eDErOycusHPJgKzufwtSiq2TcNcdAIUwRXye6g2kdtfC/k151DAGZtA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791659646; b=LKE7izbIlQ6x8HdjVGrBZSI5fjge7Z6C+0CdCo3wCc833yrpNqu2KhoYtuUx0XngzyR9MG UTgNPJnFfaScCV3ZnI63SBEXN8po2MguXWfMViPm0rU2CaYARxIkXSKgB4CRdGXX3sqel+ VWO4is26W7hhDUC6Flltqq1mXT65O+m1aybklRhusD6kHLKuEUgRMceJX7rHWB0/e4ftTU gor2q/vRcG8rutD72B4qYbCkN1/zKg5Kg2fSyxZVX4YrLrMGHpiLkeHCxbvH4FTECA2nBk AUoPpK49aKze7bQm8dKpnjK8oJE2jOHOLPHNNk+q32RBIsiIivO/3kAAwAl/hg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791659646; 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=hkRPVkS3TCvTYb9a2LXODe5h19YUOAROXjrXtLBpShk=; b=tRdYF2iJ2Nwv6AW6QjGYvrkR7kiYhbFwR7k+Iuo1F217NBLcGnTwwPcjX2GI18G3Er6O0k NZJgUCNqcKvjq4aA4A09g9H5OYQsB4lC/jlaYIkoVxYYoGqLFCdIfm745Eab3UYQf4sS3D RLbwUsCGsNcfAtvggIPvmpzyjIlY02iG0XpUdHxSv5LUVSuBw+BtTC4+nwPZxLc36xL+pn TBmCobgig98HbMcI0F3VPQhJXQtR2qwwe1VgbsbvfxJvjbirapPSPg0y/1ebtqbC/G7hlr qlb5Q1rAV08N/QMLBUtnnX+/e70Zj02it3fow5XcDcm+vDyE2Xeu9f0+GYpnlA== 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 4j2D196L5wz16wJ for ; Sat, 10 Oct 2026 19:14:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26341 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 10 Oct 2026 19:14:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: 67be955f6bd5 - main - netgraph/ng_ksocket: Enter epoch on NG_SEND_DATA_ONLY List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: Commit messages for the main branch of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pouria X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 67be955f6bd5d5b51fdee407969d1a7cde156f65 Auto-Submitted: auto-generated Date: Sat, 10 Oct 2026 19:14:05 +0000 Message-Id: <6aca8e7d.26341.5378fd00@gitrepo.freebsd.org> The branch main has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=67be955f6bd5d5b51fdee407969d1a7cde156f65 commit 67be955f6bd5d5b51fdee407969d1a7cde156f65 Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-10-10 15:51:58 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-10-10 19:12:35 +0000 netgraph/ng_ksocket: Enter epoch on NG_SEND_DATA_ONLY The work queued by ng_send_fn() is intentionally processed outside of the epoch in ngthread(). It is ng_ksocket's responsibility to enter epoch if it decides to send data from such work. Reviewed by: glebius Fixes: 104827151e2a ("ng_iface: don't recursively enter epoch ...") Differential Revision: https://reviews.freebsd.org/D60589 --- sys/netgraph/ng_ksocket.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sys/netgraph/ng_ksocket.c b/sys/netgraph/ng_ksocket.c index bb5d56eabb86..0ed9da97adcd 100644 --- a/sys/netgraph/ng_ksocket.c +++ b/sys/netgraph/ng_ksocket.c @@ -51,6 +51,7 @@ #include #include #include +#include #include #include #include @@ -1119,6 +1120,7 @@ ng_ksocket_incoming(struct socket *so, void *arg, int waitflag) static void ng_ksocket_incoming2(node_p node, hook_p hook, void *arg1, int arg2) { + struct epoch_tracker et; struct socket *so = arg1; const priv_p priv = NG_NODE_PRIVATE(node); struct ng_mesg *response; @@ -1231,7 +1233,9 @@ ng_ksocket_incoming2(node_p node, hook_p hook, void *arg1, int arg2) } sendit: /* Forward data with optional peer sockaddr as packet tag */ + NET_EPOCH_ENTER(et); NG_SEND_DATA_ONLY(error, priv->hook, m); + NET_EPOCH_EXIT(et); } /* @@ -1243,8 +1247,11 @@ sendit: /* Forward data with optional peer sockaddr as packet tag */ struct mbuf *m; m = m_gethdr(M_NOWAIT, MT_DATA); - if (m != NULL) + if (m != NULL) { + NET_EPOCH_ENTER(et); NG_SEND_DATA_ONLY(error, priv->hook, m); + NET_EPOCH_EXIT(et); + } priv->flags |= KSF_EOFSEEN; } }