From nobody Wed Jul 29 20:00:50 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 4h9NVp6wK8z6mlnY for ; Wed, 29 Jul 2026 20:00:50 +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 4h9NVp6N42z3Z81 for ; Wed, 29 Jul 2026 20:00:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785355250; 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=1TvUOO/4t5i3X48cJ8uOlO1Ymceh30hDKPo++lQEnJk=; b=Ue3JryD8EFQNZaW7numte+ADZgoqRxH/QPPUMmnl+nRQ0IPowcuSuy0jP8SkfURpDac7y2 zFe68Qp3vJFDt9CHebXtWYok6vprRxDlv84gv075tYtCRlzuR3zz6x930QCb72eq8F1J9N 8Cd6rj5yhLFogC/mIgiprHNEOG0QldwZRm1jMYm0Zp6sv90tyyw+A07uN05rpljXhc5asQ LwbdVzz0temzL/FN6HweWY/uaWNDrokxPDHmKqQmGj99rWmjr5C75t3x7zUBpiaCdobgIk Jq3S5ZWgrvtLFH8qNQzYMaLuApg7hAHuPc+imDX6qt+oQMaYCQ5lfNsvCvAgzg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785355250; a=rsa-sha256; cv=none; b=ZOJGyUPQkyU3kAiZnrFR1lE5D7Dc03f5Lheu3Xjv5RpXpHazuBXUE1gX05jlFg+cnpQBn2 2t8p0FFhjpzss9nPPQR5XepLBOxskqIZCfyO5VbfXVfDGmB4/boDWiP9crmZrMH8sW/mVC WSunGd/LntyDPW2bC4I5PvhLgn/KYd6C9OjsuS3HNisv0AOItwzSSVqZ6A9dP/dtqefAm9 SdDDqz5LDW6NtNjQxxycdFMC/zFqN0SEQX4DCmNbgIjOWHEPqeRtLTlZzOC6Ql+zWtPGnH prxo0q/kZF7B9einWLxe32z9A4VqJQ594jC/m9C3k424xDOAnZ2pm3UR/A+w6w== 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=1785355250; 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=1TvUOO/4t5i3X48cJ8uOlO1Ymceh30hDKPo++lQEnJk=; b=Exl+38n7bbld90my9X0Z20NvMotsdHlQXHSClVmz3Ap0Im9jROVL32mBD9LtY/3ahMInGc E1gPN6Q/nmOPljndEapQYoOM93TjjoaGX427+aygptgKh4+gtwmZGq7o05VymP2mwuFpfW DReNi1pJpKPxEYD+vVhR1U+piLseMz81mbWk91nKa1jkf03z4frTu9CYAo2ITW9HslWNTP v9MYwJ1LsoG+GlAQgJiCJC+FqLjFmsoZF4Bkk58CWvkeDTevtQzhqmBLT7ooIvDDr0RpJP lPssji+Eu8deYDZECoZzxs9i+A53oGmjyVkKTXC6bDn/bBvHaZ/amDoEFyg9pg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h9NVp5175zhVD for ; Wed, 29 Jul 2026 20:00:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 47bbc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 29 Jul 2026 20:00:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 815976ee1412 - main - ktls: Propagate EPG_FLAG_ANON to mapped mbufs 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 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/main X-Git-Reftype: branch X-Git-Commit: 815976ee14121bafe8a8ab002459d32f8928f2de Auto-Submitted: auto-generated Date: Wed, 29 Jul 2026 20:00:50 +0000 Message-Id: <6a6a5bf2.47bbc.1c0fe4fa@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=815976ee14121bafe8a8ab002459d32f8928f2de commit 815976ee14121bafe8a8ab002459d32f8928f2de Author: Mark Johnston AuthorDate: 2026-07-29 18:45:36 +0000 Commit: Mark Johnston CommitDate: 2026-07-29 19:30:37 +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 --- 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 9144366a9ff3..f76bf08fc438 100644 --- a/sys/kern/kern_mbuf.c +++ b/sys/kern/kern_mbuf.c @@ -1022,6 +1022,9 @@ _mb_unmapped_to_ext(struct mbuf *m, struct mbuf **mres) m_extadd(m_new, sf_buf_kva(sf), PAGE_SIZE, mb_unmapped_free_mext, sf, mref, m->m_flags & 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 0966c930ca0f..2cf6b5f1fa53 100644 --- a/sys/kern/uipc_ktls.c +++ b/sys/kern/uipc_ktls.c @@ -2423,7 +2423,8 @@ ktls_mbuf_crypto_state(struct mbuf *mb) (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); if (mb->m_flags & M_DECRYPTED) diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h index d812d66eb5eb..05fd522b7618 100644 --- a/sys/sys/mbuf.h +++ b/sys/sys/mbuf.h @@ -621,6 +621,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 */