From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0D3ABC433B4 for ; Mon, 26 Apr 2021 18:04:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C7AF9613BB for ; Mon, 26 Apr 2021 18:04:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236301AbhDZSFc (ORCPT ); Mon, 26 Apr 2021 14:05:32 -0400 Received: from mga06.intel.com ([134.134.136.31]:20703 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234332AbhDZSDn (ORCPT ); Mon, 26 Apr 2021 14:03:43 -0400 IronPort-SDR: /cLCCydUj5EWjQGJMDnSFAOEcEL/gNNM3dTyIZyywcgPmt8em8MDYw6Cr7yZg0XjK9ury13QHG 5+3YG+Ey9S/g== X-IronPort-AV: E=McAfee;i="6200,9189,9966"; a="257683621" X-IronPort-AV: E=Sophos;i="5.82,252,1613462400"; d="scan'208";a="257683621" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Apr 2021 11:02:57 -0700 IronPort-SDR: c7r8uBpw/DRcK2HKy1W1UJV7XGAIA7MmmcGl3XXUKt+HZP4hnsBqEMUBOCeqynRTx7H0ObSVdj Pr7k5Eb7UXNA== X-IronPort-AV: E=Sophos;i="5.82,252,1613462400"; d="scan'208";a="447353452" Received: from ssumanpx-mobl.amr.corp.intel.com (HELO skuppusw-mobl5.amr.corp.intel.com) ([10.254.34.197]) by fmsmga004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Apr 2021 11:02:56 -0700 From: Kuppuswamy Sathyanarayanan To: Peter Zijlstra , Andy Lutomirski , Dave Hansen , Dan Williams , Tony Luck Cc: Andi Kleen , Kirill Shutemov , Kuppuswamy Sathyanarayanan , Raj Ashok , Sean Christopherson , linux-kernel@vger.kernel.org, Kuppuswamy Sathyanarayanan Subject: [RFC v2 29/32] x86/tdx: Add helper to do MapGPA TDVMALL Date: Mon, 26 Apr 2021 11:01:56 -0700 Message-Id: <7d43f57c3b178a905ef2505cef5313844c497984.1619458733.git.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 From: "Kirill A. Shutemov" MapGPA TDVMCALL requests the host VMM to map a GPA range as private or shared memory mappings. Shared GPA mappings can be used for communication beteen TD guest and host VMM, for example for paravirtualized IO. The new helper tdx_map_gpa() provides access to the operation. Signed-off-by: Kirill A. Shutemov Reviewed-by: Andi Kleen Signed-off-by: Kuppuswamy Sathyanarayanan --- arch/x86/include/asm/tdx.h | 13 +++++++++++++ arch/x86/kernel/tdx.c | 13 +++++++++++++ 2 files changed, 26 insertions(+) diff --git a/arch/x86/include/asm/tdx.h b/arch/x86/include/asm/tdx.h index dc80cf7f7d08..4789798d7737 100644 --- a/arch/x86/include/asm/tdx.h +++ b/arch/x86/include/asm/tdx.h @@ -7,6 +7,11 @@ #ifndef __ASSEMBLY__ +enum tdx_map_type { + TDX_MAP_PRIVATE, + TDX_MAP_SHARED, +}; + #ifdef CONFIG_INTEL_TDX_GUEST #include @@ -112,6 +117,8 @@ unsigned short tdg_inw(unsigned short port); unsigned int tdg_inl(unsigned short port); extern phys_addr_t tdg_shared_mask(void); +extern int tdg_map_gpa(phys_addr_t gpa, int numpages, + enum tdx_map_type map_type); #else // !CONFIG_INTEL_TDX_GUEST @@ -155,6 +162,12 @@ static inline phys_addr_t tdg_shared_mask(void) { return 0; } + +static inline int tdg_map_gpa(phys_addr_t gpa, int numpages, + enum tdx_map_type map_type) +{ + return -ENODEV; +} #endif /* CONFIG_INTEL_TDX_GUEST */ #endif /* __ASSEMBLY__ */ #endif /* _ASM_X86_TDX_H */ diff --git a/arch/x86/kernel/tdx.c b/arch/x86/kernel/tdx.c index 7e391cd7aa2b..074136473011 100644 --- a/arch/x86/kernel/tdx.c +++ b/arch/x86/kernel/tdx.c @@ -15,6 +15,8 @@ #include "tdx-kvm.c" #endif +#define TDVMCALL_MAP_GPA 0x10001 + static struct { unsigned int gpa_width; unsigned long attributes; @@ -98,6 +100,17 @@ static void tdg_get_info(void) physical_mask &= ~tdg_shared_mask(); } +int tdg_map_gpa(phys_addr_t gpa, int numpages, enum tdx_map_type map_type) +{ + u64 ret; + + if (map_type == TDX_MAP_SHARED) + gpa |= tdg_shared_mask(); + + ret = tdvmcall(TDVMCALL_MAP_GPA, gpa, PAGE_SIZE * numpages, 0, 0); + return ret ? -EIO : 0; +} + static __cpuidle void tdg_halt(void) { u64 ret; -- 2.25.1