From nobody Tue Feb 3 14:05:03 2026 X-Original-To: dev-commits-src-main@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 4f54xW4hmTz6Pc9Z for ; Tue, 03 Feb 2026 14:05:03 +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 4f54xW1MJrz3jwY for ; Tue, 03 Feb 2026 14:05:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770127503; 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=nR5FtI6TBGwrPZA37oYyo25eNh2LgN/Iyg5/ZLBe194=; b=EURZmCk8YjV/364goYKe8tLdoSzfLK7V4XJcwR81HxyazN+U48CUOWaiJSupnk3fxropci xJJh4qcWmHxfTl1cJYG5Y0y1hk0cON1YEE6VkG3tIMltF3FWPo1fNg66yrgoaR6BbuAHXI eTirNPpBK8X7Y1t7RaZ26LhgmBcDpyW00g5FBsvRH5pVVYRY1iMPFgK+M63VU8m0D+TURB La7uQ8F1xmfCtBc60tn6CwdycF0KklZIfqAIhVK1LfwObYX1fDewe5I3mD212ZM9sR7A/2 4e2SIEGlzpI+5anG/RkrtdHwIhrxfSNSlZ4h37gTsFGrX+9RGUxxOTcFg49J+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770127503; a=rsa-sha256; cv=none; b=W40ZpcA1kS7EQaJPVv9VWof6ZyzsZoCce6B+F0DRg+udqFpFBHm9JzzHL3yFa6Zd+fsqt+ VOoTfRcR/lNzaIcnr/fHr/ZuN+vIjf/19inJKc6RWJc1I8jtL+KcnleZM1XFPpd4WLSNqt /0Adfnuegxgg/G8cubH2WTienTstjRSchdoxTEyb4x5zwTjBHeeH7OJZxdWfRczge1S2Ua Lg+Es7nDIDv12NovClRQnsKww9xoo4bYmz8/PpIZXHo3KFOSG/UngP1ps1bBqj/AezCKXk +Jr2sPoKrI5BqbwYrPFBtgdN5BgPVT4XWXjI4+WoAOLRGKTnpP3H9srpOPofUg== 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=1770127503; 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=nR5FtI6TBGwrPZA37oYyo25eNh2LgN/Iyg5/ZLBe194=; b=THfotbVucOfem26YCYE+ivoTye1Zudfgy+kFC8Dp0h0dI+j0sbojiOq4u1TocMFMIXMxBS ySWhvxc7GwS6N1lcSiII5SVLuKY1fLXL0A6uCIN1YtsWRB9uQev6MbQbHLNjZoFO/3H8PF jMCSxT0ttnAetP/7Kc5NjU9S8wQOe4Wv90gsRH0y3yuxBLFqMzYd18fa7xB2yuaPyssv2L +3ge3XVTcyoqNVKNgG9m8imkMzoYaeNxWoY/KO4YnPuD8s1Jb9oR91RPvDzAM/p7EIc3UE Khp2+d4w5aj5Dc3vJBeX4Pxwo/4s95jZP2HrqhyIiGJNRERU4N8Sv3+IZ0PQHA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f54xW0CDDz1pS for ; Tue, 03 Feb 2026 14:05:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3aaae by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Feb 2026 14:05:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 7acd7ac6385c - main - x86: x86_msr_op(): Move setting mode up, delineate logical blocks List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org 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/main X-Git-Reftype: branch X-Git-Commit: 7acd7ac6385c783699a64216198d7f2e244cc3b4 Auto-Submitted: auto-generated Date: Tue, 03 Feb 2026 14:05:03 +0000 Message-Id: <6982008f.3aaae.ca793c1@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=7acd7ac6385c783699a64216198d7f2e244cc3b4 commit 7acd7ac6385c783699a64216198d7f2e244cc3b4 Author: Olivier Certner AuthorDate: 2026-01-22 14:22:01 +0000 Commit: Olivier Certner CommitDate: 2026-02-03 14:02:55 +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 --- 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 067374be4941..b0763d7bd98e 100644 --- a/sys/x86/x86/cpu_machdep.c +++ b/sys/x86/x86/cpu_machdep.c @@ -161,16 +161,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);