[RFC,v5,24/29] KVM: selftests: Expose _vm_vaddr_alloc

Message ID	20231212204647.2170650-25-sagis@google.com
State	New
Headers	show Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="mtpFjSLq" Date: Tue, 12 Dec 2023 12:46:39 -0800 In-Reply-To: <20231212204647.2170650-1-sagis@google.com> Precedence: bulk Mime-Version: 1.0 References: <20231212204647.2170650-1-sagis@google.com> Message-ID: <20231212204647.2170650-25-sagis@google.com> Subject: [RFC PATCH v5 24/29] KVM: selftests: Expose _vm_vaddr_alloc From: Sagi Shahar <sagis@google.com> To: linux-kselftest@vger.kernel.org, Ackerley Tng <ackerleytng@google.com>, Ryan Afranji <afranji@google.com>, Erdem Aktas <erdemaktas@google.com>, Sagi Shahar <sagis@google.com>, Isaku Yamahata <isaku.yamahata@intel.com> Cc: Sean Christopherson <seanjc@google.com>, Paolo Bonzini <pbonzini@redhat.com>, Shuah Khan <shuah@kernel.org>, Peter Gonda <pgonda@google.com>, Haibo Xu <haibo1.xu@intel.com>, Chao Peng <chao.p.peng@linux.intel.com>, Vishal Annapurve <vannapurve@google.com>, Roger Wang <runanwang@google.com>, Vipin Sharma <vipinsh@google.com>, jmattson@google.com, dmatlack@google.com, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, linux-mm@kvack.org Content-Type: text/plain; charset="UTF-8"
Series	TDX KVM selftests \| expand [RFC,v5,00/29] TDX KVM selftests [RFC,v5,01/29] KVM: selftests: Add function to allow one-to-one GVA to GPA mappings [RFC,v5,02/29] KVM: selftests: Expose function that sets up sregs based on VM's mode [RFC,v5,03/29] KVM: selftests: Store initial stack address in struct kvm_vcpu [RFC,v5,04/29] KVM: selftests: Refactor steps in vCPU descriptor table initialization [RFC,v5,05/29] KVM: selftests: Add helper functions to create TDX VMs [RFC,v5,06/29] KVM: selftests: TDX: Use KVM_TDX_CAPABILITIES to validate TDs' attribute configura... [RFC,v5,07/29] KVM: selftests: TDX: Update load_td_memory_region for VM memory backed by guest memfd [RFC,v5,08/29] KVM: selftests: TDX: Add TDX lifecycle test [RFC,v5,09/29] KVM: selftests: TDX: Add report_fatal_error test [RFC,v5,10/29] KVM: selftests: TDX: Adding test case for TDX port IO [RFC,v5,11/29] KVM: selftests: TDX: Add basic TDX CPUID test [RFC,v5,12/29] KVM: selftests: TDX: Add basic get_td_vmcall_info test [RFC,v5,13/29] KVM: selftests: TDX: Add TDX IO writes test [RFC,v5,14/29] KVM: selftests: TDX: Add TDX IO reads test [RFC,v5,15/29] KVM: selftests: TDX: Add TDX MSR read/write tests [RFC,v5,16/29] KVM: selftests: TDX: Add TDX HLT exit test [RFC,v5,17/29] KVM: selftests: TDX: Add TDX MMIO reads test [RFC,v5,18/29] KVM: selftests: TDX: Add TDX MMIO writes test [RFC,v5,19/29] KVM: selftests: TDX: Add TDX CPUID TDVMCALL test [RFC,v5,20/29] KVM: selftests: TDX: Verify the behavior when host consumes a TD private memory [RFC,v5,21/29] KVM: selftests: TDX: Add TDG.VP.INFO test [RFC,v5,22/29] KVM: selftests: Add functions to allow mapping as shared [RFC,v5,23/29] KVM: selftests: TDX: Add shared memory test [RFC,v5,24/29] KVM: selftests: Expose _vm_vaddr_alloc [RFC,v5,25/29] KVM: selftests: TDX: Add support for TDG.MEM.PAGE.ACCEPT [RFC,v5,26/29] KVM: selftests: TDX: Add support for TDG.VP.VEINFO.GET [RFC,v5,28/29] KVM: selftests: TDX: Add TDX UPM selftest [RFC,v5,29/29] KVM: selftests: TDX: Add TDX UPM selftests for implicit conversion

Message ID

20231212204647.2170650-25-sagis@google.com

State

New

Headers

Date: Tue, 12 Dec 2023 12:46:39 -0800
In-Reply-To: <20231212204647.2170650-1-sagis@google.com>
Precedence: bulk
Mime-Version: 1.0
References: <20231212204647.2170650-1-sagis@google.com>
Message-ID: <20231212204647.2170650-25-sagis@google.com>
Subject: [RFC PATCH v5 24/29] KVM: selftests: Expose _vm_vaddr_alloc
From: Sagi Shahar <sagis@google.com>
To: linux-kselftest@vger.kernel.org, Ackerley Tng <ackerleytng@google.com>,
	Ryan Afranji <afranji@google.com>, Erdem Aktas <erdemaktas@google.com>,
	Sagi Shahar <sagis@google.com>, Isaku Yamahata <isaku.yamahata@intel.com>
Cc: Sean Christopherson <seanjc@google.com>,
 Paolo Bonzini <pbonzini@redhat.com>,
	Shuah Khan <shuah@kernel.org>, Peter Gonda <pgonda@google.com>,
 Haibo Xu <haibo1.xu@intel.com>,
	Chao Peng <chao.p.peng@linux.intel.com>,
 Vishal Annapurve <vannapurve@google.com>,
	Roger Wang <runanwang@google.com>, Vipin Sharma <vipinsh@google.com>,
 jmattson@google.com,
	dmatlack@google.com, linux-kernel@vger.kernel.org, kvm@vger.kernel.org,
	linux-mm@kvack.org
Content-Type: text/plain; charset="UTF-8"

Series

TDX KVM selftests | expand

Commit Message

Sagi Shahar Dec. 12, 2023, 8:46 p.m. UTC

From: Ackerley Tng <ackerleytng@google.com>

vm_vaddr_alloc always allocates memory in memslot 0. This allows users
of this function to choose which memslot to allocate virtual memory
in.

Signed-off-by: Ackerley Tng <ackerleytng@google.com>
Signed-off-by: Ryan Afranji <afranji@google.com>
Signed-off-by: Sagi Shahar <sagis@google.com>
---
 tools/testing/selftests/kvm/include/kvm_util_base.h | 3 +++
 tools/testing/selftests/kvm/lib/kvm_util.c          | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/tools/testing/selftests/kvm/include/kvm_util_base.h b/tools/testing/selftests/kvm/include/kvm_util_base.h
index efd7ae8abb20..5dbebf5cfd07 100644
--- a/tools/testing/selftests/kvm/include/kvm_util_base.h
+++ b/tools/testing/selftests/kvm/include/kvm_util_base.h
@@ -561,6 +561,9 @@  void vm_mem_region_delete(struct kvm_vm *vm, uint32_t slot);
 struct kvm_vcpu *__vm_vcpu_add(struct kvm_vm *vm, uint32_t vcpu_id);
 void vm_populate_vaddr_bitmap(struct kvm_vm *vm);
 vm_vaddr_t vm_vaddr_unused_gap(struct kvm_vm *vm, size_t sz, vm_vaddr_t vaddr_min);
+vm_vaddr_t ____vm_vaddr_alloc(struct kvm_vm *vm, size_t sz,
+			      vm_vaddr_t vaddr_min, vm_paddr_t paddr_min,
+			      uint32_t data_memslot, bool encrypt);
 vm_vaddr_t vm_vaddr_alloc(struct kvm_vm *vm, size_t sz, vm_vaddr_t vaddr_min);
 vm_vaddr_t __vm_vaddr_alloc(struct kvm_vm *vm, size_t sz, vm_vaddr_t vaddr_min,
 			    enum kvm_mem_region_type type);
diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c
index 28780fa1f0f2..d024abc5379c 100644
--- a/tools/testing/selftests/kvm/lib/kvm_util.c
+++ b/tools/testing/selftests/kvm/lib/kvm_util.c
@@ -1410,9 +1410,9 @@  vm_vaddr_t vm_vaddr_unused_gap(struct kvm_vm *vm, size_t sz,
  * a unique set of pages, with the minimum real allocation being at least
  * a page.
  */
-static vm_vaddr_t ____vm_vaddr_alloc(struct kvm_vm *vm, size_t sz,
-				     vm_vaddr_t vaddr_min, vm_paddr_t paddr_min,
-				     uint32_t data_memslot, bool encrypt)
+vm_vaddr_t ____vm_vaddr_alloc(struct kvm_vm *vm, size_t sz,
+			      vm_vaddr_t vaddr_min, vm_paddr_t paddr_min,
+			      uint32_t data_memslot, bool encrypt)
 {
 	uint64_t pages = (sz >> vm->page_shift) + ((sz % vm->page_size) != 0);

[RFC,v5,24/29] KVM: selftests: Expose _vm_vaddr_alloc

Commit Message

Patch