From nobody Thu Jul 23 10:00:21 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 4h5RSk0Zl2z6lVl9 for ; Thu, 23 Jul 2026 10:00:22 +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 4h5RSj5DP6z3VJV for ; Thu, 23 Jul 2026 10:00:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784800821; 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=cDZALpal1vz3/QjWeyWAFZNHVV1x83c9G1ueVxEDzlM=; b=eUQz1apxAqjtZsVPNb8lSSoyOl8URUcscRKilare266aNOTrHnLR0ohUwAutzzp5EuJGU1 wt440LskrD9hbFAHftBGekz22e34rOYsN1nP66bxXvGdy6URLVY7Xr5l/Pr6gfQsLwH675 W8l/yfKI1ycf1Rnf+zwS8pPEZZ452f4qP0ZVGi11YuFJNsYdmVByAYp0a4nawcz7FWlVyc V93Qtz5Hxh6PTEYKqxiD/N4frDy53+PbTHky5TwprHDmdIteGMUV21NCESGs0UCN6Ne/Ik Vxi6QLT7SfMh1OrDBmlbJ/KHDXVmkYUmubzDS1qRbY/LB5CW7I/JtQR2m3GZAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784800821; a=rsa-sha256; cv=none; b=pcnIdqaV6rBymLCk/exaW+oKYdIWMK2GrSnaNvbBOXJiVPrwUYamrf3i47QBhca0TQpbp6 OukhkBLWVz5smhB36zySvZJkyf9qg2GoxYB4sZXmJQjs7127xIxth2WJFIyAcyA7N8q4Xo O3zAZ92iBfDTpBTs4klCqRC+ymnjwteKJLQddJ2zi9Jg2A4C3hR61Rfaxm4vkiERG6feey uVJd3uIrdiyURqQW7FeZDR6+Q5RVwNINgZc1aBh995ILzL6bA+m6Y/4+FfYeKul5+T10DP hSFdltyc/h/CrXH60YDV0U0SSw0nQVWGV7JabAFjOEOEqzslN7/S9uLsGooS6w== 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=1784800821; 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=cDZALpal1vz3/QjWeyWAFZNHVV1x83c9G1ueVxEDzlM=; b=v5aT0GAsCFI+/ZXJg9vwK0hvYKyRtM94K8+5T79uAugxts86mkytpVBbGC4kOnzCaHsu0Z SEEZc7y1nobNIOm7Wi/IM41u6P9Y9NDnEx7gqTEz73PdKlbZFhVaO7Mqw9EKZD2x1sbBtY y70/vGhWWoeGU/TgL1TuLdnlFdSlj4zRxS/wv4R2tUhsyVz3KDNp2aAjJ/qvB0ZRvpUETG P0hLfuTPhkuEujt6ZKDH2eUcAAFo6hdfnccdbdfoXcp596of8oadvXWoZ+smOMzqlOM2ZF TlbzZ+7+fw+pEYMhxxs/08T2YkeHTAIM+dJQh0dAX4QFUunLo0bC2HKHyM1ptA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h5RSj3X3jz10wk for ; Thu, 23 Jul 2026 10:00:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3cc19 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 23 Jul 2026 10:00:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 370314d0946e - stable/14 - x86: x86_msr_op(): Move setting mode up, delineate logical blocks 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: 370314d0946e38563b87a6f519e219ece4591395 Auto-Submitted: auto-generated Date: Thu, 23 Jul 2026 10:00:21 +0000 Message-Id: <6a61e635.3cc19.6a60973f@gitrepo.freebsd.org> The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=370314d0946e38563b87a6f519e219ece4591395 commit 370314d0946e38563b87a6f519e219ece4591395 Author: Olivier Certner AuthorDate: 2026-01-22 14:22:01 +0000 Commit: Olivier Certner CommitDate: 2026-07-23 09:58:58 +0000 x86: x86_msr_op(): Move setting mode up, delineate logical blocks No functional changes (intended). Reviewed by: kib MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D54996 (cherry picked from commit 7acd7ac6385c783699a64216198d7f2e244cc3b4) --- sys/x86/x86/cpu_machdep.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/x86/x86/cpu_machdep.c b/sys/x86/x86/cpu_machdep.c index 6062b4e85e16..78457bde79d2 100644 --- a/sys/x86/x86/cpu_machdep.c +++ b/sys/x86/x86/cpu_machdep.c @@ -162,16 +162,18 @@ x86_msr_op(u_int msr, u_int op, uint64_t arg1, uint64_t *res) u_int exmode; int bound_cpu, cpu, i, is_bound; - a.op = op & MSR_OP_OP_MASK; - MPASS(a.op == MSR_OP_ANDNOT || a.op == MSR_OP_OR || - a.op == MSR_OP_WRITE || a.op == MSR_OP_READ); exmode = op & MSR_OP_EXMODE_MASK; MPASS(exmode == MSR_OP_LOCAL || exmode == MSR_OP_SCHED_ALL || exmode == MSR_OP_SCHED_ONE || exmode == MSR_OP_RENDEZVOUS_ALL || exmode == MSR_OP_RENDEZVOUS_ONE); + + a.op = op & MSR_OP_OP_MASK; + MPASS(a.op == MSR_OP_ANDNOT || a.op == MSR_OP_OR || + a.op == MSR_OP_WRITE || a.op == MSR_OP_READ); a.msr = msr; a.arg1 = arg1; a.res = res; + switch (exmode) { case MSR_OP_LOCAL: x86_msr_op_one(&a);