x86/sev: improve efi runtime code support.
v2 cover x86/sev: improve efi runtime code support.
v2 changes:
- rebase to latest master.
- update error message (Dionna).
- more details in the commit message (Borislav).
Gerd Hoffmann (2):
x86/sev/vc: fix efi runtime instruction emulation x86/sev: let sev_es_efi_map_ghcbs map the caa pages too
arch/x86/include/asm/sev.h | 4 ++-- arch/x86/coco/sev/core.c | 14 ++++++++++++-- arch/x86/coco/sev/vc-handle.c | 3 ++- arch/x86/platform/efi/efi_64.c | 4 ++-- 4 files changed, 18 insertions(+), 7 deletions(-)
Signature · 1 line
2.49.0
PATCH v2 1/2 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").
--- arch/x86/coco/sev/vc-handle.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/x86/coco/sev/vc-handle.c +2 -1
@@ -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>
@@ -180,7 +181,7 @@ static enum es_result __vc_decode_kern_insn(struct es_em_ctxt *ctxt)static enum es_result vc_decode_insn (struct es_em_ctxt *ctxt) { -if (user_mode (ctxt->regs)) +if (user_mode (ctxt->regs) || current->active_mm == &efi_mm)return __vc_decode_user_insn (ctxt);else return __vc_decode_kern_insn (ctxt);
Signature · 1 line
2.49.0
Re: [PATCH v2 1/2] x86/sev/vc: fix efi runtime instruction emulation
Quoted 30 lines · Gerd Hoffmann
In case
efi_mmis active go use the userspace instruction decoder which supports fetching instructions fromactive_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").
Signed-off-by Gerd Hoffmann <[email protected]>--- arch/x86/coco/sev/vc-handle.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)arch/x86/coco/sev/vc-handle.c +1
-0@@ -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>
arch/x86/coco/sev/vc-handle.c static enum es_result __vc_decode_kern_insn(struct es_em_ctxt *ctxt) · line 184
Quoted 5 lines
arch/x86/coco/sev/vc-handle.c +1
-1@@ -180,7 +181,7 @@ static enum es_result __vc_decode_kern_insn(struct es_em_ctxt *ctxt)static enum es_result vc_decode_insn (struct es_em_ctxt *ctxt) { -if (user_mode (ctxt->regs)) +if (user_mode (ctxt->regs) || current->active_mm == &efi_mm)
A comment before this would be good. Something like:
/*
* User instruction decoding is also required for the EFI runtime. Even
* though 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.
*/
Might be too verbose, but that's the general idea.
Thanks,
Tom
Quoted 3 lines
arch/x86/coco/sev/vc-handle.c +0
-0return __vc_decode_user_insn (ctxt); else return __vc_decode_kern_insn(ctxt);
Borislav Petkov
maintainerRe: [PATCH v2 1/2] x86/sev/vc: fix efi runtime instruction emulation
I have this now:
From: Gerd Hoffmann <[email protected]>
Date: Mon, 2 Jun 2025 12:50:48 +0200
Subject: [PATCH] x86/sev: Fix EFI runtime instruction emulation
In case efi_mm is active 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 and extend commit message with more backstory, add
clarifying comment from Tom. ]
--- arch/x86/coco/sev/vc-handle.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
arch/x86/coco/sev/vc-handle.c +7 -1
@@ -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,14 @@ 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 +* 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) || current->active_mm == &efi_mm)return __vc_decode_user_insn (ctxt);else return __vc_decode_kern_insn (ctxt);
Signature · 8 lines
2.43.0
--
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquettePATCH v2 2/2 x86/sev: let sev_es_efi_map_ghcbs map the caa pages too
In reply to Gerd HoffmannOVMF EFI firmware needs access to the CAA page to do SVSM protocol calls. So add that to sev_es_efi_map_ghcbs and also rename the function to reflect the additional job it is doing now.
--- arch/x86/include/asm/sev.h | 4 ++-- arch/x86/coco/sev/core.c | 14 ++++++++++++-- arch/x86/platform/efi/efi_64.c | 4 ++-- 3 files changed, 16 insertions(+), 6 deletions(-)
arch/x86/include/asm/sev.h +2 -2
@@ -445,7 +445,7 @@ static __always_inline void sev_es_nmi_complete(void) cc_platform_has(CC_ATTR_GUEST_STATE_ENCRYPT))__sev_es_nmi_complete (); } -extern int __init sev_es_efi_map_ghcbs (pgd_t *pgd); +extern int __init sev_es_efi_map_ghcbs_caas (pgd_t *pgd);extern void sev_enable (struct boot_params *bp);/*
@@ -556,7 +556,7 @@ static inline void sev_es_ist_enter(struct pt_regs *regs) { }static inline void sev_es_ist_exit (void ) { }static inline int sev_es_setup_ap_jump_table (struct real_mode_header *rmh) {return 0 ; }static inline void sev_es_nmi_complete (void ) { } -static inline int sev_es_efi_map_ghcbs (pgd_t *pgd) {return 0 ; } +static inline int sev_es_efi_map_ghcbs_caas (pgd_t *pgd) {return 0 ; }static inline void sev_enable (struct boot_params *bp) { }static inline int pvalidate (unsigned long vaddr,bool rmp_psize,bool validate) {return 0 ; }static inline int rmpadjust (unsigned long vaddr,bool rmp_psize,unsigned long attrs) {return 0 ; }
arch/x86/coco/sev/core.c +12 -2
@@ -1054,11 +1054,13 @@ int __init sev_es_setup_ap_jump_table(struct real_mode_header *rmh)* This is needed by the OVMF UEFI firmware which will use whatever it finds in * the GHCB MSR as its GHCB to talk to the hypervisor. So make sure the per-cpu * runtime GHCBs used by the kernel are also mapped in the EFI page-table. +* +* When running under SVSM the CCA page is needed too, so map it as well. */ -int __init sev_es_efi_map_ghcbs (pgd_t *pgd) +int __init sev_es_efi_map_ghcbs_caas (pgd_t *pgd) {struct sev_es_runtime_data *data; -unsigned long address, pflags; +unsigned long address, pflags, pflags_enc;int cpu;u64 pfn;
@@ -1066,6 +1068,7 @@ int __init sev_es_efi_map_ghcbs(pgd_t *pgd)return 0 ; pflags = _PAGE_NX | _PAGE_RW; + pflags_enc =cc_mkenc (pflags);for_each_possible_cpu (cpu) { data =per_cpu (runtime_data, cpu);
@@ -1075,6 +1078,13 @@ int __init sev_es_efi_map_ghcbs(pgd_t *pgd)if (kernel_map_pages_in_pgd (pgd, pfn, address,1 , pflags))return 1 ; + + address =per_cpu (svsm_caa_pa, cpu); +if (address) { + pfn = address >>PAGE_SHIFT ; +if (kernel_map_pages_in_pgd (pgd, pfn, address,1 , pflags_enc)) +return 1 ; + } }return 0 ;
arch/x86/platform/efi/efi_64.c +2 -2
@@ -216,8 +216,8 @@ int __init efi_setup_page_tables(unsigned long pa_memmap, unsigned num_pages)* When SEV-ES is active, the GHCB as set by the kernel will be used * by firmware. Create a 1:1 unencrypted mapping for each GHCB. */ -if (sev_es_efi_map_ghcbs (pgd)) { -pr_err ("Failed to create 1:1 mapping for the GHCBs!\n" ); +if (sev_es_efi_map_ghcbs_caas (pgd)) { +pr_err ("Failed to create 1:1 mapping for the GHCBs and CAAs!\n" );return 1 ; }
Signature · 1 line
2.49.0
Borislav Petkov
maintainerRe: [PATCH v2 2/2] x86/sev: let sev_es_efi_map_ghcbs map the caa pages too
I got this now:
---
From: Gerd Hoffmann <[email protected]>
Date: Mon, 2 Jun 2025 12:50:49 +0200
Subject: [PATCH] x86/sev: Let sev_es_efi_map_ghcbs() map the caa pages too
OVMF EFI firmware needs access to the CAA page to do SVSM protocol calls. For example, when the SVSM implements an EFI variable store, such calls will be necessary.
So add that to sev_es_efi_map_ghcbs() and also rename the function to reflect the additional job it is doing now.
[ bp: Massage. ]
--- arch/x86/coco/sev/core.c | 15 +++++++++++++-- arch/x86/include/asm/sev.h | 4 ++-- arch/x86/platform/efi/efi_64.c | 4 ++-- 3 files changed, 17 insertions(+), 6 deletions(-)
arch/x86/coco/sev/core.c +13 -2
@@ -1045,11 +1045,13 @@ int __init sev_es_setup_ap_jump_table(struct real_mode_header *rmh)* This is needed by the OVMF UEFI firmware which will use whatever it finds in * the GHCB MSR as its GHCB to talk to the hypervisor. So make sure the per-cpu * runtime GHCBs used by the kernel are also mapped in the EFI page-table. +* +* When running under SVSM the CCA page is needed too, so map it as well. */ -int __init sev_es_efi_map_ghcbs (pgd_t *pgd) +int __init sev_es_efi_map_ghcbs_caas (pgd_t *pgd) { +unsigned long address, pflags, pflags_enc;struct sev_es_runtime_data *data; -unsigned long address, pflags;int cpu;u64 pfn;
@@ -1057,6 +1059,7 @@ int __init sev_es_efi_map_ghcbs(pgd_t *pgd)return 0 ; pflags = _PAGE_NX | _PAGE_RW; + pflags_enc =cc_mkenc (pflags);for_each_possible_cpu (cpu) { data =per_cpu (runtime_data, cpu);
@@ -1066,6 +1069,14 @@ int __init sev_es_efi_map_ghcbs(pgd_t *pgd)if (kernel_map_pages_in_pgd (pgd, pfn, address,1 , pflags))return 1 ; + + address =per_cpu (svsm_caa_pa, cpu); +if (!address) +return 1 ; + + pfn = address >>PAGE_SHIFT ; +if (kernel_map_pages_in_pgd (pgd, pfn, address,1 , pflags_enc)) +return 1 ; }return 0 ;
arch/x86/include/asm/sev.h +2 -2
@@ -446,7 +446,7 @@ static __always_inline void sev_es_nmi_complete(void) cc_platform_has(CC_ATTR_GUEST_STATE_ENCRYPT))__sev_es_nmi_complete (); } -extern int __init sev_es_efi_map_ghcbs (pgd_t *pgd); +extern int __init sev_es_efi_map_ghcbs_caas (pgd_t *pgd);extern void sev_enable (struct boot_params *bp);/*
@@ -554,7 +554,7 @@ static inline void sev_es_ist_enter(struct pt_regs *regs) { }static inline void sev_es_ist_exit (void ) { }static inline int sev_es_setup_ap_jump_table (struct real_mode_header *rmh) {return 0 ; }static inline void sev_es_nmi_complete (void ) { } -static inline int sev_es_efi_map_ghcbs (pgd_t *pgd) {return 0 ; } +static inline int sev_es_efi_map_ghcbs_caas (pgd_t *pgd) {return 0 ; }static inline void sev_enable (struct boot_params *bp) { }static inline int pvalidate (unsigned long vaddr,bool rmp_psize,bool validate) {return 0 ; }static inline int rmpadjust (unsigned long vaddr,bool rmp_psize,unsigned long attrs) {return 0 ; }
arch/x86/platform/efi/efi_64.c +2 -2
@@ -216,8 +216,8 @@ int __init efi_setup_page_tables(unsigned long pa_memmap, unsigned num_pages)* When SEV-ES is active, the GHCB as set by the kernel will be used * by firmware. Create a 1:1 unencrypted mapping for each GHCB. */ -if (sev_es_efi_map_ghcbs (pgd)) { -pr_err ("Failed to create 1:1 mapping for the GHCBs!\n" ); +if (sev_es_efi_map_ghcbs_caas (pgd)) { +pr_err ("Failed to create 1:1 mapping for the GHCBs and CAAs!\n" );return 1 ; }
Signature · 8 lines
2.43.0
--
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteRe: [PATCH v2 2/2] x86/sev: let sev_es_efi_map_ghcbs map the caa pages too
Quoted 5 lines
arch/x86/coco/sev/core.c +0
-0for_each_possible_cpu (cpu) { data =per_cpu (runtime_data, cpu);@@ -1066,6 +1069,14 @@ int __init sev_es_efi_map_ghcbs(pgd_t *pgd)if (kernel_map_pages_in_pgd (pgd, pfn, address,1 , pflags))
arch/x86/coco/sev/core.c int __init sev_es_efi_map_ghcbs(pgd_t *pgd) · line 1080
Quoted 10 lines
arch/x86/coco/sev/core.c +8
-0return 1 ; + + address =per_cpu (svsm_caa_pa, cpu); +if (!address) +return 1 ; + + pfn = address >>PAGE_SHIFT ; +if (kernel_map_pages_in_pgd (pgd, pfn, address,1 , pflags_enc)) +return 1 ; }
The kernel allocates the caa page(s) only when running under svsm, see alloc_runtime_data(), so this is not correct. I think we either have to return to the original behavior of only doing something in case address is not NULL, or wrap the caa code block into a 'if (snp_vmpl) { ... }', following what alloc_runtime_data() is doing.
take care,
Gerd
Borislav Petkov
maintainerRe: [PATCH v2 2/2] x86/sev: let sev_es_efi_map_ghcbs map the caa pages too
Quoted 4 lines · Gerd Hoffmann
The kernel allocates the caa page(s) only when running under svsm, see
alloc_runtime_data(), so this is not correct. I think we either have to return to the original behavior of only doing something in case address is not NULL
Yes, we're doing something only when the address is not NULL.
Or maybe I'm missing what you're trying to tell me...
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteRe: [PATCH v2 2/2] x86/sev: let sev_es_efi_map_ghcbs map the caa pages too
Quoted 7 lines · Borislav Petkov
Quoted 4 lines · Gerd Hoffmann
The kernel allocates the caa page(s) only when running under svsm, see
alloc_runtime_data(), so this is not correct. I think we either have to return to the original behavior of only doing something in case address is not NULLYes, we're doing something only when the address is not NULL.
This is inside a loop, so returning in case the caa address is NULL will skip ghcb setup for all but the first CPU.
take care,
Gerd
Borislav Petkov
maintainerRe: [PATCH v2 2/2] x86/sev: let sev_es_efi_map_ghcbs map the caa pages too
Quoted 2 lines · Gerd Hoffmann
This is inside a loop, so returning in case the caa address is NULL will skip ghcb setup for all but the first CPU.
Then you should not piggyback on this loop but map the CAs in a separate step, only when a SVSM is running.
And even then we should think about allowing to continue if not all CAs map successfully.
Thx.
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteRe: [PATCH v2 2/2] x86/sev: let sev_es_efi_map_ghcbs map the caa pages too
Quoted 6 lines · Borislav Petkov
Quoted 2 lines · Gerd Hoffmann
This is inside a loop, so returning in case the caa address is NULL will skip ghcb setup for all but the first CPU.
Then you should not piggyback on this loop but map the CAs in a separate step, only when a SVSM is running.
v3 sent.
take care,
Gerd