Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp249428pxj; Tue, 1 Jun 2021 20:59:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwaLFf9Svq4QYIa4cpKFds093yiPMQ68DQIc1s+cu53GP6j8Mi+xaukDh+D4HPaPgEEdNt4 X-Received: by 2002:a02:9a17:: with SMTP id b23mr8937572jal.10.1622606389616; Tue, 01 Jun 2021 20:59:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622606389; cv=none; d=google.com; s=arc-20160816; b=qGUwvQ3C93urxrpq8nOAdECnZOjck8dSSgM9zk9hM71O9tIASaVEMuYBbYuh/Di5/p pV+mHnFBjJOMKZcJwMwqRI0zPzWLvjKoPTli0vLop4kKKjYG2/kBAvUz9htziSjekAxz eSPkU1pRpaYM+HnryJewxP4AbxssE2w4SCrSBGCD/4nGROroSuiOLisStYMsi1aGe6gc X+gUr1egEAo+I7hSwiRxljb1jl8QBWMqmx0RKXs7y5s1XtI/AY4jsFDRfGxytVoWWQcT Ea1u66S+rasItAo4VLKFayXuhHdj0GbhMHmbFBgFovSlmEPt7una2su+dJeifQy0cNr1 bIdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :ironport-sdr:ironport-sdr; bh=ruQaarPav8ro40owWEnCMr9uMvzVxYz8xM1Vb+YziMQ=; b=RgJKzgBhFWY9WBYgg9oAnwIUmncqU5CY4MNnyBffkrbR5pVE/GNpiJejG8G+Y3Cj0/ eS9QJc2stuhERY9eyJ8i6rwaGDs0TvKjGOjgFz9jmMxfjOTCBh96N2C8Y0LC8Oh4KkTh bAnss0ByG7rAs8SWgMF0xbbctDtFj2omXYrOaSt8BTIdaIeaP9CTq41FbQtKedKggE3W n1kjZ6zh/t2hiwy3ojcy7+KYDN+TRFdJZciA4tknh2ZSqRcnwxUYZ966y/RooXL4m67l 9qwJ4zPxL5eJFkZCm6/EBc4UGzviRjCTPeTUdF3002vMVJvbSnqfKt7U7tFdERm95UN8 BRSQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a7si19525459jat.120.2021.06.01.20.59.36; Tue, 01 Jun 2021 20:59:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230286AbhFBCXk (ORCPT + 99 others); Tue, 1 Jun 2021 22:23:40 -0400 Received: from mga06.intel.com ([134.134.136.31]:19493 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230161AbhFBCX2 (ORCPT ); Tue, 1 Jun 2021 22:23:28 -0400 IronPort-SDR: 6UgtPPGzfZtNV3D1RUGfy8niFTGOFD+amLAFD/LLM+7cVPvAxsS3J+5lfviCbPDgrmBnIoaUtG C50XQ5slXaog== X-IronPort-AV: E=McAfee;i="6200,9189,10002"; a="264865319" X-IronPort-AV: E=Sophos;i="5.83,241,1616482800"; d="scan'208";a="264865319" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Jun 2021 19:21:46 -0700 IronPort-SDR: bhzVvgCP/A95GsWLwckl7ckEqYiB5Dob8G47uWYvZY+BQgZ8kAaFmnboB3OU/cMA+OWQPiJzxr zWpn8UezuG2Q== X-IronPort-AV: E=Sophos;i="5.83,241,1616482800"; d="scan'208";a="633069199" Received: from mjdelaro-mobl.amr.corp.intel.com (HELO skuppusw-desk1.amr.corp.intel.com) ([10.254.3.23]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Jun 2021 19:21:46 -0700 From: Kuppuswamy Sathyanarayanan To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Peter Zijlstra , Andy Lutomirski Cc: Peter H Anvin , Dave Hansen , Tony Luck , Dan Williams , Andi Kleen , Kirill Shutemov , Kuppuswamy Sathyanarayanan , Sean Christopherson , Kuppuswamy Sathyanarayanan , linux-kernel@vger.kernel.org, x86@kernel.org Subject: [PATCH v1 04/11] x86/x86: Add is_tdx_guest() interface Date: Tue, 1 Jun 2021 19:21:29 -0700 Message-Id: <20210602022136.2186759-5-sathyanarayanan.kuppuswamy@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210602022136.2186759-1-sathyanarayanan.kuppuswamy@linux.intel.com> References: <20210602022136.2186759-1-sathyanarayanan.kuppuswamy@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add helper function to detect TDX feature support. It will be used to protect TDX specific code. Co-developed-by: Sean Christopherson Signed-off-by: Sean Christopherson Reviewed-by: Andi Kleen Reviewed-by: Tony Luck Signed-off-by: Kuppuswamy Sathyanarayanan --- arch/x86/boot/compressed/Makefile | 1 + arch/x86/boot/compressed/tdx.c | 32 +++++++++++++++++++++++++++++++ arch/x86/include/asm/tdx.h | 8 ++++++++ arch/x86/kernel/tdx.c | 6 ++++++ 4 files changed, 47 insertions(+) create mode 100644 arch/x86/boot/compressed/tdx.c diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile index 431bf7f846c3..22a2a6cc2ab4 100644 --- a/arch/x86/boot/compressed/Makefile +++ b/arch/x86/boot/compressed/Makefile @@ -98,6 +98,7 @@ ifdef CONFIG_X86_64 endif vmlinux-objs-$(CONFIG_ACPI) += $(obj)/acpi.o +vmlinux-objs-$(CONFIG_INTEL_TDX_GUEST) += $(obj)/tdx.o vmlinux-objs-$(CONFIG_EFI_MIXED) += $(obj)/efi_thunk_$(BITS).o efi-obj-$(CONFIG_EFI_STUB) = $(objtree)/drivers/firmware/efi/libstub/lib.a diff --git a/arch/x86/boot/compressed/tdx.c b/arch/x86/boot/compressed/tdx.c new file mode 100644 index 000000000000..0a87c1775b67 --- /dev/null +++ b/arch/x86/boot/compressed/tdx.c @@ -0,0 +1,32 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * tdx.c - Early boot code for TDX + */ + +#include + +static int __ro_after_init tdx_guest = -1; + +static inline bool native_cpuid_has_tdx_guest(void) +{ + u32 eax = TDX_CPUID_LEAF_ID, signature[3] = {0}; + + if (native_cpuid_eax(0) < TDX_CPUID_LEAF_ID) + return false; + + native_cpuid(&eax, &signature[0], &signature[1], &signature[2]); + + if (memcmp("IntelTDX ", signature, 12)) + return false; + + return true; +} + +bool is_tdx_guest(void) +{ + if (tdx_guest < 0) + tdx_guest = native_cpuid_has_tdx_guest(); + + return !!tdx_guest; +} + diff --git a/arch/x86/include/asm/tdx.h b/arch/x86/include/asm/tdx.h index 679500e807f3..69af72d08d3d 100644 --- a/arch/x86/include/asm/tdx.h +++ b/arch/x86/include/asm/tdx.h @@ -9,10 +9,18 @@ #include +/* Common API to check TDX support in decompression and common kernel code. */ +bool is_tdx_guest(void); + void __init tdx_early_init(void); #else // !CONFIG_INTEL_TDX_GUEST +static inline bool is_tdx_guest(void) +{ + return false; +} + static inline void tdx_early_init(void) { }; #endif /* CONFIG_INTEL_TDX_GUEST */ diff --git a/arch/x86/kernel/tdx.c b/arch/x86/kernel/tdx.c index 5b14b72e41c5..5e70617e9877 100644 --- a/arch/x86/kernel/tdx.c +++ b/arch/x86/kernel/tdx.c @@ -19,6 +19,12 @@ static inline bool cpuid_has_tdx_guest(void) return true; } +bool is_tdx_guest(void) +{ + return static_cpu_has(X86_FEATURE_TDX_GUEST); +} +EXPORT_SYMBOL_GPL(is_tdx_guest); + void __init tdx_early_init(void) { if (!cpuid_has_tdx_guest()) -- 2.25.1