[PATCH v2 00/20] KVM: selftests: PPC pre-enabling · Sean Christopherson <seanjc@google.com> · 2026-09-02
[PATCH v2 01/20] KVM: selftests: Use MEM_REGION_PT memslot instead of '0' for s390 regions/segments · Sean Christopherson <seanjc@google.com> · 2026-09-02
[PATCH v2 02/20] KVM: selftests: Use the common minimum GPA for page tables on LoongArch · Sean Christopherson <seanjc@google.com> · 2026-09-02
Re: [PATCH v2 02/20] KVM: selftests: Use the common minimum GPA for page tables on LoongArch · Bibo Mao <maobibo@loongson.cn> · 2026-09-03
[PATCH v2 03/20] KVM: selftests: Use vm_alloc_page_table() to allocate LoongArch page tables · Sean Christopherson <seanjc@google.com> · 2026-09-02
[PATCH v2 04/20] KVM: selftests: Rename "num" param to "nr_pages" for physical page allocators · Sean Christopherson <seanjc@google.com> · 2026-09-02
Re: [PATCH v2 04/20] KVM: selftests: Rename "num" param to "nr_pages" for physical page allocators · Ritesh Harjani (IBM) <ritesh.list@gmail.com> · 2026-09-04
[PATCH v2 05/20] KVM: selftests: Use goto instead of do-while to retry finding unused physical pages · Sean Christopherson <seanjc@google.com> · 2026-09-02
Re: [PATCH v2 05/20] KVM: selftests: Use goto instead of do-while to retry finding unused physical pages · Gautam Menghani <hidden> · 2026-09-04
[PATCH v2 06/20] KVM: selftests: Extend page allocator to support naturally aligned allocations · Sean Christopherson <seanjc@google.com> · 2026-09-02
[PATCH v2 07/20] KVM: selftests: Make the single-page allocator APIs static inline · Sean Christopherson <seanjc@google.com> · 2026-09-02
[PATCH v2 08/20] KVM: selftests: Use the innermost page allocator API in the memslot perf test · Sean Christopherson <seanjc@google.com> · 2026-09-02
[PATCH v2 09/20] KVM: selftests: Use the innermost page allocator API in s390's IRQ routing test · Sean Christopherson <seanjc@google.com> · 2026-09-02
[PATCH v2 10/20] KVM: selftests: Add a wrapper API to allocate multiple page table pages · Sean Christopherson <seanjc@google.com> · 2026-09-02
Re: [PATCH v2 10/20] KVM: selftests: Add a wrapper API to allocate multiple page table pages · Gautam Menghani <hidden> · 2026-09-04
[PATCH v2 11/20] KVM: selftests: Initialize vm->memslots[] with invalid memslots during creation · Sean Christopherson <seanjc@google.com> · 2026-09-02
Re: [PATCH v2 11/20] KVM: selftests: Initialize vm->memslots[] with invalid memslots during creation · Gautam Menghani <hidden> · 2026-09-04
[PATCH v2 12/20] KVM: selftests: Add APIs to override memory region types with custom memslots · Sean Christopherson <seanjc@google.com> · 2026-09-02
[PATCH v2 14/20] KVM: selftests: Use TEST_EXTRA region in arm64's vGIC LPI stress test · Sean Christopherson <seanjc@google.com> · 2026-09-02
[PATCH v2 13/20] KVM: selftests: Add TEST_EXTRA memory region type for "special" memslots · Sean Christopherson <seanjc@google.com> · 2026-09-02
[PATCH v2 15/20] KVM: selftests: Use TEST_EXTRA region in x86's smaller MAXPHYADDR test · Sean Christopherson <seanjc@google.com> · 2026-09-02
[PATCH v2 16/20] KVM: selftests: Use TEST_EXTRA region in set memory region test · Sean Christopherson <seanjc@google.com> · 2026-09-02
[PATCH v2 17/20] KVM: selftests: Take the memory region type, not memslot, in page allocators · Sean Christopherson <seanjc@google.com> · 2026-09-02
[PATCH v2 18/20] KVM: selftests: Use TEST_ASSERT(), not assert(), in vm_get_mem_region() · Sean Christopherson <seanjc@google.com> · 2026-09-02
[PATCH v2 19/20] KVM: selftests: Automatically pick min_gpa for allocations based on region type · Sean Christopherson <seanjc@google.com> · 2026-09-02
[PATCH v2 20/20] KVM: selftests: Add arch hook to force page tables to be naturally aligned · Sean Christopherson <seanjc@google.com> · 2026-09-02
Re: [PATCH v2 00/20] KVM: selftests: PPC pre-enabling · Itaru Kitayama <hidden> · 2026-09-02

WARM1d REVIEWED: 1 (0M)

Revision v2 of 2 in this series; 1 review trailer.

Revisions (2)

2026-08-26 v1 [diff vs current]
2026-09-02 v2 current

[PATCH v2 18/20] KVM: selftests: Use TEST_ASSERT(), not assert(), in vm_get_mem_region()

From: Sean Christopherson <seanjc@google.com>
Date: 2026-09-02 16:41:50
Also in: kvm, kvm-riscv, kvmarm, linux-riscv, lkml, loongarch
Subsystem: kernel selftest framework, kernel virtual machine (kvm), the rest · Maintainers: Shuah Khan, Shuah Khan, Paolo Bonzini, Linus Torvalds

Use a proper selftests TEST_ASSERT() in vm_get_mem_region() so that bad
input is guaranteed to fail the test, and with the standard error message
format.

Tested-by: Itaru Kitayama <redacted>
Signed-off-by: Sean Christopherson <seanjc@google.com>
---
 tools/testing/selftests/kvm/include/kvm_util.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/testing/selftests/kvm/include/kvm_util.h b/tools/testing/selftests/kvm/include/kvm_util.h
index c9ef2e5c9971..c166fce4599c 100644
--- a/tools/testing/selftests/kvm/include/kvm_util.h
+++ b/tools/testing/selftests/kvm/include/kvm_util.h

@@ -200,7 +200,8 @@ memslot2region(struct kvm_vm *vm, u32 memslot);
 static inline struct userspace_mem_region *vm_get_mem_region(struct kvm_vm *vm,
 							     enum kvm_mem_region_type type)
 {
-	assert(type < NR_MEM_REGIONS);
+	TEST_ASSERT(type < NR_MEM_REGIONS,
+		    "Invalid memory region type '%u'", type);
 	return memslot2region(vm, vm->memslots[type]);
 }

-- 
2.55.0.966.g6673acef38-goog