From nobody Fri Feb 13 08:17:54 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 4fC4mM1r7fz6SjP6 for ; Fri, 13 Feb 2026 08:17:55 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fC4mL6ppwz3fKJ for ; Fri, 13 Feb 2026 08:17:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770970675; 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=RZgNNKuX6DEIPICJQIww/yPU5kXRQsMPGpiGiY7OxYc=; b=tfRoC23ukHaydqHnbLG2m0InIqFZuZ4i7yAWmFqkwhxAeKbm/57PUDZIDLj9i5nyw54F0J Iw/zIEo2qhBJJ3QR1pFOdiSliaq4JimQFKbGbFA7dO47LLUAwT58t5hCjL5WA6FbXTKtWX gr0mqlVkQQpxm7E0YBOFu+qHOzKfzTK0qeOzrGwtz62g9qr/BRws8T4N+dWhTLX/aUXs77 7hZlTZh18oOAA/WwHaSGwoA3le3vRLvdB/wL3Kj7S+c+aIC2O/bMKB9+U3zgYkFH6lMa70 Kw95fXmMyIOubc6Q45Ukkd+1NYF1VtuXjh25jVr+yAm5mvFRWrOSi2fxDLzIiQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770970675; a=rsa-sha256; cv=none; b=wF+DPieqzBSK+WxyKOxes/Oc7T2CrK1XxsMoM7+45uQx7djE/+1VK2iKZUVpjL2y2f2XmJ 9GPSQpX39NHcao34fIZhx9FWz5OZ+gzQtqylWOiSFTn8grrWdl9t0+hptfdROIXvMpuqv6 ecITjecWjijSxK7kkRDHBtvJ+k4ouD7wIiBCifVXfwdPtFb5s4GNtBRC7Q4XerXqD+9dB6 xDnvmyZuUG7bio9iTdsuNAdIa4Gm6dDUd2FERm9k0jDQWEQQMtP9JAQssfF7GtNshGsH3t PR+Dzz/2l0eXGzShGg1cWvV1Y7iz7JGvRiogsXmMMG16KOphH6mb2DwRv+6cFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770970675; 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=RZgNNKuX6DEIPICJQIww/yPU5kXRQsMPGpiGiY7OxYc=; b=dsbL21TGxNDRS2AKKiG5nGYXwqOpTrYkshTwCtC6nVAnYFvNIEzhAj+KvuTgO6hGxgP0bG PeEk2ryPyouDoi5UKEr1UTOziJtI0Hsq2EG+9iLzXD1r5WgRUDkg1gAWg2irbrm1Y99mBd 0J5GjLyvvAB11m7ba52kuKe0CXwBhVQ0bRx2SZaiKUBoFzJELwV6YB2Ds6RMxRYacnEtTV bAb/Rv+uWT+xWFbKk+S1wFNnWvWsLfwzJzDl8jQZK5g/Huu71gkFu2JqQnHOoVnxOZL4Nm YaK9Ip3cHPx8qzxV8z5GKXLAe2sgr510dpwI3qv2oZENRLy5mNsKZcYXleszwQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fC4mL5DNvz1C7n for ; Fri, 13 Feb 2026 08:17:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 40137 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Feb 2026 08:17:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: af99e40af1dd - main - x86: add a safe variant of MSR_OP_SCHED* operations for x86_msr_op(9) 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 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: af99e40af1dd4e8b39ca986240ee8b9aea722958 Auto-Submitted: auto-generated Date: Fri, 13 Feb 2026 08:17:54 +0000 Message-Id: <698ede32.40137.471593f8@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=af99e40af1dd4e8b39ca986240ee8b9aea722958 commit af99e40af1dd4e8b39ca986240ee8b9aea722958 Author: Konstantin Belousov AuthorDate: 2026-02-01 23:43:50 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-13 07:55:04 +0000 x86: add a safe variant of MSR_OP_SCHED* operations for x86_msr_op(9) The modifier executes the operation using msr{read,write}_safe() functions instead of plain msr reads and writes. Returns EFAULT if any MSR access caused #GP. Reviewed by: markj, olce Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55045 --- sys/x86/include/x86_var.h | 3 +- sys/x86/x86/cpu_machdep.c | 75 ++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 70 insertions(+), 8 deletions(-) diff --git a/sys/x86/include/x86_var.h b/sys/x86/include/x86_var.h index 215fe0562465..caaab207b57a 100644 --- a/sys/x86/include/x86_var.h +++ b/sys/x86/include/x86_var.h @@ -174,6 +174,7 @@ uint64_t rdtsc_ordered(void); * * All modes cause execution on the target CPU(s) with interrupts disabled. */ +#define MSR_OP_SAFE 0x08000000 #define MSR_OP_LOCAL 0x10000000 #define MSR_OP_SCHED_ALL 0x20000000 #define MSR_OP_SCHED_ONE 0x30000000 @@ -181,7 +182,7 @@ uint64_t rdtsc_ordered(void); #define MSR_OP_RENDEZVOUS_ONE 0x50000000 #define MSR_OP_CPUID(id) ((id) << 8) -void x86_msr_op(u_int msr, u_int op, uint64_t arg1, uint64_t *res); +int x86_msr_op(u_int msr, u_int op, uint64_t arg1, uint64_t *res); #if defined(__i386__) && defined(INVARIANTS) void trap_check_kstack(void); diff --git a/sys/x86/x86/cpu_machdep.c b/sys/x86/x86/cpu_machdep.c index 5f8965bd5614..023b02ba7c76 100644 --- a/sys/x86/x86/cpu_machdep.c +++ b/sys/x86/x86/cpu_machdep.c @@ -118,15 +118,60 @@ struct msr_op_arg { int op; uint64_t arg1; uint64_t *res; + bool safe; + int error; }; static void -x86_msr_op_one(void *argp) +x86_msr_op_one_safe(struct msr_op_arg *a) +{ + uint64_t v; + int error; + + error = 0; + switch (a->op) { + case MSR_OP_ANDNOT: + error = rdmsr_safe(a->msr, &v); + if (error != 0) { + atomic_cmpset_int(&a->error, 0, error); + break; + } + v &= ~a->arg1; + error = wrmsr_safe(a->msr, v); + if (error != 0) + atomic_cmpset_int(&a->error, 0, error); + break; + case MSR_OP_OR: + error = rdmsr_safe(a->msr, &v); + if (error != 0) { + atomic_cmpset_int(&a->error, 0, error); + break; + } + v |= a->arg1; + error = wrmsr_safe(a->msr, v); + if (error != 0) + atomic_cmpset_int(&a->error, 0, error); + break; + case MSR_OP_WRITE: + error = wrmsr_safe(a->msr, a->arg1); + if (error != 0) + atomic_cmpset_int(&a->error, 0, error); + break; + case MSR_OP_READ: + error = rdmsr_safe(a->msr, &v); + if (error == 0) + *a->res = v; + else + atomic_cmpset_int(&a->error, 0, error); + break; + } +} + +static void +x86_msr_op_one_unsafe(struct msr_op_arg *a) { - struct msr_op_arg *a; uint64_t v; - a = argp; switch (a->op) { case MSR_OP_ANDNOT: v = rdmsr(a->msr); @@ -150,11 +195,24 @@ x86_msr_op_one(void *argp) } } +static void +x86_msr_op_one(void *arg) +{ + struct msr_op_arg *a; + + a = arg; + if (a->safe) + x86_msr_op_one_safe(a); + else + x86_msr_op_one_unsafe(a); +} + #define MSR_OP_EXMODE_MASK 0xf0000000 #define MSR_OP_OP_MASK 0x000000ff -#define MSR_OP_GET_CPUID(x) (((x) & ~MSR_OP_EXMODE_MASK) >> 8) +#define MSR_OP_GET_CPUID(x) \ + (((x) & ~(MSR_OP_EXMODE_MASK | MSR_OP_SAFE)) >> 8) -void +int x86_msr_op(u_int msr, u_int op, uint64_t arg1, uint64_t *res) { struct thread *td; @@ -167,8 +225,10 @@ x86_msr_op(u_int msr, u_int op, uint64_t arg1, uint64_t *res) exmode = op & MSR_OP_EXMODE_MASK; a.op = op & MSR_OP_OP_MASK; a.msr = msr; + a.safe = (op & MSR_OP_SAFE) != 0; a.arg1 = arg1; a.res = res; + a.error = 0; switch (exmode) { case MSR_OP_LOCAL: @@ -209,8 +269,8 @@ x86_msr_op(u_int msr, u_int op, uint64_t arg1, uint64_t *res) thread_unlock(td); break; case MSR_OP_RENDEZVOUS_ALL: - smp_rendezvous(smp_no_rendezvous_barrier, x86_msr_op_one, - smp_no_rendezvous_barrier, &a); + smp_rendezvous(smp_no_rendezvous_barrier, + x86_msr_op_one, smp_no_rendezvous_barrier, &a); break; case MSR_OP_RENDEZVOUS_ONE: cpu = MSR_OP_GET_CPUID(op); @@ -221,6 +281,7 @@ x86_msr_op(u_int msr, u_int op, uint64_t arg1, uint64_t *res) default: __assert_unreachable(); } + return (a.error); } /*