From nobody Mon Jul 27 17:32:02 2026 X-Original-To: dev-commits-src-all@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 4h85J83sj0z6nHZj for ; Mon, 27 Jul 2026 17:32:08 +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 4h85J81t4zz3K7m for ; Mon, 27 Jul 2026 17:32:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785173528; 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=WxN4xCE7s5IgM2jJtkvoKqiZ1vJvL3d7mPePmWQuSZQ4L5RkTfedGbM1r5UJH9DJzZL8Tc ODt+SThT3vcB8z/4SV0+gMl+s8bOixTJjjh1kJDo6sChPjJRFZTDeituPn4gZVr6367rA2 Ay0afwVhQorSJ+PrEIlu82TMWBLLStJ8dPLx/a6sLTQC5QuDwzuWEpWJqnOCck7VWpDLi9 xCpdqrJfG1GxPzi4jwRnKHwtWqtnkR5/Uqu1toXd1cPAeBgq9iknqbAnME/pIdRWjN8W9y sImTPxdqMsMhTW+VE5Taz65ZaS6VbwC5kICWdmjOPuL+kN9fIiwO/vS/3sKusQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785173528; a=rsa-sha256; cv=none; b=lFiDk3zQviE2Eo4lI8EvWXLxrxedgSDRs6HoRSWRq4PO8TwaVSvmM1xFx/e0nKlxeUZ/CI oFgChSjhFrNK74TeaFueWihABwI4KOeu2P/E3oCmeFuCAqvkDGRk6Pg7HqlvXrZp0Jo4y2 3i1DFWerdlqeXiEzw4iB4DqeetA8OP5FSPpinbrmPawsy03h+XLEMSrjCrTD8uCKS8twDC xSz+kEH24kbzA8SZjsB4QIEwz/4mlVCU9MAM5bDkZYIuzJ5kQ7a3NNXM4Q++qN/txHkh6u 5txXATpARfrDQTnmGn6rp7G5OrKmm2NhYOmoyqV3bJxUsA/OYhvINYYyK/z3ag== 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=1785173528; 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=m2JDoiBu1bubSnnOK2l3ZYlZzYgE+sKTfQxvAYbSVH04rM+hoWwUMDv8K3j7hFKF6iVy9z U2lZGd7DSQ/vZkpa0g5ffIaBEnhGQU3lmThemDZrWJx3Zl3lEvrCa7icOFS07RSODhqTSc f0aGBkyylHgH/RGfoFkAQQG0V7ybbp+X/l5qAFb+vfGuKlj04yKZ2kd8bKTc5yBBBz795r 0NfRIXK9P79TLvHNWOIvES8C8bgNnhtTEdFNaoeZWEIBxbcCv3Gd9gvfe9rseWh2AiRw+i W/SgmTRYv0czBjbHQog5IoFV0pXsLabIXR82rLFMgNyk8buXtvOuBSUQmyItJQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h85J80k5Kz1H0y for ; Mon, 27 Jul 2026 17:32:08 +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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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)