From nobody Mon Jul 27 17:32:02 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 4h85J30PRMz6nHX4 for ; Mon, 27 Jul 2026 17:32:03 +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 4h85J26vLnz3KLm for ; Mon, 27 Jul 2026 17:32:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785173523; 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=C0TUwgVD61PSE+w4GI9RIvE1goFt9pXbBGaeVYpNi+4=; b=b2mEfpZnJaNz0S1lNWpd/FeHGXIeas5y2pBDqZJjr1oh9M0z20rn5sl8xInWHbs8OxQv6A zJPEC8SYz/Xkewv/EKkjvOKMF1r5BwS1GU94Lcd8xM7JzX3ZY3RowRkyJmdSS3JFJDxkb+ VsU0bQb2KsgIB1okGZxIA1svkn771X9oCLROmmLFwchkvwVoCm25028QovOv1pdTDuj1dB aBiS7JSvMIxLl9SOwe3DwmiMy0Z4qvPDJMEMuDCQEv7v2Hb+EpYiY5BsdPv3z576waLJnR +0AJP809h+MSS+OdyHlMGhbLEUf5bYa/3M7oXsjz/fhKadqUYJssYbC7W8wIfA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785173523; a=rsa-sha256; cv=none; b=Urz/dNhLIqaE8aA+aTb7mQcFBeyyz7001c8t2VIeFo/C9ugE9aan1ym6tRTGnqgSuozDBP SbyQknuDtF1TNT57K/FfBpNmY9ibvzuqEALQIvoyLIth1XEgUT+DrA51NQsUYUtWMgALab bSpR3lZ+xgW0F6Q8tTxi4LP61cxCVimlfgE5ebzD6Wpcxwv6Gl5uTE7AZN2mJkfHBOtA0F OvBvGcbIG43lPnjILl7x1Jpue+TMt0gh25kQAgXa3Q2KXBxn1PctXgB5W9UO/Xh7dMEAWN vBQcfzKupAO1rkGqjDHEFWSm4UZy2D2JairnsX6VICBhMDU1QLuCq7dZmZWMeQ== 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=1785173523; 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=C0TUwgVD61PSE+w4GI9RIvE1goFt9pXbBGaeVYpNi+4=; b=R8jndhjZFntQs4d026kqCq5QsT6x5DXyi3cvN8TuUaoxL7+jc3CdeMg7Cd0HC2y8pHwsDh X5uCfjeJi3jT41M8FJDExRyC3N0xxJ0u7Q85etqeOAg0p7p3Orp/hNZxrXd8P3FjzSonL7 nUFKz+qt3dmFN7ILLdkJV52xeeTDezdzM2em9Xu87WTHQSzL+Cye5PtQydRPE53Fo2VYIC U4FKkZfiG6OqyqqTb95a4IHV892jR1q61+n9PWXZoFDCQ2b/l+/+2HIaZnb3czsAY0ycQU XsonCGuMlCuT6xI8QRcDKs09HPIuMt/eeGYLXsvte3WzatzLl3vB8rxFqVbEJA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h85J25cQ0z1HTV for ; Mon, 27 Jul 2026 17:32:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25bd9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 27 Jul 2026 17:32:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 801c0f383c0a - main - 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: 801c0f383c0a719165c21ff5c29f231fb7b920c4 Auto-Submitted: auto-generated Date: Mon, 27 Jul 2026 17:32:02 +0000 Message-Id: <6a679612.25bd9.5ea7e964@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=801c0f383c0a719165c21ff5c29f231fb7b920c4 commit 801c0f383c0a719165c21ff5c29f231fb7b920c4 Author: Gleb Smirnoff AuthorDate: 2026-07-27 17:31:24 +0000 Commit: Gleb Smirnoff CommitDate: 2026-07-27 17:31:24 +0000 tests/ktls: merge two sysctl checking helpers into one No functional change. --- tests/sys/kern/ktls_test.c | 35 ++++++++--------------------------- 1 file changed, 8 insertions(+), 27 deletions(-) diff --git a/tests/sys/kern/ktls_test.c b/tests/sys/kern/ktls_test.c index e0bcf17262f2..5cb1a084271b 100644 --- a/tests/sys/kern/ktls_test.c +++ b/tests/sys/kern/ktls_test.c @@ -51,45 +51,26 @@ #include static void -require_ktls(void) +require_ktls(bool need_rx) { + const char *name = need_rx ? "kern.ipc.tls.rx_enable" : + "kern.ipc.tls.enable"; size_t len; bool enable; len = sizeof(enable); - if (sysctlbyname("kern.ipc.tls.enable", &enable, &len, NULL, 0) == -1) { + if (sysctlbyname(name, &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.enable"); + atf_libc_error(errno, "Failed to read %s", name); } if (!enable) - atf_tc_skip("Kernel TLS is disabled"); + atf_tc_skip("Kernel TLS%s is disabled", need_rx ? " RX" : ""); } -#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() +#define ATF_REQUIRE_KTLS() require_ktls(false) +#define ATF_REQUIRE_KTLS_RX() require_ktls(true) static void check_tls_mode(const atf_tc_t *tc, int s, int sockopt)