Linux Kernel Selftest development
 help / color / mirror / Atom feed
From: Sagi Shahar <sagis@google.com>
To: linux-kselftest@vger.kernel.org,
	Paolo Bonzini <pbonzini@redhat.com>,
	 Shuah Khan <shuah@kernel.org>,
	Sean Christopherson <seanjc@google.com>,
	 Ackerley Tng <ackerleytng@google.com>,
	Ryan Afranji <afranji@google.com>,
	 Andrew Jones <ajones@ventanamicro.com>,
	Isaku Yamahata <isaku.yamahata@intel.com>,
	 Erdem Aktas <erdemaktas@google.com>,
	Rick Edgecombe <rick.p.edgecombe@intel.com>,
	 Sagi Shahar <sagis@google.com>,
	Roger Wang <runanwang@google.com>,
	 Binbin Wu <binbin.wu@linux.intel.com>,
	Oliver Upton <oliver.upton@linux.dev>,
	 "Pratik R. Sampat" <pratikrajesh.sampat@amd.com>,
	Reinette Chatre <reinette.chatre@intel.com>
Cc: linux-kernel@vger.kernel.org, kvm@vger.kernel.org
Subject: [PATCH v7 08/30] KVM: selftests: TDX: Update load_td_memory_region() for VM memory backed by guest memfd
Date: Fri, 13 Jun 2025 12:13:35 -0700	[thread overview]
Message-ID: <20250613191359.35078-9-sagis@google.com> (raw)
In-Reply-To: <20250613191359.35078-1-sagis@google.com>

From: Ackerley Tng <ackerleytng@google.com>

If guest memory is backed by restricted memfd

+ UPM is being used, hence encrypted memory region has to be
  registered
+ Can avoid making a copy of guest memory before getting TDX to
  initialize the memory region

Signed-off-by: Ackerley Tng <ackerleytng@google.com>
Signed-off-by: Sagi Shahar <sagis@google.com>
---
 .../selftests/kvm/lib/x86/tdx/tdx_util.c      | 38 +++++++++++++++----
 1 file changed, 30 insertions(+), 8 deletions(-)

diff --git a/tools/testing/selftests/kvm/lib/x86/tdx/tdx_util.c b/tools/testing/selftests/kvm/lib/x86/tdx/tdx_util.c
index bb074af4a476..e2bf9766dc03 100644
--- a/tools/testing/selftests/kvm/lib/x86/tdx/tdx_util.c
+++ b/tools/testing/selftests/kvm/lib/x86/tdx/tdx_util.c
@@ -324,6 +324,21 @@ static void tdx_td_finalize_mr(struct kvm_vm *vm)
 	tdx_ioctl(vm->fd, KVM_TDX_FINALIZE_VM, 0, NULL);
 }
 
+/*
+ * Other ioctls
+ */
+
+/*
+ * Register a memory region that may contain encrypted data in KVM.
+ */
+static void register_encrypted_memory_region(struct kvm_vm *vm,
+					     struct userspace_mem_region *region)
+{
+	vm_set_memory_attributes(vm, region->region.guest_phys_addr,
+				 region->region.memory_size,
+				 KVM_MEMORY_ATTRIBUTE_PRIVATE);
+}
+
 /*
  * TD creation/setup/finalization
  */
@@ -459,28 +474,35 @@ static void load_td_memory_region(struct kvm_vm *vm,
 	if (!sparsebit_any_set(pages))
 		return;
 
+	if (region->region.guest_memfd != -1)
+		register_encrypted_memory_region(vm, region);
+
 	sparsebit_for_each_set_range(pages, i, j) {
 		const uint64_t size_to_load = (j - i + 1) * vm->page_size;
 		const uint64_t offset =
 			(i - lowest_page_in_region) * vm->page_size;
 		const uint64_t hva = hva_base + offset;
 		const uint64_t gpa = gpa_base + offset;
-		void *source_addr;
+		void *source_addr = (void *)hva;
 
 		/*
 		 * KVM_TDX_INIT_MEM_REGION ioctl cannot encrypt memory in place.
 		 * Make a copy if there's only one backing memory source.
 		 */
-		source_addr = mmap(NULL, size_to_load, PROT_READ | PROT_WRITE,
-				   MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
-		TEST_ASSERT(source_addr,
-			    "Could not allocate memory for loading memory region");
-
-		memcpy(source_addr, (void *)hva, size_to_load);
+		if (region->region.guest_memfd == -1) {
+			source_addr = mmap(NULL, size_to_load, PROT_READ | PROT_WRITE,
+					   MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
+			TEST_ASSERT(source_addr,
+				    "Could not allocate memory for loading memory region");
+
+			memcpy(source_addr, (void *)hva, size_to_load);
+			memset((void *)hva, 0, size_to_load);
+		}
 
 		tdx_init_mem_region(vm, source_addr, gpa, size_to_load);
 
-		munmap(source_addr, size_to_load);
+		if (region->region.guest_memfd == -1)
+			munmap(source_addr, size_to_load);
 	}
 }
 
-- 
2.50.0.rc2.692.g299adb8693-goog


  parent reply	other threads:[~2025-06-13 19:14 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-06-13 19:13 [PATCH v7 00/30] TDX KVM selftests Sagi Shahar
2025-06-13 19:13 ` [PATCH v7 01/30] KVM: selftests: Add function to allow one-to-one GVA to GPA mappings Sagi Shahar
2025-06-13 19:13 ` [PATCH v7 02/30] KVM: selftests: Expose function that sets up sregs based on VM's mode Sagi Shahar
2025-06-13 19:13 ` [PATCH v7 03/30] KVM: selftests: Store initial stack address in struct kvm_vcpu Sagi Shahar
2025-06-13 19:13 ` [PATCH v7 04/30] KVM: selftests: Add vCPU descriptor table initialization utility Sagi Shahar
2025-06-13 19:13 ` [PATCH v7 05/30] KVM: selftests: Update kvm_init_vm_address_properties() for TDX Sagi Shahar
2025-07-21 21:51   ` Ira Weiny
2025-08-01 23:10     ` Sagi Shahar
2025-08-05 15:41       ` Ira Weiny
2025-08-07 20:19         ` Sagi Shahar
2025-06-13 19:13 ` [PATCH v7 06/30] KVM: selftests: Add helper functions to create TDX VMs Sagi Shahar
2025-06-13 19:13 ` [PATCH v7 07/30] KVM: selftests: TDX: Use KVM_TDX_CAPABILITIES to validate TDs' attribute configuration Sagi Shahar
2025-06-13 19:13 ` Sagi Shahar [this message]
2025-06-13 19:13 ` [PATCH v7 09/30] KVM: selftests: TDX: Add TDX lifecycle test Sagi Shahar
2025-06-13 19:13 ` [PATCH v7 10/30] KVM: selftests: TDX: Add report_fatal_error test Sagi Shahar
2025-06-13 19:13 ` [PATCH v7 11/30] KVM: selftests: TDX: Adding test case for TDX port IO Sagi Shahar
2025-06-13 19:13 ` [PATCH v7 12/30] KVM: selftests: TDX: Add basic TDX CPUID test Sagi Shahar
2025-06-13 19:13 ` [PATCH v7 13/30] KVM: selftests: TDX: Add basic TDG.VP.VMCALL<GetTdVmCallInfo> test Sagi Shahar
2025-06-13 19:13 ` [PATCH v7 14/30] KVM: selftests: TDX: Add TDX IO writes test Sagi Shahar
2025-06-13 19:13 ` [PATCH v7 15/30] KVM: selftests: TDX: Add TDX IO reads test Sagi Shahar
2025-06-13 19:13 ` [PATCH v7 16/30] KVM: selftests: TDX: Add TDX MSR read/write tests Sagi Shahar
2025-06-13 19:13 ` [PATCH v7 17/30] KVM: selftests: TDX: Add TDX HLT exit test Sagi Shahar
2025-06-13 19:13 ` [PATCH v7 18/30] KVM: selftests: TDX: Add TDX MMIO reads test Sagi Shahar
2025-06-13 19:13 ` [PATCH v7 19/30] KVM: selftests: TDX: Add TDX MMIO writes test Sagi Shahar
2025-06-13 19:13 ` [PATCH v7 20/30] KVM: selftests: TDX: Add TDX CPUID TDVMCALL test Sagi Shahar
2025-06-13 19:13 ` [PATCH v7 21/30] KVM: selftests: TDX: Verify the behavior when host consumes a TD private memory Sagi Shahar
2025-06-13 19:13 ` [PATCH v7 22/30] KVM: selftests: TDX: Add TDG.VP.INFO test Sagi Shahar
2025-06-13 19:13 ` [PATCH v7 23/30] KVM: selftests: Add functions to allow mapping as shared Sagi Shahar
2025-06-13 19:13 ` [PATCH v7 24/30] KVM: selftests: TDX: Add shared memory test Sagi Shahar
2025-06-13 19:13 ` [PATCH v7 25/30] KVM: selftests: KVM: selftests: Expose new vm_vaddr_alloc_private() Sagi Shahar
2025-06-13 19:13 ` [PATCH v7 26/30] KVM: selftests: TDX: Add support for TDG.MEM.PAGE.ACCEPT Sagi Shahar
2025-06-13 19:13 ` [PATCH v7 27/30] KVM: selftests: TDX: Add support for TDG.VP.VEINFO.GET Sagi Shahar
2025-06-13 19:13 ` [PATCH v7 28/30] KVM: selftests: TDX: Add TDX UPM selftest Sagi Shahar
2025-06-13 19:13 ` [PATCH v7 29/30] KVM: selftests: TDX: Add TDX UPM selftests for implicit conversion Sagi Shahar
2025-06-13 19:13 ` [PATCH v7 30/30] KVM: selftests: TDX: Test LOG_DIRTY_PAGES flag to a non-GUEST_MEMFD memslot Sagi Shahar

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=20250613191359.35078-9-sagis@google.com \
    --to=sagis@google.com \
    --cc=ackerleytng@google.com \
    --cc=afranji@google.com \
    --cc=ajones@ventanamicro.com \
    --cc=binbin.wu@linux.intel.com \
    --cc=erdemaktas@google.com \
    --cc=isaku.yamahata@intel.com \
    --cc=kvm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-kselftest@vger.kernel.org \
    --cc=oliver.upton@linux.dev \
    --cc=pbonzini@redhat.com \
    --cc=pratikrajesh.sampat@amd.com \
    --cc=reinette.chatre@intel.com \
    --cc=rick.p.edgecombe@intel.com \
    --cc=runanwang@google.com \
    --cc=seanjc@google.com \
    --cc=shuah@kernel.org \
    /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