From nobody Fri Oct 10 13:44:22 2025 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) (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 63FFE258CF9 for ; Fri, 13 Jun 2025 19:14:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749842068; cv=none; b=kKPAfT2V2D+zuajGn89FGZrUIh9w09y5GfKK4v9k/dnfAkhZdCVIIACal+uSuWSMFSmGdv+TQhiB9HcUiWnA3Em5ed49G79Zf0Qz572IsgnEcYXVtQ6VZ4/mXoxV1FzrUy9M1Lqqu4EFjRiPlgszMPwvLDfpSTef9Boglqc6c7E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749842068; c=relaxed/simple; bh=KcVmSP1z2F1a4ltip8O2m08swJFdtWWy+j4vG4u1hDQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=mxzQfLNlhY82Bwp5+HN/NpcoYaa2By9EXyLMt1txYpwP1pT8g0DcO30Pn7PJPKgMsnPSv4hEvp1lmqAna6LsNovcmLvepTMygU+tdfa8R3IRoyj0SOEYP4p3rsHSKJwEi2MxlymFotV7iXqRKsmb+XTcJkjegJXwEB1cFOu7EAA= 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=T9mgj1L/; arc=none smtp.client-ip=209.85.214.201 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="T9mgj1L/" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-23507382e64so22352405ad.2 for ; Fri, 13 Jun 2025 12:14:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1749842065; x=1750446865; 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=8AuGWyHRN5gujSVF8K3xVc7oiFPlkN5tzT3tBT+wdnU=; b=T9mgj1L/4sH6Wu09lsHAJ5Ukx3qoJyBYHvHzsnwoZqs86XKYZioxfi5Sq2mBoDifVt 3wI4f6o3LrjidLCq3oETimLyPz+ysppwsMy9LpenI+5d95Zi6S/hvdfrRKCTlnDs3SgA eQVtGH/JiRnl84re/8diMaTwRwSYyCnAFbT+cCLNel62ev/yxgSg2ol+ksCdrLiCy7An P2bl1R5pE8F9Rn3N6s3sQ7Q9TSUwnRC/y12F0M2MZn9/4D4cNSnagzJ6DDyr6dcP7w6h 7TBQCz+/VJfTovANygYhsKFTrFs7tCGzPJTqTuSeS0qq97olhnHP7vb5Svvb8RKKLgJ1 gP0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749842065; x=1750446865; 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=8AuGWyHRN5gujSVF8K3xVc7oiFPlkN5tzT3tBT+wdnU=; b=YnZHZo3rLIZp4eaNdr/CVxNNvpbmp7VT+LW4M7PQKYNbl1kfMkn+IjOUPpZbFOYLyA QoYGs2cCIvy9VNtautc/0wXzKhHR/WjLU76Uv8FrIDNweQ1M6nDOqjjMrgt/1RAMtDAS cKQlC7nJ2nSFLKVTSIZC/tpyAKlK0NHs85/PYqw5wMuCrstdliGhCIai0DhF4cpjHZCX KzhsBVWcX7uZdMvGAGRVy6dpPgZjFBRjaWQNhmz4hwwD3m32kn2T+W8pw9GweaDMLlQC bdD7MPmv5ROUQk+QpYkOjXIYsExtutd9hBV8pf2C62fwvpcKfzutzXvXQEW9euLGwEVi etQA== X-Gm-Message-State: AOJu0YxZKVLDvc31OgMbhNZQC+uYy1I5Enj7zag05zTathBTNafEhkUa zkiXS+mgoRTOf+lm8D4wmVwZfiTZIP3r7vCL5RAVj3RI4TefU7M3J98FS0zeb2vjZrCRu4C+lK2 xxg== X-Google-Smtp-Source: AGHT+IF18P5p08M+J/Joy/4/oVDXDnwIzpUjm+DY25LUCmL9I7E9TjnRyHCMNZ7btIS+DLrs42822fh7aQ== X-Received: from pgbbo11.prod.google.com ([2002:a05:6a02:38b:b0:b2f:6681:1f1e]) (user=sagis job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:c943:b0:234:8a4a:adac with SMTP id d9443c01a7336-2366b32d048mr7098285ad.20.1749842064612; Fri, 13 Jun 2025 12:14:24 -0700 (PDT) Date: Fri, 13 Jun 2025 12:13:35 -0700 In-Reply-To: <20250613191359.35078-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: <20250613191359.35078-1-sagis@google.com> X-Mailer: git-send-email 2.50.0.rc2.692.g299adb8693-goog Message-ID: <20250613191359.35078-9-sagis@google.com> Subject: [PATCH v7 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 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.50.0.rc2.692.g299adb8693-goog