From nobody Mon Nov 09 19:31:37 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 4jNfzY6GWFz70MLp for ; Mon, 09 Nov 2026 19:31:37 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jNfzY3JRgz4YFk for ; Mon, 09 Nov 2026 19:31:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794252697; 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: content-transfer-encoding:content-transfer-encoding; bh=DRJMpoZVzX17cV2YCtdsvdPflXRTiZFMQJsKpqEV0hg=; b=ZIkQnlTga0rD6C7QWhmDbRwRaYrCYzcu9iNXF3KVlk83YmdgK1XnW3d+jvltbWm7bNSA6h QLnSEgTuEbt1dzwtzBxz7VgLatg+9FpuH1QS0yXmu52JN6P4nJDpJLYeEniUgN+GIV56rE n2fEHdiZQDw8xx0ODzvaalAVLnGnyGCtraWReiUOkcIqLXaUWD4c9mpR3Dx5jD8dONne85 IaQ2XVkYAsuWQXtc5N/OrVxRFr+6xMh8eeyj9fUahajC/t15dnOsJ+ccm3xGBAgOEH3hWQ /KFrbvJG2PhXUeUSuPEehUF75pSUl83BjzUAqrfAq7mhSk1EfqLATAYAnOmFWA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794252697; b=t8gVZrlmWn36M3Ju1+geOoaPgp5Tm7UUwpqtw/MNomjyvXLVR833wotWvDcvS95YkUT71h csEgA+bMt1VQT67wtSzKj8UX5si71udfsZCir+T7nqaUrHOxXAPNUXolyD8Iq6vGuJSJuh NzRpf2pyrAT5JtRWiP16ZTNZcotw5YzALqACG9Tjo8jIFFv2W7bP3NTyOjEHqfDUFA/glc M27OVTfeYjN4oPuIUTGn8VWHKIwOBl1JKX1QalBOItfNrOqKr8y7cKXOtwqkIcSPizvu4/ YPgoerGqJrRdQby7ia9mSfCMHUlP70T+16YgW1T/FooRqe8qDFFFNGGr6xKkvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794252697; 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: content-transfer-encoding:content-transfer-encoding; bh=DRJMpoZVzX17cV2YCtdsvdPflXRTiZFMQJsKpqEV0hg=; b=Ei3RjWPeQUwuZMrhAxw+6a2JW7SU0/RETG3Y0E3P8Ra2vqbhXGxnX8QUVxnvmyAH/XxPIw 2zb/kCVFEhLQzW7x3r/MwPbbhnleRSjPdk1WX/mSN+61UzrJ+x+hYPThhjq68QVeT2nNLa 09OQ7SHDn4iNMyZgIllrYtYwrIC08wqVSuJBqd7zQJO/JmsOdqu75e6RAV/7/Ab/vlI0wU RDaaW+kQV189Bq+mn1/plv8c/HE2yatFMHapT177ugJcHCP+jW+OwSOfkV5mwCYcgMscse 2yjMbB+wa9jFnQK13sVBykM17Gbzbzwq2QlxMB1mrYtfa5jH/Nkj0hz50dOjXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jNfzY2YDYzv1V for ; Mon, 09 Nov 2026 19:31:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 11789 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Nov 2026 19:31:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Konstantin Belousov From: Colin Percival Subject: git: 05465dd434e8 - releng/15.2 - amd64: make hw.splitlock_force adjustable at runtime List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.2 X-Git-Reftype: branch X-Git-Commit: 05465dd434e88bb6ce87ff09a99c984a3bfe2bb9 Auto-Submitted: auto-generated Date: Mon, 09 Nov 2026 19:31:37 +0000 Message-Id: <6af21f99.11789.5155d56@gitrepo.freebsd.org> The branch releng/15.2 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=05465dd434e88bb6ce87ff09a99c984a3bfe2bb9 commit 05465dd434e88bb6ce87ff09a99c984a3bfe2bb9 Author: Konstantin Belousov AuthorDate: 2026-11-06 13:05:50 +0000 Commit: Colin Percival CommitDate: 2026-11-09 19:30:55 +0000 amd64: make hw.splitlock_force adjustable at runtime Approved by: re (cperciva) (cherry picked from commit 57bc1e1c2f4c01953336bdf03743e30f4ba12cdc) (cherry picked from commit 91bcaea97cc6da847bb4edf5b9822b461c5a43fe) --- sys/amd64/amd64/machdep.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index c902e2fbc962..2472eca5446c 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -211,10 +211,29 @@ int ia32_splitlock = 0; SYSCTL_INT(_hw, OID_AUTO, splitlock, CTLFLAG_RD, &ia32_splitlock, 0, "splitlock prevention supported"); + int ia32_splitlock_force = 1; -SYSCTL_INT(_hw, OID_AUTO, splitlock_force, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, - &ia32_splitlock_force, 0, - "splitlock prevention enabled by default"); + +static int +sysctl_hw_splitlock_force_proc(SYSCTL_HANDLER_ARGS) +{ + int error, val; + + val = ia32_splitlock_force; + error = sysctl_handle_int(oidp, &val, 0, req); + if (error != 0 || req->newptr == NULL) + return (error); + if (val != 0 && !ia32_splitlock) + error = ENOTSUP; + else + ia32_splitlock_force = val != 0; + return (error); +} + +SYSCTL_PROC(_hw, OID_AUTO, splitlock_force, + CTLTYPE_INT | CTLFLAG_RWTUN | CTLFLAG_NOFETCH | CTLFLAG_MPSAFE, 0, 0, + sysctl_hw_splitlock_force_proc, "I", + "Splitlock prevention enabled on exec"); int __read_frequently fred = 0; SYSCTL_INT(_hw, OID_AUTO, fred, CTLFLAG_RDTUN | CTLFLAG_NOFETCH,