From nobody Thu Jun 4 00:36:21 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 4gW5Gb28Kxz6h5w7 for ; Thu, 04 Jun 2026 00:36: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gW5GZ0pycz3pxj for ; Thu, 04 Jun 2026 00:36:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780533382; 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=LANad9gMMqE56hhnFWZO03dG3xdgVGGtlxFW3ZGm458=; b=HPlwohKZ3+FDCiU6jZlASvJnVvPm+2uOUngOJ8l/wigwwgjllcN9ynDwJUxlVoSoriHYfv QtBrswQJ6QTZ3jPNcf4rCi5EGoxr3vAgSbJ1mBLmrENjqJLmALZUCQ2ks43L75j7i0maFP UU+jKMWtJZOBxRTI84ijN94lV3gkBi5CW3nl+4oRyqAvh+Cm36HSIOQyyPgIWyTrPKIuoA 0nAQs3TJAHrivUpIhq9vDNDoQFnN2m4ZkjWPkjOOpfo1l5clXTPDmrf/ez9oE36CZjGQMy 28qosGhble1l17GVofY1TFs2bNrczUwXDGoAHLFE8lVpnNrjpvsCfv7SHaPs+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780533382; a=rsa-sha256; cv=none; b=S3J5WZkg8+vbLw9b4sDiZrcNFevyoMgNeuDK2WYL6xnX5YMWlMWLw8CauOyA6o+y/DyFvj kOdvXE/ttEmOLdNCxhKT9BZfbWmy84/wdGYDjNEIBvycAt9z1+EiptPNLTk0MIRubKAr1h USlTDdyAWpLdoZinLpDS4QWJA7O9MA434Hp+hmICmLOwtJcG7lFEFjiaF/i3ZwlUMa/X1E scC6cPKLaQAHslK2HZmXZBrWugq2PUtM5AhEIs09LSiraKUjqP/2xr2s6XdxvesEW7f/pR 7kxiC0pbIJ3tTx96vodUpfEfwSCZoPalcTvuq7tDX8jSwEbbjQBfg9Rjmm1uQw== 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=1780533382; 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=LANad9gMMqE56hhnFWZO03dG3xdgVGGtlxFW3ZGm458=; b=B8DXcsMwfgjHKu5svs/6iSsNgqfXYmvJV98+Hu1BmDCbCG298HuqW/nbyQJcmxfIHvJj5k vwPaqhXGUqaB5FRLsicjgLEPE9ykOYK6pzJVUosnyZCaceN3R1qxhoMqOPVi4jzOSfoYms NlY+HD0lHKq7aDUYiMGiA7fPBeZXNrmyDoyXNDDS8O6qZkYKqR1Y0IXcE06IB/a4tTEGzU AvlvBfiion6JLl8cFZUHD3l7sV9WRex7uh8lLibgnXSpqmGDEywxOew3GU13ljjtRTx/Qt mZsjgm/JxxZkLejYPefzYIJCt/GYJFI0YEAAJT2NpAFuATN5Q2MTldTCzT7Vww== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gW5GY5C8Szb22 for ; Thu, 04 Jun 2026 00:36:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21eb6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 04 Jun 2026 00:36:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: cc0080607d14 - stable/15 - x86: for wrmsr_early_safe(), catch all exceptions, not only #GP 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 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/stable/15 X-Git-Reftype: branch X-Git-Commit: cc0080607d14fe437ca0f0faa6999536df59acae Auto-Submitted: auto-generated Date: Thu, 04 Jun 2026 00:36:21 +0000 Message-Id: <6a20c885.21eb6.3b2cce95@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=cc0080607d14fe437ca0f0faa6999536df59acae commit cc0080607d14fe437ca0f0faa6999536df59acae Author: Konstantin Belousov AuthorDate: 2026-05-27 08:21:10 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-04 00:34:43 +0000 x86: for wrmsr_early_safe(), catch all exceptions, not only #GP (cherry picked from commit 0a02a47fd94a8326e84ac0a6cb857342b59671f8) --- 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 2c69c1b3ace5..0d4ed59a98b1 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -1828,29 +1828,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])); } #ifdef KDB diff --git a/sys/amd64/amd64/support.S b/sys/amd64/amd64/support.S index 27694a95653c..547a37b37376 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);