From nobody Thu Feb 19 22:08:47 2026 X-Original-To: dev-commits-src-branches@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 4fH6wH4nnKz6SXRp for ; Thu, 19 Feb 2026 22:08:47 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fH6wH2cGnz426p for ; Thu, 19 Feb 2026 22:08:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771538927; 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=terVSF+qBUjB9VF4SVVFDISgQS8DjOBGAGoQEVU7yuk=; b=E4pIcEnvUB6npRqz4YZzX6fwQIw/BTczFa/tUokC+OY8udW9c254AgUzi/uRD0UWo0kb+S +cOU4ABOjwaXPSc2x2axStal1fuQK6nfGfiJPqyGtxNS6bNFVDyg1U31nufJop/kl2EA2Y qD+dpLcq5NhLfccPLLzZbk9D3aYClDgzFaIWLYEKxKw6V96cSV5tHxAO6U6Cx0h0FTPc8T DSJqrQjMlhcv5JeV3RCi1Xhy8Nlxbm8QhZcHn93G/Pjkyd8OI2EZgEmnkNDx6sx5JIeONm 7hOXBj/FRfMIkpuY+bybKv6hyeLB2lEgnxy1s+PxcL1FWI8RWSILNO4OspiO7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771538927; a=rsa-sha256; cv=none; b=H8nPgtmpHAEIhztDHoz/q5qeDIgoBsltsPYnGVlA15lvMQPzFPC976yp2bzjz/a4cld/Ky 9+kVZEisVDR9N13YwL8zWg0Y1RsDGSAUN+lTdirirhZ47tKtvczc6kDYQ2lVVbYo1VVqSN 6lE21dTRO+79RPZ6HOIrMa6CiZk3mRmCZ+LPrKxaODD8wtsoH13vRE7ioBrD14tnHRpHql ahlaGe9VcuoUi/drFbJkTapGGsQvsjXHM5DgFfE4nHuR1Z+LyvdOWRiaYGiqf39PrMBmek MCLdKiuHnMd7b6GMOPscSDK7Y1XvJHBK37shvmyZ9vAkCWYEg2HW4RKa8h/8eg== 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=1771538927; 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=terVSF+qBUjB9VF4SVVFDISgQS8DjOBGAGoQEVU7yuk=; b=hal6wOE66WZ8W6EqYUmZn8LXr1TisgVXegUdSMwYc0y78HF4aQI6Z8lbevvrtC3F9rlyLp P6iKKhYgUW7bKxSAV7vbf/0WlH0DKRM8X14JmsPEt0NWK3I4BezsGKnIAv6xVWg0zL4Rch oX4jfZ0O+Vi7EwLj/7eVRxdz8xnxp+f1sHYmVIqvJE7hffyOIPhvtFvqLCdqZ72tAy+Uv7 6zlUCi0dXDhbyy2ZlE0VaKJ2yVzw0kSbfhdO68Wds1KtFlwy06LB1VlWNhp6ma9B+5VjTI zNskpXaVCJWr+N79e5WSWif/nYTLnAaot5v4lO1ljnGCjVyuF6lfZ84SdKAe/Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fH6wH1hmtz115Y for ; Thu, 19 Feb 2026 22:08:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26c97 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 22:08:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: b0bc769c363e - stable/15 - x86_msr_op(9): consistently return the value read from MSR List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/15 X-Git-Reftype: branch X-Git-Commit: b0bc769c363ef616c1e7c21a9d4b031be11ef00e Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 22:08:47 +0000 Message-Id: <699789ef.26c97.7eec5214@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b0bc769c363ef616c1e7c21a9d4b031be11ef00e commit b0bc769c363ef616c1e7c21a9d4b031be11ef00e Author: Konstantin Belousov AuthorDate: 2026-02-04 00:24:58 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-19 22:05:20 +0000 x86_msr_op(9): consistently return the value read from MSR (cherry picked from commit 36ceb5509d01ff2e6482a78ca809c344574e9a25) --- sys/x86/x86/cpu_machdep.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/sys/x86/x86/cpu_machdep.c b/sys/x86/x86/cpu_machdep.c index 023b02ba7c76..6c3f4add6202 100644 --- a/sys/x86/x86/cpu_machdep.c +++ b/sys/x86/x86/cpu_machdep.c @@ -136,6 +136,8 @@ x86_msr_op_one_safe(struct msr_op_arg *a) atomic_cmpset_int(&a->error, 0, error); break; } + if (a->res != NULL) + atomic_store_64(a->res, v); v &= ~a->arg1; error = wrmsr_safe(a->msr, v); if (error != 0) @@ -147,6 +149,8 @@ x86_msr_op_one_safe(struct msr_op_arg *a) atomic_cmpset_int(&a->error, 0, error); break; } + if (a->res != NULL) + atomic_store_64(a->res, v); v |= a->arg1; error = wrmsr_safe(a->msr, v); if (error != 0) @@ -159,10 +163,12 @@ x86_msr_op_one_safe(struct msr_op_arg *a) break; case MSR_OP_READ: error = rdmsr_safe(a->msr, &v); - if (error == 0) - *a->res = v; - else + if (error == 0) { + if (a->res != NULL) + atomic_store_64(a->res, v); + } else { atomic_cmpset_int(&a->error, 0, error); + } break; } } @@ -175,11 +181,15 @@ x86_msr_op_one_unsafe(struct msr_op_arg *a) switch (a->op) { case MSR_OP_ANDNOT: v = rdmsr(a->msr); + if (a->res != NULL) + atomic_store_64(a->res, v); v &= ~a->arg1; wrmsr(a->msr, v); break; case MSR_OP_OR: v = rdmsr(a->msr); + if (a->res != NULL) + atomic_store_64(a->res, v); v |= a->arg1; wrmsr(a->msr, v); break; @@ -188,7 +198,8 @@ x86_msr_op_one_unsafe(struct msr_op_arg *a) break; case MSR_OP_READ: v = rdmsr(a->msr); - *a->res = v; + if (a->res != NULL) + atomic_store_64(a->res, v); break; default: __assert_unreachable();