From nobody Wed Aug 5 15:16:18 2026 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 4hFYsH3MR4z6nQD2 for ; Wed, 05 Aug 2026 15:16:19 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hFYsH0Zp4z3vTj for ; Wed, 05 Aug 2026 15:16:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785942979; 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=veqozrRaDNlS822CgmD59Hv+beZ3dCkZJ5rEjHAsu4U=; b=qz3eJdd7ACt8k16k+8ezsFubpjMRBxYmqzQsfSVLY2SdSXKX0T/fuI2wzuE9RsPtOYGMib yUCJWzbbAcM1eMt1P/Haa4kuLAy1PZ3WsCNeovdsGsvGyuHEozo79TVeVLHeEddB4aqHuF NEJBIWtljPNXxFCW9PBBAVksa9WmakBvfJZDo3ab2sBdBhhtElE9f5eBRtgEl2fh2ka3Vo Y+67okJNw5v8CL9AAvFBWqeE78ui/NghTs6fnxcxDkjkSDpR5aHNbxD5gcaa7uoRzQHht7 czc5V2mdBDvjECISOe16WpaX3bqrzzVVBXhcszeru84V2O9e7mKiuUDh85bK4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785942979; a=rsa-sha256; cv=none; b=NUeRDCpBXWEBKQRtYtnR/Dq/IenSmxTdDfm2hPCULD/xSRDMRp2CypgP2Zy2Ol9EGIdXkG tmT0pZJTuK0Vu41aykAHzpzv6Jf6mtFh7ep07sNtWtTYcYEGZgpxItvsi68DvAfHIkZIsh 5KqoZDBnjZfpDEhxwxBtfgO8tXJ5OZkpBrI0xQboNUEXzSkZvpNUIJi606nzZjUAdQrJmD upTTtdEFtBCfWmdKF+48H0bQ5SC353xCQA7InJnxTlZfM0XbiaNoQorf4AFV5KR/Y6m5YB G5fwN5dul7l+XGC4q113L1YcUUYnzkIpGnLGAapP5RgQd6AbUqr0fHETP9Cr+g== 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=1785942979; 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=veqozrRaDNlS822CgmD59Hv+beZ3dCkZJ5rEjHAsu4U=; b=HJCb3IrFK35w0YyR17mADPKHPovpAv9YDUDYCqqThrT+r48ZtAiVS0NjFcY3LPn92IqRt7 2Yle5SBPQCM0MJOKBuMUO6lNw1dACOfrO0fm5gUaJ+Woq9bPd21oC6xqnoj9tNNaCBfVzm nl42CTJZZv3jshb/wb2Jxo93XwiRaIlZTnP5Abt54FKenQvawUintD5FW99mngNxyBnt9J CAB7Cd2ZP7L/tlYFQ8g1dJR3HhShfOPm6t56xaVD48M/wC21lpZxbUtBbj0bowANHiCdX5 Ne5uLk9UdrYmNOzk2QRZA2e73sRw2sugCDMQm0FbDP4O6orQhz6opDh4ZwJnOw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hFYsG676JzgK7 for ; Wed, 05 Aug 2026 15:16:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 455f3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 05 Aug 2026 15:16:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 0af1065b3a57 - stable/14 - ktls: Propagate EPG_FLAG_ANON to mapped mbufs 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 List-Id: 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0af1065b3a5721a9e5433622dcc8a7adb96ad2ed Auto-Submitted: auto-generated Date: Wed, 05 Aug 2026 15:16:18 +0000 Message-Id: <6a7353c2.455f3.773d46b7@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0af1065b3a5721a9e5433622dcc8a7adb96ad2ed commit 0af1065b3a5721a9e5433622dcc8a7adb96ad2ed Author: Mark Johnston AuthorDate: 2026-07-29 18:45:36 +0000 Commit: Mark Johnston CommitDate: 2026-08-05 15:15:14 +0000 ktls: Propagate EPG_FLAG_ANON to mapped mbufs Otherwise ktls_mbuf_crypto_state() will reject mbufs created by _mb_unmapped_to_ext(), which arises when transmitting packets through an interface that doesn't support unmapped mbufs, and the loopback interface in particular. PR: 296498 Fixes: 3444414cb463 ("ktls: Don't attempt to modify non-anonymous mbufs on the receive path") Reviewed by: gallatin, jhb MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D57557 (cherry picked from commit 815976ee14121bafe8a8ab002459d32f8928f2de) --- sys/kern/kern_mbuf.c | 3 +++ sys/kern/uipc_ktls.c | 3 ++- sys/sys/mbuf.h | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/kern/kern_mbuf.c b/sys/kern/kern_mbuf.c index 69d82086c7a5..16e1d8af56ae 100644 --- a/sys/kern/kern_mbuf.c +++ b/sys/kern/kern_mbuf.c @@ -1021,6 +1021,9 @@ _mb_unmapped_to_ext(struct mbuf *m, struct mbuf **mres) ref_inc++; m_extadd(m_new, (char *)sf_buf_kva(sf), PAGE_SIZE, mb_unmapped_free_mext, sf, mref, M_RDONLY, EXT_SFBUF); + m_new->m_ext.ext_flags |= + (m->m_epg_flags & EPG_FLAG_ANON) != 0 ? + EXT_FLAG_SFBUF_ANON : 0; m_new->m_data += segoff; m_new->m_len = seglen; diff --git a/sys/kern/uipc_ktls.c b/sys/kern/uipc_ktls.c index dc370d033a7a..81914324fe5b 100644 --- a/sys/kern/uipc_ktls.c +++ b/sys/kern/uipc_ktls.c @@ -2360,7 +2360,8 @@ ktls_mbuf_crypto_state(struct mbuf *mb, int offset, int len) (mb->m_epg_flags & EPG_FLAG_ANON) == 0) return (KTLS_MBUF_CRYPTO_ST_SHAREDMBUF); if ((mb->m_flags & M_EXT) != 0 && - mb->m_ext.ext_type == EXT_SFBUF) + mb->m_ext.ext_type == EXT_SFBUF && + (mb->m_ext.ext_flags & EXT_FLAG_SFBUF_ANON) == 0) return (KTLS_MBUF_CRYPTO_ST_SHAREDMBUF); m_flags_ored |= mb->m_flags; diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h index 2ba2836f84ac..23b6c0de3d1a 100644 --- a/sys/sys/mbuf.h +++ b/sys/sys/mbuf.h @@ -618,6 +618,7 @@ m_epg_pagelen(const struct mbuf *m, int pidx, int pgoff) */ #define EXT_FLAG_EMBREF 0x000001 /* embedded ext_count */ #define EXT_FLAG_EXTREF 0x000002 /* external ext_cnt, notyet */ +#define EXT_FLAG_SFBUF_ANON 0x000004 /* sendfile buffer is mutable */ #define EXT_FLAG_NOFREE 0x000010 /* don't free mbuf to pool, notyet */