From nobody Thu Aug 6 15:01:43 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 4hG9V008gcz6nB9k for ; Thu, 06 Aug 2026 15:01:44 +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 4hG9Tz3vsGz3Dvk for ; Thu, 06 Aug 2026 15:01:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786028503; 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=7WRD+t7/zRnCN0rlu3uFDz7fX3I1aof2tfZ0zhPHiYU=; b=XzbAp0e11YmqMo7k6SgyRfFaJjP/ZIGxz3Egx4VcGognVkW+cFfnBhzGIQnOwZsWp++NrP aur9VCFsfmJj2VIXKiAZOjZ0BGx+KDUC9H2frG1HerrOYgFdRYqBjMVH6EsHfB8f9+tzGp g74JNcEWBbt/woKmMNazR/D+bajAkMsfEU/kDXvtYqNRZqSbKs19CRZ+4ycnmeVnESB8it Og5HHXXNgknmveag6XVuT0H2owyL5SSD3Poa/Cs4FamPuMjmg8234H9Inxfuze/3oO8mNs mpFumY97nkj3OeMRCoJLk3KfeJKxyhqpk6IdwBbSX9YiuUfBvaHA0XGoQ/Ay/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786028503; a=rsa-sha256; cv=none; b=kEgCV1M3eR7BUQ1ipjZvNHgWKARcDdmJVi7zQKndq77PUt+zAUDGL9+NUBRfWBFsR1tYDH JTRVUm41llUx/qyHsHnd5/HU3aikN2el8xOw0/t6C51c6s0HT8w0N6deKjl5XaKIGYOyu2 xJ/TKNuy6jFhmZIhV5sBQdps8ez2KGgh6XSJ3W+9kxXyzb/SATC8BK2LSAxvTI6aihzXDX RZMyow6b8VpI3PLKWPXuZmEf3/eGV2N+uXu0COEkW0okERy4TQffUVVBpbIGCf1MDjWszr hE1Gq6osx8gqLN5b/uSjskQEEjw9oS3ntrvSq73913gEvScwhWKurNZucGwxng== 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=1786028503; 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=7WRD+t7/zRnCN0rlu3uFDz7fX3I1aof2tfZ0zhPHiYU=; b=lWvglLr66QjDZqjdKkqLkmd4RbAVuFFkx5BTF5PEspPP9dRthGy2fGpg5p+icDByLKVR5y lD6r43HzgWzdVwd/HcSZhh4tBLOeZgsatVnji+OJxhqwxF0v3aqgvU2Nyq7c7P1rZsoSaI sEhxWUjG7Ie7b54nOEeGn5/Ohj5ZEwfZsPv6PFMhTNqnAvd5O/ht92tBBxjM+pOEWUUx0G C4hEQXFvzv/dSc1gqEc5mRUka3ObCzIsEXY3qGtvFAt2i1vCtFs/+wuvhTSpOKi6cgaMJf 3OADrLQH3daI2LITQJjmysdsFFhEaqNtjdfmhyJsOZUocLuJo5KSp7Rx7LSl1A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hG9Tz2fxrz9QV for ; Thu, 06 Aug 2026 15:01:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46c1e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 06 Aug 2026 15:01:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 9d2e5039ee18 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 9d2e5039ee18eb9545b26a8934e650c1f06139cb Auto-Submitted: auto-generated Date: Thu, 06 Aug 2026 15:01:43 +0000 Message-Id: <6a74a1d7.46c1e.433f571b@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=9d2e5039ee18eb9545b26a8934e650c1f06139cb commit 9d2e5039ee18eb9545b26a8934e650c1f06139cb Author: Mark Johnston AuthorDate: 2026-07-29 18:45:36 +0000 Commit: Mark Johnston CommitDate: 2026-08-06 13:24:43 +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 90af03e29dfb..c3f59a66b84e 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, (char *)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 5f7d061bfb55..06d1bcabc267 100644 --- a/sys/kern/uipc_ktls.c +++ b/sys/kern/uipc_ktls.c @@ -2442,7 +2442,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 8a0a8e31d5b4..cba7702c6ebb 100644 --- a/sys/sys/mbuf.h +++ b/sys/sys/mbuf.h @@ -617,6 +617,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 */