Commit 18c3933c authored by Brijesh Singh's avatar Brijesh Singh Committed by Borislav Petkov
Browse files

x86/sev: Shorten GHCB terminate macro names 



Shorten macro names for improved readability.

Suggested-by: default avatarBorislav Petkov <bp@suse.de>
Signed-off-by: default avatarBrijesh Singh <brijesh.singh@amd.com>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Reviewed-by: default avatarVenu Busireddy <venu.busireddy@oracle.com>
Link: https://lkml.kernel.org/r/20211110220731.2396491-5-brijesh.singh@amd.com
parent fa55b7dc

arch/x86/boot/compressed/sev.c

+3 −3
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ static enum es_result vc_read_mem(struct es_em_ctxt *ctxt, 
static bool early_setup_sev_es(void)

{

	if (!sev_es_negotiate_protocol())

		sev_es_terminate(GHCB_SEV_ES_REASON_PROTOCOL_UNSUPPORTED);

		sev_es_terminate(GHCB_SEV_ES_PROT_UNSUPPORTED);



	if (set_page_decrypted((unsigned long)&boot_ghcb_page))

		return false;
@@ -175,7 +175,7 @@ void do_boot_stage2_vc(struct pt_regs *regs, unsigned long exit_code) 
	enum es_result result;



	if (!boot_ghcb && !early_setup_sev_es())

		sev_es_terminate(GHCB_SEV_ES_REASON_GENERAL_REQUEST);

		sev_es_terminate(GHCB_SEV_ES_GEN_REQ);



	vc_ghcb_invalidate(boot_ghcb);

	result = vc_init_em_ctxt(&ctxt, regs, exit_code);
@@ -202,5 +202,5 @@ void do_boot_stage2_vc(struct pt_regs *regs, unsigned long exit_code) 
	if (result == ES_OK)

		vc_finish_insn(&ctxt);

	else if (result != ES_RETRY)

		sev_es_terminate(GHCB_SEV_ES_REASON_GENERAL_REQUEST);

		sev_es_terminate(GHCB_SEV_ES_GEN_REQ);

}

arch/x86/include/asm/sev-common.h

+2 −2
Original line number Diff line number Diff line
@@ -68,8 +68,8 @@ 
	(((((u64)reason_set) &  GHCB_MSR_TERM_REASON_SET_MASK) << GHCB_MSR_TERM_REASON_SET_POS) | \

	((((u64)reason_val) & GHCB_MSR_TERM_REASON_MASK) << GHCB_MSR_TERM_REASON_POS))



#define GHCB_SEV_ES_REASON_GENERAL_REQUEST	0

#define GHCB_SEV_ES_REASON_PROTOCOL_UNSUPPORTED	1

#define GHCB_SEV_ES_GEN_REQ		0

#define GHCB_SEV_ES_PROT_UNSUPPORTED	1



#define GHCB_RESP_CODE(v)		((v) & GHCB_MSR_INFO_MASK)

arch/x86/kernel/sev-shared.c

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ void __init do_vc_no_ghcb(struct pt_regs *regs, unsigned long exit_code) 


fail:

	/* Terminate the guest */

	sev_es_terminate(GHCB_SEV_ES_REASON_GENERAL_REQUEST);

	sev_es_terminate(GHCB_SEV_ES_GEN_REQ);

}



static enum es_result vc_insn_string_read(struct es_em_ctxt *ctxt,

arch/x86/kernel/sev.c

+2 −2
Original line number Diff line number Diff line
@@ -1411,7 +1411,7 @@ DEFINE_IDTENTRY_VC_KERNEL(exc_vmm_communication) 
		show_regs(regs);



		/* Ask hypervisor to sev_es_terminate */

		sev_es_terminate(GHCB_SEV_ES_REASON_GENERAL_REQUEST);

		sev_es_terminate(GHCB_SEV_ES_GEN_REQ);



		/* If that fails and we get here - just panic */

		panic("Returned from Terminate-Request to Hypervisor\n");
@@ -1459,7 +1459,7 @@ bool __init handle_vc_boot_ghcb(struct pt_regs *regs) 


	/* Do initial setup or terminate the guest */

	if (unlikely(boot_ghcb == NULL && !sev_es_setup_ghcb()))

		sev_es_terminate(GHCB_SEV_ES_REASON_GENERAL_REQUEST);

		sev_es_terminate(GHCB_SEV_ES_GEN_REQ);



	vc_ghcb_invalidate(boot_ghcb);