Commit 9183c97e authored by Borislav Petkov (AMD)'s avatar Borislav Petkov (AMD)
Browse files

x86/sev: Rename sev_es_ghcb_handle_msr() to __vc_handle_msr() 



Forgot to do that during the Secure AVIC review. :-\

No functional changes.

Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Reviewed-by: default avatarTom Lendacky <thomas.lendacky@amd.com>
Link: https://patch.msgid.link/20260119141310.29605-1-bp@kernel.org
parent e21279b7

arch/x86/coco/sev/core.c

+2 −2
Original line number Diff line number Diff line
@@ -989,7 +989,7 @@ u64 savic_ghcb_msr_read(u32 reg) 
	ghcb = __sev_get_ghcb(&state);

	vc_ghcb_invalidate(ghcb);



	res = sev_es_ghcb_handle_msr(ghcb, &ctxt, false);

	res = __vc_handle_msr(ghcb, &ctxt, false);

	if (res != ES_OK) {

		pr_err("Secure AVIC MSR (0x%llx) read returned error (%d)\n", msr, res);

		/* MSR read failures are treated as fatal errors */
@@ -1019,7 +1019,7 @@ void savic_ghcb_msr_write(u32 reg, u64 value) 
	ghcb = __sev_get_ghcb(&state);

	vc_ghcb_invalidate(ghcb);



	res = sev_es_ghcb_handle_msr(ghcb, &ctxt, true);

	res = __vc_handle_msr(ghcb, &ctxt, true);

	if (res != ES_OK) {

		pr_err("Secure AVIC MSR (0x%llx) write returned error (%d)\n", msr, res);

		/* MSR writes should never fail. Any failure is fatal error for SNP guest */

arch/x86/coco/sev/internal.h

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ static __always_inline void sev_es_wr_ghcb_msr(u64 val) 
	native_wrmsr(MSR_AMD64_SEV_ES_GHCB, low, high);

}



enum es_result sev_es_ghcb_handle_msr(struct ghcb *ghcb, struct es_em_ctxt *ctxt, bool write);

enum es_result __vc_handle_msr(struct ghcb *ghcb, struct es_em_ctxt *ctxt, bool write);



u64 get_hv_features(void);

arch/x86/coco/sev/vc-handle.c

+2 −2
Original line number Diff line number Diff line
@@ -404,7 +404,7 @@ static enum es_result __vc_handle_secure_tsc_msrs(struct es_em_ctxt *ctxt, bool 
	return ES_OK;

}



enum es_result sev_es_ghcb_handle_msr(struct ghcb *ghcb, struct es_em_ctxt *ctxt, bool write)

enum es_result __vc_handle_msr(struct ghcb *ghcb, struct es_em_ctxt *ctxt, bool write)

{

	struct pt_regs *regs = ctxt->regs;

	enum es_result ret;
@@ -448,7 +448,7 @@ enum es_result sev_es_ghcb_handle_msr(struct ghcb *ghcb, struct es_em_ctxt *ctxt 


static enum es_result vc_handle_msr(struct ghcb *ghcb, struct es_em_ctxt *ctxt)

{

	return sev_es_ghcb_handle_msr(ghcb, ctxt, ctxt->insn.opcode.bytes[1] == 0x30);

	return __vc_handle_msr(ghcb, ctxt, ctxt->insn.opcode.bytes[1] == 0x30);

}



static void __init vc_early_forward_exception(struct es_em_ctxt *ctxt)