From nobody Thu Jul 23 10:00:24 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 4h5RSq2qCHz6lVwM for ; Thu, 23 Jul 2026 10:00:27 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h5RSn4TBrz3VCg for ; Thu, 23 Jul 2026 10:00:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784800825; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UG4hWhnFzyjAnI/sw4IrtXaJpce1gWDd4fZM0KR7uYM=; b=IXKVIXQ+soOEDBCHV+/gjCGbP9A3GvXkdD4hJ+Sf4c95b85SKP8A64Qakdl1X8cRonhyrN jgghsCshZtLU5hi3oNkIXYV6jVYFZc3PnhAYVVXJ/Ey3+aNT34+lOVwJi+WE+fC0ffwhqN +TeK1xKMfP+ylGQPrEHSgdgofd/Ei1fC+t/VcUR4BZ5MN1kPM9/QEEwEgB5aWjvKhzGSdN DTOlOOwTF8+mFhuPYQGX5jmnJYPom0EBSvtbRw57FDAXo2U/ovt5IyosPyUgBThgPMxEx4 bd5kFSkPUCW9rjk9v4x1z/aMAEzt+EzYUHjiOkmcjmS+mOJ/M4TXbtV/13WLuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784800825; a=rsa-sha256; cv=none; b=E0MywSebEYLDuBiAug4HBH9oAuKNClU1IFzNRqbnJ9XsUMXPjMLOnbZCosLWqqKcFjL8oX k6NQve9EiUmKDAKEBrinmChKj8lCNUJ0oOnjvag/+VLqQUdwZKdV2HiTYIZucwNDgE/yHg yGy0diWEs2qrDVmWw3yY/aVyIe5yq0FRjknQXr1rwIBLz0pyGWQTuMJsm90l8HxfCgx/le lr2XXb0o3nXvPLHkYH8k767hJYj3auQuZI9v7lkMffg5pgpfpMQIKDfiJryss3JlFCrCFS bt5bZdldkhYaFP+dt282ksGystjQsc+ifQckRF/BvN93oygSBrpB9Q8J74bEbw== 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=1784800825; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UG4hWhnFzyjAnI/sw4IrtXaJpce1gWDd4fZM0KR7uYM=; b=UDsqFtEkCERCV2RDTPrNmeBkIA62IWa1Y/VVWFn1LKqwc+nRwH5pfoxHXEQTrKTHLpryMA 70r0G5ySsjXCOv4QfM4kuUUeI5V7FPXqI0URRkjTM24MPIVjv5m0/JAT41VwnFAU9zab9t iJkbtqAkB4GBo+Ds78t7iG8dQ+LIOTMJrlqkHVB8cTjdgVL2jbHtYJdeSgyw6fLJv31nmD kvO8A3RUPIR1SGT6HsLkpeld8YmQBSXn/mbMFLrXEDFkOBk7+LtNgFeNLLUSvlO0uFeuYL knWtxOzTQUVLcoXWZcBYWniFxfWwu/O8nu9ADMYTIi6OVTTISNqzLfypyVYMLg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h5RSm5rltz10dk for ; Thu, 23 Jul 2026 10:00:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d32f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 23 Jul 2026 10:00:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Konstantin Belousov From: Olivier Certner Subject: git: 7ad1f88f6f5d - stable/14 - 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 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7ad1f88f6f5db6754d31f2018599c92efb11ab6f Auto-Submitted: auto-generated Date: Thu, 23 Jul 2026 10:00:24 +0000 Message-Id: <6a61e638.3d32f.1a0f2af8@gitrepo.freebsd.org> The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=7ad1f88f6f5db6754d31f2018599c92efb11ab6f commit 7ad1f88f6f5db6754d31f2018599c92efb11ab6f Author: Konstantin Belousov AuthorDate: 2026-02-01 23:43:50 +0000 Commit: Olivier Certner CommitDate: 2026-07-23 09:58:59 +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 (cherry picked from commit af99e40af1dd4e8b39ca986240ee8b9aea722958) --- 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 bd246623ec07..e12f88e0ae03 100644 --- a/sys/x86/include/x86_var.h +++ b/sys/x86/include/x86_var.h @@ -172,6 +172,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 @@ -179,7 +180,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 1c10af10e79d..6e49a25f8ece 100644 --- a/sys/x86/x86/cpu_machdep.c +++ b/sys/x86/x86/cpu_machdep.c @@ -119,15 +119,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); @@ -151,11 +196,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; @@ -168,8 +226,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: @@ -210,8 +270,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); @@ -222,6 +282,7 @@ x86_msr_op(u_int msr, u_int op, uint64_t arg1, uint64_t *res) default: __assert_unreachable(); } + return (a.error); } /*