From nobody Fri Jun 26 15:18:30 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 4gmzpG5kpbz6jf4Q for ; Fri, 26 Jun 2026 15:18:30 +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 4gmzpG2wDqz3lKQ for ; Fri, 26 Jun 2026 15:18:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782487110; 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=0Gu58NL+A4BkO/qQoapn6f6rC53b39INjq42Xeq0FWY=; b=rRhpkUkDf/pdZ4P6e89yCK+47mTTLDtA3I/qoNfWzMrG1d6Wb8Hip9bm420hBDe5NTRWJX Vl38IyYKHqoci0Y1hc0dBoymfHq9IGaq5Jbek37t8OTjCRSiokmrfGnGU90it0zgoYgvvI AL3gBzgu3DP/i/fLMU/r2uS6rkU/mm4QfDP/FyBHZqpz4fmI21ShFMxS62jSLrd2kqwpa/ qLaZTBJ4HrkMQrHX6hKla6za8Nny90WNDlxyyp02HPVHJnMJJZ5c9qENuDimQfRE0+it3/ Uwvv48lxybOibLqI4VdcnkWcwydxEnHWOOrINsHKWEGqawcZQAkZetAQ6zrPrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782487110; a=rsa-sha256; cv=none; b=A6m9W2bdCpuAozKmY0iQWG7BDStSJ50P2p0dryqrsHz+qQ3q6sJXwiM9W5neuDvlqEAO6w gvEo1uCAGO+d6spbaV0dNohxMzIK6qUbuml8LxF1DpbeaHJw8K3KEuGl9pgE1ptMIje0AG OoaQVe0ux4WfZZ0nX8kMxHfMXZUvYILbm29O7+khTodCer4QHqkMDybSiCeGHqY5gGGE/K 22biebtbFsPKNqksJZsUwkCcCGmGY5q2kZVx+Yv/kE4Zn85S+5vZfgH7UYcftynVGWAN8u 3v9tM+v31KgTM7yCvUOyATyg9RUWuKTVpb7TFLNbEHnD66/cVBDEPN6hK3l6Lw== 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=1782487110; 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=0Gu58NL+A4BkO/qQoapn6f6rC53b39INjq42Xeq0FWY=; b=SJRZlbdG/cTRHBDV83ozl88phVXkETgKekVYwGLDw8xPDyWyMcrAKQ34ELe23qNMQVADlz 8FpnHWXkZpE7THmM6/l9P9gW7AjEJQcuGzoFTtNcUo8nr26kUtKXJ2OhMBPYchTL+UrMl2 Ig0wEZCIuYVMwCFbx9tHqfWptrmPasU3aPU5TIr8f4k9JMVjimZXeFIFYOWkH3fekfzsdw uiQmmtRtWEezFQw45OvjiwNm5W7SrEppSsw3qHWwP841oHFTWvBv2nb9MoBQLHw4CZBfnl n9aITA/R/Mnag8NpJmrA3RoPucTRssJxLVCe4SFpVjYKA6eX4SlwYiflYPCXOg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gmzpG1zcszjJp for ; Fri, 26 Jun 2026 15:18:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2174f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 15:18:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Siva Mahadevan Subject: git: 12f47bff4a97 - stable/15 - src.opts.mk: enable OPENSSL_KTLS by default on riscv64 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: siva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 12f47bff4a97f06d172dc38bbc987f0823d372c2 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 15:18:30 +0000 Message-Id: <6a3e9846.2174f.7878c9ff@gitrepo.freebsd.org> The branch stable/15 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=12f47bff4a97f06d172dc38bbc987f0823d372c2 commit 12f47bff4a97f06d172dc38bbc987f0823d372c2 Author: Siva Mahadevan AuthorDate: 2026-06-10 22:30:14 +0000 Commit: Siva Mahadevan 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