From nobody Thu Jul 23 10:00:22 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 4h5RSl05lnz6lVmD for ; Thu, 23 Jul 2026 10:00:23 +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 4h5RSk5ZGPz3VTK for ; Thu, 23 Jul 2026 10:00:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784800822; 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=Q3xhzZls3BZrieuflbW/X4kL1usR5zSkSxasBifgEC4=; b=PD9Vd+8IgZU+Pp2Ivgfot8jh8o1IUPDq53K0PIcwv5D8X+B/oeFW3qzlGugTUYnbdXeTzr 4V54Ri4jweO+8Gj0MS3QcQPJ5CGBwYzZc8iWoTMxly43askN9Ju4p71NpkxxkWzDGpvOys abNIeNNAkMcBIGn4cWCDjNdkICUEMp6BGrD3l2WKRw6zvZkXVAf30G6D9JpLa/rpe6a+Ro 4+HLrCGxpyDlZRCgmrxVJaHtWlQSZ3vyhcavKnf/+Xr6ubFCxoEp+/4sGhoUrEQiBfA9r1 5iVfxhb4ItXHepCKM3p+RMwHYVE+42fqyVyNcF/f6UMr5SsQgIoZrk/9o6v1oQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784800822; a=rsa-sha256; cv=none; b=bkl/BdMaHdRTmWSuNYfGdhWx0ZgMITAvCO+eomy+6PZCox5DMya0hycYMj8EozjTL7Z/cG R6Qyr8cj5Uh295TxUgqAvh+daUC6x+IxEx0+72+vxzNEgsH7C2SvOHGQiC1uZbaVVxpjCv AngxJPkz/dhK2BldfoLGLuhPcQbswoh7Kkx5rdD6iQOwmknKx1KW14Xb2PlJ/EkiqNMnS1 P+/feyF9q5jkOe66T/yqQr2t2rhz7tggE8tkngispogm0ijJGndF+AVkHE/dmqFHY1u9M6 UwGGLuoqOvAimcWlGXgTbJZqHHs4DsM+1CwL8v9srMx/OE0BSWgYZ9lAJAlU9w== 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=1784800822; 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=Q3xhzZls3BZrieuflbW/X4kL1usR5zSkSxasBifgEC4=; b=G/hNZ2UnzLmugH7S+oT+0vwgyVdu5ZcD59VJHDknSsU8EL5/Q6WrRo29eC4Ryz2ZXL6Cos x7ZPuZnLiqW1ytTFi3aTjhhFF+g0HIAUcGsBYNtFonqffx6kTC4zz2Js5ezHjEbbu46ucP zBq9xae9kIVYfGjw+N2/r8Rggushr1vM6AFBHu93EJ5o3bQ1ykfUXXMArGVqowXPScGVSh 3sczisI7AZqiWGFODIfh8PlPGDywclclbElCuijkwh31E3pyUEhD+08oVH1Od/gwpgTg8Q M1AvpnKt6yqe4CC2bqXfFj0gt3uylr8+N4ZXAfQbC0y729sI40VXXuYSitccuw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h5RSk4J0Gz10dj for ; Thu, 23 Jul 2026 10:00:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3be2c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 23 Jul 2026 10:00:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 3e6bdd3acecb - stable/14 - x86: x86_msr_op(): Simplify assertions 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: 3e6bdd3acecb0ff414421dadfc1e3e0e00278d85 Auto-Submitted: auto-generated Date: Thu, 23 Jul 2026 10:00:22 +0000 Message-Id: <6a61e636.3be2c.38a04878@gitrepo.freebsd.org> The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=3e6bdd3acecb0ff414421dadfc1e3e0e00278d85 commit 3e6bdd3acecb0ff414421dadfc1e3e0e00278d85 Author: Olivier Certner AuthorDate: 2026-01-22 14:37:00 +0000 Commit: Olivier Certner CommitDate: 2026-07-23 09:58:59 +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 (cherry picked from commit a1a8bcdfde2e616cffeb4bf4e1968ba55cf409e9) --- 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 78457bde79d2..ca975560fd1c 100644 --- a/sys/x86/x86/cpu_machdep.c +++ b/sys/x86/x86/cpu_machdep.c @@ -146,6 +146,8 @@ x86_msr_op_one(void *argp) v = rdmsr(a->msr); *a->res = v; break; + default: + __assert_unreachable(); } } @@ -163,13 +165,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; @@ -220,6 +216,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(); } }