Received: by 2002:a05:7412:3784:b0:e2:908c:2ebd with SMTP id jk4csp505409rdb; Sat, 30 Sep 2023 13:28:31 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFDkclGQkNz1RHjGrRuTxPW5KtaB6/D83SaPpj+qmHi2kZszZ1AjWR8S9tMpIA0GWnYN7Oy X-Received: by 2002:a05:6a00:190b:b0:690:41a1:9b6c with SMTP id y11-20020a056a00190b00b0069041a19b6cmr7501506pfi.10.1696105711228; Sat, 30 Sep 2023 13:28:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696105711; cv=none; d=google.com; s=arc-20160816; b=h1a4T2qmEGomriaL+Zd3eg9B4idkhCZPmen9pau+8MevIn+sMXH+WNgL1Fyr8wixi5 gkAr66MVFn4JTm7aBi7+3X9wOWzoFDmCuWlf0cLKuR9Exb8UUcEpys/uCbyw+x5H8u+c oUAcLqVNmPbhAwZI2VxIFS0+h9Tf1Kcj639K2up5QVZiZTmtqWWyEDuOBMeS47e1SbWo AtowfZIALXbdlg0QJUs4cwjKgP9xlqzp4J667HX2slvvciGc3W30ZbGGabi3jhDYXPZ5 YRlyHRKredNkKMbO8UGmprcHGMP2uYKe5r8KU3K6QI6KY5OQo+/M0nGeuksuyBrUuJSz EWKQ== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=yNKqrkK7gFWu5CGqTYQm5fLL8+YGV5wtJSc6h9IzPpM=; fh=0tgHvBmOWnfoxNpMbZ1Dz28VeIGZMykRgMzt7fauYKM=; b=HxoBb0J0DnjYyhpfEvfVxZBXDdeJmiF9AY17eIiMvcgaUcoEpxIeU/sFsjyW6AQrPy O0Rylq4EkRisgLpA1yov1VTl8mXmXFYDb7CcHrImGShvM0cmo2pdB3MBEn6QCKWrbVWV yNApHP6si6wuKkUZz6p7N1vLB7P3c2qYYuXHU5ZnLMQqkpw/zWNBYcgNCWKcDxHsE4XP Qr+zuPdMqVun2kgsamihVEo8z7g6iBgDL8YyEQt9LaH1vcbHEYAtV+9/7EeCCLhOA6E1 SAIc1pbZRoirighAX7R9qVW9xWFeuvI27TfcN6ejbfO57MDd6aS0nub1/00lVnblAuYE hmvQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=chN7zWoZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id p20-20020a056a000a1400b006902507d409si26010035pfh.174.2023.09.30.13.28.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 Sep 2023 13:28:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=chN7zWoZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 3AC358112A85; Sat, 30 Sep 2023 09:12:13 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234470AbjI3QLz (ORCPT + 99 others); Sat, 30 Sep 2023 12:11:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43336 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231779AbjI3QLy (ORCPT ); Sat, 30 Sep 2023 12:11:54 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 330D1B9 for ; Sat, 30 Sep 2023 09:11:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1696090311; x=1727626311; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=54TB47Ve2g3NQfBdZ3OcMfBVNFAiDr22rl1oeSleK5o=; b=chN7zWoZ/5EPTfiSp5aWz6GgkJzSjFS5EqLZQS8tQ6KyAYSIQ5Preezq /OC3tLfkJc6uU0ZrWbPIk2LxSU7IgnfO7tWUzldbPyC65UqQFL0/sL6Pa POOofUuaxa9E5I30n1hl7ULHqc0Fh8S0BiygZgbqAjBPJGFpcFNHZOoJj reL0uDYIIXhB2v0dyasWWrQUX0MPDEsrFwERbrm03C2s0JkulKIMn6+OJ RSbmEtpoEVF160VOGPzlFCE5UkEG0uf9wNbgQf19e5J3/aZ27VCzkxzC/ hj/5WXIqd5jTzpP1OcPi5eht+XmujcBh5IxaFkANf+9yYq19bOChfy7JK w==; X-IronPort-AV: E=McAfee;i="6600,9927,10849"; a="361840558" X-IronPort-AV: E=Sophos;i="6.03,190,1694761200"; d="scan'208";a="361840558" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Sep 2023 09:11:50 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10849"; a="815869669" X-IronPort-AV: E=Sophos;i="6.03,190,1694761200"; d="scan'208";a="815869669" Received: from sunyi-station.sh.intel.com (HELO ysun46-mobl.sh.intel.com) ([10.239.159.10]) by fmsmga008.fm.intel.com with ESMTP; 30 Sep 2023 09:11:48 -0700 From: Yi Sun To: kirill.shutemov@linux.intel.com, sathyanarayanan.kuppuswamy@linux.intel.com, linux-kernel@vger.kernel.org Cc: heng.su@intel.com, yi.sun@linux.intel.com, Yi Sun , Dongcheng Yan Subject: [PATCH v3] x86/tdx: Dump TDX version During the TD Bootup Date: Sun, 1 Oct 2023 00:11:10 +0800 Message-Id: <20230930161110.3251107-1-yi.sun@intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Sat, 30 Sep 2023 09:12:13 -0700 (PDT) It is essential for TD users to be aware of the vendor and version of the current TDX. Additionally, they can reference the TDX version when reporting bugs or issues. Furthermore, the applications or device drivers running in TD can achieve enhanced reliability and flexibility by following the TDX Module ABI specification, because there are significant differences between different versions of TDX, as mentioned in the "IntelĀ® TDX Module Incompatibilities between v1.0 and v1.5" reference. Here are a few examples: MSR Name Index Reason ---------------------------------------------- IA32_UARCH_MISC_CTL 0x1B01 From v1.5 IA32_ARCH_CAPABILITIES 0x010A Changed in v1.5 IA32_TSX_CTRL 0x0122 Changed in v1.5 CPUID Leaf Sub-leaf Reason --------------------------------------- 0x7 2 From v1.5 0x22 0 From v1.5 0x23 0~3 From v1.5 0x80000007 0 From v1.5 During TD initialization, the TDX version info can be obtained by calling TDG.SYS.RD. This will fetch the current version of TDX, including the major and minor version numbers and vendor ID. The TDCALL TDG.SYS.RD originates from TDX version 1.5. If the error TDCALL_INVALID_OPERAND occurs, it should be treated as TDX version 1.0. Co-developed-by: Dongcheng Yan Signed-off-by: Dongcheng Yan Signed-off-by: Yi Sun diff --git a/arch/x86/coco/tdx/tdx.c b/arch/x86/coco/tdx/tdx.c index 1d6b863c42b0..052376d521d1 100644 --- a/arch/x86/coco/tdx/tdx.c +++ b/arch/x86/coco/tdx/tdx.c @@ -37,6 +37,24 @@ #define TDREPORT_SUBTYPE_0 0 +/* + * TDX metadata base field id, used by TDCALL TDG.SYS.RD + * See TDX ABI Spec section 3.3.2.3 Global Metadata Fields + */ +#define TDX_SYS_VENDOR_ID_FID 0x0800000200000000ULL +#define TDX_SYS_MINOR_FID 0x0800000100000003ULL +#define TDX_SYS_MAJOR_FID 0x0800000100000004ULL +#define TDX_VENDOR_INTEL 0x8086 + +/* + * The global-scope metadata field via TDG.SYS.RD TDCALL + */ +struct tdg_sys_info { + u32 vendor_id; + u16 major_version; + u16 minor_version; +}; + /* Called from __tdx_hypercall() for unrecoverable failure */ noinstr void __tdx_hypercall_failed(void) { @@ -757,10 +775,54 @@ static bool tdx_enc_status_change_finish(unsigned long vaddr, int numpages, return true; } +/* + * Parse the tdx module version info from the global-scope metadata fields. + */ +static int tdg_get_sysinfo(struct tdg_sys_info *td_sys) +{ + struct tdx_module_output out; + u64 ret; + + if (!td_sys) + return -EINVAL; + + ret = __tdx_module_call(TDX_SYS_RD, 0, TDX_SYS_VENDOR_ID_FID, 0, 0, + &out); + if (TDCALL_RETURN_CODE(ret) == TDCALL_INVALID_OPERAND) + goto version_1_0; + else if (ret) + return ret; + + td_sys->vendor_id = (u32)out.r8; + + ret = __tdx_module_call(TDX_SYS_RD, 0, TDX_SYS_MAJOR_FID, 0, 0, &out); + if (ret) + return ret; + + td_sys->major_version = (u16)out.r8; + + ret = __tdx_module_call(TDX_SYS_RD, 0, TDX_SYS_MINOR_FID, 0, 0, &out); + if (ret) + return ret; + + td_sys->minor_version = (u16)out.r8; + + return 0; + + /* TDX 1.0 does not have the TDCALL TDG.SYS.RD */ +version_1_0: + td_sys->vendor_id = TDX_VENDOR_INTEL; + td_sys->major_version = 1; + td_sys->minor_version = 0; + + return 0; +} + void __init tdx_early_init(void) { u64 cc_mask; u32 eax, sig[3]; + struct tdg_sys_info td_sys_info; cpuid_count(TDX_CPUID_LEAF_ID, 0, &eax, &sig[0], &sig[2], &sig[1]); @@ -820,5 +882,9 @@ void __init tdx_early_init(void) */ x86_cpuinit.parallel_bringup = false; - pr_info("Guest detected\n"); + tdg_get_sysinfo(&td_sys_info); + + pr_info("Guest detected. TDX version:%u.%u VendorID: %x\n", + td_sys_info.major_version, td_sys_info.minor_version, + td_sys_info.vendor_id); } diff --git a/arch/x86/include/asm/shared/tdx.h b/arch/x86/include/asm/shared/tdx.h index 7513b3bb69b7..10ecb5dece84 100644 --- a/arch/x86/include/asm/shared/tdx.h +++ b/arch/x86/include/asm/shared/tdx.h @@ -16,6 +16,7 @@ #define TDX_GET_REPORT 4 #define TDX_ACCEPT_PAGE 6 #define TDX_WR 8 +#define TDX_SYS_RD 11 /* TDCS fields. To be used by TDG.VM.WR and TDG.VM.RD module calls */ #define TDCS_NOTIFY_ENABLES 0x9100000000000010 -- 2.34.1