From nobody Mon Jul 27 18:27:56 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 4h86Xb1j7hz6nMJF; Mon, 27 Jul 2026 18:27:59 +0000 (UTC) (envelope-from markj@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h86Xb0H1Hz3Trk; Mon, 27 Jul 2026 18:27:59 +0000 (UTC) (envelope-from markj@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785176879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Q33rveCfmmuDkQA+vq/8b91zFW2f2nf77ZtY5oK4fOQ=; b=dk127EOVx5FWKbveju18XM2mQFj00+RrhagguC2lCwBxsaUlR5M8qU9AN45jMaXNHmuCRJ fCZlvpIORTA5hRbJHkRt1/A9wzF+AXiBCF0F2jmL/Ih7gVHCBIVaW5cOtpDeoOQc+TlsVI fsdKSQbKJnhKTyJqmc9bEiSNMVDVIBQ31ngWNiY+i4GhrOuvdcHvUQzEoPSCezZXr3a8ZS L3KmopL1c0j+ehl/pRH+qSahLSGeRl9hl3bwFw5STPfGx2v1l0kCwlxenqeQ7avPZ0jpbO yK/Zfv8OyjxiA8ynyp+irMeUWKgR90NHPCHicR3ywbRNXH9VoKMjq1t0J32R+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785176879; a=rsa-sha256; cv=none; b=gq16knq/bBfeSdQPNeDVhvLSONTxrF5DV1G0hFFaGATw1muT1EKzMfB79mZo993ShsZv9J pfPNc09nuqhRtHicHpejkvZKV78TSxO+B6fF7BzMZWQYGkv4yEFeVEvGQgA3jvcIRkzMkc 1KsDF/ACJ+ZtmWRpgZ8WENDppMKIUwmXrLbgJOnmQO7hVjdXdXY8WgedSwN7aXzCOqjFbT 3Fuhv0srguw8jTh32NpnzaIZ+27yGrJBOYBdvvC6M8whlbnF8Dz8ojgkSuYd/noT8IwJgm gqV522UByIHaSWnykWdouBPRX9Pl6ABro/cNDE916nT1uGsSLC4PxlXcUfUezQ== 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=1785176879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Q33rveCfmmuDkQA+vq/8b91zFW2f2nf77ZtY5oK4fOQ=; b=QPnWDFm3G6Cqdlh4UkS70GWiGnlXDszOJa9nvIvfY7zZ7MYkQCqBhpiRF9ExzUcZAfrL0K RRu2zuS0LgOD7gUDbLpAq7yBMwA9ykxgv3A7tI29EPLP9TRi3Vx8L0TR2S2tAwB2+9JyAJ IkUvSOvw9wZmeIdLNNC+Smg3vyvmOelykrVmRq09xAULqDZczCP6uLJn7/6SqHUIli/ukd JpDJ8WDf2rdDKSD3GiexpiTwdNcTM0ooWJQ1WKNZ2Zkviunlb4KfDcjmKyQWZk5Vfkw6oe SVUuiB4B6nnLmdROoTwLRbb+ZXViTR7fnhQ9Ndrr8ez7u7v6al2YOXqAWPVP7g== Received: from nuc (192-0-220-237.cpe.teksavvy.com [192.0.220.237]) (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 did not present a certificate) (Authenticated sender: markj) by smtp.freebsd.org (Postfix) with ESMTPSA id 4h86XZ4hzrzsyT; Mon, 27 Jul 2026 18:27:58 +0000 (UTC) (envelope-from markj@freebsd.org) Date: Mon, 27 Jul 2026 14:27:56 -0400 From: Mark Johnston To: Gleb Smirnoff Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 801c0f383c0a - main - tests/ktls: merge two sysctl checking helpers into one Message-ID: References: <6a679612.25bd9.5ea7e964@gitrepo.freebsd.org> 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=us-ascii Content-Disposition: inline In-Reply-To: <6a679612.25bd9.5ea7e964@gitrepo.freebsd.org> On Mon, Jul 27, 2026 at 05:32:02PM +0000, Gleb Smirnoff wrote: > 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) { Now, if someone sets kern.ipc.tls.enable=0 to disable both RX and TX KTLS, but leaves kern.ipc.tls.rx_enable set to the default value, all of the tests will fail instead of being skipped. > 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) >