From nobody Sun Oct 5 07:26:10 2025 Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1B1C1274B4F for ; Thu, 7 Aug 2025 20:16:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754597811; cv=none; b=BIB3IZiIBY3ua9Sqsk6zyv9xBp0/O41AN2zMRBf2WDI2F78XLgMLKUwY/AwjzhAHRdr8u94hYrtFqlBy8b+beQ/eTyqFFx8CjBeR/dY1zdunAWRGBArwZdyC0j8wOLA4nnjOUbJHGCDWBJ/gPhETNqMRYRhzbomhDKSxA0RAAqo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754597811; c=relaxed/simple; bh=puYw+DEIdp6ykwAZy5OOEpeoIJJ7PtsStnf4pcAGRJw=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=hSf5ZsmDGmVF2TXqKMULIw4gttiV8usPCUAciW8yRg3GXu8Y9FqsNVAsi9QKnorOgvcM/k3NZsnbGVEQ5wj7v5tyPLxOqGnv0To/x9e1rjVMRIBtk6TirA1Q7zm85GsrjoIuGQ6DEmbQ7wjjNcm7Lw52uGsfZ/G4ze85+tFLe60= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--sagis.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=ALyL3qfZ; arc=none smtp.client-ip=209.85.216.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--sagis.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="ALyL3qfZ" Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-3211b736a11so2947737a91.0 for ; Thu, 07 Aug 2025 13:16:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1754597809; x=1755202609; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=US9j6ZWNrs7ioksHVAQpJEm6nvGXIAewRRt1GeZbRi8=; b=ALyL3qfZGKDIBtj1bES14Z9JHq/OB3UIZrlKVTFmgGlfiUbyteknxP3mtmGAPQh5c3 Yif0lWJEmdJlYOOFa4qjnYJBsPW4KF68z9qOMJ55221wKSPNIxOo1eGlx1sXDUR4F+Qz JECzrvg2jzho3AKaMjK3ZPRZ/IcLAqvhb1CMoF9WmUFeqLcKti3HPpTYAL4CCHITNrwv lbQF7F4ty5Y8powt3/4Wwk3r6YuGhr/1DI+iKyQEOShPHzwmtJSfHVJi59guZq6UgQs7 HXMwUkmfSf4boX/lNwmxq8UG5gP3kwyQBlVwjXeUdt5dnXvz2DUTdhVeuV74zfypW08y 4PTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754597809; x=1755202609; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=US9j6ZWNrs7ioksHVAQpJEm6nvGXIAewRRt1GeZbRi8=; b=B6VlhJTq8ygwQHgih9xhrzRdDJLF16DNwu3AEhQkyDN7JIGcbAr876OWPb99RFP5x0 vJzmEsEhT2XtwP70GhkUdHnWi20J84jrxdGA6E35EnYmybcfqax702fT1GLkCF0gK0yx s5etYF1yhnkZ0lj1mPG7P+mk6RPGOdmYgv8iK9lmiG8FvbKwVzZGIGd7jrcaYshed40B cCdOjdg8k/HGShZBCYlFYWxJddN8+8Zhj9m5eI6hhoZfCGxikBAON/IlhJMtkHFAH6N3 KXox/1+Uy78ZM5UQwwSoHmrh8uPkI8B9C8GtdCl1gIgwVqVHtlpcm4TXLNGsxReUg3J6 hW3A== X-Gm-Message-State: AOJu0YxrgyRHTp6luDFiTunE9iToTUZN/cRImxhA2D8sC+btfX2A0gTF 5Ng4x1oEyp+BRK8FYM5zMOAJ+czWeNykpWJC4LwxsKvjQorOcWIrfW7Duuff7h718utpxznjISP BkA== X-Google-Smtp-Source: AGHT+IFyMZB6DpVtHi3kL/x2IK8tM54yw75AkkxHEHT74p5qROfChvdgkD5MZdZL++lkM7KX+XcCTQn/Ow== X-Received: from pjbns14.prod.google.com ([2002:a17:90b:250e:b0:31e:a865:8b32]) (user=sagis job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:268b:b0:312:1ae9:152b with SMTP id 98e67ed59e1d1-32183c48d07mr385969a91.23.1754597809647; Thu, 07 Aug 2025 13:16:49 -0700 (PDT) Date: Thu, 7 Aug 2025 13:16:04 -0700 In-Reply-To: <20250807201628.1185915-1-sagis@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250807201628.1185915-1-sagis@google.com> X-Mailer: git-send-email 2.51.0.rc0.155.g4a0f42376b-goog Message-ID: <20250807201628.1185915-9-sagis@google.com> Subject: [PATCH v8 08/30] KVM: selftests: TDX: Update load_td_memory_region() for VM memory backed by guest memfd From: Sagi Shahar To: linux-kselftest@vger.kernel.org, Paolo Bonzini , Shuah Khan , Sean Christopherson , Ackerley Tng , Ryan Afranji , Andrew Jones , Isaku Yamahata , Erdem Aktas , Rick Edgecombe , Sagi Shahar , Roger Wang , Binbin Wu , Oliver Upton , "Pratik R. Sampat" , Reinette Chatre , Ira Weiny Cc: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Ackerley Tng 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 Signed-off-by: Sagi Shahar --- .../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/tes= ting/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); } =20 +/* + * 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; =20 + if (region->region.guest_memfd !=3D -1) + register_encrypted_memory_region(vm, region); + sparsebit_for_each_set_range(pages, i, j) { const uint64_t size_to_load =3D (j - i + 1) * vm->page_size; const uint64_t offset =3D (i - lowest_page_in_region) * vm->page_size; const uint64_t hva =3D hva_base + offset; const uint64_t gpa =3D gpa_base + offset; - void *source_addr; + void *source_addr =3D (void *)hva; =20 /* * KVM_TDX_INIT_MEM_REGION ioctl cannot encrypt memory in place. * Make a copy if there's only one backing memory source. */ - source_addr =3D 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 =3D=3D -1) { + source_addr =3D 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); + } =20 tdx_init_mem_region(vm, source_addr, gpa, size_to_load); =20 - munmap(source_addr, size_to_load); + if (region->region.guest_memfd =3D=3D -1) + munmap(source_addr, size_to_load); } } =20 --=20 2.51.0.rc0.155.g4a0f42376b-goog