Re: [PATCH] x86/sev: Fully map the #VC exception stacks

From: Borislav Petkov
Date: Fri Oct 01 2021 - 04:58:06 EST


On Thu, Sep 30, 2021 at 11:40:50PM -0500, Tom Lendacky wrote:
> The size of the exception stacks was recently increased, resulting in
> stack sizes greater than a page in size. The #VC exception handling was
> only mapping the first (bottom) page, resulting in an SEV-ES guest failing
> to boot.
>
> Update setup_vc_stacks() to map all the pages of both the IST stack area
> and the fallback stack area.
>
> Fixes: 7fae4c24a2b8 ("x86: Increase exception stack sizes")
> Signed-off-by: Tom Lendacky <thomas.lendacky@xxxxxxx>
> ---
> arch/x86/kernel/sev.c | 24 ++++++++++++++++--------
> 1 file changed, 16 insertions(+), 8 deletions(-)
>
> diff --git a/arch/x86/kernel/sev.c b/arch/x86/kernel/sev.c
> index a6895e440bc3..33e4704164cc 100644
> --- a/arch/x86/kernel/sev.c
> +++ b/arch/x86/kernel/sev.c
> @@ -99,25 +99,33 @@ DEFINE_STATIC_KEY_FALSE(sev_es_enable_key);
> /* Needed in vc_early_forward_exception */
> void do_early_exception(struct pt_regs *regs, int trapnr);
>
> +static void __init map_vc_stack(unsigned long bot, unsigned long top,
> + phys_addr_t pa)
> +{
> + while (bot < top) {
> + cea_set_pte((void *)bot, pa, PAGE_KERNEL);
> + bot += PAGE_SIZE;
> + pa += PAGE_SIZE;
> + }
> +}
> +
> static void __init setup_vc_stacks(int cpu)
> {
> struct sev_es_runtime_data *data;
> struct cpu_entry_area *cea;
> - unsigned long vaddr;
> - phys_addr_t pa;
>
> data = per_cpu(runtime_data, cpu);
> cea = get_cpu_entry_area(cpu);
>
> /* Map #VC IST stack */
> - vaddr = CEA_ESTACK_BOT(&cea->estacks, VC);
> - pa = __pa(data->ist_stack);
> - cea_set_pte((void *)vaddr, pa, PAGE_KERNEL);
> + map_vc_stack(CEA_ESTACK_BOT(&cea->estacks, VC),
> + CEA_ESTACK_TOP(&cea->estacks, VC),
> + __pa(data->ist_stack));

So this would not have broken if it would've used EXCEPTION_STKSZ or
EXCEPTION_STACK_ORDER rather since we're mapping pages.

Please use those defines so that this keeps working when someone mad
decides to increase those exception stack sizes again because everything
*and* the kitchen sink wants to instrument the damn kernel. Nothing to
see here people...

--
Regards/Gruss,
Boris.

https://people.kernel.org/tglx/notes-about-netiquette