From nobody Thu Jul 23 10:00:25 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 4h5RSq3GSnz6lVVj 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 4h5RSp1mkhz3VfM for ; Thu, 23 Jul 2026 10:00:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784800826; 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=RGA1i+W8awe5CX5jVZTIQhRAjhlWJfwljumfL3zbYwI=; b=n7cVVR0k3ErkVD2Ii7BYwDJCzIekJ2edOKCJ+r0LkBsT4gykwrAj2G1ePkU57cM41SSRcS yJip5cNxtUTQyxhT48u0sWjs9Hu+SKmBi17jE/3BVQsWbjS81er1YBOdOMm+bA2Sf6AN97 DAsLGw/rlyYYBocDEhw/dw9/txaVmYd+qJ3MgQCtFGuQ9gngXgIqdHK7BtHvpvBYzFJCkR G4kyUnHxossvrBh5NCCK1HJkByM6an3G+UeMbOB64XdAbkuKDJRPn1YXEVwHiOprklk87N Z5jy5jEIrD+yfls0YWD5doypnHQcWAMXwA6otAlbOqyNyrsGo99nXSgO1CYafQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784800826; a=rsa-sha256; cv=none; b=kQ5O96XAM9DZlSGbgxuyvVjesz8L2ijlF3559kE2fv2CK9GWCvHxhsRWtfgMfovay5cO8I fLmJlbzhm1pTJSKSqhMsWJKesnWHWGwTMhBt6pen+i4DVwNXeJZ/mPmjUfLgmkJIhU8Wgn 7Cn+hctPg2j4lr0mp+NBttKth2lq5WbBmN48BjDq9dW+uvaSeQbuf4LySVRfBmw88z7pxW Alz18wO5R+T733l7CJe86SeCt3ZOjaSA2iTDIB1UU0Oms8rIy64MWuelfD9WsitKmAmxZQ Qc0gIn6IirkGEdYV1lGq6SGJKNjZ7+6K9w9u9mTzwTuG+gKaOgqHDD4xebtdvg== 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=1784800826; 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=RGA1i+W8awe5CX5jVZTIQhRAjhlWJfwljumfL3zbYwI=; b=w+UwDtVsYuE+aWAI/UQAH5GsEOhxf6hGH9jc1ddme3O0g5xbrPfvFqQm5zxO22PaAfsH5G JBtWb1dOPFnjpCVPUYnGq77jZv18esHSK5x7LRQr8Te4AVFwGd/lduRmLMObDrWgEgBS6n EkqEfRkGSmVMKWMvYY11iYpHCOMSJEY3LD/ar1wsikRASnAduypYMrPklLXHo5832qQLR6 SmFFQVvDLzkkXX62hG6DqP/kR5ZiJIXJaWo+z6qbUo1uOmrgSVvme79eNyO9/bJ1wq5jOo kU8XmQd1ti/kVs1qEmx97DvVLlL/1vrNgvKS27TeexzWcQy1F6ZB4+vYJNE6sw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h5RSn6hdKz10dl for ; Thu, 23 Jul 2026 10:00:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d397 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 23 Jul 2026 10:00:25 +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: 8b2546469323 - stable/14 - x86_msr_op(9): consistently return the value read from MSR 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: 8b2546469323c72a954d4c0c1202d0845b80c3ee Auto-Submitted: auto-generated Date: Thu, 23 Jul 2026 10:00:25 +0000 Message-Id: <6a61e639.3d397.6cf43856@gitrepo.freebsd.org> The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=8b2546469323c72a954d4c0c1202d0845b80c3ee commit 8b2546469323c72a954d4c0c1202d0845b80c3ee Author: Konstantin Belousov AuthorDate: 2026-02-04 00:24:58 +0000 Commit: Olivier Certner CommitDate: 2026-07-23 09:59:00 +0000 x86_msr_op(9): consistently return the value read from MSR If the operation is executed on more than one CPU, a random instance of the read value is returned. Reviewed by: markj, olce Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55045 (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 6e49a25f8ece..0228e127419b 100644 --- a/sys/x86/x86/cpu_machdep.c +++ b/sys/x86/x86/cpu_machdep.c @@ -137,6 +137,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) @@ -148,6 +150,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) @@ -160,10 +164,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; } } @@ -176,11 +182,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; @@ -189,7 +199,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();