lkml.org 
[lkml]   [2022]   [Feb]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCHv4 02/30] x86/tdx: Detect running as a TDX guest in early boot
    Date
    From: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>

    In preparation of extending cc_platform_has() API to support TDX guest,
    use CPUID instruction to detect support for TDX guests in the early
    boot code (via tdx_early_init()). Since copy_bootdata() is the first
    user of cc_platform_has() API, detect the TDX guest status before it.

    Define a synthetic feature flag (X86_FEATURE_TDX_GUEST) and set this
    bit in a valid TDX guest platform.

    Signed-off-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
    Reviewed-by: Andi Kleen <ak@linux.intel.com>
    Reviewed-by: Tony Luck <tony.luck@intel.com>
    Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
    ---
    arch/x86/Kconfig | 12 ++++++++++++
    arch/x86/coco/Makefile | 2 ++
    arch/x86/coco/tdx.c | 23 +++++++++++++++++++++++
    arch/x86/include/asm/cpufeatures.h | 1 +
    arch/x86/include/asm/disabled-features.h | 8 +++++++-
    arch/x86/include/asm/tdx.h | 21 +++++++++++++++++++++
    arch/x86/kernel/head64.c | 4 ++++
    7 files changed, 70 insertions(+), 1 deletion(-)
    create mode 100644 arch/x86/coco/tdx.c
    create mode 100644 arch/x86/include/asm/tdx.h

    diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
    index 57a4e0285a80..c346d66b51fc 100644
    --- a/arch/x86/Kconfig
    +++ b/arch/x86/Kconfig
    @@ -880,6 +880,18 @@ config ACRN_GUEST
    IOT with small footprint and real-time features. More details can be
    found in https://projectacrn.org/.

    +config INTEL_TDX_GUEST
    + bool "Intel TDX (Trust Domain Extensions) - Guest Support"
    + depends on X86_64 && CPU_SUP_INTEL
    + depends on X86_X2APIC
    + help
    + Support running as a guest under Intel TDX. Without this support,
    + the guest kernel can not boot or run under TDX.
    + TDX includes memory encryption and integrity capabilities
    + which protect the confidentiality and integrity of guest
    + memory contents and CPU state. TDX guests are protected from
    + some attacks from the VMM.
    +
    endif #HYPERVISOR_GUEST

    source "arch/x86/Kconfig.cpu"
    diff --git a/arch/x86/coco/Makefile b/arch/x86/coco/Makefile
    index c1ead00017a7..32f4c6e6f199 100644
    --- a/arch/x86/coco/Makefile
    +++ b/arch/x86/coco/Makefile
    @@ -4,3 +4,5 @@ KASAN_SANITIZE_core.o := n
    CFLAGS_core.o += -fno-stack-protector

    obj-y += core.o
    +
    +obj-$(CONFIG_INTEL_TDX_GUEST) += tdx.o
    diff --git a/arch/x86/coco/tdx.c b/arch/x86/coco/tdx.c
    new file mode 100644
    index 000000000000..00898e3eb77f
    --- /dev/null
    +++ b/arch/x86/coco/tdx.c
    @@ -0,0 +1,23 @@
    +// SPDX-License-Identifier: GPL-2.0
    +/* Copyright (C) 2021-2022 Intel Corporation */
    +
    +#undef pr_fmt
    +#define pr_fmt(fmt) "tdx: " fmt
    +
    +#include <linux/cpufeature.h>
    +#include <asm/tdx.h>
    +
    +void __init tdx_early_init(void)
    +{
    + u32 eax, sig[3];
    +
    + cpuid_count(TDX_CPUID_LEAF_ID, 0, &eax, &sig[0], &sig[2], &sig[1]);
    +
    + BUILD_BUG_ON(sizeof(sig) != sizeof(TDX_IDENT) - 1);
    + if (memcmp(TDX_IDENT, sig, sizeof(sig)))
    + return;
    +
    + setup_force_cpu_cap(X86_FEATURE_TDX_GUEST);
    +
    + pr_info("Guest detected\n");
    +}
    diff --git a/arch/x86/include/asm/cpufeatures.h b/arch/x86/include/asm/cpufeatures.h
    index 5cd22090e53d..cacc8dde854b 100644
    --- a/arch/x86/include/asm/cpufeatures.h
    +++ b/arch/x86/include/asm/cpufeatures.h
    @@ -238,6 +238,7 @@
    #define X86_FEATURE_VMW_VMMCALL ( 8*32+19) /* "" VMware prefers VMMCALL hypercall instruction */
    #define X86_FEATURE_PVUNLOCK ( 8*32+20) /* "" PV unlock function */
    #define X86_FEATURE_VCPUPREEMPT ( 8*32+21) /* "" PV vcpu_is_preempted function */
    +#define X86_FEATURE_TDX_GUEST ( 8*32+22) /* Intel Trust Domain Extensions Guest */

    /* Intel-defined CPU features, CPUID level 0x00000007:0 (EBX), word 9 */
    #define X86_FEATURE_FSGSBASE ( 9*32+ 0) /* RDFSBASE, WRFSBASE, RDGSBASE, WRGSBASE instructions*/
    diff --git a/arch/x86/include/asm/disabled-features.h b/arch/x86/include/asm/disabled-features.h
    index 1231d63f836d..b37de8268c9a 100644
    --- a/arch/x86/include/asm/disabled-features.h
    +++ b/arch/x86/include/asm/disabled-features.h
    @@ -68,6 +68,12 @@
    # define DISABLE_SGX (1 << (X86_FEATURE_SGX & 31))
    #endif

    +#ifdef CONFIG_INTEL_TDX_GUEST
    +# define DISABLE_TDX_GUEST 0
    +#else
    +# define DISABLE_TDX_GUEST (1 << (X86_FEATURE_TDX_GUEST & 31))
    +#endif
    +
    /*
    * Make sure to add features to the correct mask
    */
    @@ -79,7 +85,7 @@
    #define DISABLED_MASK5 0
    #define DISABLED_MASK6 0
    #define DISABLED_MASK7 (DISABLE_PTI)
    -#define DISABLED_MASK8 0
    +#define DISABLED_MASK8 (DISABLE_TDX_GUEST)
    #define DISABLED_MASK9 (DISABLE_SMAP|DISABLE_SGX)
    #define DISABLED_MASK10 0
    #define DISABLED_MASK11 0
    diff --git a/arch/x86/include/asm/tdx.h b/arch/x86/include/asm/tdx.h
    new file mode 100644
    index 000000000000..ba8042ce61c2
    --- /dev/null
    +++ b/arch/x86/include/asm/tdx.h
    @@ -0,0 +1,21 @@
    +/* SPDX-License-Identifier: GPL-2.0 */
    +/* Copyright (C) 2021-2022 Intel Corporation */
    +#ifndef _ASM_X86_TDX_H
    +#define _ASM_X86_TDX_H
    +
    +#include <linux/init.h>
    +
    +#define TDX_CPUID_LEAF_ID 0x21
    +#define TDX_IDENT "IntelTDX "
    +
    +#ifdef CONFIG_INTEL_TDX_GUEST
    +
    +void __init tdx_early_init(void);
    +
    +#else
    +
    +static inline void tdx_early_init(void) { };
    +
    +#endif /* CONFIG_INTEL_TDX_GUEST */
    +
    +#endif /* _ASM_X86_TDX_H */
    diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
    index 4f5ecbbaae77..6dff50c3edd6 100644
    --- a/arch/x86/kernel/head64.c
    +++ b/arch/x86/kernel/head64.c
    @@ -40,6 +40,7 @@
    #include <asm/extable.h>
    #include <asm/trapnr.h>
    #include <asm/sev.h>
    +#include <asm/tdx.h>

    /*
    * Manage page tables very early on.
    @@ -514,6 +515,9 @@ asmlinkage __visible void __init x86_64_start_kernel(char * real_mode_data)

    idt_setup_early_handler();

    + /* Needed before cc_platform_has() can be used for TDX */
    + tdx_early_init();
    +
    copy_bootdata(__va(real_mode_data));

    /*
    --
    2.34.1
    \
     
     \ /
      Last update: 2022-02-24 17:06    [W:4.135 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site