Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp16222845rwd; Mon, 26 Jun 2023 07:18:58 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6/TSy3nsMtRmsL5Db4vEEz1ZYZYHIuTKL6scP0P/pT1Gilyrq+2eAKoqmfaCmkN6pLijeW X-Received: by 2002:a17:90a:a386:b0:261:875:c2be with SMTP id x6-20020a17090aa38600b002610875c2bemr13405450pjp.29.1687789138578; Mon, 26 Jun 2023 07:18:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687789138; cv=none; d=google.com; s=arc-20160816; b=Zp/OtskZm55OWXGLm9IKGWqIXtluGTnJNNSYF9+lKOtr0W8/x63D/5iRS9jJP34Mze Xeo/93XoUTd/sYWAsCmjxCA9XLHQh5I8DMCJNU8BdvjHlBrLpotuURpJxwcjCUQxw0j2 zf/NvcutNAbmdOLGme2nMMItTAkeyec37ehNTRWQtYp69RSe/ZhTHGEk1mjdF42WOUnG H/7K5QrwgtyjP2CYKk2Qcw73rd+I6jvgJgClWl26g2/ib+oJ6AMcLp5f4kOjr508E35N ZBofCp8/m/0uqJgPehygeTq88MOVEJnmcnT+C2wRLqn8LbhChWUHXOcTxyHkZxrV3nGW Jnxg== 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 :dkim-signature; bh=MEB6PUAULYWrhK8ujbZNY49+xs3c+06kytkyxg88xxw=; fh=6HfxY0KVNaGJjlkZjh3Hzm5TphdbqQTBO+53/7gNlSk=; b=quz8DL+4GfR2+YnFow2Spg/mR/qLkGXt0iopj8wcu3Ar5e74AeIw1crcky9dUMSb8i qDDMRDyzAHLG3Ob2uEZCety3H4N5l3F1Co9SKQFvSLy5WjELVECkAC0i+fhRHDpXBO/u hgGVsqdJpzo4b1Smw8PZBnsOkJNK+X4n0p6Hg/HsGaK5D/oHlNauMS2U3eE0jp3CNfb6 3lAsnOq7zfNFeyNs49o7UJHLI98RmD6zbT9fXk22fkE5FB0QVaFp96oXBvtfZ9wWNqkq 2s/7m6yjocE9ZkMcjLKYnD3Zb7lOzZlbIi57yaaHiChMJtFuSzHJKcsTJRrclcf274Hd lCqg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=AORaLCY3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k184-20020a6324c1000000b00541710a9d44si4902558pgk.114.2023.06.26.07.18.45; Mon, 26 Jun 2023 07:18:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=AORaLCY3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231466AbjFZOQW (ORCPT + 99 others); Mon, 26 Jun 2023 10:16:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35240 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231390AbjFZOPy (ORCPT ); Mon, 26 Jun 2023 10:15:54 -0400 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 05BD626B7; Mon, 26 Jun 2023 07:15:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1687788921; x=1719324921; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=7sUUC3QHhe9v8agSed4LLafdaNDuQsaczLJKmfjGoz0=; b=AORaLCY36TQldmvEjWQeGtBKQ+CzUx1Cj3oXZelipvUWeTt3xbIsxN8E CQsj0oRlxZGLuofVy3/IcrUyKJl2tCd299e+U+JLmJYz23Wput6V8HwM5 hm7O+VX4Eu7Ow7vSbtqYrCe2kKwCeZn9bEdMP2h8mqZc9cZdr0qLvQFa7 rXK5PsrwY7qmRtyRKDitleUVCRiC+6XOqYqF+dVbzBQ7JVDnrmxW3Khmf 9TrGOZui9pW4D7ob61Z6h4UUYY4eV5Djm+QUflfXR0CRGLauniomvSZmx gCIE6/x3Rt4B5Im7fN+6LQRAyF4bypwCx/emQzr5n+Xef2a4UJnEefsfD g==; X-IronPort-AV: E=McAfee;i="6600,9927,10753"; a="346033934" X-IronPort-AV: E=Sophos;i="6.01,159,1684825200"; d="scan'208";a="346033934" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Jun 2023 07:15:09 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10753"; a="890292396" X-IronPort-AV: E=Sophos;i="6.01,159,1684825200"; d="scan'208";a="890292396" Received: from smithau-mobl1.amr.corp.intel.com (HELO khuang2-desk.gar.corp.intel.com) ([10.213.179.223]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Jun 2023 07:15:02 -0700 From: Kai Huang To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: linux-mm@kvack.org, x86@kernel.org, dave.hansen@intel.com, kirill.shutemov@linux.intel.com, tony.luck@intel.com, peterz@infradead.org, tglx@linutronix.de, bp@alien8.de, mingo@redhat.com, hpa@zytor.com, seanjc@google.com, pbonzini@redhat.com, david@redhat.com, dan.j.williams@intel.com, rafael.j.wysocki@intel.com, ashok.raj@intel.com, reinette.chatre@intel.com, len.brown@intel.com, ak@linux.intel.com, isaku.yamahata@intel.com, ying.huang@intel.com, chao.gao@intel.com, sathyanarayanan.kuppuswamy@linux.intel.com, nik.borisov@suse.com, bagasdotme@gmail.com, sagis@google.com, imammedo@redhat.com, kai.huang@intel.com Subject: [PATCH v12 14/22] x86/virt/tdx: Configure TDX module with the TDMRs and global KeyID Date: Tue, 27 Jun 2023 02:12:44 +1200 Message-Id: <0978700f954d311a5580b746ec44124d1cb65c28.1687784645.git.kai.huang@intel.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The TDX module uses a private KeyID as the "global KeyID" for mapping things like the PAMT and other TDX metadata. This KeyID has already been reserved when detecting TDX during the kernel early boot. After the list of "TD Memory Regions" (TDMRs) has been constructed to cover all TDX-usable memory regions, the next step is to pass them to the TDX module together with the global KeyID. Signed-off-by: Kai Huang Reviewed-by: Isaku Yamahata Reviewed-by: Kirill A. Shutemov --- v11 -> v12: - Added Kirill's tag v10 -> v11: - No update v9 -> v10: - Code change due to change static 'tdx_tdmr_list' to local 'tdmr_list'. v8 -> v9: - Improved changlog to explain why initializing TDMRs can take long time (Dave). - Improved comments around 'next-to-initialize' address (Dave). v7 -> v8: (Dave) - Changelog: - explicitly call out this is the last step of TDX module initialization. - Trimed down changelog by removing SEAMCALL name and details. - Removed/trimmed down unnecessary comments. - Other changes due to 'struct tdmr_info_list'. v6 -> v7: - Removed need_resched() check. -- Andi. --- arch/x86/virt/vmx/tdx/tdx.c | 41 ++++++++++++++++++++++++++++++++++++- arch/x86/virt/vmx/tdx/tdx.h | 2 ++ 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/arch/x86/virt/vmx/tdx/tdx.c b/arch/x86/virt/vmx/tdx/tdx.c index 2bcace5cb25c..1992245290de 100644 --- a/arch/x86/virt/vmx/tdx/tdx.c +++ b/arch/x86/virt/vmx/tdx/tdx.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -864,6 +865,39 @@ static int construct_tdmrs(struct list_head *tmb_list, return ret; } +static int config_tdx_module(struct tdmr_info_list *tdmr_list, u64 global_keyid) +{ + u64 *tdmr_pa_array; + size_t array_sz; + int i, ret; + + /* + * TDMRs are passed to the TDX module via an array of physical + * addresses of each TDMR. The array itself also has certain + * alignment requirement. + */ + array_sz = tdmr_list->nr_consumed_tdmrs * sizeof(u64); + array_sz = roundup_pow_of_two(array_sz); + if (array_sz < TDMR_INFO_PA_ARRAY_ALIGNMENT) + array_sz = TDMR_INFO_PA_ARRAY_ALIGNMENT; + + tdmr_pa_array = kzalloc(array_sz, GFP_KERNEL); + if (!tdmr_pa_array) + return -ENOMEM; + + for (i = 0; i < tdmr_list->nr_consumed_tdmrs; i++) + tdmr_pa_array[i] = __pa(tdmr_entry(tdmr_list, i)); + + ret = seamcall(TDH_SYS_CONFIG, __pa(tdmr_pa_array), + tdmr_list->nr_consumed_tdmrs, + global_keyid, 0, NULL, NULL); + + /* Free the array as it is not required anymore. */ + kfree(tdmr_pa_array); + + return ret; +} + static int init_tdx_module(void) { struct tdsysinfo_struct *sysinfo; @@ -917,16 +951,21 @@ static int init_tdx_module(void) if (ret) goto out_free_tdmrs; + /* Pass the TDMRs and the global KeyID to the TDX module */ + ret = config_tdx_module(&tdmr_list, tdx_global_keyid); + if (ret) + goto out_free_pamts; + /* * TODO: * - * - Configure the TDMRs and the global KeyID to the TDX module. * - Configure the global KeyID on all packages. * - Initialize all TDMRs. * * Return error before all steps are done. */ ret = -EINVAL; +out_free_pamts: if (ret) tdmrs_free_pamt_all(&tdmr_list); else diff --git a/arch/x86/virt/vmx/tdx/tdx.h b/arch/x86/virt/vmx/tdx/tdx.h index 9b5a65f37e8b..c386aa3afe2a 100644 --- a/arch/x86/virt/vmx/tdx/tdx.h +++ b/arch/x86/virt/vmx/tdx/tdx.h @@ -24,6 +24,7 @@ #define TDH_SYS_INFO 32 #define TDH_SYS_INIT 33 #define TDH_SYS_LP_INIT 35 +#define TDH_SYS_CONFIG 45 struct cmr_info { u64 base; @@ -88,6 +89,7 @@ struct tdmr_reserved_area { } __packed; #define TDMR_INFO_ALIGNMENT 512 +#define TDMR_INFO_PA_ARRAY_ALIGNMENT 512 struct tdmr_info { u64 base; -- 2.40.1