Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp1605407pxj; Sat, 12 Jun 2021 14:07:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwNXreBjzY9ONB1HsKaomPIRHjWCTRukgOiNeVVbvAfO8SL1/epoj8QjCrMBZOtvCrFzOqp X-Received: by 2002:a17:906:c211:: with SMTP id d17mr9050972ejz.247.1623532046405; Sat, 12 Jun 2021 14:07:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623532046; cv=none; d=google.com; s=arc-20160816; b=Z0SApoIfsZ2EYd4J/buXVRCbnWpjszqwIsaw04cDvZERrCtngoHrx+iZIf+7UfF0bO Z2Rak9D92PIBKFzjOcEtE+YXpyi2urjTW5Ir3xUZPANKOU2X9fj7M6uVCBIbYkBh5Wx3 y05WvY3leOJYkCNDrk1mXU16is98nW0wf8w3qdD5uEO0cyTQDlgGxyCV+bIrqx1ntCOO 3uZkESC0JKMXjMbQSWQu6QlE2YiLkdkFnNCs+1kifdOYYau/cPDLpUtq5lYKp0KWkoPg igjU9M3+OaKVBoCbh8i778d1CaI427A6QKYk+zb7lO1dN05At5JY7B/uIfgysWHBaPzB 9QeQ== 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=CH2cLgSJY95pTEO/OhhmSl/69Cc8tPxihqbX7ogH5j0=; b=ybR3EIyar68LroRYBv2K9pngd7QR6DwYR77s6efTvSX8jL5Hu9DBopRgpcO0wALN/D Is1hfaM9Xx2jfqvbDcfSsUXPJ8Buxt3ihYZkGxqEQzVb4bNOtTXgNOLzmg6MTyKmPlh+ al7+KkBUUyHVEtTY3kAmK1hiEgc3rhYWoj7atqLfvF6Pqc7/AcZhDvbYZgOhAGKqiPb2 p6wLOqvjLuwnVsKda0HTqIyRh4KJ+FVdLAeNeDjFL9fMZXKMdy701vMGaCXCi5+eRAUs gSrIsOzK6u5dxqNoC9cG0ANClLVj4ZlVo2OGEe3ygykYj6QEYBJyD/T0haKTC8zLfXsl clcA== 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 j12si1374736ejj.20.2021.06.12.14.07.03; Sat, 12 Jun 2021 14:07:26 -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 S231311AbhFLVGw (ORCPT + 99 others); Sat, 12 Jun 2021 17:06:52 -0400 Received: from mga11.intel.com ([192.55.52.93]:10438 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229753AbhFLVGv (ORCPT ); Sat, 12 Jun 2021 17:06:51 -0400 IronPort-SDR: efL0Qq+T4wFzDaR7OYJkyJC+FvzLE0gFFaF81omAd+viriDrNOL40cZzcS6lOfOyM0c1P42aMt F0bB1a25WyMw== X-IronPort-AV: E=McAfee;i="6200,9189,10013"; a="202655507" X-IronPort-AV: E=Sophos;i="5.83,268,1616482800"; d="scan'208";a="202655507" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jun 2021 14:04:52 -0700 IronPort-SDR: F47yiKVKWrqhY3Ze7On1jO8O1Y5r2HPFQ85Uj0IcnoKbgUQZU05MxaTTNMUs9VoqpljaaBpyKm S5ifYln37YTg== X-IronPort-AV: E=Sophos;i="5.83,268,1616482800"; d="scan'208";a="449467873" Received: from rong2-mobl1.amr.corp.intel.com (HELO skuppusw-desk1.amr.corp.intel.com) ([10.254.36.179]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jun 2021 14:04:47 -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 , Sean Christopherson , Kuppuswamy Sathyanarayanan , Kuppuswamy Sathyanarayanan , x86@kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 04/12] x86/x86: Add early_is_tdx_guest() interface Date: Sat, 12 Jun 2021 14:04:45 -0700 Message-Id: <20210612210445.2164948-1-sathyanarayanan.kuppuswamy@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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 in decompression code. Reviewed-by: Andi Kleen Reviewed-by: Tony Luck Signed-off-by: Kuppuswamy Sathyanarayanan --- Changes since v1: * Removed is_tdx_guest() interface. We will rely on prot_guest_has(PR_GUEST_TDX) for TDX related checks. * Renamed is_tdx_guest() to early_is_tdx_guest() as per review suggestion. * Fixed commit title and log to reflect above changes. * Simplified native_cpuid_has_tdx_guest() as per review suggestion. arch/x86/boot/compressed/Makefile | 1 + arch/x86/boot/compressed/tdx.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 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..ddfa4a6d1939 --- /dev/null +++ b/arch/x86/boot/compressed/tdx.c @@ -0,0 +1,28 @@ +// 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, sig[3] = {0}; + + if (native_cpuid_eax(0) < TDX_CPUID_LEAF_ID) + return false; + + native_cpuid(&eax, &sig[0], &sig[1], &sig[2]); + + return !memcmp("IntelTDX ", sig, 12); +} + +bool early_is_tdx_guest(void) +{ + if (tdx_guest < 0) + tdx_guest = native_cpuid_has_tdx_guest(); + + return !!tdx_guest; +} -- 2.25.1