From nobody Fri Nov 06 13:31:45 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 4jLg7q2yZ0z6yHJ5 for ; Fri, 06 Nov 2026 13:31:51 +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 4jLg7p6mNgz4L4W for ; Fri, 06 Nov 2026 13:31:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793971910; 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=oZjifLeQEUVLsACzQc619SlKCMbhcEEK4uB6zbTXRuI=; b=OTZoMXXvKgzVVZYnWnU1jtx7uLVkm8Fm8ydkt8jv+Tf2WCNeAg3V/q1Pd04FCC9jkXt/uv 7iXidvKvKg0JkEXs/tDinGU88etPsEabdKnU2JvVrj0FIbmQlBZQSnOktfZWEsENT4qiHv 6X9VScY+iWvZDnApLnnrE3hVlS5+YGkPsg2OMhp9Lu4ByZQZNK3IoroAJW90zbheQCq2Su kFdai/TEVfMnBi+su10rcIrjtdnxBrxXjenw9aSt0vg94C4y38NRFts6fLAjI89S6q3KTN 7y9YSyxItPp0TYGOGPbJ1t1imQxWedAioKiN5/P606GR0W87Wq1kLldA1t8eyA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793971910; b=Mmi/fET+XZ8n6+ilmL8FNow+JQ5sEmnrzYMo/Osv7WGdqcCltPeuqs25nishw9cgYd1HfJ 33+gvkFYf6WMteJLFsd2gie88IzNQC5Jrrwr5Rcv8hFbVD9RtXnh++BMlvD+L+49KSNP5X TbSyui43udaGSXcgF9PX0Z1KKcCNftZW10V+TyKK2BTsMPqlyd4ZLFOeF+aDhFTNXECtU3 QeGvlZo0/ZXPWjTpYci7KXv3Id4Rh++HnhRhQ+U8yjH3AcD9khMJqGFA9BfTP0ut/Xp3ur 93Nhx+80ykmRe+NtydmY4DERXRzY6WIGF7N3Bd+140bLnUpU2dgIlSXN1Urdmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793971910; 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=oZjifLeQEUVLsACzQc619SlKCMbhcEEK4uB6zbTXRuI=; b=oRo1FXicjgCJ4sQdv/rO2ZzVEo4fVUFiemUVoodNGfz3Ui+ihg4bkEA2U8YHx2p6pN7mUN YeaXGsWNFoxkcfYyB1b7uzFvvIdwLVfXMJIjkb093w4QrQHrfQLr0zfoa9cCBplyTC5Jjw uFhL5fEQQPrNffu9MUrQUtRlgJuwzQg42GM4NMW7WyFSTUrY4IpDnUO32u69FeWanocMB8 pMG9/TTcXvZNfZC6Eo3CKvnNzR9jSUqfcpZ/pzhy20vdF0J1cO9BH3I+XMtBpr3tvtbt1i EGU4GLzAf2D2fMWG077Q5fUy3wbLe/x8j1k24DDX9nSGfaYfJbdGB/9XZ1seug== 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 4jLg7p6R68zgGW for ; Fri, 06 Nov 2026 13:31:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c673 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 06 Nov 2026 13:31:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 57bc1e1c2f4c - main - 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 57bc1e1c2f4c01953336bdf03743e30f4ba12cdc Auto-Submitted: auto-generated Date: Fri, 06 Nov 2026 13:31:45 +0000 Message-Id: <6aedd6c1.1c673.381cbbb6@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=57bc1e1c2f4c01953336bdf03743e30f4ba12cdc commit 57bc1e1c2f4c01953336bdf03743e30f4ba12cdc Author: Konstantin Belousov AuthorDate: 2026-11-06 13:05:50 +0000 Commit: Konstantin Belousov CommitDate: 2026-11-06 13:31:28 +0000 amd64: make hw.splitlock_force adjustable at runtime The setting is only read on exec(2), so it can be safely modified. This is useful to adapt the system to newly discovered buggy programs without reboot. Note that that running processes keep their mode until they exec again. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- 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 a714c4e52b9b..04204fa74c11 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -210,10 +210,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,