From nobody Tue Jul 28 02:17:18 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 4h8Jy70Zgvz6mKn5 for ; Tue, 28 Jul 2026 02:17: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 4h8Jy66vXDz3mZW for ; Tue, 28 Jul 2026 02:17:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785205039; 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=LljQv3MsYzaAybpczWCRbP8DM09wUImDLAOOzy09d3E=; b=AU2f9XImgMURu43AiaolVvE4hC3JwXf5lBVQcYGrYo1rNtylF/GOJZHwmx8E3Gkg39Ujto YLflLCr7LTct9BzCY4R28/IJvP6I1ftC5K/WGv7fXegR1DTfsC2gek4fHfI5i8DnxHQ7Rz tVLBMsYyIRRG/47APc7ewiSdbkfVEzITyjY3Hu7lcnx7jMe7wNlMSwJznAd0nTl8tFeLGh hr5dl6GS7HWGiRBXTagdscFEq8/OdrXtKucYwCkZ3ucXJdGkjZl2y3bTeRKE0gcnRUb+lb B2nnCfUsi8guYG+JC2Olv4N97OyrqBmkkQeGf3jZQHy437bmquBbcnc0IHKPXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785205039; a=rsa-sha256; cv=none; b=O97CRebvYM0Zo0eZYWaX7QPlIMAB4Kb+9nuyg4QLTbBMsvL2vMqmcY3CYSl5L5+HdZdTqm hbbGGPx8CwWSsvqwrfzXiMKfMX9Nk/IEzzweUXwN7ICzA/P2kd0Y5bxaEnTuCyF0Tqj4lP APOJbtDVXncz2N9RfgLJLGQE6jV0tLW+Z7+cIqWvyDFgZgV6so2N3eIk5jnecwfSNkJIXA QcaIAy+rgLBJ9nqOkQ2/Qups45WQ2yVQSzlpdCpD/x8eGHHlgEtckcCCpZcH2mtg5TjOZ7 /6iPVoDpi1/yw2QbvoyuLELvDIw8Xa+7QoeH4IeHbDMZ78gNSYzn7mTn5+tA0Q== 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=1785205039; 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=LljQv3MsYzaAybpczWCRbP8DM09wUImDLAOOzy09d3E=; b=sS3lAUff2bSloeUdBnvjEZii6Ayoxh/jj47hrqoOUrkxldHDgU3BgK9n+1nBWVxlQ1G8cZ da9gMoj6C7azB49WxyLeJlaeIhtFK1vjgprJd/TOfSBryiC/j15AXEsPlgHK7CeJFvdS7d XSAYUErOxuWMeh9ORXT7Wl0Owj564PR8mmzYmLWtbcKvjcn14//zhdLFPd+8kJu4vKP3eK isSGqITDQVK2BI8BGGU3FFICg7nZzOu8lOZYExCbM2FvMHT7C+vW3jEGvR2Tw3gGMr4OIo mErOUn72+FU4AvqJpTXF68LewN/LE00XrjbO73Ge+mVIk0GkpqAwbU+W9xBGXA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h8Jy65NSvz4Wh for ; Tue, 28 Jul 2026 02:17:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4545e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 28 Jul 2026 02:17:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 76363a797043 - main - Revert "tests/ktls: merge two sysctl checking helpers into one" 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 76363a797043aa2dbbcb0e589146b5002033905a Auto-Submitted: auto-generated Date: Tue, 28 Jul 2026 02:17:18 +0000 Message-Id: <6a68112e.4545e.3dfe4148@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=76363a797043aa2dbbcb0e589146b5002033905a commit 76363a797043aa2dbbcb0e589146b5002033905a Author: Gleb Smirnoff AuthorDate: 2026-07-28 02:16:39 +0000 Commit: Gleb Smirnoff CommitDate: 2026-07-28 02:16:39 +0000 Revert "tests/ktls: merge two sysctl checking helpers into one" With certain sysctl configuration the test will fail. This reverts commit 801c0f383c0a719165c21ff5c29f231fb7b920c4. --- tests/sys/kern/ktls_test.c | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/tests/sys/kern/ktls_test.c b/tests/sys/kern/ktls_test.c index 5cb1a084271b..e0bcf17262f2 100644 --- a/tests/sys/kern/ktls_test.c +++ b/tests/sys/kern/ktls_test.c @@ -51,26 +51,45 @@ #include static void -require_ktls(bool need_rx) +require_ktls(void) { - const char *name = need_rx ? "kern.ipc.tls.rx_enable" : - "kern.ipc.tls.enable"; size_t len; bool enable; len = sizeof(enable); - if (sysctlbyname(name, &enable, &len, NULL, 0) == -1) { + if (sysctlbyname("kern.ipc.tls.enable", &enable, &len, NULL, 0) == -1) { if (errno == ENOENT) atf_tc_skip("kernel does not support TLS offload"); - atf_libc_error(errno, "Failed to read %s", name); + atf_libc_error(errno, "Failed to read kern.ipc.tls.enable"); } if (!enable) - atf_tc_skip("Kernel TLS%s is disabled", need_rx ? " RX" : ""); + atf_tc_skip("Kernel TLS is disabled"); } -#define ATF_REQUIRE_KTLS() require_ktls(false) -#define ATF_REQUIRE_KTLS_RX() require_ktls(true) +#define ATF_REQUIRE_KTLS() require_ktls() + +static void +require_ktls_rx(void) +{ + size_t len; + bool enable; + + ATF_REQUIRE_KTLS(); + + len = sizeof(enable); + if (sysctlbyname("kern.ipc.tls.rx_enable", &enable, &len, NULL, 0) == + -1) { + if (errno == ENOENT) + atf_tc_skip("kernel does not support TLS offload"); + atf_libc_error(errno, "Failed to read kern.ipc.tls.rx_enable"); + } + + if (!enable) + atf_tc_skip("Kernel TLS receive is disabled"); +} + +#define ATF_REQUIRE_KTLS_RX() require_ktls_rx() static void check_tls_mode(const atf_tc_t *tc, int s, int sockopt)