linux-kernel - [tip: x86/sev] x86/sev/vc: Fix EFI runtime instruction emulation

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <175102744208.406.15035701661646196374.tip-bot2@tip-bot2>
Date: Fri, 27 Jun 2025 12:30:42 -0000
From: "tip-bot2 for Gerd Hoffmann" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: Gerd Hoffmann <kraxel@...hat.com>, "Borislav Petkov (AMD)" <bp@...en8.de>,
 Pankaj Gupta <pankaj.gupta@....com>, x86@...nel.org,
 linux-kernel@...r.kernel.org
Subject: [tip: x86/sev] x86/sev/vc: Fix EFI runtime instruction emulation

The following commit has been merged into the x86/sev branch of tip:

Commit-ID:     7b22e0432981c2fa230f1b493082b7e67112c4aa
Gitweb:        https://git.kernel.org/tip/7b22e0432981c2fa230f1b493082b7e67112c4aa
Author:        Gerd Hoffmann <kraxel@...hat.com>
AuthorDate:    Thu, 26 Jun 2025 13:40:11 +02:00
Committer:     Borislav Petkov (AMD) <bp@...en8.de>
CommitterDate: Fri, 27 Jun 2025 13:53:12 +02:00

x86/sev/vc: Fix EFI runtime instruction emulation

In case efi_mm is active go use the userspace instruction decoder which
supports fetching instructions from active_mm.  This is needed to make
instruction emulation work for EFI runtime code, so it can use CPUID and
RDMSR.

EFI runtime code uses the CPUID instruction to gather information about
the environment it is running in, such as SEV being enabled or not, and
choose (if needed) the SEV code path for ioport access.

EFI runtime code uses the RDMSR instruction to get the location of the
CAA page (see SVSM spec, section 4.2 - "Post Boot").

The big picture behind this is that the kernel needs to be able to
properly handle #VC exceptions that come from EFI runtime services.
Since EFI runtime services have a special page table mapping for the EFI
virtual address space, the efi_mm context must be used when decoding
instructions during #VC handling.

  [ bp: Massage. ]

Signed-off-by: Gerd Hoffmann <kraxel@...hat.com>
Signed-off-by: Borislav Petkov (AMD) <bp@...en8.de>
Reviewed-by: Pankaj Gupta <pankaj.gupta@....com>
Link: https://lore.kernel.org/20250626114014.373748-2-kraxel@redhat.com
---
 arch/x86/coco/sev/vc-handle.c |  9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/arch/x86/coco/sev/vc-handle.c b/arch/x86/coco/sev/vc-handle.c
index 0989d98..faf1fce 100644
--- a/arch/x86/coco/sev/vc-handle.c
+++ b/arch/x86/coco/sev/vc-handle.c
@@ -17,6 +17,7 @@
 #include <linux/mm.h>
 #include <linux/io.h>
 #include <linux/psp-sev.h>
+#include <linux/efi.h>
 #include <uapi/linux/sev-guest.h>

 #include <asm/init.h>
@@ -178,9 +179,15 @@ static enum es_result __vc_decode_kern_insn(struct es_em_ctxt *ctxt)
 		return ES_OK;
 }

+/*
+ * User instruction decoding is also required for the EFI runtime. Even though
+ * the EFI runtime is running in kernel mode, it uses special EFI virtual
+ * address mappings that require the use of efi_mm to properly address and
+ * decode.
+ */
 static enum es_result vc_decode_insn(struct es_em_ctxt *ctxt)
 {
-	if (user_mode(ctxt->regs))
+	if (user_mode(ctxt->regs) || mm_is_efi(current->active_mm))
 		return __vc_decode_user_insn(ctxt);
 	else
 		return __vc_decode_kern_insn(ctxt);