From nobody Fri Oct 16 04:46:27 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 4j5XTJ040rz6vv7C for ; Fri, 16 Oct 2026 04:46:28 +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 4j5XTH5ts0z3FS5 for ; Fri, 16 Oct 2026 04:46:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792125987; 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=tstzlsQUNl4HsCx7ExKFbANwEoV5zgCFGROH3vprucM=; b=DepjoKHYnhlVtWqMm+FpQxAzqh5QphdJtioRjlVJ1s4lt4El6wzyR5HrQMjjU2tdRlxxhm tLcJQIFI8IIM/xxS/OA8CFpD5NY1E9DWooi7Gy7sOnNGN6cnR/s+1a2U1kXBAvU9Ug86Ie 0JyfgR7LmAEq3CBhG/Uti6rOGAmxVxPHuhL2mzoRZ/EYJeCNw9RxfxIHqsuwugDNwjBwSz 8/zNF+6gm9uM/5Vkfr0k6l7TkL35vSnxZZlHO3IQPC8RCMFuc320QZ7jtCE7nMQYfJ9E7b kH7At3C29V4zmLAK8op8xHXaoOSqx8Y+3miF4TRx12fz/R3Xs7kMrCAhoTkEUQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792125987; b=dKKuncC0T8+Dnx1k+tMfHqtfH7xTaMVA0rq3m0deynFT0KRWPo5ereRVda4puVSgcgbsJv YCT8j3jm46X3OfNHqDZ8t+3jfhp0SD5XSHcRC7aLeVE0BdjmzJs/HlGx/avcmsjK821c7V /knLQPGpfl0enZzAOY1IfhlMAcyvEhDM7YJQW/Ujm6uJP/F6dipuCqgK/Cke7LbB+Josxo BSp+1oJ3W6zv0v3a4voxcwl6MtA9mAi3yEvPzff7WBAwZeX28t7SAS4t542eok9PM40Z7x 0ZWCWG4ae2dpm738MlSLzHEE1jbmtKNKQzpBuOttPF6WS9zfJnQ6xmPiLj3MsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792125987; 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=tstzlsQUNl4HsCx7ExKFbANwEoV5zgCFGROH3vprucM=; b=ioPEJXotFmuwznN0cWhAuxl2ej1ykE5CsQp3/FZGVTnFt8V65NlRcRyg9baQbUtaGDSGwq 8n1GQbm69nBTtd7YiQ5cq3R60u/WWcaBOCWgJSz9RycZ9S9eQDg3iKlXhdNzjWixtXY7oQ 0ImUYMKVZ2TkOhydLR1i1MPP7EoSAOgqrSC18Gs9ZPV2J3iKbD4eKAQBYm7Sl9FcCAJke/ Ys9U7V7pFCt3jNEL4J/6r2d9/OjgVcKYw9IiuH1P2CVjLBGQQrTzZghZYJjIuP8oR5AjIW bwTiyf0uvPQlvAlg5suRePvi+uzHM5Z8AswmShNllLqPCOETD6Dcpoh1BHW8Ew== 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 4j5XTH3wlyz14W8 for ; Fri, 16 Oct 2026 04:46:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ca3f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 16 Oct 2026 04:46:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Cochard Subject: git: 32a981471c01 - main - ktls: Fix capability checks in ktls_reset_receive_tag() 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: olivier X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 32a981471c0147ea494745477434807cf8b6dadb Auto-Submitted: auto-generated Date: Fri, 16 Oct 2026 04:46:27 +0000 Message-Id: <6ad1ac23.3ca3f.76a1d0a0@gitrepo.freebsd.org> The branch main has been updated by olivier: URL: https://cgit.FreeBSD.org/src/commit/?id=32a981471c0147ea494745477434807cf8b6dadb commit 32a981471c0147ea494745477434807cf8b6dadb Author: Olivier Cochard AuthorDate: 2026-10-16 04:40:03 +0000 Commit: Olivier Cochard CommitDate: 2026-10-16 04:40:03 +0000 ktls: Fix capability checks in ktls_reset_receive_tag() IFCAP2_RXTLS4 and IFCAP2_RXTLS6 are bit numbers, not masks, so ktls_reset_receive_tag() tested if_capenable2 against 0 for IPv4 and against the RXTLS4 bit for IPv6. An IPv4 connection with NIC receive TLS offload thus never got a new receive tag after its packets moved to another interface, and fell back to software decryption for good. c721694 fixed the same checks in ktls_alloc_rcv_tag(); use IFCAP2_BIT() here as well. Fixes: fe8c78f ("ktls: Add full support for TLS RX offloading via network interface.") Approved by: gallatin, kib Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D60757 --- sys/kern/uipc_ktls.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/kern/uipc_ktls.c b/sys/kern/uipc_ktls.c index c1eb080b1455..cfd1f07ba4a7 100644 --- a/sys/kern/uipc_ktls.c +++ b/sys/kern/uipc_ktls.c @@ -1708,10 +1708,10 @@ ktls_reset_receive_tag(void *context, int pending) INP_RUNLOCK(inp); if (inp->inp_vflag & INP_IPV6) { - if ((if_getcapenable2(ifp) & IFCAP2_RXTLS6) == 0) + if ((if_getcapenable2(ifp) & IFCAP2_BIT(IFCAP2_RXTLS6)) == 0) goto out; } else { - if ((if_getcapenable2(ifp) & IFCAP2_RXTLS4) == 0) + if ((if_getcapenable2(ifp) & IFCAP2_BIT(IFCAP2_RXTLS4)) == 0) goto out; }