From nobody Tue Sep 29 00:31:58 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 4htzdV3M3Dz6t5BQ for ; Tue, 29 Sep 2026 00:31:58 +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 4htzdV20K1z4VX8 for ; Tue, 29 Sep 2026 00:31:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790641918; 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=+iPs5WbRPnyBh1Rh7EpuDkUksUUsqdDnqmEoyUnL9yY=; b=wfrfUHm8S1nNtYuWNvSpjNhuks1FmUlRLOiqlDM/5+71iQ3PZ8IXSL2xpbChR/GyY5wxLk OtketKTQcPM5H3ED+ebgMtEsbEWMumHwgQvFUworNa3FZsKsSQK58UGdLBY808U6xVxnxf na7seN5ORy+5dFlCc8ERjDwvkmtOzvZfVRV0EHmtaFncypkM+/BRQS+bft1KyzvYCpFpce LrB24a6icWBRDRXn2a0717uBn9o3rwfITYPaVhrK4238+gjqNBg2Ph/MhRSK34FAIFoVfd BhJSUCdWbI+zTE2dIwxYRBJJzZeJZFlRcEW8B/KHMRUQq+RJvdtcjN9AerhqyQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790641918; b=Sd7WH0NPZMvfU3/V84jM+UjJVDAzjD+Hg6ZmhbW4mlPiXlYNZY/5onczZhHcCmCJUsnPUh XRCfaQenj6yTd5eK7JzbsR19YCtxc4ISXp+bJFRYWjiAvmCpAimC+0C8gOy1bqOjp3iahl Ks7iGlaAjmHYPQNGec8TPqs0QPdcfqVc2EAvG3BU+H5cXS4ZXyF/BvIcVcyp4TxENoE1/J VXw7kArNrCYOASC36raADyAy2xkl+IhBD/hTzdOrgqkqVLrk4UBjd6208EvGVeYgyNUKrI wMcub9jOh+Se5RD/AIbNM9bRD/VjABMYtrhoiTVMoQJKbMij15gHsbgi0cPe/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790641918; 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=+iPs5WbRPnyBh1Rh7EpuDkUksUUsqdDnqmEoyUnL9yY=; b=asU4Xgz6FB5Obwr3CgYj6tQjlRHyWqJ78AawpJV2i1Lr/XWiZ2JkUAlCgYZlQRV483Pw/P Pco4nFHZJ+x29V6h9u0npZfwBan0VqojFC0Z7zxYmZaye0nTjKwCUH6XwaPhdiYOKBwoPv q95iEu0CKf/f8S33a5oNN6vmgRWPSWSVxiPPq1UuDT6nxhLuYs1J7luGtKb+Oy2gIauIGY SMMwEwH/ASS/gdwN6gbDMpR03B9zyxPmBwvEf3w1z8r6Ywu6mySboEktZ0+O0Cp9P7s/mZ iazI7RLK1H6efyq3OsHi+HvY8kSQXhYi0G5oabKuq+gZk8cDb3ZHcY1a+Rl9Jg== 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 4htzdV0xYJzrX0 for ; Tue, 29 Sep 2026 00:31:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b053 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 29 Sep 2026 00:31:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: d95433ec84b9 - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: d95433ec84b973c7e6ab819bbf4fb5bbcb829d2a Auto-Submitted: auto-generated Date: Tue, 29 Sep 2026 00:31:58 +0000 Message-Id: <6abb06fe.3b053.55b0b756@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d95433ec84b973c7e6ab819bbf4fb5bbcb829d2a commit d95433ec84b973c7e6ab819bbf4fb5bbcb829d2a Author: Konstantin Belousov AuthorDate: 2026-09-18 14:33:54 +0000 Commit: Konstantin Belousov CommitDate: 2026-09-29 00:27:15 +0000 amd64: add userspace control for disabling splitlocks (cherry picked from commit 51cea5416a2421f29d22100bc71ab6486b1dc54a) --- 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 1df73a25c05e..02b2567dd8e9 100644 --- a/sys/amd64/amd64/sys_machdep.c +++ b/sys/amd64/amd64/sys_machdep.c @@ -179,7 +179,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 /* @@ -198,6 +198,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: @@ -266,6 +268,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; } @@ -426,6 +432,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 cf7ee9ee5518..8fda776a3b08 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