mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Kai Huang <kai.huang@intel.com>
To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org
Cc: 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 v13 02/22] x86/tdx: Define TDX supported page sizes as macros
Date: Sat, 26 Aug 2023 00:14:21 +1200	[thread overview]
Message-ID: <39174b01de1b0a16eded0982487a5b6a4fda6318.1692962263.git.kai.huang@intel.com> (raw)
In-Reply-To: <cover.1692962263.git.kai.huang@intel.com>

TDX supports 4K, 2M and 1G page sizes.  The corresponding values are
defined by the TDX module spec and used as TDX module ABI.  Currently,
they are used in try_accept_one() when the TDX guest tries to accept a
page.  However currently try_accept_one() uses hard-coded magic values.

Define TDX supported page sizes as macros and get rid of the hard-coded
values in try_accept_one().  TDX host support will need to use them too.

Signed-off-by: Kai Huang <kai.huang@intel.com>
Reviewed-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Reviewed-by: Dave Hansen <dave.hansen@linux.intel.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
---
 arch/x86/coco/tdx/tdx-shared.c    | 6 +++---
 arch/x86/include/asm/shared/tdx.h | 5 +++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/arch/x86/coco/tdx/tdx-shared.c b/arch/x86/coco/tdx/tdx-shared.c
index 78e413269791..1655aa56a0a5 100644
--- a/arch/x86/coco/tdx/tdx-shared.c
+++ b/arch/x86/coco/tdx/tdx-shared.c
@@ -22,13 +22,13 @@ static unsigned long try_accept_one(phys_addr_t start, unsigned long len,
 	 */
 	switch (pg_level) {
 	case PG_LEVEL_4K:
-		page_size = 0;
+		page_size = TDX_PS_4K;
 		break;
 	case PG_LEVEL_2M:
-		page_size = 1;
+		page_size = TDX_PS_2M;
 		break;
 	case PG_LEVEL_1G:
-		page_size = 2;
+		page_size = TDX_PS_1G;
 		break;
 	default:
 		return 0;
diff --git a/arch/x86/include/asm/shared/tdx.h b/arch/x86/include/asm/shared/tdx.h
index 8d1427562c63..257a41d0a36d 100644
--- a/arch/x86/include/asm/shared/tdx.h
+++ b/arch/x86/include/asm/shared/tdx.h
@@ -52,6 +52,11 @@
 	(TDX_RDX | TDX_RBX | TDX_RSI | TDX_RDI | TDX_R8  | TDX_R9  | \
 	 TDX_R10 | TDX_R11 | TDX_R12 | TDX_R13 | TDX_R14 | TDX_R15)
 
+/* TDX supported page sizes from the TDX module ABI. */
+#define TDX_PS_4K	0
+#define TDX_PS_2M	1
+#define TDX_PS_1G	2
+
 #ifndef __ASSEMBLY__
 
 /*
-- 
2.41.0


  parent reply	other threads:[~2023-08-25 12:16 UTC|newest]

Thread overview: 52+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-25 12:14 [PATCH v13 00/22] TDX host kernel support Kai Huang
2023-08-25 12:14 ` [PATCH v13 01/22] x86/virt/tdx: Detect TDX during kernel boot Kai Huang
2023-09-08 15:19   ` Dave Hansen
2023-08-25 12:14 ` Kai Huang [this message]
2023-08-25 12:14 ` [PATCH v13 03/22] x86/virt/tdx: Make INTEL_TDX_HOST depend on X86_X2APIC Kai Huang
2023-08-25 12:14 ` [PATCH v13 04/22] x86/cpu: Detect TDX partial write machine check erratum Kai Huang
2023-09-08 15:22   ` Dave Hansen
2023-09-11 12:39     ` Huang, Kai
2023-08-25 12:14 ` [PATCH v13 05/22] x86/virt/tdx: Handle SEAMCALL no entropy error in common code Kai Huang
2023-09-08 16:21   ` Dave Hansen
2023-09-11 11:41     ` Huang, Kai
2023-08-25 12:14 ` [PATCH v13 06/22] x86/virt/tdx: Add SEAMCALL error printing for module initialization Kai Huang
2023-09-07 12:45   ` Nikolay Borisov
2023-09-08 10:33     ` Huang, Kai
2023-09-08 10:38       ` Nikolay Borisov
2023-09-08 11:00         ` Huang, Kai
2023-09-08 16:31   ` Dave Hansen
2023-09-11 12:07     ` Huang, Kai
2023-08-25 12:14 ` [PATCH v13 07/22] x86/virt/tdx: Add skeleton to enable TDX on demand Kai Huang
2023-09-07 14:19   ` Nikolay Borisov
2023-09-08 10:16     ` Huang, Kai
2023-08-25 12:14 ` [PATCH v13 08/22] x86/virt/tdx: Get information about TDX module and TDX-capable memory Kai Huang
2023-08-25 12:14 ` [PATCH v13 09/22] x86/virt/tdx: Use all system memory when initializing TDX module as TDX memory Kai Huang
2023-08-25 12:14 ` [PATCH v13 10/22] x86/virt/tdx: Add placeholder to construct TDMRs to cover all TDX memory regions Kai Huang
2023-08-25 12:14 ` [PATCH v13 11/22] x86/virt/tdx: Fill out " Kai Huang
2023-08-25 12:14 ` [PATCH v13 12/22] x86/virt/tdx: Allocate and set up PAMTs for TDMRs Kai Huang
2023-08-25 12:14 ` [PATCH v13 13/22] x86/virt/tdx: Designate reserved areas for all TDMRs Kai Huang
2023-08-25 12:14 ` [PATCH v13 14/22] x86/virt/tdx: Configure TDX module with the TDMRs and global KeyID Kai Huang
2023-08-25 12:14 ` [PATCH v13 15/22] x86/virt/tdx: Configure global KeyID on all packages Kai Huang
2023-08-25 12:14 ` [PATCH v13 16/22] x86/virt/tdx: Initialize all TDMRs Kai Huang
2023-08-25 12:14 ` [PATCH v13 17/22] x86/kexec: Flush cache of TDX private memory Kai Huang
2023-09-15 17:43   ` Edgecombe, Rick P
2023-09-15 17:50     ` Dave Hansen
2023-09-18 12:08       ` Huang, Kai
2023-09-18 15:44         ` Dave Hansen
2023-09-18 22:14           ` Huang, Kai
2023-08-25 12:14 ` [PATCH v13 18/22] x86/virt/tdx: Keep TDMRs when module initialization is successful Kai Huang
2023-09-15 23:10   ` Edgecombe, Rick P
2023-09-15 23:10   ` Edgecombe, Rick P
2023-08-25 12:14 ` [PATCH v13 19/22] x86/virt/tdx: Improve readibility of module initialization error handling Kai Huang
2023-09-15 23:14   ` Edgecombe, Rick P
2023-08-25 12:14 ` [PATCH v13 20/22] x86/kexec(): Reset TDX private memory on platforms with TDX erratum Kai Huang
2023-09-14 21:36   ` Edgecombe, Rick P
2023-09-15 11:42     ` Huang, Kai
2023-09-15 16:42       ` Edgecombe, Rick P
2023-09-18  4:36         ` Huang, Kai
2023-08-25 12:14 ` [PATCH v13 21/22] x86/mce: Improve error log of kernel space TDX #MC due to erratum Kai Huang
2023-08-25 12:14 ` [PATCH v13 22/22] Documentation/x86: Add documentation for TDX host support Kai Huang
2023-09-11 11:32   ` Nikolay Borisov
2023-09-13 11:27     ` Huang, Kai
2023-09-28  7:48 ` [PATCH v13 00/22] TDX host kernel support Nikolay Borisov
2023-09-28 10:19   ` Huang, Kai

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=39174b01de1b0a16eded0982487a5b6a4fda6318.1692962263.git.kai.huang@intel.com \
    --to=kai.huang@intel.com \
    --cc=ak@linux.intel.com \
    --cc=ashok.raj@intel.com \
    --cc=bagasdotme@gmail.com \
    --cc=bp@alien8.de \
    --cc=chao.gao@intel.com \
    --cc=dan.j.williams@intel.com \
    --cc=dave.hansen@intel.com \
    --cc=david@redhat.com \
    --cc=hpa@zytor.com \
    --cc=imammedo@redhat.com \
    --cc=isaku.yamahata@intel.com \
    --cc=kirill.shutemov@linux.intel.com \
    --cc=kvm@vger.kernel.org \
    --cc=len.brown@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@redhat.com \
    --cc=nik.borisov@suse.com \
    --cc=pbonzini@redhat.com \
    --cc=peterz@infradead.org \
    --cc=rafael.j.wysocki@intel.com \
    --cc=reinette.chatre@intel.com \
    --cc=sagis@google.com \
    --cc=sathyanarayanan.kuppuswamy@linux.intel.com \
    --cc=seanjc@google.com \
    --cc=tglx@linutronix.de \
    --cc=tony.luck@intel.com \
    --cc=x86@kernel.org \
    --cc=ying.huang@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®