x86/sev: KEXEC/KDUMP support for SEV-ES guests
Subsystems (6)
v5 cover x86/sev: KEXEC/KDUMP support for SEV-ES guests
From: Vasant Karasulli <[email protected]>
Hi,
here are changes to enable kexec/kdump in SEV-ES guests. The biggest problem for supporting kexec/kdump under SEV-ES is to find a way to hand the non-boot CPUs (APs) from one kernel to another.
Without SEV-ES the first kernel parks the CPUs in a HLT loop until they get reset by the kexec'ed kernel via an INIT-SIPI-SIPI sequence. For virtual machines the CPU reset is emulated by the hypervisor, which sets the vCPU registers back to reset state.
This does not work under SEV-ES, because the hypervisor has no access to the vCPU registers and can't make modifications to them. So an SEV-ES guest needs to reset the vCPU itself and park it using the AP-reset-hold protocol. Upon wakeup the guest needs to jump to real-mode and to the reset-vector configured in the AP-Jump-Table.
The code to do this is the main part of this patch-set. It works by placing code on the AP Jump-Table page itself to park the vCPU and for jumping to the reset vector upon wakeup. The code on the AP Jump Table runs in 16-bit protected mode with segment base set to the beginning of the page. The AP Jump-Table is usually not within the first 1MB of memory, so the code can't run in real-mode.
The AP Jump-Table is the best place to put the parking code, because the memory is owned, but read-only by the firmware and writeable by the OS. Only the first 4 bytes are used for the reset-vector, leaving the rest of the page for code/data/stack to park a vCPU. The code can't be in kernel memory because by the time the vCPU wakes up the memory will be owned by the new kernel, which might have overwritten it already.
The other patches add initial GHCB Version 2 protocol support, because kexec/kdump need the MSR-based (without a GHCB) AP-reset-hold VMGEXIT, which is a GHCB protocol version 2 feature.
The kexec'ed kernel is also entered via the decompressor and needs MMIO support there, so this patch-set also adds MMIO #VC support to the decompressor and support for handling CLFLUSH instructions.
Finally there is also code to disable kexec/kdump support at runtime when the environment does not support it (e.g. no GHCB protocol version 2 support or AP Jump Table over 4GB).
The diffstat looks big, but most of it is moving code for MMIO #VC support around to make it available to the decompressor.
The previous version of this patch-set can be found here:
https://lore.kernel.org/kvm/[email protected]/
Please review.
Thanks,
Vasant
Changes v4->v5:
- Rebased to v6.9-rc2 kernel
- Applied review comments by Tom Lendacky
- Exclude the AP jump table related code for SEV-SNP guests
Changes v3->v4:
- Rebased to v6.8 kernel
- Applied review comments by Sean Christopherson
- Combined sev_es_setup_ap_jump_table() and sev_setup_ap_jump_table() into a single function which makes caching jump table address unnecessary
- annotated struct sev_ap_jump_table_header with __packed attribute
- added code to set up real mode data segment at boot time instead of hardcoding the value.
Changes v2->v3:
- Rebased to v5.17-rc1
- Applied most review comments by Boris
- Use the name 'AP jump table' consistently
- Make kexec-disabling for unsupported guests x86-specific
- Cleanup and consolidate patches to detect GHCB v2 protocol support
Joerg Roedel (9):
x86/kexec/64: Disable kexec when SEV-ES is active x86/sev: Save and print negotiated GHCB protocol version x86/sev: Set GHCB data structure version
x86/sev: Setup code to park APs in the AP Jump Table x86/sev: Park APs on AP Jump Table with GHCB protocol version 2 x86/sev: Use AP Jump Table blob to stop CPU
x86/sev: Add MMIO handling support to boot/compressed/ code x86/sev: Handle CLFLUSH MMIO events
x86/kexec/64: Support kexec under SEV-ES with AP Jump Table Blob
Vasant Karasulli (1):
x86/sev: Exclude AP jump table related code for SEV-SNP guests
arch/x86/boot/compressed/sev.c | 45 +- arch/x86/include/asm/insn-eval.h | 1 + arch/x86/include/asm/realmode.h | 5 + arch/x86/include/asm/sev-ap-jumptable.h | 30 + arch/x86/include/asm/sev.h | 7 + arch/x86/kernel/machine_kexec_64.c | 12 + arch/x86/kernel/process.c | 8 + arch/x86/kernel/sev-shared.c | 234 +++++- arch/x86/kernel/sev.c | 376 +++++----- arch/x86/lib/insn-eval-shared.c | 921 ++++++++++++++++++++++++ arch/x86/lib/insn-eval.c | 911 +---------------------- arch/x86/realmode/Makefile | 9 +- arch/x86/realmode/init.c | 5 +- arch/x86/realmode/rm/Makefile | 11 +- arch/x86/realmode/rm/header.S | 3 + arch/x86/realmode/rm/sev.S | 85 +++ arch/x86/realmode/rmpiggy.S | 6 + arch/x86/realmode/sev/Makefile | 33 + arch/x86/realmode/sev/ap_jump_table.S | 131 ++++ arch/x86/realmode/sev/ap_jump_table.lds | 24 + 20 files changed, 1711 insertions(+), 1146 deletions(-) create mode 100644 arch/x86/include/asm/sev-ap-jumptable.h create mode 100644 arch/x86/lib/insn-eval-shared.c create mode 100644 arch/x86/realmode/rm/sev.S create mode 100644 arch/x86/realmode/sev/Makefile create mode 100644 arch/x86/realmode/sev/ap_jump_table.S create mode 100644 arch/x86/realmode/sev/ap_jump_table.lds
base-commit: 39cd87c4eb2b893354f3b850f916353f2658ae6f --
2.34.1
PATCH v5 1/10 x86/kexec/64: Disable kexec when SEV-ES is active
From: Joerg Roedel <[email protected]>
SEV-ES needs special handling to support kexec. Disable it when SEV-ES is active until support is implemented.
--- arch/x86/kernel/machine_kexec_64.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
arch/x86/kernel/machine_kexec_64.c +11 -0
@@ -267,11 +267,22 @@ static void load_segments(void) ); } +static bool machine_kexec_supported (void ) +{ +if (cc_platform_has (CC_ATTR_GUEST_STATE_ENCRYPT )) +return false; + +return true; +} +int machine_kexec_prepare (struct kimage *image) {unsigned long start_pgtable;int result; +if (!machine_kexec_supported ()) +return -ENOSYS ; +/* Calculate the offsets */ start_pgtable =page_to_pfn (image->control_code_page) <<PAGE_SHIFT ;
--
2.34.1
PATCH v5 2/10 x86/sev: Save and print negotiated GHCB protocol version
In reply to [email protected]From: Joerg Roedel <[email protected]>
Save the results of the GHCB protocol negotiation into a data structure and print information about versions supported and used to the kernel log.
This is useful for debugging kexec issues in SEV-ES guests down the road to quickly spot whether kexec is supported on the given host.
--- arch/x86/kernel/sev-shared.c | 33 +++++++++++++++++++++++++++++++-- arch/x86/kernel/sev.c | 8 ++++++++ 2 files changed, 39 insertions(+), 2 deletions(-)
arch/x86/kernel/sev-shared.c +31 -2
@@ -23,6 +23,23 @@#define sev_printk_rtl (fmt, ...)#endif +/* +* struct ghcb_info - Used to return GHCB protocol +* negotiation details. +* +* @hv_proto_min: Minimum GHCB protocol version supported by Hypervisor +* @hv_proto_max: Maximum GHCB protocol version supported by Hypervisor +* @vm_proto: Protocol version the VM (this kernel) will use +*/ +struct ghcb_info { +unsigned int hv_proto_min; +unsigned int hv_proto_max; +unsigned int vm_proto; +}; + +/* Negotiated GHCB protocol version */ +static struct ghcb_info ghcb_info__ro_after_init ; +/* I/O parameters for CPUID-related helpers */ struct cpuid_leaf {u32 fn;
@@ -159,12 +176,24 @@ static bool sev_es_negotiate_protocol(void)if (GHCB_MSR_INFO (val) !=GHCB_MSR_SEV_INFO_RESP )return false; -if (GHCB_MSR_PROTO_MAX (val) <GHCB_PROTOCOL_MIN || -GHCB_MSR_PROTO_MIN (val) >GHCB_PROTOCOL_MAX ) +/* Sanity check untrusted input */ +if (GHCB_MSR_PROTO_MIN (val) >GHCB_MSR_PROTO_MAX (val))return false; +/* Use maximum supported protocol version */ ghcb_version =min_t (size_t,GHCB_MSR_PROTO_MAX (val),GHCB_PROTOCOL_MAX ); +/* +* Hypervisor does not support any protocol version required for this +* kernel. +*/ +if (ghcb_version <GHCB_MSR_PROTO_MIN (val)) +return false; + + ghcb_info.hv_proto_min =GHCB_MSR_PROTO_MIN (val); + ghcb_info.hv_proto_max =GHCB_MSR_PROTO_MAX (val); + ghcb_info.vm_proto = ghcb_version; +return true; }
arch/x86/kernel/sev.c +8 -0
@@ -1399,6 +1399,14 @@ void __init sev_es_init_vc_handling(void)/* Secondary CPUs use the runtime #VC handler */ initial_vc_handler = (unsigned long )kernel_exc_vmm_communication; + +/* +* Print information about supported and negotiated GHCB protocol +* versions. +*/ +pr_info ("Hypervisor GHCB protocol version support: min=%u max=%u\n" , + ghcb_info.hv_proto_min, ghcb_info.hv_proto_max); +pr_info ("Using GHCB protocol version %u\n" , ghcb_info.vm_proto); }static void __init vc_early_forward_exception (struct es_em_ctxt *ctxt)
Signature · 1 line
2.34.1
kernel test robot
build botRe: [PATCH v5 02/10] x86/sev: Save and print negotiated GHCB protocol version
FYI: kernel test robot notices the stable kernel rule is not satisfied.
Hi,
Thanks for your patch.
FYI: kernel test robot notices the stable kernel rule is not satisfied.
The check is based on https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html#option-1
Rule: add the tag "Cc: [email protected]" in the sign-off area to have the patch automatically included in the stable tree.
Subject: [PATCH v5 02/10] x86/sev: Save and print negotiated GHCB protocol version
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
PATCH v5 3/10 x86/sev: Set GHCB data structure version
In reply to [email protected]From: Joerg Roedel <[email protected]>
It turned out that the GHCB->protocol field does not declare the version of the guest-hypervisor communication protocol, but rather the version of the GHCB data structure. Reflect that in the define used to set the protocol field.
--- arch/x86/include/asm/sev.h | 3 +++ arch/x86/kernel/sev-shared.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)
arch/x86/include/asm/sev.h +3 -0
@@ -19,6 +19,9 @@#define GHCB_PROTOCOL_MAX 2ULL#define GHCB_DEFAULT_USAGE 0ULL +/* Version of the GHCB data structure */ +#define GHCB_VERSION 1 +#define VMGEXIT () { asm volatile("rep; vmmcall\n\r"); }struct boot_params ;
arch/x86/kernel/sev-shared.c +1 -1
@@ -264,7 +264,7 @@ static enum es_result sev_es_ghcb_hv_call(struct ghcb *ghcb, u64 exit_info_2) {/* Fill in protocol and format specifiers */ - ghcb->protocol_version = ghcb_version; + ghcb->protocol_version =GHCB_VERSION ; ghcb->ghcb_usage =GHCB_DEFAULT_USAGE ;ghcb_set_sw_exit_code (ghcb, exit_code);
Signature · 1 line
2.34.1
PATCH v5 4/10 x86/sev: Setup code to park APs in the AP Jump Table
In reply to [email protected]From: Joerg Roedel <[email protected]>
The AP jump table under SEV-ES contains the reset vector where non-boot CPUs start executing when coming out of reset. This means that a CPU coming out of the AP-reset-hold VMGEXIT also needs to start executing at the reset vector stored in the AP jump table.
The problem is to find a safe place to put the real-mode code which executes the VMGEXIT and jumps to the reset vector. The code can not be in kernel memory, because after kexec that memory is owned by the new kernel and the code might have been overwritten.
Fortunately the AP jump table itself is a safe place, because the memory is not owned by the OS and will not be overwritten by a new kernel started through kexec. The table is 4k in size and only the first 4 bytes are used for the reset vector. This leaves enough space for some 16-bit code to do the job and even a small stack.
The AP jump table must be 4K in size, in encrypted memory and it must be 4K (page) aligned. There can only be one AP jump table and it should reside in memory that has been marked as reserved by UEFI.
Install 16-bit code into the AP jump table under SEV-ES. The code will do an AP-reset-hold VMGEXIT and jump to the reset vector after being woken up.
--- arch/x86/include/asm/realmode.h | 2 + arch/x86/include/asm/sev-ap-jumptable.h | 30 ++++++ arch/x86/kernel/sev.c | 94 ++++++++++++++--- arch/x86/realmode/Makefile | 9 +- arch/x86/realmode/rmpiggy.S | 6 ++ arch/x86/realmode/sev/Makefile | 33 ++++++ arch/x86/realmode/sev/ap_jump_table.S | 131 ++++++++++++++++++++++++ arch/x86/realmode/sev/ap_jump_table.lds | 24 +++++ 8 files changed, 316 insertions(+), 13 deletions(-) create mode 100644 arch/x86/include/asm/sev-ap-jumptable.h create mode 100644 arch/x86/realmode/sev/Makefile create mode 100644 arch/x86/realmode/sev/ap_jump_table.S create mode 100644 arch/x86/realmode/sev/ap_jump_table.lds
arch/x86/include/asm/realmode.h +2 -0
@@ -63,6 +63,8 @@ extern unsigned long initial_code;extern unsigned long initial_stack;#ifdef CONFIG_AMD_MEM_ENCRYPT extern unsigned long initial_vc_handler; +extern unsigned char rm_ap_jump_table_blob[]; +extern unsigned char rm_ap_jump_table_blob_end[];#endif extern u32 *trampoline_lock;
arch/x86/include/asm/sev-ap-jumptable.h new file +30 -0
@@ -0,0 +1,30 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* AMD Encrypted Register State Support +* +* Author: Joerg Roedel <[email protected]> +*/ +#ifndef __ASM_SEV_AP_JUMPTABLE_H +#define __ASM_SEV_AP_JUMPTABLE_H + +#define SEV_APJT_CS16 0x8 +#define SEV_APJT_DS16 0x10 +#define SEV_RM_DS 0x18 + +#define SEV_APJT_ENTRY 0x10 + +#ifndef __ASSEMBLY__ + +/* +* The reset_ip and reset_cs members are fixed and defined through the GHCB +* specification. Do not change or move them around. +*/ +struct sev_ap_jump_table_header { +u16 reset_ip; +u16 reset_cs; +u16 ap_jumptable_gdt; +} __packed; + +#endif /* !__ASSEMBLY__ */ + +#endif /* __ASM_SEV_AP_JUMPTABLE_H */
arch/x86/kernel/sev.c +82 -12
157 lines not on this page · raw message
arch/x86/realmode/Makefile +8 -1
@@ -11,12 +11,19 @@ KASAN_SANITIZE := n KCSAN_SANITIZE := n +RMPIGGY-y = $(obj)/rm/realmode.bin +RMPIGGY-$(CONFIG_AMD_MEM_ENCRYPT) += $(obj)/sev/ap_jump_table.bin + subdir- := rm +subdir- := sev obj-y += init.o obj-y += rmpiggy.o -$(obj)/rmpiggy.o: $(obj)/rm/realmode.bin +$(obj)/rmpiggy.o: $(RMPIGGY-y) $(obj)/rm/realmode.bin: FORCE $(Q)$(MAKE) $(build)=$(obj)/rm $@ + +$(obj)/sev/ap_jump_table.bin: FORCE + $(Q)$(MAKE) $(build)=$(obj)/sev $@
arch/x86/realmode/rmpiggy.S +6 -0
@@ -17,3 +17,9 @@ SYM_DATA_END_LABEL(real_mode_blob, SYM_L_GLOBAL, real_mode_blob_end) SYM_DATA_START(real_mode_relocs) .incbin "arch/x86/realmode/rm/realmode.relocs" SYM_DATA_END(real_mode_relocs) + +#ifdef CONFIG_AMD_MEM_ENCRYPT +SYM_DATA_START(rm_ap_jump_table_blob) + .incbin "arch/x86/realmode/sev/ap_jump_table.bin" +SYM_DATA_END_LABEL(rm_ap_jump_table_blob, SYM_L_GLOBAL, rm_ap_jump_table_blob_end) +#endif
arch/x86/realmode/sev/Makefile new file +33 -0
@@ -0,0 +1,33 @@ +# SPDX-License-Identifier: GPL-2.0 + +# Sanitizer runtimes are unavailable and cannot be linked here. +KASAN_SANITIZE := n +KCSAN_SANITIZE := n +OBJECT_FILES_NON_STANDARD := y + +# Prevents link failures: __sanitizer_cov_trace_pc() is not linked in. +KCOV_INSTRUMENT := n + +always-y := ap_jump_table.bin +ap_jump_table-y += ap_jump_table.o +targets += $(ap_jump_table-y) + +APJUMPTABLE_OBJS = $(addprefix $(obj)/,$(ap_jump_table-y)) + +LDFLAGS_ap_jump_table.elf := -m elf_i386 -T + +targets += ap_jump_table.elf +$(obj)/ap_jump_table.elf: $(obj)/ap_jump_table.lds $(APJUMPTABLE_OBJS) FORCE + $(call if_changed,ld) + +OBJCOPYFLAGS_ap_jump_table.bin := -O binary + +targets += ap_jump_table.bin +$(obj)/ap_jump_table.bin: $(obj)/ap_jump_table.elf FORCE + $(call if_changed,objcopy) + +# --------------------------------------------------------------------------- + +KBUILD_AFLAGS := $(REALMODE_CFLAGS) -D__ASSEMBLY__ +GCOV_PROFILE := n +UBSAN_SANITIZE := n
arch/x86/realmode/sev/ap_jump_table.S new file +131 -0
131 lines not on this page · raw message
arch/x86/realmode/sev/ap_jump_table.lds new file +24 -0
@@ -0,0 +1,24 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * ap_jump_table.lds + * + * Linker script for the SEV-ES AP jump table code + */ + +OUTPUT_FORMAT("elf32-i386") +OUTPUT_ARCH(i386) +ENTRY(ap_park) + +SECTIONS +{ + . = 0; + .text : { + *(.text) + *(.text.*) + } + + /DISCARD/ : { + *(.note*) + *(.debug*) + } +}
Signature · 1 line
2.34.1
PATCH v5 5/10 x86/sev: Park APs on AP Jump Table with GHCB protocol version 2
In reply to [email protected]From: Joerg Roedel <[email protected]>
GHCB protocol version 2 adds the MSR-based AP-reset-hold VMGEXIT which does not need a GHCB. Use that to park APs in 16-bit protected mode on the AP jump table.
--- arch/x86/include/asm/realmode.h | 3 ++ arch/x86/kernel/sev.c | 55 ++++++++++++++++++--- arch/x86/realmode/rm/Makefile | 11 +++-- arch/x86/realmode/rm/header.S | 3 ++ arch/x86/realmode/rm/sev.S | 85 +++++++++++++++++++++++++++++++++ 5 files changed, 146 insertions(+), 11 deletions(-) create mode 100644 arch/x86/realmode/rm/sev.S
arch/x86/include/asm/realmode.h +3 -0
@@ -23,6 +23,9 @@ struct real_mode_header {u32 trampoline_header;#ifdef CONFIG_AMD_MEM_ENCRYPT u32 sev_es_trampoline_start; +u32 sev_ap_park; +u32 sev_ap_park_seg; +u32 sev_ap_park_gdt;#endif #ifdef CONFIG_X86_64 u32 trampoline_start64;
arch/x86/kernel/sev.c +49 -6
86 lines not on this page · raw message
arch/x86/realmode/rm/Makefile +6 -5
@@ -28,11 +28,12 @@ wakeup-objs += video-vga.o wakeup-objs += video-vesa.o wakeup-objs += video-bios.o -realmode-y += header.o -realmode-y += trampoline_$(BITS).o -realmode-y += stack.o -realmode-y += reboot.o -realmode-$(CONFIG_ACPI_SLEEP) += $(wakeup-objs) +realmode-y += header.o +realmode-y += trampoline_$(BITS).o +realmode-y += stack.o +realmode-y += reboot.o +realmode-$(CONFIG_ACPI_SLEEP) += $(wakeup-objs) +realmode-$(CONFIG_AMD_MEM_ENCRYPT) += sev.o targets += $(realmode-y)
arch/x86/realmode/rm/header.S +3 -0
@@ -22,6 +22,9 @@ SYM_DATA_START(real_mode_header) .long pa_trampoline_header #ifdef CONFIG_AMD_MEM_ENCRYPT .long pa_sev_es_trampoline_start + .long pa_sev_ap_park_asm + .long __KERNEL32_CS + .long pa_sev_ap_park_gdt; #endif #ifdef CONFIG_X86_64 .long pa_trampoline_start64
arch/x86/realmode/rm/sev.S new file +85 -0
85 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v5 6/10 x86/sev: Use AP Jump Table blob to stop CPU
In reply to [email protected]From: Joerg Roedel <[email protected]>
To support kexec under SEV-ES the APs can't be parked with HLT. Upon wakeup the AP needs to find its way to execute at the reset vector set by the new kernel and in real-mode.
This is what the AP jump table blob provides, so stop the APs the SEV-ES way by calling the AP-reset-hold VMGEXIT from the AP jump table.
--- arch/x86/include/asm/sev.h | 2 ++ arch/x86/kernel/process.c | 8 ++++++++ arch/x86/kernel/sev.c | 15 ++++++++++++++- 3 files changed, 24 insertions(+), 1 deletion(-)
arch/x86/include/asm/sev.h +2 -0
@@ -233,6 +233,7 @@ u64 snp_get_unsupported_features(u64 status);u64 sev_get_status (void );void kdump_sev_callback (void );void sev_show_status (void ); +void sev_es_stop_this_cpu (void );#else static inline void sev_es_ist_enter (struct pt_regs *regs) { }static inline void sev_es_ist_exit (void ) { }
@@ -263,6 +264,7 @@ static inline u64 snp_get_unsupported_features(u64 status) { return 0; }static inline u64 sev_get_status (void ) {return 0 ; }static inline void kdump_sev_callback (void ) { }static inline void sev_show_status (void ) { } +static inline void sev_es_stop_this_cpu (void ) { }#endif #ifdef CONFIG_KVM_AMD_SEV
arch/x86/kernel/process.c +8 -0
@@ -52,6 +52,7 @@#include <asm/tdx.h> #include <asm/mmu_context.h> #include <asm/shstk.h> +#include <asm/sev.h> #include "process.h"
@@ -836,6 +837,13 @@ void __noreturn stop_this_cpu(void *dummy)cpumask_clear_cpu (cpu, &cpus_stop_mask);for (;;) { +/* +* SEV-ES guests need a special stop routine to support +* kexec. Try this first, if it fails the function will +* return and native_halt() is used. +*/ +sev_es_stop_this_cpu (); +/* * Use native_halt() so that memory contents don't change * (stack usage and variables) after possibly issuing the
arch/x86/kernel/sev.c +14 -1
@@ -1357,7 +1357,6 @@ void setup_ghcb(void)snp_register_ghcb_early (__pa (&boot_ghcb_page)); } -#ifdef CONFIG_HOTPLUG_CPU void __noreturn sev_jumptable_ap_park (void ) {local_irq_disable ();
@@ -1390,6 +1389,20 @@ void __noreturn sev_jumptable_ap_park(void) }STACK_FRAME_NON_STANDARD (sev_jumptable_ap_park); +void sev_es_stop_this_cpu (void ) +{ +if (!(cc_vendor ==CC_VENDOR_AMD ) || + !cc_platform_has (CC_ATTR_GUEST_STATE_ENCRYPT )) +return ; + +/* Only park in the AP jump table when the code has been installed */ +if (!sev_ap_jumptable_blob_installed) +return ; + +sev_jumptable_ap_park (); +} + +#ifdef CONFIG_HOTPLUG_CPU static void sev_es_ap_hlt_loop (void ) {struct ghcb_state state;
Signature · 1 line
2.34.1
PATCH v5 7/10 x86/sev: Add MMIO handling support to boot/compressed/ code
In reply to [email protected]From: Joerg Roedel <[email protected]>
Move the code for MMIO handling in the #VC handler to sev-shared.c so that it can be used in the decompressor code. The decompressor needs to handle MMIO events for writing to the VGA framebuffer.
When the kernel is booted via UEFI the VGA console is not enabled that early, but a kexec boot will enable it and the decompressor needs MMIO support to write to the frame buffer.
This also requires to share some code from lib/insn-eval.c. Since insn-eval.c can't be included into the decompressor code directly, move the relevant parts into lib/insn-eval-shared.c and include that file.
--- arch/x86/boot/compressed/sev.c | 45 +- arch/x86/kernel/sev-shared.c | 196 +++++++ arch/x86/kernel/sev.c | 195 ------- arch/x86/lib/insn-eval-shared.c | 914 ++++++++++++++++++++++++++++++++ arch/x86/lib/insn-eval.c | 911 +------------------------------ 5 files changed, 1140 insertions(+), 1121 deletions(-) create mode 100644 arch/x86/lib/insn-eval-shared.c
arch/x86/boot/compressed/sev.c +26 -19
@@ -29,25 +29,6 @@static struct ghcb boot_ghcb_page__aligned(PAGE_SIZE) ;struct ghcb *boot_ghcb; -/* -* Copy a version of this function here - insn-eval.c can't be used in -* pre-decompression code. -*/ -static bool insn_has_rep_prefix (struct insn *insn) -{ -insn_byte_t p; -int i; - -insn_get_prefixes (insn); - -for_each_insn_prefix (insn, i, p) { -if (p ==0xf2 || p ==0xf3 ) -return true; - } - -return false; -} -/* * Only a dummy for insn_get_seg_base() - Early boot-code is 64bit only and * doesn't use segments.
@@ -57,6 +38,16 @@ static unsigned long insn_get_seg_base(struct pt_regs *regs, int seg_reg_idx)return 0UL ; } +static int get_seg_base_limit (struct insn *insn,struct pt_regs *regs, +int regoff,unsigned long *base, +unsigned long *limit) +{ +if (base) + *base =0ULL ; +if (limit) + *limit = ~0ULL ; +} +static inline u64 sev_es_rd_ghcb_msr (void ) {struct msr m;
@@ -104,6 +95,14 @@ static enum es_result vc_read_mem(struct es_em_ctxt *ctxt,return ES_OK ; } +static enum es_result vc_slow_virt_to_phys (struct ghcb *ghcb,struct es_em_ctxt *ctxt, +unsigned long vaddr,phys_addr_t *paddr) +{ + *paddr = (phys_addr_t )vaddr; + +return ES_OK ; +} +static enum es_result vc_ioio_check (struct es_em_ctxt *ctxt,u16 port,size_t size) {return ES_OK ;
@@ -122,9 +121,14 @@ static bool fault_in_kernel_space(unsigned long address)#define __BOOT_COMPRESSED +#undef WARN_ONCE +#define WARN_ONCE(condition, format...) +/* Basic instruction decoding support needed */ +#include <asm/insn-eval.h> #include "../../lib/inat.c" #include "../../lib/insn.c" +#include "../../lib/insn-eval-shared.c" /* Include code for early handlers */ #include "../../kernel/sev-shared.c"
@@ -323,6 +327,9 @@ void do_boot_stage2_vc(struct pt_regs *regs, unsigned long exit_code)case SVM_EXIT_CPUID : result =vc_handle_cpuid (boot_ghcb, &ctxt);break ; +case SVM_EXIT_NPF : + result =vc_handle_mmio (boot_ghcb, &ctxt); +break ;default : result =ES_UNSUPPORTED ;break ;
arch/x86/kernel/sev-shared.c +196 -0
202 lines not on this page · raw message
arch/x86/kernel/sev.c +0 -195
201 lines not on this page · raw message
arch/x86/lib/insn-eval-shared.c new file +914 -0
914 lines not on this page · raw message
arch/x86/lib/insn-eval.c +4 -907
938 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v5 8/10 x86/sev: Handle CLFLUSH MMIO events
In reply to [email protected]From: Joerg Roedel <[email protected]>
Handle CLFLUSH instruction to MMIO memory in the #VC handler. The instruction is ignored by the handler, as the Hypervisor is responsible for cache management of emulated MMIO memory.
--- arch/x86/include/asm/insn-eval.h | 1 + arch/x86/kernel/sev-shared.c | 3 +++ arch/x86/lib/insn-eval-shared.c | 7 +++++++ 3 files changed, 11 insertions(+)
arch/x86/include/asm/insn-eval.h +1 -0
@@ -40,6 +40,7 @@ enum insn_mmio_type {INSN_MMIO_READ_ZERO_EXTEND ,INSN_MMIO_READ_SIGN_EXTEND ,INSN_MMIO_MOVS , + INSN_MMIO_IGNORE, };enum insn_mmio_type insn_decode_mmio (struct insn *insn,int *bytes);
arch/x86/kernel/sev-shared.c +3 -0
@@ -1171,6 +1171,9 @@ static enum es_result vc_handle_mmio(struct ghcb *ghcb, struct es_em_ctxt *ctxt)if (mmio ==INSN_MMIO_DECODE_FAILED )return ES_DECODE_FAILED ; +if (mmio ==INSN_MMIO_IGNORE ) +return ES_OK ; +if (mmio !=INSN_MMIO_WRITE_IMM && mmio !=INSN_MMIO_MOVS ) { reg_data =insn_get_modrm_reg_ptr (insn, ctxt->regs);if (!reg_data)
arch/x86/lib/insn-eval-shared.c +7 -0
@@ -906,6 +906,13 @@ enum insn_mmio_type insn_decode_mmio(struct insn *insn, int *bytes) *bytes =2 ; type =INSN_MMIO_READ_SIGN_EXTEND ;break ; +case 0xae :/* CLFLUSH */ +/* +* Ignore CLFLUSHes - those go to emulated MMIO anyway and the +* hypervisor is responsible for cache management. +*/ + type =INSN_MMIO_IGNORE ; +break ; }break ; }
Signature · 1 line
2.34.1
PATCH v5 9/10 x86/kexec/64: Support kexec under SEV-ES with AP Jump Table Blob
In reply to [email protected]From: Joerg Roedel <[email protected]>
When the AP jump table blob is installed the kernel can hand over the APs from the old to the new kernel. Enable kexec when the AP jump table blob has been installed.
--- arch/x86/include/asm/sev.h | 2 ++ arch/x86/kernel/machine_kexec_64.c | 3 ++- arch/x86/kernel/sev.c | 15 +++++++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-)
arch/x86/include/asm/sev.h +2 -0
@@ -234,6 +234,7 @@ u64 sev_get_status(void);void kdump_sev_callback (void );void sev_show_status (void );void sev_es_stop_this_cpu (void ); +bool sev_kexec_supported (void );#else static inline void sev_es_ist_enter (struct pt_regs *regs) { }static inline void sev_es_ist_exit (void ) { }
@@ -265,6 +266,7 @@ static inline u64 sev_get_status(void) { return 0; }static inline void kdump_sev_callback (void ) { }static inline void sev_show_status (void ) { }static inline void sev_es_stop_this_cpu (void ) { } +static inline bool sev_kexec_supported (void ) {return true; }#endif #ifdef CONFIG_KVM_AMD_SEV
arch/x86/kernel/machine_kexec_64.c +2 -1
@@ -28,6 +28,7 @@#include <asm/setup.h> #include <asm/set_memory.h> #include <asm/cpu.h> +#include <asm/sev.h> #ifdef CONFIG_ACPI /*
@@ -269,7 +270,7 @@ static void load_segments(void)static bool machine_kexec_supported (void ) { -if (cc_platform_has (CC_ATTR_GUEST_STATE_ENCRYPT )) +if (!sev_kexec_supported ())return false;return true;
arch/x86/kernel/sev.c +15 -0
@@ -1463,6 +1463,21 @@ static void __init sev_es_setup_play_dead(void)static inline void sev_es_setup_play_dead (void ) { }#endif +bool sev_kexec_supported (void ) +{ +if (!cc_platform_has (CC_ATTR_GUEST_STATE_ENCRYPT )) +return true; + +/* +* KEXEC with SEV-ES and more than one CPU is only supported +* when the AP jump table is installed. +*/ +if (num_possible_cpus () >1 ) +return sev_ap_jumptable_blob_installed; +else +return true; +} +static void __init alloc_runtime_data (int cpu) {struct sev_es_runtime_data *data;
Signature · 1 line
2.34.1
PATCH v5 10/10 x86/sev: Exclude AP jump table related code for SEV-SNP guests
In reply to [email protected]From: Vasant Karasulli <[email protected]>
Unlike SEV-ES, AP jump table technique is not used in SEV-SNP when transitioning from one layer of code to another (e.g. when going from UEFI to the OS).
--- arch/x86/kernel/sev.c | 6 +++++- arch/x86/realmode/init.c | 5 +++-- 2 files changed, 8 insertions(+), 3 deletions(-)
arch/x86/kernel/sev.c +5 -1
@@ -1392,7 +1392,8 @@ STACK_FRAME_NON_STANDARD(sev_jumptable_ap_park);void sev_es_stop_this_cpu (void ) {if (!(cc_vendor ==CC_VENDOR_AMD ) || - !cc_platform_has (CC_ATTR_GUEST_STATE_ENCRYPT )) + !cc_platform_has (CC_ATTR_GUEST_STATE_ENCRYPT ) || +cc_platform_has (CC_ATTR_GUEST_SEV_SNP ))return ;/* Only park in the AP jump table when the code has been installed */
@@ -1468,6 +1469,9 @@ bool sev_kexec_supported(void)if (!cc_platform_has (CC_ATTR_GUEST_STATE_ENCRYPT ))return true; +if (cc_platform_has (CC_ATTR_GUEST_SEV_SNP )) +return false; +/* * KEXEC with SEV-ES and more than one CPU is only supported * when the AP jump table is installed.
arch/x86/realmode/init.c +3 -2
@@ -80,8 +80,9 @@ static void __init sme_sev_setup_real_mode(struct trampoline_header *th)*/ th->start = (u64 ) secondary_startup_64_no_verify; -if (sev_es_setup_ap_jump_table (real_mode_header)) - panic("Failed to get/update SEV-ES AP Jump Table"); +if (!cc_platform_has (CC_ATTR_GUEST_SEV_SNP )) +if (sev_es_setup_ap_jump_table (real_mode_header)) +panic ("Failed to get/update SEV-ES AP Jump Table" ); }#endif }
--
2.34.1