Commit 5bb6c1d1 authored by Borislav Petkov's avatar Borislav Petkov
Browse files

Revert "x86/sev: Expose sev_es_ghcb_hv_call() for use by HyperV" 



This reverts commit 007faec0.

Now that hyperv does its own protocol negotiation:

  49d6a3c0 ("x86/Hyper-V: Add SEV negotiate protocol support in Isolation VM")

revert this exposure of the sev_es_ghcb_hv_call() helper.

Cc: Wei Liu <wei.liu@kernel.org>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Reviewed-by：Tianyu Lan <tiala@microsoft.com>
Link: https://lore.kernel.org/r/20220614014553.1915929-1-ltykernel@gmail.com
parent 871808fd

arch/x86/include/asm/sev.h

+1 −6
Original line number Original line Diff line number Diff line
@@ -72,7 +72,6 @@ static inline u64 lower_bits(u64 val, unsigned int bits) 




struct real_mode_header;

struct real_mode_header;

enum stack_type;

enum stack_type;

struct ghcb;





/* Early IDT entry points for #VC handler */

/* Early IDT entry points for #VC handler */

extern void vc_no_ghcb(void);

extern void vc_no_ghcb(void);
@@ -156,11 +155,7 @@ static __always_inline void sev_es_nmi_complete(void) 
		__sev_es_nmi_complete();

		__sev_es_nmi_complete();

}

}

extern int __init sev_es_efi_map_ghcbs(pgd_t *pgd);

extern int __init sev_es_efi_map_ghcbs(pgd_t *pgd);

extern enum es_result sev_es_ghcb_hv_call(struct ghcb *ghcb,



					  bool set_ghcb_msr,

					  struct es_em_ctxt *ctxt,

					  u64 exit_code, u64 exit_info_1,

					  u64 exit_info_2);

static inline int rmpadjust(unsigned long vaddr, bool rmp_psize, unsigned long attrs)

static inline int rmpadjust(unsigned long vaddr, bool rmp_psize, unsigned long attrs)

{

{

	int rc;

	int rc;

arch/x86/kernel/sev-shared.c

+9 −16
Original line number Original line Diff line number Diff line
@@ -219,9 +219,10 @@ static enum es_result verify_exception_info(struct ghcb *ghcb, struct es_em_ctxt 
	return ES_VMM_ERROR;

	return ES_VMM_ERROR;

}

}





enum es_result sev_es_ghcb_hv_call(struct ghcb *ghcb, bool set_ghcb_msr,

static enum es_result sev_es_ghcb_hv_call(struct ghcb *ghcb,

				   struct es_em_ctxt *ctxt, u64 exit_code,

					  struct es_em_ctxt *ctxt,

				   u64 exit_info_1, u64 exit_info_2)

					  u64 exit_code, u64 exit_info_1,

					  u64 exit_info_2)

{

{

	/* Fill in protocol and format specifiers */

	/* Fill in protocol and format specifiers */

	ghcb->protocol_version = ghcb_version;

	ghcb->protocol_version = ghcb_version;
@@ -231,14 +232,7 @@ enum es_result sev_es_ghcb_hv_call(struct ghcb *ghcb, bool set_ghcb_msr, 
	ghcb_set_sw_exit_info_1(ghcb, exit_info_1);

	ghcb_set_sw_exit_info_1(ghcb, exit_info_1);

	ghcb_set_sw_exit_info_2(ghcb, exit_info_2);

	ghcb_set_sw_exit_info_2(ghcb, exit_info_2);





	/*

	 * Hyper-V unenlightened guests use a paravisor for communicating and

	 * GHCB pages are being allocated and set up by that paravisor. Linux

	 * should not change the GHCB page's physical address.

	 */

	if (set_ghcb_msr)

	sev_es_wr_ghcb_msr(__pa(ghcb));

	sev_es_wr_ghcb_msr(__pa(ghcb));



	VMGEXIT();

	VMGEXIT();





	return verify_exception_info(ghcb, ctxt);

	return verify_exception_info(ghcb, ctxt);
@@ -795,7 +789,7 @@ static enum es_result vc_handle_ioio(struct ghcb *ghcb, struct es_em_ctxt *ctxt) 
		 */

		 */

		sw_scratch = __pa(ghcb) + offsetof(struct ghcb, shared_buffer);

		sw_scratch = __pa(ghcb) + offsetof(struct ghcb, shared_buffer);

		ghcb_set_sw_scratch(ghcb, sw_scratch);

		ghcb_set_sw_scratch(ghcb, sw_scratch);

		ret = sev_es_ghcb_hv_call(ghcb, true, ctxt, SVM_EXIT_IOIO,

		ret = sev_es_ghcb_hv_call(ghcb, ctxt, SVM_EXIT_IOIO,

					  exit_info_1, exit_info_2);

					  exit_info_1, exit_info_2);

		if (ret != ES_OK)

		if (ret != ES_OK)

			return ret;

			return ret;
@@ -837,8 +831,7 @@ static enum es_result vc_handle_ioio(struct ghcb *ghcb, struct es_em_ctxt *ctxt) 




		ghcb_set_rax(ghcb, rax);

		ghcb_set_rax(ghcb, rax);





		ret = sev_es_ghcb_hv_call(ghcb, true, ctxt,

		ret = sev_es_ghcb_hv_call(ghcb, ctxt, SVM_EXIT_IOIO, exit_info_1, 0);

					  SVM_EXIT_IOIO, exit_info_1, 0);

		if (ret != ES_OK)

		if (ret != ES_OK)

			return ret;

			return ret;
@@ -894,7 +887,7 @@ static enum es_result vc_handle_cpuid(struct ghcb *ghcb, 
		/* xgetbv will cause #GP - use reset value for xcr0 */

		/* xgetbv will cause #GP - use reset value for xcr0 */

		ghcb_set_xcr0(ghcb, 1);

		ghcb_set_xcr0(ghcb, 1);





	ret = sev_es_ghcb_hv_call(ghcb, true, ctxt, SVM_EXIT_CPUID, 0, 0);

	ret = sev_es_ghcb_hv_call(ghcb, ctxt, SVM_EXIT_CPUID, 0, 0);

	if (ret != ES_OK)

	if (ret != ES_OK)

		return ret;

		return ret;
@@ -919,7 +912,7 @@ static enum es_result vc_handle_rdtsc(struct ghcb *ghcb, 
	bool rdtscp = (exit_code == SVM_EXIT_RDTSCP);

	bool rdtscp = (exit_code == SVM_EXIT_RDTSCP);

	enum es_result ret;

	enum es_result ret;





	ret = sev_es_ghcb_hv_call(ghcb, true, ctxt, exit_code, 0, 0);

	ret = sev_es_ghcb_hv_call(ghcb, ctxt, exit_code, 0, 0);

	if (ret != ES_OK)

	if (ret != ES_OK)

		return ret;

		return ret;

arch/x86/kernel/sev.c

+8 −9
Original line number Original line Diff line number Diff line
@@ -786,7 +786,7 @@ static int vmgexit_psc(struct snp_psc_desc *desc) 
		ghcb_set_sw_scratch(ghcb, (u64)__pa(data));

		ghcb_set_sw_scratch(ghcb, (u64)__pa(data));





		/* This will advance the shared buffer data points to. */

		/* This will advance the shared buffer data points to. */

		ret = sev_es_ghcb_hv_call(ghcb, true, &ctxt, SVM_VMGEXIT_PSC, 0, 0);

		ret = sev_es_ghcb_hv_call(ghcb, &ctxt, SVM_VMGEXIT_PSC, 0, 0);





		/*

		/*

		 * Page State Change VMGEXIT can pass error code through

		 * Page State Change VMGEXIT can pass error code through
@@ -1212,8 +1212,7 @@ static enum es_result vc_handle_msr(struct ghcb *ghcb, struct es_em_ctxt *ctxt) 
		ghcb_set_rdx(ghcb, regs->dx);

		ghcb_set_rdx(ghcb, regs->dx);

	}

	}





	ret = sev_es_ghcb_hv_call(ghcb, true, ctxt, SVM_EXIT_MSR,

	ret = sev_es_ghcb_hv_call(ghcb, ctxt, SVM_EXIT_MSR, exit_info_1, 0);

				  exit_info_1, 0);





	if ((ret == ES_OK) && (!exit_info_1)) {

	if ((ret == ES_OK) && (!exit_info_1)) {

		regs->ax = ghcb->save.rax;

		regs->ax = ghcb->save.rax;
@@ -1452,7 +1451,7 @@ static enum es_result vc_do_mmio(struct ghcb *ghcb, struct es_em_ctxt *ctxt, 




	ghcb_set_sw_scratch(ghcb, ghcb_pa + offsetof(struct ghcb, shared_buffer));

	ghcb_set_sw_scratch(ghcb, ghcb_pa + offsetof(struct ghcb, shared_buffer));





	return sev_es_ghcb_hv_call(ghcb, true, ctxt, exit_code, exit_info_1, exit_info_2);

	return sev_es_ghcb_hv_call(ghcb, ctxt, exit_code, exit_info_1, exit_info_2);

}

}





/*

/*
@@ -1628,7 +1627,7 @@ static enum es_result vc_handle_dr7_write(struct ghcb *ghcb, 




	/* Using a value of 0 for ExitInfo1 means RAX holds the value */

	/* Using a value of 0 for ExitInfo1 means RAX holds the value */

	ghcb_set_rax(ghcb, val);

	ghcb_set_rax(ghcb, val);

	ret = sev_es_ghcb_hv_call(ghcb, true, ctxt, SVM_EXIT_WRITE_DR7, 0, 0);

	ret = sev_es_ghcb_hv_call(ghcb, ctxt, SVM_EXIT_WRITE_DR7, 0, 0);

	if (ret != ES_OK)

	if (ret != ES_OK)

		return ret;

		return ret;
@@ -1658,7 +1657,7 @@ static enum es_result vc_handle_dr7_read(struct ghcb *ghcb, 
static enum es_result vc_handle_wbinvd(struct ghcb *ghcb,

static enum es_result vc_handle_wbinvd(struct ghcb *ghcb,

				       struct es_em_ctxt *ctxt)

				       struct es_em_ctxt *ctxt)

{

{

	return sev_es_ghcb_hv_call(ghcb, true, ctxt, SVM_EXIT_WBINVD, 0, 0);

	return sev_es_ghcb_hv_call(ghcb, ctxt, SVM_EXIT_WBINVD, 0, 0);

}

}





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

static enum es_result vc_handle_rdpmc(struct ghcb *ghcb, struct es_em_ctxt *ctxt)
@@ -1667,7 +1666,7 @@ static enum es_result vc_handle_rdpmc(struct ghcb *ghcb, struct es_em_ctxt *ctxt 




	ghcb_set_rcx(ghcb, ctxt->regs->cx);

	ghcb_set_rcx(ghcb, ctxt->regs->cx);





	ret = sev_es_ghcb_hv_call(ghcb, true, ctxt, SVM_EXIT_RDPMC, 0, 0);

	ret = sev_es_ghcb_hv_call(ghcb, ctxt, SVM_EXIT_RDPMC, 0, 0);

	if (ret != ES_OK)

	if (ret != ES_OK)

		return ret;

		return ret;
@@ -1708,7 +1707,7 @@ static enum es_result vc_handle_vmmcall(struct ghcb *ghcb, 
	if (x86_platform.hyper.sev_es_hcall_prepare)

	if (x86_platform.hyper.sev_es_hcall_prepare)

		x86_platform.hyper.sev_es_hcall_prepare(ghcb, ctxt->regs);

		x86_platform.hyper.sev_es_hcall_prepare(ghcb, ctxt->regs);





	ret = sev_es_ghcb_hv_call(ghcb, true, ctxt, SVM_EXIT_VMMCALL, 0, 0);

	ret = sev_es_ghcb_hv_call(ghcb, ctxt, SVM_EXIT_VMMCALL, 0, 0);

	if (ret != ES_OK)

	if (ret != ES_OK)

		return ret;

		return ret;
@@ -2197,7 +2196,7 @@ int snp_issue_guest_request(u64 exit_code, struct snp_req_data *input, unsigned 
		ghcb_set_rbx(ghcb, input->data_npages);

		ghcb_set_rbx(ghcb, input->data_npages);

	}

	}





	ret = sev_es_ghcb_hv_call(ghcb, true, &ctxt, exit_code, input->req_gpa, input->resp_gpa);

	ret = sev_es_ghcb_hv_call(ghcb, &ctxt, exit_code, input->req_gpa, input->resp_gpa);

	if (ret)

	if (ret)

		goto e_put;

		goto e_put;