From nobody Thu Feb 19 12:29:30 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 4fGt3v1RjLz6QRNT for ; Thu, 19 Feb 2026 12:29:31 +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 4fGt3t5dq2z3Sw3 for ; Thu, 19 Feb 2026 12:29:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771504170; 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=8p+Bc80p33gpaOWmUa9Lw5IzvO4G+GKhGScdfHUEeVU=; b=lgoslwRtIyOh/UAQF6XsFp1B+1RSACEj1UXFzrx+lSU7m0dFs15ZQPFLoEUIA5AT62dYhu cVoX1vsHHCskF7k2dd5sKs79vf5nVerouSOvf4nAJS1P4fgRP3LmEwBWoe5NM+su8wylwQ jyFWePlcU9WAqnurYJmF0li+xLAoJqO1uM1mq5SUjgTEvM6qeWpsa6P66on4E85pCN5DMV d+OU7dAD2TBxYjLx1PkuvYvOL1sLUs7bmWPMpQaU3nUUrBhMS+IHBp/UBBkwN5KbpO0Lwa C/jbzGlIliZssEF820reIwdpcuowRjKdtJ9kQETSn8KNfuWfqWynSuV32EMM+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771504170; a=rsa-sha256; cv=none; b=Wgw1DLkXdeSQWZ8gUNfygS2UtJEFEusyY+kqKOhr/XDCaklBD4dbRmKaoRWTrtNCtdUubl LQC+Ax26kJN4gR155rue4/6GPP6hi2WRZFWXoE/G6VY6cErui+r/jvf/H7w77xS59Zr6k6 azb+ldeEuzqKoTW20Sh6+SlSAwIMjLBa/ParsS70m180NZHZTF8AAEDAv/W0lqwgxt9Q5g XSYxCKNYM2ur3NJJxgjFH/9WtgLiFy1J2UjMlgqRCF0BchmqlLAc6KaoONCQSa8LVDdfAQ kDWh/8jZ0pahrBMlzw6r/6mg3//bhhRVge8EukedSM7FchtodCP7aJeC9QeT1A== 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=1771504170; 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=8p+Bc80p33gpaOWmUa9Lw5IzvO4G+GKhGScdfHUEeVU=; b=jp8jfy70jBsUXjhAK7a7+ZqvIO7ueZnHcp4gtRYPgQafE1odFCRzDILn5J3/g4PtkqsJR7 KuEEFgmymCRCe0hR/Vfw5WXlrfXSRg4RcDLJIWx74JxG9AnVtgOs9pIfDECVhuOjWz9MdR u8MGQLYOkvcIkVO6JsvUWZkWrqkV1fMk9xy8z4KghnhNGUlJC7nnoVP5+MfNvHks6Yy6PD onDsHOPKygvQZWc0viCFZBjH95vhuWirSMDAKcfDtJCGrXYDrDkCagylUjE+VTK5tKXCBL O0VZMrORU4Hpv+n3/FmSuOjZ+gosewFl+vgrcaoyZWeDU05TwGpVt4SS7jTgPw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGt3t5DCvzhqZ for ; Thu, 19 Feb 2026 12:29:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a4c0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 12:29:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 314aeea9f688 - stable/15 - x86: x86_msr_op(): Simplify assertions 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: 314aeea9f688865d4852efbe938c4ecfb04ea338 Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 12:29:30 +0000 Message-Id: <6997022a.3a4c0.7a501f2b@gitrepo.freebsd.org> The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=314aeea9f688865d4852efbe938c4ecfb04ea338 commit 314aeea9f688865d4852efbe938c4ecfb04ea338 Author: Olivier Certner AuthorDate: 2026-01-22 14:37:00 +0000 Commit: Olivier Certner CommitDate: 2026-02-19 12:28:51 +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 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(); } }