From nobody Tue Sep 22 15:41:51 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 4hq48c25xXz6sNY9 for ; Tue, 22 Sep 2026 15:41:52 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hq48b5rJRz4vTM for ; Tue, 22 Sep 2026 15:41:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790091712; 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=W2mHDsfVLvtSlSijXl5huYKaupYuwU9C8o0P50ZGe7o=; b=NGXcbybWn99zJHrTdNke0s6YRmMW1n6rsZ8O6Afh87ktfKUw88HCORrtnR+ftjssjmAPLw f9WfIuD7T5wyrxtEKvOsg+5+djHF7xyef0dsHMg7vCXAJT7gbHF0DQyCjZElsQBFoj7SzP I9cVe9S3pPvDAlX5TfcsJlOjQUqlyEPR/b1CcQKnVmcm5dS1NXUl0uAPttBy9PzXweCenf LPkK5ZUa8JjRsIEa/HDUBZ2OKCztaSzrXPwNNTwk8jMrWSY7F5gaiXUQLYzIVYsdkCr3Qs mWM/m9HD173afC9QW2bupp3vDrzrSBmpbRfOYzIFfGezGbWpKwt407OulKwy0w== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790091712; b=wCtpHfesoZ8htaVwDH7CXmA5EJXYPi5ZzG68AcCj2qBRgB0JKKrbApvZKfT/vT6u5H731X 5RY1FG3mfbO604FPGek+136G6bS6qgFFmMA8J97iOAixfR07vkM26nMKX3mza/AGKK/4Um pRRiJyYjWDyGGFN940UXYSPIeloVPeF1FUGE7vtFQqUsPNecUWrszNhfv4eV1DC1BeNAte HpyGdamsJCaWrvIIvmlcdL7v+L0MEn4BMuMTyvbO+hdJTlO1pGK/hiJ9LdDIK/tSy7VrBB Jmqo0mtfbnKNhjbbh3tNrNACqWsk4n4ovdFQqAD2cyvax+SDVJLfW01g4CfqnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790091712; 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=W2mHDsfVLvtSlSijXl5huYKaupYuwU9C8o0P50ZGe7o=; b=LkCMOmqhK8GooezIWXCklOGyS6fhzl01dGZ2j/cO/Rn3QwxlWFsrUPyyQIWSpZVt4su6KM qzdam80l4IsXF894yeEXmYvblDmIv34tK2RufTvBA/HyUq1YbZF0ANpuhSpUNh3mvM5l7V PkOnjiNq9cXUKINdpKMsImkYSmesJbt56VXY8xaDel0xIAVQog3r84uKCJfX43EW27hRsJ dti1QTc+2hIX8srjsNYYGafSOns546AImP0l2o9ya02PujhHF4xA8lNv9ziOIJsR7VntlF Usw7IbYdZY3A25ttgK4T4gJEVdWnC4i1N0UZo1aaSCy+N1tclKqHep5/ciSTTQ== 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 4hq48b4cWQz1CCn for ; Tue, 22 Sep 2026 15:41:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 365d0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 22 Sep 2026 15:41:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 51cea5416a24 - main - amd64: add userspace control for disabling splitlocks 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 51cea5416a2421f29d22100bc71ab6486b1dc54a Auto-Submitted: auto-generated Date: Tue, 22 Sep 2026 15:41:51 +0000 Message-Id: <6ab2a1bf.365d0.1c4417a@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=51cea5416a2421f29d22100bc71ab6486b1dc54a commit 51cea5416a2421f29d22100bc71ab6486b1dc54a Author: Konstantin Belousov AuthorDate: 2026-09-18 14:33:54 +0000 Commit: Konstantin Belousov CommitDate: 2026-09-22 15:40:41 +0000 amd64: add userspace control for disabling splitlocks Thread can control it with sysarch(I386_SET_SPLITLOCK). The global default is set with hw.splitlock_force. Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D59815 --- sys/amd64/amd64/sys_machdep.c | 27 ++++++++++++++++++++++++++- sys/x86/include/sysarch.h | 2 ++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/sys/amd64/amd64/sys_machdep.c b/sys/amd64/amd64/sys_machdep.c index 2c6387d2a0d2..0942ed22c8a8 100644 --- a/sys/amd64/amd64/sys_machdep.c +++ b/sys/amd64/amd64/sys_machdep.c @@ -212,7 +212,7 @@ sysarch(struct thread *td, struct sysarch_args *uap) struct i386_set_pkru i386pkru; struct amd64_get_xfpustate a64xfpu; struct amd64_set_pkru a64pkru; - int error; + int error, val; #ifdef CAPABILITY_MODE /* @@ -231,6 +231,8 @@ sysarch(struct thread *td, struct sysarch_args *uap) case I386_GET_XFPUSTATE: case I386_SET_PKRU: case I386_CLEAR_PKRU: + case I386_SET_SPLITLOCK: + case I386_GET_SPLITLOCK: case AMD64_GET_FSBASE: case AMD64_SET_FSBASE: case AMD64_GET_GSBASE: @@ -299,6 +301,10 @@ sysarch(struct thread *td, struct sysarch_args *uap) sizeof(struct amd64_set_pkru))) != 0) return (error); break; + case I386_SET_SPLITLOCK: + if ((error = copyin(uap->parms, &val, sizeof(val))) != 0) + return (error); + break; default: break; } @@ -421,6 +427,25 @@ sysarch(struct thread *td, struct sysarch_args *uap) update_pcb_bases(pcb); break; + case I386_SET_SPLITLOCK: + if (!ia32_splitlock) { + if (val != 0) + error = ENOTSUP; + break; + } + if (val == 0) + disable_splitlock(td); + else if (val == 1) + enable_splitlock(td); + else + error = EINVAL; + break; + + case I386_GET_SPLITLOCK: + val = (td->td_md.md_td_flags & TDF_MD_SPLITLOCK_AC) != 0; + error = copyout(&val, uap->parms, sizeof(val)); + break; + default: error = EINVAL; break; diff --git a/sys/x86/include/sysarch.h b/sys/x86/include/sysarch.h index 9a8c95d9ae75..094995239043 100644 --- a/sys/x86/include/sysarch.h +++ b/sys/x86/include/sysarch.h @@ -52,6 +52,8 @@ #define I386_GET_XFPUSTATE 11 #define I386_SET_PKRU 12 #define I386_CLEAR_PKRU 13 +#define I386_SET_SPLITLOCK 14 +#define I386_GET_SPLITLOCK 15 /* Leave space for 0-127 for to avoid translating syscalls */ #define AMD64_GET_FSBASE 128