lkml.org 
[lkml]   [2021]   [Jun]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH Part1 RFC v3 01/22] x86/sev: shorten GHCB terminate macro names
On 2021-06-02 09:03:55 -0500, Brijesh Singh wrote:
> Suggested-by: Borislav Petkov <bp@suse.de>
> Signed-off-by: Brijesh Singh <brijesh.singh@amd.com>

Reviewed-by: Venu Busireddy <venu.busireddy@oracle.com>

> ---
> arch/x86/boot/compressed/sev.c | 6 +++---
> arch/x86/include/asm/sev-common.h | 4 ++--
> arch/x86/kernel/sev-shared.c | 2 +-
> arch/x86/kernel/sev.c | 4 ++--
> 4 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/arch/x86/boot/compressed/sev.c b/arch/x86/boot/compressed/sev.c
> index 670e998fe930..28bcf04c022e 100644
> --- a/arch/x86/boot/compressed/sev.c
> +++ b/arch/x86/boot/compressed/sev.c
> @@ -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);
> }
> diff --git a/arch/x86/include/asm/sev-common.h b/arch/x86/include/asm/sev-common.h
> index 629c3df243f0..11b7d9cea775 100644
> --- a/arch/x86/include/asm/sev-common.h
> +++ b/arch/x86/include/asm/sev-common.h
> @@ -54,8 +54,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)
>
> diff --git a/arch/x86/kernel/sev-shared.c b/arch/x86/kernel/sev-shared.c
> index 6ec8b3bfd76e..14198075ff8b 100644
> --- a/arch/x86/kernel/sev-shared.c
> +++ b/arch/x86/kernel/sev-shared.c
> @@ -207,7 +207,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,
> diff --git a/arch/x86/kernel/sev.c b/arch/x86/kernel/sev.c
> index 9578c82832aa..460717e3f72d 100644
> --- a/arch/x86/kernel/sev.c
> +++ b/arch/x86/kernel/sev.c
> @@ -1383,7 +1383,7 @@ DEFINE_IDTENTRY_VC_SAFE_STACK(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");
> @@ -1416,7 +1416,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);
>
> --
> 2.17.1
>

\
 
 \ /
  Last update: 2021-06-08 17:58    [W:0.554 / U:1.676 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site