lkml.org 
[lkml]   [2022]   [Apr]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip: x86/sev] x86/compressed/64: Add identity mapping for Confidential Computing blob
    The following commit has been merged into the x86/sev branch of tip:

    Commit-ID: 76f61e1e89b32f3e5d639f1b57413a919066da06
    Gitweb: https://git.kernel.org/tip/76f61e1e89b32f3e5d639f1b57413a919066da06
    Author: Michael Roth <michael.roth@amd.com>
    AuthorDate: Thu, 24 Feb 2022 10:56:17 -06:00
    Committer: Borislav Petkov <bp@suse.de>
    CommitterDate: Thu, 07 Apr 2022 16:47:11 +02:00

    x86/compressed/64: Add identity mapping for Confidential Computing blob

    The run-time kernel will need to access the Confidential Computing blob
    very early during boot to access the CPUID table it points to. At that
    stage, it will be relying on the identity-mapped page table set up by
    the boot/compressed kernel, so make sure the blob and the CPUID table it
    points to are mapped in advance.

    [ bp: Massage. ]

    Signed-off-by: Michael Roth <michael.roth@amd.com>
    Signed-off-by: Brijesh Singh <brijesh.singh@amd.com>
    Signed-off-by: Borislav Petkov <bp@suse.de>
    Link: https://lore.kernel.org/r/20220307213356.2797205-38-brijesh.singh@amd.com
    ---
    arch/x86/boot/compressed/ident_map_64.c | 3 ++-
    arch/x86/boot/compressed/misc.h | 2 ++
    arch/x86/boot/compressed/sev.c | 21 +++++++++++++++++++++
    3 files changed, 25 insertions(+), 1 deletion(-)

    diff --git a/arch/x86/boot/compressed/ident_map_64.c b/arch/x86/boot/compressed/ident_map_64.c
    index 99348ee..44c350d 100644
    --- a/arch/x86/boot/compressed/ident_map_64.c
    +++ b/arch/x86/boot/compressed/ident_map_64.c
    @@ -163,8 +163,9 @@ void initialize_identity_maps(void *rmode)
    cmdline = get_cmd_line_ptr();
    kernel_add_identity_map(cmdline, cmdline + COMMAND_LINE_SIZE);

    + sev_prep_identity_maps(top_level_pgt);
    +
    /* Load the new page-table. */
    - sev_verify_cbit(top_level_pgt);
    write_cr3(top_level_pgt);
    }

    diff --git a/arch/x86/boot/compressed/misc.h b/arch/x86/boot/compressed/misc.h
    index aae2722..75d284e 100644
    --- a/arch/x86/boot/compressed/misc.h
    +++ b/arch/x86/boot/compressed/misc.h
    @@ -127,6 +127,7 @@ void sev_es_shutdown_ghcb(void);
    extern bool sev_es_check_ghcb_fault(unsigned long address);
    void snp_set_page_private(unsigned long paddr);
    void snp_set_page_shared(unsigned long paddr);
    +void sev_prep_identity_maps(unsigned long top_level_pgt);
    #else
    static inline void sev_enable(struct boot_params *bp) { }
    static inline void sev_es_shutdown_ghcb(void) { }
    @@ -136,6 +137,7 @@ static inline bool sev_es_check_ghcb_fault(unsigned long address)
    }
    static inline void snp_set_page_private(unsigned long paddr) { }
    static inline void snp_set_page_shared(unsigned long paddr) { }
    +static inline void sev_prep_identity_maps(unsigned long top_level_pgt) { }
    #endif

    /* acpi.c */
    diff --git a/arch/x86/boot/compressed/sev.c b/arch/x86/boot/compressed/sev.c
    index dd3cf55..1e4930c 100644
    --- a/arch/x86/boot/compressed/sev.c
    +++ b/arch/x86/boot/compressed/sev.c
    @@ -478,3 +478,24 @@ bool snp_init(struct boot_params *bp)

    return true;
    }
    +
    +void sev_prep_identity_maps(unsigned long top_level_pgt)
    +{
    + /*
    + * The Confidential Computing blob is used very early in uncompressed
    + * kernel to find the in-memory CPUID table to handle CPUID
    + * instructions. Make sure an identity-mapping exists so it can be
    + * accessed after switchover.
    + */
    + if (sev_snp_enabled()) {
    + unsigned long cc_info_pa = boot_params->cc_blob_address;
    + struct cc_blob_sev_info *cc_info;
    +
    + kernel_add_identity_map(cc_info_pa, cc_info_pa + sizeof(*cc_info));
    +
    + cc_info = (struct cc_blob_sev_info *)cc_info_pa;
    + kernel_add_identity_map(cc_info->cpuid_phys, cc_info->cpuid_phys + cc_info->cpuid_len);
    + }
    +
    + sev_verify_cbit(top_level_pgt);
    +}
    \
     
     \ /
      Last update: 2022-04-08 11:13    [W:3.176 / U:0.456 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site