From nobody Mon Nov 09 01:13: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 4jNBcn42bJz70GpZ for ; Mon, 09 Nov 2026 01:13:45 +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 4jNBcn31v0z4k0s for ; Mon, 09 Nov 2026 01:13:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794186825; 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=XrWXqcC+0ZHzNtl3liETigtBCHgu+84fzkhgvuUGBmg=; b=Vn8fUQnfspvqbxSrJNKmj3vlL59YVthkg2zPVMkiOQReQ4uHHRbFlxO41cjUjr7693hnx+ w+ukzk+EdMZWE87Uz/37HMf6YDMxVPVHdKjoAjvZ89gDP1LzDRtZnRxl4QgafIZ2s9b4Vx ZPYz8l6qBWhS89/Nhx6Xo4SKqSznhfpH5hnEhvZ/IEYlCC2hCdnRmu16hZct3Ladk9YEDS FY7b6kW/Jpyo7bpMeW7VTEk6VvF7RaiHpTiuC9bKLgxMn4DNSEPp1dPENspL7diOpz+j3A ghZzZ7Usq0jIiyKU+ULuumej9rlGyu/RdCA9owh4IxBRki5/+hKIU1tN6BgiRQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794186825; b=WIIMekhJTdfH/XyOy3R0RIPl7S7C42U/x8hGVCO79l4gIpzJ57lJ1OCfeQtqP2WxSKKiQ9 zMbPfUPhyACp9fLRMtqX2PBgUDUQmvZ5LzaFBhzBrC0d6KFq1bVxPx6tpLE+O0jJhGesOu DtP5L+noX3VjQAD0FYiV6FsuZPfANaRHWNTaiItUjSFKgsN0H1mS/SZDfTB8VHhvJnpJyV fPKxdoe/daqnInSqWzwBjixzSjdyTQBlm9RLcCUVZfOzr1GsMStQEfYGBjRNRTzNMM/DBL v9DlPi5zMx3CdXRyK49nyNeWiFgEHU1ZNNFuYvMRd6Da+WFJYAYCXAF8HgPI2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794186825; 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=XrWXqcC+0ZHzNtl3liETigtBCHgu+84fzkhgvuUGBmg=; b=Yt1sKFw42zoLu+pMQFmhv2QaoBFzYIwCcpae0jHkV7+AEVfBsy60rT67jIed729xuBn6h3 Ot5dHJBVcFWkHwPabSq0mVFiKIHLt/t0O8A6QaDjJa6BnbA4veL1uifJ1Ab4dxu06IE9D2 LwdMIFUBwCu0HCAWxjioWLq44TlzddMfgwUgPq6206g7fColgYcAc1dMirN/mfSN2GtMyw 3oP7hcHQVXD7X0dQ5eyPoVcYmcFcmzC6Vjn82OGITxmkcNXF4SemI/QksoRR1dbFfwKUVK BNHU6sHdz/HT42Hak72OdQK76G41lxCh0T+9nzuvMQsOMnXaIKFG3x2SLVODPQ== 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 4jNBcn2hTYzGvL for ; Mon, 09 Nov 2026 01:13:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 421a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Nov 2026 01:13:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 91bcaea97cc6 - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 91bcaea97cc6da847bb4edf5b9822b461c5a43fe Auto-Submitted: auto-generated Date: Mon, 09 Nov 2026 01:13:45 +0000 Message-Id: <6af11e49.421a.48463e8@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=91bcaea97cc6da847bb4edf5b9822b461c5a43fe commit 91bcaea97cc6da847bb4edf5b9822b461c5a43fe Author: Konstantin Belousov AuthorDate: 2026-11-06 13:05:50 +0000 Commit: Konstantin Belousov CommitDate: 2026-11-09 01:13:21 +0000 amd64: make hw.splitlock_force adjustable at runtime (cherry picked from commit 57bc1e1c2f4c01953336bdf03743e30f4ba12cdc) --- 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,