Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 26 Jun 2026 15:18:30 +0000
From:      Siva Mahadevan <siva@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 12f47bff4a97 - stable/15 - src.opts.mk: enable OPENSSL_KTLS by default on riscv64
Message-ID:  <6a3e9846.2174f.7878c9ff@gitrepo.freebsd.org>
index | next in thread | raw e-mail 

The branch stable/15 has been updated by siva:

URL: https://cgit.FreeBSD.org/src/commit/?id=12f47bff4a97f06d172dc38bbc987f0823d372c2

commit 12f47bff4a97f06d172dc38bbc987f0823d372c2
Author:     Siva Mahadevan <siva@FreeBSD.org>
AuthorDate: 2026-06-10 22:30:14 +0000
Commit:     Siva Mahadevan <siva@FreeBSD.org>
CommitDate: 2026-06-26 15:16:43 +0000

    src.opts.mk: enable OPENSSL_KTLS by default on riscv64
    
    1e649491b8567151270095fda3bce8faea394952 enabled KERN_TLS in
    riscv/conf/GENERIC, but didn't enable OPENSSL_KTLS.
    
    This passes all testcases in the sys/kern/ssl_sendfile suite and
    fixes CI failures seen here:
    https://ci.freebsd.org/job/FreeBSD-main-riscv64-test/16606/testReport/sys.kern/ssl_sendfile/
    
    PR:     293810
    Fixes:  1e649491b8567151270095fda3bce8faea394952
    MFC after:      3 days
    Reviewed by:    gallatin, ngie
    Differential Revision:  https://reviews.freebsd.org/D57316
    
    (cherry picked from commit b61ab2d693c04d4be5468e7db4b03d5777228f95)
---
 share/man/man5/src.conf.5 | 12 +++++++++---
 share/mk/src.opts.mk      |  4 ++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5
index ad1a2b3ed93a..2ec7862b1a21 100644
--- a/share/man/man5/src.conf.5
+++ b/share/man/man5/src.conf.5
@@ -1,5 +1,5 @@
 .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman.
-.Dd March 28, 2026
+.Dd June 26, 2026
 .Dt SRC.CONF 5
 .Os
 .Sh NAME
@@ -1527,12 +1527,12 @@ is set explicitly)
 Do not include kernel TLS support in OpenSSL.
 .Pp
 This is a default setting on
-arm/armv7, i386/i386 and riscv/riscv64.
+arm/armv7 and i386/i386.
 .It Va WITH_OPENSSL_KTLS
 Include kernel TLS support in OpenSSL.
 .Pp
 This is a default setting on
-amd64/amd64, arm64/aarch64, powerpc/powerpc64 and powerpc/powerpc64le.
+amd64/amd64, arm64/aarch64, powerpc/powerpc64, powerpc/powerpc64le and riscv/riscv64.
 .It Va WITHOUT_PAM
 Do not build PAM library and modules.
 .Bf -symbolic
@@ -1893,6 +1893,12 @@ not
 .Pa /etc/src.conf .
 .It Va WITHOUT_USB
 Do not build USB-related programs and libraries.
+When set, it enforces these options:
+.Pp
+.Bl -item -compact
+.It
+.Va WITHOUT_USB_GADGET_EXAMPLES
+.El
 .It Va WITHOUT_USB_GADGET_EXAMPLES
 Do not build USB gadget kernel modules.
 .It Va WITHOUT_UTMPX
diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index f9fc2dad280a..ad87a295c8fd 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -348,8 +348,8 @@ BROKEN_OPTIONS+=LOADER_IA32
 BROKEN_OPTIONS+=LOADER_GELI LOADER_LUA
 .endif
 
-# Kernel TLS is enabled by default on amd64, aarch64 and powerpc64*
-.if ${__T} == "aarch64" || ${__T} == "amd64" || ${__T:Mpowerpc64*} != ""
+# Kernel TLS is enabled by default on amd64, aarch64, powerpc64*, and riscv64*
+.if ${__T} == "aarch64" || ${__T} == "amd64" || ${__T:Mpowerpc64*} != "" || ${__T:Mriscv64*} != ""
 __DEFAULT_YES_OPTIONS+=OPENSSL_KTLS
 .else
 __DEFAULT_NO_OPTIONS+=OPENSSL_KTLS
home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a3e9846.2174f.7878c9ff>