From nobody Fri Oct 30 17: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 4jGTGn2dvJz6xH94 for ; Fri, 30 Oct 2026 17:53:21 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jGTGn1pGDz4llP for ; Fri, 30 Oct 2026 17:53:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793382801; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Mn4PhAyRxuUGX2qa9XvAeNe0nO5jZOD8qFnk5h0k1LM=; b=jv3KzGsAlSf9b1D39OO7s3XiTndgpOkPHuCOA5/mBNd727SzjHZrjnGzkDHm/NXIsROH9+ xwX7pcilgeAP9wus2t873CVMIwDwYNKPOpewaShilpo8tRdHQXy0wZQfD3hyzv4NU9nht3 FFhHRLAb80p1fZEzutFtyQAy1v0rmHWz0sFDWzHLPLiMj70RiKoy9kcgE32856cis5z2dV YeVrFzCr7hm6TfWy6fhqbnISD++GFKQ+yCz4sGH8Ajk6efsXNGLuMeY0FlJs8sBDaFvbli GVKYAGbUUgMPHmfyJLXONVrjbbamSUaElwWC4YOm7/NwgG+/lTGhozOcr0Mp6g== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793382801; b=OPt583j6rXg2eGRIcgmnOVWpRjW5+tQank9KhmEJDudjDQs1cWofbBWdS1pP4l5QB98DF1 ReGXZAfDXmW0XaM6yo7KyzMiuz8tazVjAXtVzCDKtyJ+sVE0eTx3II7NP6HHwzpvezzrCm ZuyuCJ0SdMVKqCB7R74843L1ZWlnTX4AG+YhSFKmjLd2qB5pFh8NCj2N85AAXbure9sGQI JIxl9/ieLXo72Cfq3njFvF6u9YHX/O6SqItjT/lHrYTI45vb1jWGBhXiVrjw3DV9TJ8Fio t9jWHtbGa1jFtqs3nQu39ggfX/5Mp2E7y+LwqW4irvJEAMS5OmyCp8PzPP/iVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793382801; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Mn4PhAyRxuUGX2qa9XvAeNe0nO5jZOD8qFnk5h0k1LM=; b=JQXhQ7J3Ld6DrzxuLZaykptnj4jkYNhfx2a0wTONgVYdTaPGsOPXZJcSDYb4oHypzO1e2m GIb97rQAofLmmAittAB6QRJC82q7SnF8+tmvD5U1Tb46sPYt6kXsUbRrN6m9LGAEMxZSzQ vf1JRy5AlIsk/VGo7eeAL8ErKK2en7ct682Qyu2+RylnEGtUS2iIpHXKcADRidcrq8o4K7 9gd6a3NJZGlZp4qTv12vE8h1Lk+Is3Zt7HbhBlGeVfj8ltik8s7G3ejDz0uaz80rRDQd2E sCxZmwpzFrSnjSFkC3lu9fGcoH/2I5S3qHs8ZXopNMa06GkMO5lzGB+OVH9OFg== 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 4jGTGn18s6zfG8 for ; Fri, 30 Oct 2026 17:53:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42196 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 30 Oct 2026 17:53:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Pouria Mousavizadeh Tehrani From: Kevin Bowling Subject: git: c804f6ecdf1e - stable/15 - netgraph/ng_ksocket: Enter epoch on NG_SEND_DATA_ONLY List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches 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: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c804f6ecdf1e9a79e6b6b0ad805adf1a0239dba4 Auto-Submitted: auto-generated Date: Fri, 30 Oct 2026 17:53:21 +0000 Message-Id: <6ae4d991.42196.1fc2995c@gitrepo.freebsd.org> The branch stable/15 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=c804f6ecdf1e9a79e6b6b0ad805adf1a0239dba4 commit c804f6ecdf1e9a79e6b6b0ad805adf1a0239dba4 Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-10-10 15:51:58 +0000 Commit: Kevin Bowling CommitDate: 2026-10-30 17:53:10 +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 (cherry picked from commit 67be955f6bd5d5b51fdee407969d1a7cde156f65) --- 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 74b2e211c0ed..aa4d4d12ed7a 100644 --- a/sys/netgraph/ng_ksocket.c +++ b/sys/netgraph/ng_ksocket.c @@ -51,6 +51,7 @@ #include #include #include +#include #include #include #include @@ -1120,6 +1121,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; @@ -1232,7 +1234,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); } /* @@ -1244,8 +1248,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; } }