Commit 7cb7b6de authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Borislav Petkov (AMD)
Browse files

x86/sev: Use MSR protocol only for early SVSM PVALIDATE call 



The early page state change API performs an SVSM call to PVALIDATE each page
when running under a SVSM, and this involves either a GHCB page based call or
a call based on the MSR protocol.

The GHCB page based variant involves VA to PA translation of the GHCB address,
and this is best avoided in the startup code, where virtual addresses are
ambiguous (1:1 or kernel virtual).

As this is the last remaining occurrence of svsm_perform_call_protocol() in
the startup code, switch to the MSR protocol exclusively in this particular
case, so that the GHCB based plumbing can be moved out of the startup code
entirely in a subsequent patch.

Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Reviewed-by: default avatarTom Lendacky <thomas.lendacky@amd.com>
Link: https://lore.kernel.org/20250828102202.1849035-27-ardb+git@google.com
parent c15a4705

arch/x86/boot/compressed/sev.c

+0 −20
Original line number Diff line number Diff line
@@ -50,31 +50,11 @@ u64 svsm_get_caa_pa(void) 
	return boot_svsm_caa_pa;

}



int svsm_perform_call_protocol(struct svsm_call *call);



u8 snp_vmpl;



/* Include code for early handlers */

#include "../../boot/startup/sev-shared.c"



int svsm_perform_call_protocol(struct svsm_call *call)

{

	struct ghcb *ghcb;

	int ret;



	if (boot_ghcb)

		ghcb = boot_ghcb;

	else

		ghcb = NULL;



	do {

		ret = ghcb ? svsm_perform_ghcb_protocol(ghcb, call)

			   : svsm_perform_msr_protocol(call);

	} while (ret == -EAGAIN);



	return ret;

}



static bool sev_snp_enabled(void)

{

	return sev_status & MSR_AMD64_SEV_SNP_ENABLED;

arch/x86/boot/startup/sev-shared.c

+6 −3
Original line number Diff line number Diff line
@@ -741,7 +741,6 @@ static void __head svsm_pval_4k_page(unsigned long paddr, bool validate) 
	struct svsm_call call = {};

	unsigned long flags;

	u64 pc_pa;

	int ret;



	/*

	 * This can be called very early in the boot, use native functions in
@@ -766,8 +765,12 @@ static void __head svsm_pval_4k_page(unsigned long paddr, bool validate) 
	call.rax = SVSM_CORE_CALL(SVSM_CORE_PVALIDATE);

	call.rcx = pc_pa;



	ret = svsm_perform_call_protocol(&call);

	if (ret)

	/*

	 * Use the MSR protocol exclusively, so that this code is usable in

	 * startup code where VA/PA translations of the GHCB page's address may

	 * be problematic.

	 */

	if (svsm_call_msr_protocol(&call))

		sev_es_terminate(SEV_TERM_SET_LINUX, GHCB_TERM_PVALIDATE);



	native_local_irq_restore(flags);