From nobody Thu Feb 19 12:29:29 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 4fGt3t1Dwvz6QRWF for ; Thu, 19 Feb 2026 12:29:30 +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 4fGt3s52Nfz3Sy4 for ; Thu, 19 Feb 2026 12:29:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771504169; 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=AvKSP5RT8DWlD/j8cIV7pFI00nZm5KRl9P5SpaP5aW0=; b=If6x3x1aee/4E7CWeIyxC1neM/gjBhNf6lKSIZJjhZF0yLZ29UnDrkkkKcrwHZkfmgdFrJ NbXwUpPyFWkgRMuOTs0VOjLocmElibRafPXESR70i4IK8V+cgNv4GWuu0D+qQTW7ihMvi6 UFYZo+k5RYNqYeQZjAuvb8koxr9dre9mNcDAjRAme13gOIh+5dmffKcMB29I2Z3Di3UWHG k76SjTUBxl+vmf4XipatFkprIFmFDzvXlwwZXdV2Xa/NZg0jxMoUufKd6C2oi0gDhyZsXw DbpZEIQY5ARd42NFXmGeM2+nvI5IvLpsf1tfdMkCfeJ2XEU5Yga4W1ThBPbrpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771504169; a=rsa-sha256; cv=none; b=aWhuN7tdth1ZXLp1nz/jLi4nc/p62m12/9CbaR+IsxZPXY5OQyb2LxocovRWLzzPCeH/Fr bTSwKOBAMhpbq04YsNZwWk/vu+LvonpugfYw+3o+EHsVVoPl+uI4QHhrZqmmOTU47w3WYR u9Ao17vMW5dII9p0BE2TH//ZU0c1uYfMAelREpLeTvxEZewCaaEI2eA0YAC2kOtNsGBV+z STp+xl1ntfF5KDM1pUL79ZSwa7pc4FS8tnTrbPD5JOt+Kzmbj79Wqre+dqzn8YNaEj0h/j tsfGsP9/6a0gB/0p9PLFFSbaEvn2juc9ad8QgzYo9EPFbpe9coi258vbN7ukog== 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=1771504169; 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=AvKSP5RT8DWlD/j8cIV7pFI00nZm5KRl9P5SpaP5aW0=; b=AAA3121pTI7lZjwo8F1D63vgjUW+9qjugilBpwwm0KGQO0N9SZ2cSzl6mM8XMB8hxmucAi JpQmk6rqBixudrXrdzg+PZ+rP/T0RyISr0X+pHG58+Hc6W+sPQCLrzyKTSkcrA3wFxbqLF x0JAiCmfhek3uh+L4ZklJsFLg7xofsSh0hPPhHs1bw/Xsddr4WFZyERnWX8DHOa1kw3nsy sMmZEckBF57aq8qamVOdXRraz2/1TXdub+VrJwjg6MWSDU+CTg3Be7TKvgVR3xKjHBJ0OQ iWOWHv0bejMzaFd2ytxySuZAUMpURpfuBeSM6d96zTmExePgKMXotcYycVjDSA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGt3s4T0XzjXN for ; Thu, 19 Feb 2026 12:29:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37975 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 12:29:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 30f803f2898b - stable/15 - x86: x86_msr_op(): Move setting mode up, delineate logical blocks 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 30f803f2898b019569cae617116f1d9d910446df Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 12:29:29 +0000 Message-Id: <69970229.37975.1a263376@gitrepo.freebsd.org> The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=30f803f2898b019569cae617116f1d9d910446df commit 30f803f2898b019569cae617116f1d9d910446df Author: Olivier Certner AuthorDate: 2026-01-22 14:22:01 +0000 Commit: Olivier Certner CommitDate: 2026-02-19 12:28:51 +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 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);