lkml.org 
[lkml]   [2020]   [Jul]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5 74/75] x86/efi: Add GHCB mappings when SEV-ES is active
    Date
    From: Tom Lendacky <thomas.lendacky@amd.com>

    Calling down to EFI runtime services can result in the firmware performing
    VMGEXIT calls. The firmware is likely to use the GHCB of the OS (e.g., for
    setting EFI variables), so each GHCB in the system needs to be identity
    mapped in the EFI page tables, as unencrypted, to avoid page faults.

    Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
    [ jroedel@suse.de: Moved GHCB mapping loop to sev-es.c ]
    Signed-off-by: Joerg Roedel <jroedel@suse.de>
    ---
    arch/x86/boot/compressed/sev-es.c | 1 +
    arch/x86/include/asm/sev-es.h | 2 ++
    arch/x86/kernel/sev-es.c | 30 ++++++++++++++++++++++++++++++
    arch/x86/platform/efi/efi_64.c | 10 ++++++++++
    4 files changed, 43 insertions(+)

    diff --git a/arch/x86/boot/compressed/sev-es.c b/arch/x86/boot/compressed/sev-es.c
    index 1ce144e0ddc3..b522c18c0588 100644
    --- a/arch/x86/boot/compressed/sev-es.c
    +++ b/arch/x86/boot/compressed/sev-es.c
    @@ -12,6 +12,7 @@
    */
    #include "misc.h"

    +#include <asm/pgtable_types.h>
    #include <asm/sev-es.h>
    #include <asm/trapnr.h>
    #include <asm/trap_pf.h>
    diff --git a/arch/x86/include/asm/sev-es.h b/arch/x86/include/asm/sev-es.h
    index 21fdee11ac83..f22c4531624c 100644
    --- a/arch/x86/include/asm/sev-es.h
    +++ b/arch/x86/include/asm/sev-es.h
    @@ -101,11 +101,13 @@ static __always_inline void sev_es_nmi_complete(void)
    if (static_branch_unlikely(&sev_es_enable_key))
    __sev_es_nmi_complete();
    }
    +extern int __init sev_es_efi_map_ghcbs(pgd_t *pgd);
    #else
    static inline void sev_es_ist_enter(struct pt_regs *regs) { }
    static inline void sev_es_ist_exit(void) { }
    static inline int sev_es_setup_ap_jump_table(struct real_mode_header *rmh) { return 0; }
    static inline void sev_es_nmi_complete(void) { }
    +static inline int sev_es_efi_map_ghcbs(pgd_t *pgd) { return 0; }
    #endif

    #endif
    diff --git a/arch/x86/kernel/sev-es.c b/arch/x86/kernel/sev-es.c
    index 6db343bd0117..c5e0ceb099c2 100644
    --- a/arch/x86/kernel/sev-es.c
    +++ b/arch/x86/kernel/sev-es.c
    @@ -495,6 +495,36 @@ int sev_es_setup_ap_jump_table(struct real_mode_header *rmh)
    return 0;
    }

    +/*
    + * This is needed by the OVMF UEFI firmware which will use whatever it finds in
    + * the GHCB MSR as its GHCB to talk to the hypervisor. So make sure the per-cpu
    + * runtime GHCBs used by the kernel are also mapped in the EFI page-table.
    + */
    +int __init sev_es_efi_map_ghcbs(pgd_t *pgd)
    +{
    + struct sev_es_runtime_data *data;
    + unsigned long address, pflags;
    + int cpu;
    + u64 pfn;
    +
    + if (!sev_es_active())
    + return 0;
    +
    + pflags = _PAGE_NX | _PAGE_RW;
    +
    + for_each_possible_cpu(cpu) {
    + data = per_cpu(runtime_data, cpu);
    +
    + address = __pa(&data->ghcb_page);
    + pfn = address >> PAGE_SHIFT;
    +
    + if (kernel_map_pages_in_pgd(pgd, pfn, address, 1, pflags))
    + return 1;
    + }
    +
    + return 0;
    +}
    +
    static enum es_result vc_handle_msr(struct ghcb *ghcb, struct es_em_ctxt *ctxt)
    {
    struct pt_regs *regs = ctxt->regs;
    diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c
    index 413583f904a6..bcf979c4aa10 100644
    --- a/arch/x86/platform/efi/efi_64.c
    +++ b/arch/x86/platform/efi/efi_64.c
    @@ -47,6 +47,7 @@
    #include <asm/realmode.h>
    #include <asm/time.h>
    #include <asm/pgalloc.h>
    +#include <asm/sev-es.h>

    /*
    * We allocate runtime services regions top-down, starting from -4G, i.e.
    @@ -229,6 +230,15 @@ int __init efi_setup_page_tables(unsigned long pa_memmap, unsigned num_pages)
    return 1;
    }

    + /*
    + * When SEV-ES is active, the GHCB as set by the kernel will be used
    + * by firmware. Create a 1:1 unencrypted mapping for each GHCB.
    + */
    + if (sev_es_efi_map_ghcbs(pgd)) {
    + pr_err("Failed to create 1:1 mapping for the GHCBs!\n");
    + return 1;
    + }
    +
    /*
    * When making calls to the firmware everything needs to be 1:1
    * mapped and addressable with 32-bit pointers. Map the kernel
    --
    2.27.0
    \
     
     \ /
      Last update: 2020-07-24 18:05    [W:2.061 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site