From nobody Tue Feb 3 14:05:04 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 4f54xY2Hd3z6PcDY for ; Tue, 03 Feb 2026 14:05:05 +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 4f54xX1WH2z3k11 for ; Tue, 03 Feb 2026 14:05:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770127504; 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=cNW+ocY4jow5eCvePelIjZmzMVN9823mq/DeEsXLIqk=; b=oeuNlxfQDvvTJyFu61p+hfeOb/Ah3PvtfkbROpSMrTf3he5D+/+UDjIbs5IeZHixh/aur9 D+rk7ExwnSMX67sR9piAlDZLVfWPn9VjBBaw5OmQ0xRREYv/56MBdzMxGHYVSR2hkID831 i2DpAOhsC+aZCs5R5YlD6vvXoUzbrro7JIWp6HT8tUodsFQF+0R37IfprQvoKcd3V0iMrA wuRyRd9NCCkFCsTTIZypEs8TM1Wv/caKll7GpV7JE6z1VRhAc7gi/+46+TP3autOhgmPnA kxA+nU3tOP+IxJSXFRtgJjTJUZD4ed1cMlI/v+o1S/ozsWGQZVoX8fwvGny7nA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770127504; a=rsa-sha256; cv=none; b=MzFV5HcDF3jJvsW5XbLXya650zla+8zG2GdE/Dt0wGPPvneij9V06jtBv8zRvz9VPzr9G+ fOPy4IX36iX0lgnlkpSXBMbrbghhwf7jTXEgpZ90pb6FQkiqsKCw72eDqhcmzkBfVUbgLc tL9J24mFv7R69tlXR9GC7SjLDBgWepMZebU98pS31uDdaGvDwm6lQ+fvWzxl7NgHwT+Pe2 Tl50jUptPrmi/OEzeXYhJpGLky7V9kgQHg9t6uiPFPi+DGqsa1hS6yKzUUBOLr+4QrvV04 3UfF9krr0nxcwxs/PtcxuNbX3nsrhZqgtTb1UYYU0pMg9rxcEC8A/MgXdPREvA== 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=1770127504; 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=cNW+ocY4jow5eCvePelIjZmzMVN9823mq/DeEsXLIqk=; b=PlKQ0TwrpkgsXgSphlxPcBoFQflMiKjcfCsM92VFkoudXNC8ScmxwwigE7QzelcWAJ+LIw cx34DwnjgNatP8Fn8fSi0GYOSupJI5P9BAH92p1IebsTnlX/efJwjTOT4BqO4NDBhqL7ft 5qbWryeE+Im7WRb+YI6Xs70zBjiJBMRNDX8cAOfE5Ty2Wy8ESt1xQwVqSbaaEkxuKFbsuq t2wRnTMypaabb7weTi6LJu9wMHPzD9SeQCjQ9EiO+s1Twm92A8Q1NfCfEan+ByplZis9T4 2O4REmrf/h+3CfwHG/aAQQXQ9lH7NM37w77Jfy3OdT1t5CBZLYzHc6g3p9sBxw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f54xX0xNwz204 for ; Tue, 03 Feb 2026 14:05:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b12a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Feb 2026 14:05:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: a1a8bcdfde2e - main - x86: x86_msr_op(): Simplify assertions 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: a1a8bcdfde2e616cffeb4bf4e1968ba55cf409e9 Auto-Submitted: auto-generated Date: Tue, 03 Feb 2026 14:05:04 +0000 Message-Id: <69820090.3b12a.69cfbf16@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=a1a8bcdfde2e616cffeb4bf4e1968ba55cf409e9 commit a1a8bcdfde2e616cffeb4bf4e1968ba55cf409e9 Author: Olivier Certner AuthorDate: 2026-01-22 14:37:00 +0000 Commit: Olivier Certner CommitDate: 2026-02-03 14:03:01 +0000 x86: x86_msr_op(): Simplify assertions Simplify them by moving them into more natural places, i.e., default cases of 'switch' statements. No functional change (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 | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sys/x86/x86/cpu_machdep.c b/sys/x86/x86/cpu_machdep.c index b0763d7bd98e..5cbcb40540bb 100644 --- a/sys/x86/x86/cpu_machdep.c +++ b/sys/x86/x86/cpu_machdep.c @@ -145,6 +145,8 @@ x86_msr_op_one(void *argp) v = rdmsr(a->msr); *a->res = v; break; + default: + __assert_unreachable(); } } @@ -162,13 +164,7 @@ x86_msr_op(u_int msr, u_int op, uint64_t arg1, uint64_t *res) int bound_cpu, cpu, i, is_bound; 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; @@ -219,6 +215,8 @@ x86_msr_op(u_int msr, u_int op, uint64_t arg1, uint64_t *res) smp_rendezvous_cpus(set, smp_no_rendezvous_barrier, x86_msr_op_one, smp_no_rendezvous_barrier, &a); break; + default: + __assert_unreachable(); } }