From nobody Thu May 28 17:27:36 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 4gRD2c2gMBz6g3jb for ; Thu, 28 May 2026 17:27:36 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gRD2c215Sz436J for ; Thu, 28 May 2026 17:27:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779989256; 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=H79c7Bl/dQkSQuO95pooluDu4PIkvwjmX5hmx/IuSJE=; b=Jz9O6yU7kEOqw++epvXJ6o8ZC9/tW+bDwTZ+VBb0YcYJD4u/3EsyEWHjBiOneAVu/BHsLx Eg6txg00h7AnXtgirOzMgZ3HPx8z/LNw0xrzXYSpBIy9g4pGEciDpsKRyMH4Eiy+YIMdb+ rucW2brI2ME2n5wpmjqvpohCd7I+0x/mieEqP45FYVLLAbcornvgI/D/fCTK+5jep4f9h7 nnz2pgKErKcQxI/YyXjbi6aOeX8cg3WcxtpfURUp25Wgut42Dkkxh44hEQlsGrOkzDEeqT 6TH+g7ggGOIwSkDoWKG+NFKJFY96OWs7vHid7FPkTfRhl7/0/l4iIglRM+HfGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779989256; a=rsa-sha256; cv=none; b=QLKFWSh/NbV4W6uBcDHk8w+n+TUGyVbeaMAQEaRXUd2+gU9zLDd3+Up9tWZlb8fAclwmYw OVYELzLXnxNPgsXExkHpNiLTQe+6TmLXuSLhgWBU+4p70wwcjQjAOurvfL01l3K4mGEpbg Zsuhn1V+7t1hZGV2qBgFtgQ/gbaP1COAH6SbEt9DjmHiTtQOfYXIAQVF6Bq45ErDSTWvs9 NwdUqujV/dtSaRGG93i39hIBuPHKMo7PjMvmMZ0tGtxYFCU9taQTdTBSrpGnpR6LXr+5Oy iMidum+MsmJw8ABBLJwX+30PpYi3B51ffCx7M5sH9aXdLwr6l5BX4iYOHrqOwg== 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=1779989256; 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=H79c7Bl/dQkSQuO95pooluDu4PIkvwjmX5hmx/IuSJE=; b=Xu0mq45whUICTf66rLrRsrxxe0r/9xene/RDqQwRk6us2MuFxCeM/Wv4w4U8T7x29NsaR4 9Q7X5i+jI41WxjoqHGq0yMCnhOLOS+LgGRiG1GnXEdUVRATVZilYnQX1PnDQTUY0ciGwAH Lb8+jIjpDhFOUPi44y79LB83px4ivRYNRgA6NWxoXoCfIFrsiMmZji96xK/o69nM+ehACl AXxdZOHlTeqUUmJmEqUqNHCr1QNAPWIgyIS6ZdkaSSvwAlAfmJ9sglB7Yl/lus0q/11+04 r78n7GCPRH78ZVnMLe3koSGYGADPglpcv/gOAkjsM2FxHKda3fLFX2Yg8rO9cA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gRD2c12njzwB3 for ; Thu, 28 May 2026 17:27:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d055 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 28 May 2026 17:27:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 0a02a47fd94a - main - x86: for wrmsr_early_safe(), catch all exceptions, not only #GP 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 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0a02a47fd94a8326e84ac0a6cb857342b59671f8 Auto-Submitted: auto-generated Date: Thu, 28 May 2026 17:27:36 +0000 Message-Id: <6a187b08.3d055.7ff4566f@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0a02a47fd94a8326e84ac0a6cb857342b59671f8 commit 0a02a47fd94a8326e84ac0a6cb857342b59671f8 Author: Konstantin Belousov AuthorDate: 2026-05-27 08:21:10 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-28 17:26:56 +0000 x86: for wrmsr_early_safe(), catch all exceptions, not only #GP Reviewed by: olce Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D57264 --- sys/amd64/amd64/machdep.c | 24 +++++++++++++++--------- sys/amd64/amd64/support.S | 7 +++---- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index db2fd5927f7f..8df4868f5312 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -1827,29 +1827,35 @@ wrmsr_early_safe_start(void) { struct region_descriptor efi_idt; struct gate_descriptor *gpf_descr; + int i; sidt(&wrmsr_early_safe_orig_efi_idt); efi_idt.rd_limit = 32 * sizeof(idt0[0]); efi_idt.rd_base = (uintptr_t)idt0; lidt(&efi_idt); - gpf_descr = &idt0[IDT_GP]; - gpf_descr->gd_looffset = (uintptr_t)wrmsr_early_safe_gp_handler; - gpf_descr->gd_hioffset = (uintptr_t)wrmsr_early_safe_gp_handler >> 16; - gpf_descr->gd_selector = rcs(); - gpf_descr->gd_type = SDT_SYSTGT; - gpf_descr->gd_p = 1; + /* Setup handler for all possible exceptions. */ + for (i = 0; i < 32; i++) { + gpf_descr = &idt0[i]; + gpf_descr->gd_looffset = + (uintptr_t)wrmsr_early_safe_gp_handler; + gpf_descr->gd_hioffset = + (uintptr_t)wrmsr_early_safe_gp_handler >> 16; + gpf_descr->gd_selector = rcs(); + gpf_descr->gd_type = SDT_SYSTGT; + gpf_descr->gd_p = 1; + } } void wrmsr_early_safe_end(void) { - struct gate_descriptor *gpf_descr; + int i; lidt(&wrmsr_early_safe_orig_efi_idt); - gpf_descr = &idt0[IDT_GP]; - memset_early(gpf_descr, 0, sizeof(*gpf_descr)); + for (i = 0; i < 32; i++) + memset_early(&idt0[i], 0, sizeof(idt0[0])); } int diff --git a/sys/amd64/amd64/support.S b/sys/amd64/amd64/support.S index 09d4ef85b087..1d7d05843ba8 100644 --- a/sys/amd64/amd64/support.S +++ b/sys/amd64/amd64/support.S @@ -1566,20 +1566,19 @@ msr_onfault: ret ENTRY(wrmsr_early_safe) + movq %rsp,%r11 movl %edi,%ecx movl %esi,%eax sarq $32,%rsi movl %esi,%edx wrmsr xorl %eax,%eax -wrmsr_early_faulted: ret ENTRY(wrmsr_early_safe_gp_handler) - addq $8,%rsp + movq %r11,%rsp movl $EFAULT,%eax - movq $wrmsr_early_faulted,(%rsp) - iretq + ret /* * void pmap_pti_pcid_invalidate(uint64_t ucr3, uint64_t kcr3);