On Mon, Sep 13, 2021 at 05:55:58PM +0200, Joerg Roedel wrote:
> From: Joerg Roedel <jroedel@xxxxxxx>
>
> 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."
I think we need to state in the spec that some of that space can be used
by the OS so that future changes to the spec do not cause trouble.
> Install 16-bit code into the AP Jump Table under SEV-ES after the APs
> have been brought up. The code will do an AP-reset-hold VMGEXIT and jump
> to the reset vector after being woken up.
>
> Signed-off-by: Joerg Roedel <jroedel@xxxxxxx>
> ---
> arch/x86/include/asm/realmode.h | 2 +
> arch/x86/include/asm/sev-ap-jumptable.h | 25 +++++
> arch/x86/kernel/sev.c | 105 +++++++++++++++++++
> arch/x86/realmode/Makefile | 9 +-
> arch/x86/realmode/rmpiggy.S | 6 ++
> arch/x86/realmode/sev/Makefile | 41 ++++++++
> arch/x86/realmode/sev/ap_jump_table.S | 130 ++++++++++++++++++++++++
> arch/x86/realmode/sev/ap_jump_table.lds | 24 +++++
> 8 files changed, 341 insertions(+), 1 deletion(-)
> 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
>
> diff --git a/arch/x86/include/asm/realmode.h b/arch/x86/include/asm/realmode.h
> index 5db5d083c873..29590a4ddf24 100644
> --- a/arch/x86/include/asm/realmode.h
> +++ b/arch/x86/include/asm/realmode.h
> @@ -62,6 +62,8 @@ extern unsigned long initial_gs;
> 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 unsigned char real_mode_blob[];
> diff --git a/arch/x86/include/asm/sev-ap-jumptable.h b/arch/x86/include/asm/sev-ap-jumptable.h
> new file mode 100644
> index 000000000000..1c8b2ce779e2
> --- /dev/null
> +++ b/arch/x86/include/asm/sev-ap-jumptable.h
Why a separate header? arch/x86/include/asm/sev.h looks small enough.
> @@ -0,0 +1,25 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> +/*
> + * AMD Encrypted Register State Support
> + *
> + * Author: Joerg Roedel <jroedel@xxxxxxx>
> + */
> +#ifndef __ASM_SEV_AP_JUMPTABLE_H
> +#define __ASM_SEV_AP_JUMPTABLE_H
> +
> +#define SEV_APJT_CS16 0x8
> +#define SEV_APJT_DS16 0x10
> +
> +#define SEV_APJT_ENTRY 0x10
> +
> +#ifndef __ASSEMBLY__
> +
> +struct sev_ap_jump_table_header {
> + u16 reset_ip;
> + u16 reset_cs;
> + u16 gdt_offset;
I guess you should state that the first two members are as the spec
mandates and cannot be moved around or changed or so.
Also, this gdt_offset thing looks like it wants to be ap_jumptable_gdt,
no?
> +};
> +
> +#endif /* !__ASSEMBLY__ */
> +
> +#endif /* __ASM_SEV_AP_JUMPTABLE_H */
> diff --git a/arch/x86/kernel/sev.c b/arch/x86/kernel/sev.c
> index eedba56b6bac..a98eab926682 100644
> --- a/arch/x86/kernel/sev.c
> +++ b/arch/x86/kernel/sev.c
> @@ -19,6 +19,7 @@
> #include <linux/kernel.h>
> #include <linux/mm.h>
>
> +#include <asm/sev-ap-jumptable.h>
> #include <asm/cpu_entry_area.h>
> #include <asm/stacktrace.h>
> #include <asm/sev.h>
> @@ -45,6 +46,9 @@ static struct ghcb __initdata *boot_ghcb;
> /* Cached AP Jump Table Address */
> static phys_addr_t sev_es_jump_table_pa;
>
> +/* Whether the AP Jump Table blob was successfully installed */
> +static bool sev_ap_jumptable_blob_installed __ro_after_init;
> +
> /* #VC handler runtime per-CPU data */
> struct sev_es_runtime_data {
> struct ghcb ghcb_page;
> @@ -749,6 +753,107 @@ static void __init sev_es_setup_play_dead(void)
> static inline void sev_es_setup_play_dead(void) { }
> #endif
>
> +/*
> + * This function make the necessary runtime changes to the AP Jump Table blob.
s/This function make/Make/
Ditto for the other "This function" below.
> + * For now this only sets up the GDT used while the code executes. The GDT needs
> + * to contain 16-bit code and data segments with a base that points to AP Jump
> + * Table page.
> + */
> +void __init sev_es_setup_ap_jump_table_data(void *base, u32 pa)
Why is this a separate function?
It is all part of the jump table setup.
> + struct sev_ap_jump_table_header *header;
> + struct desc_ptr *gdt_descr;
> + u64 *ap_jumptable_gdt;
> +
> + header = base;
> +
> + /*
> + * Setup 16-bit protected mode code and data segments for AP Jumptable.
> + * Set the segment limits to 0xffff to already be compatible with
> + * real-mode.
> + */
> + ap_jumptable_gdt = (u64 *)(base + header->gdt_offset);
> + ap_jumptable_gdt[SEV_APJT_CS16 / 8] = GDT_ENTRY(0x9b, pa, 0xffff);
> + ap_jumptable_gdt[SEV_APJT_DS16 / 8] = GDT_ENTRY(0x93, pa, 0xffff);
> +
> + /* Write correct GDT base address into GDT descriptor */
> + gdt_descr = (struct desc_ptr *)(base + header->gdt_offset);
> + gdt_descr->address += pa;
> +}
> +
> +/*
> + * This function sets up the AP Jump Table blob which contains code which runs
> + * in 16-bit protected mode to park an AP. After the AP is woken up again the
> + * code will disable protected mode and jump to the reset vector which is also
> + * stored in the AP Jump Table.
> + *
> + * The Jump Table is a safe place to park an AP, because it is owned by the
> + * BIOS and writable by the OS. Putting the code in kernel memory would break
> + * with kexec, because by the time th APs wake up the memory is owned by
the
> + * the new kernel, and possibly already overwritten.
> + *
> + * Kexec is also the reason this function is called as an init-call after SMP
s/called as //
> + * bringup. Only after all CPUs are up there is a guarantee that no AP is still
> + * parked in AP jump-table code.
> + */
> +static int __init sev_es_setup_ap_jump_table_blob(void)
Everywhere: use prefix sev_ pls. IOW:
sev_setup_ap_jump_table()
plain and simple.
> +{
> + size_t blob_size = rm_ap_jump_table_blob_end - rm_ap_jump_table_blob;
> + u16 startup_cs, startup_ip;
> + u16 __iomem *jump_table;
> + phys_addr_t pa;
> +
> + if (!sev_es_active())
if (!cc_platform_has(CC_ATTR_GUEST_STATE_ENCRYPT))
> + return 0;
> +
> + if (sev_get_ghcb_proto_ver() < 2) {
> + pr_info("AP Jump Table parking requires at least GHCB protocol version 2\n");
Not pr_warn?
Also, can we drop everywhere this first-letter capitalized spelling?
AP jump table parking...
is ok already.
> + return 0;
Why are you returning 0 here and below?
> + }
> +
> + pa = get_jump_table_addr();
> +
> + /* Overflow and size checks for untrusted Jump Table address */
/* Check overflow and size...
> + if (pa + PAGE_SIZE < pa || pa + PAGE_SIZE > SZ_4G) {
> + pr_info("AP Jump Table is above 4GB - not enabling AP Jump Table parking\n");
That error message needs to say about the overflow too.
> + return 0;
> + }
> +
> + /* On UP guests there is no jump table so this is not a failure */
> + if (!pa)
> + return 0;
So this check needs to happen right after the get_ call.
> +
> + jump_table = ioremap_encrypted(pa, PAGE_SIZE);
> + if (WARN_ON(!jump_table))
> + return -EINVAL;
> +
> + /*
> + * Safe reset vector to restore it later because the blob will
Save...
> + * overwrite it.
> + */
> + startup_ip = jump_table[0];
> + startup_cs = jump_table[1];
> +
> + /* Install AP Jump Table Blob with real mode AP parking code */
> + memcpy_toio(jump_table, rm_ap_jump_table_blob, blob_size);
> +
> + /* Setup AP Jumptable GDT */
> + sev_es_setup_ap_jump_table_data(jump_table, (u32)pa);
> +
> + writew(startup_ip, &jump_table[0]);
> + writew(startup_cs, &jump_table[1]);
> +
> + iounmap(jump_table);
> +
> + pr_info("AP Jump Table Blob successfully set up\n");
> +
> + /* Mark AP Jump Table blob as available */
> + sev_ap_jumptable_blob_installed = true;
I don't like those random boolean variables all over the place but at
least it is static.
> +
> + return 0;
> +}
> +core_initcall(sev_es_setup_ap_jump_table_blob);
> +
> static void __init alloc_runtime_data(int cpu)
> {
> struct sev_es_runtime_data *data;
> diff --git a/arch/x86/realmode/Makefile b/arch/x86/realmode/Makefile
> index a0b491ae2de8..00f3cceb9580 100644
> --- a/arch/x86/realmode/Makefile
> +++ b/arch/x86/realmode/Makefile
> @@ -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 $@
> diff --git a/arch/x86/realmode/rmpiggy.S b/arch/x86/realmode/rmpiggy.S
> index c8fef76743f6..a659f98617ff 100644
> --- a/arch/x86/realmode/rmpiggy.S
> +++ b/arch/x86/realmode/rmpiggy.S
> @@ -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
> diff --git a/arch/x86/realmode/sev/Makefile b/arch/x86/realmode/sev/Makefile
> new file mode 100644
> index 000000000000..5a96a518ccb3
> --- /dev/null
> +++ b/arch/x86/realmode/sev/Makefile
> @@ -0,0 +1,41 @@
<--- # SPDX-License-Identifier: GPL-2.0
We don't do that GPL text anymore.
> +#
> +# arch/x86/sev/Makefile
> +#
> +# This file is subject to the terms and conditions of the GNU General Public
> +# License. See the file "COPYING" in the main directory of this archive
> +# for more details.
> +#
> +
> +# 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
The vertical alignment of those is kinda random. Please unify.
> +
> +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
> diff --git a/arch/x86/realmode/sev/ap_jump_table.S b/arch/x86/realmode/sev/ap_jump_table.S
> new file mode 100644
> index 000000000000..547cb363bb94
> --- /dev/null
> +++ b/arch/x86/realmode/sev/ap_jump_table.S
> @@ -0,0 +1,130 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> +
> +#include <linux/linkage.h>
> +#include <asm/sev-ap-jumptable.h>
> +
> +/*
> + * This file contains the source code for the binary blob which gets copied to
> + * the SEV-ES AP Jumptable to park APs while offlining CPUs or booting a new
I've seen "Jumptable", "Jump Table" and "jump table" at least. I'd say, do
the last one everywhere pls.
> + * kernel via KEXEC.
> + *
> + * The AP Jumptable is the only safe place to put this code, as any memory the
> + * kernel allocates will be owned (and possibly overwritten) by the new kernel
> + * once the APs are woken up.
> + *
> + * This code runs in 16-bit protected mode, the CS, DS, and SS segment bases are
> + * set to the beginning of the AP Jumptable page.
> + *
> + * Since the GDT will also be gone when the AP wakes up, this blob contains its
> + * own GDT, which is set up by the AP Jumptable setup code with the correct
> + * offsets.
> + *
> + * Author: Joerg Roedel <jroedel@xxxxxxx>
> + */
> +
> + .text
> + .org 0x0
> + .code16
> +SYM_DATA_START(ap_jumptable_header)
> + .word 0 /* reset IP */
> + .word 0 /* reset CS */
> + .word ap_jumptable_gdt /* GDT Offset */
> +SYM_DATA_END(ap_jumptable_header)
> +
> + .org SEV_APJT_ENTRY
So this hardcodes the fact that the first 16 bytes are header and the
rest is free game. I think the spec needs to play along here...
> +SYM_CODE_START(ap_park_asm)
This whole file is asm. I guess simply "ap_park" is enough.
> +
> + /* Switch to AP Jumptable GDT first */
> + lgdtl ap_jumptable_gdt
> +
> + /* Reload CS */
> + ljmpw $SEV_APJT_CS16, $1f
> +1:
> +
> + /* Reload DS and SS */
> + movl $SEV_APJT_DS16, %ecx
> + movl %ecx, %ds
> + movl %ecx, %ss
> +
> + /*
> + * Setup a stack pointing to the end of the AP Jumptable page.
> + * The stack is needed ot reset EFLAGS after wakeup.
s/ot/to/
> + */
> + movl $0x1000, %esp
> +
> + /* Execute AP reset hold VMGEXIT */
> +2: xorl %edx, %edx
> + movl $0x6, %eax
> + movl $0xc0010130, %ecx
MSR_AMD64_SEV_ES_GHCB
> + wrmsr
> + rep; vmmcall
> + rdmsr
> + movl %eax, %ecx
> + andl $0xfff, %ecx
> + cmpl $0x7, %ecx
> + jne 2b
> + shrl $12, %eax
> + jnz 3f
> + testl %edx, %edx
> + jnz 3f
> + jmp 2b
You usually document your asm pretty nicely but those after the RDMSR
are a bit lacking...
> +3:
> + /*
> + * Successfully woken up - Patch the correct target into the far jump at
patch
> + * the end. An indirect far jump does not work here, because at the time
> + * the jump is executed DS is already loaded with real-mode values.
> + */
> +
> + /* Jump target is at address 0x0 - copy it to the far jump instruction */
> + movl $0, %ecx
> + movl (%ecx), %eax
> + movl %eax, jump_target
> +
> + /* Reset EFLAGS */
> + pushl $2
I'm assuming that two is bit 1 in rFLAGS which is always 1? Comment pls.
> + popfl
> +
> + /* Setup DS and SS for real-mode */
> + movl $0x18, %ecx
> + movl %ecx, %ds
> + movl %ecx, %ss
> +
> + /* Reset remaining registers */
> + movl $0, %esp
> + movl $0, %eax
> + movl $0, %ebx
> + movl $0, %edx
All 4: use xor
> +
> + /* Reset CR0 to get out of protected mode */
> + movl $0x60000010, %ecx
Another magic naked number.
--
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette
_______________________________________________
kexec mailing list
kexec@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/kexec
