From patchwork Thu May 18 23:14:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirill A . Shutemov" X-Patchwork-Id: 13247513 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2FFFCC77B73 for ; Thu, 18 May 2023 23:15:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9D05390000D; Thu, 18 May 2023 19:15:09 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 95A43900009; Thu, 18 May 2023 19:15:09 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7380390000D; Thu, 18 May 2023 19:15:09 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 588C8900009 for ; Thu, 18 May 2023 19:15:09 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 246D21C78B7 for ; Thu, 18 May 2023 23:15:09 +0000 (UTC) X-FDA: 80804933538.05.4962B5A Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by imf05.hostedemail.com (Postfix) with ESMTP id 1107810000B for ; Thu, 18 May 2023 23:15:06 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b="c7/jejpI"; dmarc=pass (policy=none) header.from=intel.com; spf=none (imf05.hostedemail.com: domain of kirill.shutemov@linux.intel.com has no SPF policy when checking 134.134.136.20) smtp.mailfrom=kirill.shutemov@linux.intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1684451707; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=cAZ5dclHmr3bPqqN6wlS/ms38HkegOt+k+1Qe8V3J/Y=; b=uVHjELikxoOaDgGW4CMqaJ7lciEfeAcYnjNWZZuCfdbaOb6ImjvWQokfQzCtZEfApZvMAn V37to9sfqrwk9B7FLazBVDMwsPU7xZ5FMQBgteKpIav87QmQAa6hMvLTcE09BBol/RxZkn UgxDf0ty5SN3iMk/a6YH1RL/wRfKF+Y= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b="c7/jejpI"; dmarc=pass (policy=none) header.from=intel.com; spf=none (imf05.hostedemail.com: domain of kirill.shutemov@linux.intel.com has no SPF policy when checking 134.134.136.20) smtp.mailfrom=kirill.shutemov@linux.intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684451707; a=rsa-sha256; cv=none; b=cpMtrNhaNarvSAZemTY68FmodHSHYgxQIsRxlnnRMd/7Vl8GOn1NS2hvv+EeL6ijPg/WDf 62A66ycQnrxkmrGhOd1610W1yMclGFtHhDmllinVI+t+SYedTPZcPRDJQR5P9PxdyvmQQX 0Hf4WS40nwYXWoSS11ogv/ZHQy9m4zA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1684451707; x=1715987707; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Eu57mUO9ct2ICW4Etq/GrS2vGWKQMEDS8IVWtzUCpBo=; b=c7/jejpIlTcZsq0kzlwlZbnEm0mg8apDPq1pMIyxFoYAA+wt2K6gMZc3 kXj+9KQpYdqdczUcs1UdlKOizU4kVYbePI2s2GFvHj36vUBr2d0+LLRor rCAwvPwu0EK7scYRgq0EfDfvZLs/rG+aBWq7W3vvRPYFgpaC+87gSs9vG dnvBjEObFoEQfLYaR7FQOiflprLzVDUWTHnTWepVWEoy27XUbJBptO0AQ qRG/NvHix3lwRXnwv9nLkdcJSUJjZQ1QBzxX4a2DBtCuzlbxuE3aGttV9 sZ6YFxEmt8foJpXkzLyUTwhvAK+KO//ahpZOY46ewCRzH8vbwpYDlnyEC g==; X-IronPort-AV: E=McAfee;i="6600,9927,10714"; a="341652156" X-IronPort-AV: E=Sophos;i="6.00,175,1681196400"; d="scan'208";a="341652156" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 May 2023 16:15:00 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10714"; a="772065107" X-IronPort-AV: E=Sophos;i="6.00,175,1681196400"; d="scan'208";a="772065107" Received: from rkiyama-mobl1.amr.corp.intel.com (HELO box.shutemov.name) ([10.251.222.16]) by fmsmga004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 May 2023 16:14:52 -0700 Received: by box.shutemov.name (Postfix, from userid 1000) id 6149C10DFD4; Fri, 19 May 2023 02:14:40 +0300 (+03) From: "Kirill A. Shutemov" To: Borislav Petkov , Andy Lutomirski , Dave Hansen , Sean Christopherson , Andrew Morton , Joerg Roedel , Ard Biesheuvel Cc: Andi Kleen , Kuppuswamy Sathyanarayanan , David Rientjes , Vlastimil Babka , Tom Lendacky , Thomas Gleixner , Peter Zijlstra , Paolo Bonzini , Ingo Molnar , Dario Faggioli , Mike Rapoport , David Hildenbrand , Mel Gorman , marcelo.cerri@canonical.com, tim.gardner@canonical.com, khalid.elmously@canonical.com, philip.cox@canonical.com, aarcange@redhat.com, peterx@redhat.com, x86@kernel.org, linux-mm@kvack.org, linux-coco@lists.linux.dev, linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org, "Kirill A. Shutemov" , Dave Hansen Subject: [PATCHv12 7/9] x86/tdx: Make _tdx_hypercall() and __tdx_module_call() available in boot stub Date: Fri, 19 May 2023 02:14:32 +0300 Message-Id: <20230518231434.26080-8-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20230518231434.26080-1-kirill.shutemov@linux.intel.com> References: <20230518231434.26080-1-kirill.shutemov@linux.intel.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 1107810000B X-Stat-Signature: xmbzx313rcyqbtwa7irxde88a1rnsdoc X-HE-Tag: 1684451706-66272 X-HE-Meta: U2FsdGVkX19hxr8Kf7MQ4a+2OfPA9xyAWe5SRtTCG7WSaLl645YpZmGZJ4bk4m97SAvhPO19TF7Dp56b1DplDo2uht/+EtI+dv51kuCNepqeWTFq087k9KLfzKgNkXxH5w+ijVjF4vdTWm/iKoIJrHScwH3JA9f2Ctr0UHl0Sn8GR2Giy4TcMFwhh45u0DDRyLksw53ztqbZ8IG7pUWa4qNE2Oqe+GAtqNoH+2mLqeZTQudiDQBTMadsRWOK7nqqhZiwLoDMkeIX8gl+NYN+u2unxvQSJ3gZBo3zEghy00j6nDDKpahwBT6oiWA6GuoQvOtXCW3914lKyljMN8/x2Cdi0Zr4b6W9gFIdxmY9BO7uGdiT6nZ1sX72r0uLzCI0ZItOyX4CVf0/7Eer023fMpzBbWCnF2V10oQbrxAkbrSQ5sEKTl3m3bHahMl2PhZlMh5/bj0d1JX+xc0fm/ZAd+fEzholxmvLz8Lhbdf1exonClAh2VvZbiXstYQkMgc2it4imvRQzGT0cY6Iiav+WPUkCbrL4ugn3qwW0lgpwbLDMrJDdhDSw4YO0Kn4gfZe/4Q4W6ybMNkcXpGVoPtRMKa/motEuotd0OlOe8/CQ6c8SZgYelmCbPYFobt/DcO2v20nYF7k80QX4V+EmhZC2PfJ1RgaSjwKQwEmlu3nXVkIRD7wPDP/m3PO2hVX98kZMo0GZNzX2bh/5G89KOUv6BXzUxBpA0usK9yNR44LrWHpWevWrNupS3DLZJau6nMNOzmvzXTVUY1Ujn/R+Zlw6V+FeyetGp4FuQ386O8RQ24gd2LMVf8geNlEfoERuMPjytM9nwARMUoEqbC99Y38J1kzJsDSRIooCs3r1m/7g5qKZ75fVIVC7WC3cItzurce3WdNFwmoxgF4NSok6Rd0Eret7EVIK+wnjIOBudXCsbUBJVxyPBzsxNeM7LZCiOXO8dDfaEwD4tyyBcWFKvo gU7VC/Cb pMSRT9ygLMuF6AmqVv1BHxsi1uymadQ+uUyc8wiGTMFWUOypp2QbQ97t33L407fRZ6NJg+9Q1n/n7ywusDDxYDI3Q3NgfDI6883hZhqHON4uYzZL3gzCsxLUhRrG2/wj0bVtOgp8iZnTKbSK1ppQIiZ+3XWQjB56fn9/T0IBlG6Gn9wbCWiIT9IxxOLp7aVWe7iQ7 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Memory acceptance requires a hypercall and one or multiple module calls. Make helpers for the calls available in boot stub. It has to accept memory where kernel image and initrd are placed. Signed-off-by: Kirill A. Shutemov Reviewed-by: Dave Hansen --- arch/x86/coco/tdx/tdx.c | 32 ------------------- arch/x86/include/asm/shared/tdx.h | 51 +++++++++++++++++++++++++++++++ arch/x86/include/asm/tdx.h | 19 ------------ 3 files changed, 51 insertions(+), 51 deletions(-) diff --git a/arch/x86/coco/tdx/tdx.c b/arch/x86/coco/tdx/tdx.c index e146b599260f..e6f4c2758a68 100644 --- a/arch/x86/coco/tdx/tdx.c +++ b/arch/x86/coco/tdx/tdx.c @@ -14,20 +14,6 @@ #include #include -/* TDX module Call Leaf IDs */ -#define TDX_GET_INFO 1 -#define TDX_GET_VEINFO 3 -#define TDX_GET_REPORT 4 -#define TDX_ACCEPT_PAGE 6 -#define TDX_WR 8 - -/* TDCS fields. To be used by TDG.VM.WR and TDG.VM.RD module calls */ -#define TDCS_NOTIFY_ENABLES 0x9100000000000010 - -/* TDX hypercall Leaf IDs */ -#define TDVMCALL_MAP_GPA 0x10001 -#define TDVMCALL_REPORT_FATAL_ERROR 0x10003 - /* MMIO direction */ #define EPT_READ 0 #define EPT_WRITE 1 @@ -51,24 +37,6 @@ #define TDREPORT_SUBTYPE_0 0 -/* - * Wrapper for standard use of __tdx_hypercall with no output aside from - * return code. - */ -static inline u64 _tdx_hypercall(u64 fn, u64 r12, u64 r13, u64 r14, u64 r15) -{ - struct tdx_hypercall_args args = { - .r10 = TDX_HYPERCALL_STANDARD, - .r11 = fn, - .r12 = r12, - .r13 = r13, - .r14 = r14, - .r15 = r15, - }; - - return __tdx_hypercall(&args); -} - /* Called from __tdx_hypercall() for unrecoverable failure */ noinstr void __tdx_hypercall_failed(void) { diff --git a/arch/x86/include/asm/shared/tdx.h b/arch/x86/include/asm/shared/tdx.h index 2631e01f6e0f..1ff0ee822961 100644 --- a/arch/x86/include/asm/shared/tdx.h +++ b/arch/x86/include/asm/shared/tdx.h @@ -10,6 +10,20 @@ #define TDX_CPUID_LEAF_ID 0x21 #define TDX_IDENT "IntelTDX " +/* TDX module Call Leaf IDs */ +#define TDX_GET_INFO 1 +#define TDX_GET_VEINFO 3 +#define TDX_GET_REPORT 4 +#define TDX_ACCEPT_PAGE 6 +#define TDX_WR 8 + +/* TDCS fields. To be used by TDG.VM.WR and TDG.VM.RD module calls */ +#define TDCS_NOTIFY_ENABLES 0x9100000000000010 + +/* TDX hypercall Leaf IDs */ +#define TDVMCALL_MAP_GPA 0x10001 +#define TDVMCALL_REPORT_FATAL_ERROR 0x10003 + #ifndef __ASSEMBLY__ /* @@ -37,8 +51,45 @@ struct tdx_hypercall_args { u64 __tdx_hypercall(struct tdx_hypercall_args *args); u64 __tdx_hypercall_ret(struct tdx_hypercall_args *args); +/* + * Wrapper for standard use of __tdx_hypercall with no output aside from + * return code. + */ +static inline u64 _tdx_hypercall(u64 fn, u64 r12, u64 r13, u64 r14, u64 r15) +{ + struct tdx_hypercall_args args = { + .r10 = TDX_HYPERCALL_STANDARD, + .r11 = fn, + .r12 = r12, + .r13 = r13, + .r14 = r14, + .r15 = r15, + }; + + return __tdx_hypercall(&args); +} + + /* Called from __tdx_hypercall() for unrecoverable failure */ void __tdx_hypercall_failed(void); +/* + * Used in __tdx_module_call() to gather the output registers' values of the + * TDCALL instruction when requesting services from the TDX module. This is a + * software only structure and not part of the TDX module/VMM ABI + */ +struct tdx_module_output { + u64 rcx; + u64 rdx; + u64 r8; + u64 r9; + u64 r10; + u64 r11; +}; + +/* Used to communicate with the TDX module */ +u64 __tdx_module_call(u64 fn, u64 rcx, u64 rdx, u64 r8, u64 r9, + struct tdx_module_output *out); + #endif /* !__ASSEMBLY__ */ #endif /* _ASM_X86_SHARED_TDX_H */ diff --git a/arch/x86/include/asm/tdx.h b/arch/x86/include/asm/tdx.h index 28d889c9aa16..234197ec17e4 100644 --- a/arch/x86/include/asm/tdx.h +++ b/arch/x86/include/asm/tdx.h @@ -20,21 +20,6 @@ #ifndef __ASSEMBLY__ -/* - * Used to gather the output registers values of the TDCALL and SEAMCALL - * instructions when requesting services from the TDX module. - * - * This is a software only structure and not part of the TDX module/VMM ABI. - */ -struct tdx_module_output { - u64 rcx; - u64 rdx; - u64 r8; - u64 r9; - u64 r10; - u64 r11; -}; - /* * Used by the #VE exception handler to gather the #VE exception * info from the TDX module. This is a software only structure @@ -55,10 +40,6 @@ struct ve_info { void __init tdx_early_init(void); -/* Used to communicate with the TDX module */ -u64 __tdx_module_call(u64 fn, u64 rcx, u64 rdx, u64 r8, u64 r9, - struct tdx_module_output *out); - void tdx_get_ve_info(struct ve_info *ve); bool tdx_handle_virt_exception(struct pt_regs *regs, struct ve_info *ve);