From nobody Fri Dec 19 14:05:00 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6ADF013C9A7 for ; Fri, 26 Apr 2024 11:46:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714131963; cv=none; b=Hb/eaLHr8L4dysP36WZVbodaVzTUd/128VUj6KONU0P1sTrCLPsN93ICGXl+Z6kw1+9xJGGiqzKB+KEYDutm1QOFAhFjuT9hiECH5d+INlb48CWrBgEOe0SEhojhbmDtA5kPkTNhTWryS0mn+4go3dA/GpYqaJ+VnjfPn6rBgMg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714131963; c=relaxed/simple; bh=BRhNhRa5nUoyvEtCWgA0o5hBNXQs9lcW5HCVxK11thE=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=h6GWUdlTWkrPtREyVYv1x80CqOjSFSW8IB66U8DCOIw8TfSvBHGX0KShsvaVi3w/YosqM3MNmwLg970M9izz0QkMIXSFc1ETGk0VddGmEc3VjyHryQbFHhaSBZDqaGeY+GYyLfAbxw/+K3WKdIZtMJEW75UUJ0EJldEo+Eetwy8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=e5eLt6gm; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="e5eLt6gm" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714131960; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=4RdPwyA7wfNaOIr7UmLDrra9JAYl3veQ/lffaIDIODI=; b=e5eLt6gmbUs8RjkJHy7u9Rltdf50o3cGpKl/Rk3j4jgRxDr9R2hgcSZjcYx6D1yDALMhyx ytwN4iwZh80kGMakJGXE358eO5ZgW4/U8FiHGobejH2GuGXHXfyxhdEYg5ALpInTYSqEpk XvU9PU4fnAJ2AyIWl6aX7iZLgJ/oWeI= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-656-xpgkS5RBOImOAAM83bu05w-1; Fri, 26 Apr 2024 07:45:57 -0400 X-MC-Unique: xpgkS5RBOImOAAM83bu05w-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A0D561005D5C; Fri, 26 Apr 2024 11:45:56 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.180]) by smtp.corp.redhat.com (Postfix) with ESMTP id 39EDE1C060D0; Fri, 26 Apr 2024 11:45:53 +0000 (UTC) From: Thomas Huth To: kvm@vger.kernel.org, Paolo Bonzini , Sean Christopherson Cc: linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Shuah Khan , Muhammad Usama Anjum Subject: [PATCH v2] KVM: selftests: Use TAP interface in the set_memory_region test Date: Fri, 26 Apr 2024 13:45:52 +0200 Message-ID: <20240426114552.667346-1-thuth@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.7 Content-Type: text/plain; charset="utf-8" Use the kselftest_harness.h interface in this test to get TAP output, so that it is easier for the user to see what the test is doing. (Note: We are not using the KVM_ONE_VCPU_TEST_SUITE() macro here since these tests are creating their VMs with the vm_create_barebones() function, not with vm_create_with_one_vcpu()) Reviewed-by: Andrew Jones Signed-off-by: Thomas Huth Reviewed-by: Muhammad Usama Anjum Tested-by: Muhammad Usama Anjum --- v2: - Rebase to linux-next branch - Make "loops" variable static - Added Andrew's Reviewed-by .../selftests/kvm/set_memory_region_test.c | 86 +++++++++---------- 1 file changed, 42 insertions(+), 44 deletions(-) diff --git a/tools/testing/selftests/kvm/set_memory_region_test.c b/tools/t= esting/selftests/kvm/set_memory_region_test.c index 68c899d27561..a5c9bee5235a 100644 --- a/tools/testing/selftests/kvm/set_memory_region_test.c +++ b/tools/testing/selftests/kvm/set_memory_region_test.c @@ -16,6 +16,7 @@ #include #include #include +#include "kselftest_harness.h" =20 /* * s390x needs at least 1MB alignment, and the x86_64 MOVE/DELETE tests ne= ed a @@ -38,6 +39,8 @@ extern const uint64_t final_rip_end; =20 static sem_t vcpu_ready; =20 +static int loops; + static inline uint64_t guest_spin_on_val(uint64_t spin_val) { uint64_t val; @@ -219,6 +222,13 @@ static void test_move_memory_region(void) kvm_vm_free(vm); } =20 +TEST(move_in_use_region) +{ + ksft_print_msg("Testing MOVE of in-use region, %d loops\n", loops); + for (int i =3D 0; i < loops; i++) + test_move_memory_region(); +} + static void guest_code_delete_memory_region(void) { uint64_t val; @@ -308,12 +318,19 @@ static void test_delete_memory_region(void) kvm_vm_free(vm); } =20 -static void test_zero_memory_regions(void) +TEST(delete_in_use_region) +{ + ksft_print_msg("Testing DELETE of in-use region, %d loops\n", loops); + for (int i =3D 0; i < loops; i++) + test_delete_memory_region(); +} + +TEST(zero_memory_regions) { struct kvm_vcpu *vcpu; struct kvm_vm *vm; =20 - pr_info("Testing KVM_RUN with zero added memory regions\n"); + ksft_print_msg("Testing KVM_RUN with zero added memory regions\n"); =20 vm =3D vm_create_barebones(); vcpu =3D __vm_vcpu_add(vm, 0); @@ -326,7 +343,7 @@ static void test_zero_memory_regions(void) } #endif /* __x86_64__ */ =20 -static void test_invalid_memory_region_flags(void) +TEST(invalid_memory_region_flags) { uint32_t supported_flags =3D KVM_MEM_LOG_DIRTY_PAGES; const uint32_t v2_only_flags =3D KVM_MEM_GUEST_MEMFD; @@ -389,7 +406,7 @@ static void test_invalid_memory_region_flags(void) * Test it can be added memory slots up to KVM_CAP_NR_MEMSLOTS, then any * tentative to add further slots should fail. */ -static void test_add_max_memory_regions(void) +TEST(add_max_memory_regions) { int ret; struct kvm_vm *vm; @@ -408,13 +425,13 @@ static void test_add_max_memory_regions(void) max_mem_slots =3D kvm_check_cap(KVM_CAP_NR_MEMSLOTS); TEST_ASSERT(max_mem_slots > 0, "KVM_CAP_NR_MEMSLOTS should be greater than 0"); - pr_info("Allowed number of memory slots: %i\n", max_mem_slots); + ksft_print_msg("Allowed number of memory slots: %i\n", max_mem_slots); =20 vm =3D vm_create_barebones(); =20 /* Check it can be added memory slots up to the maximum allowed */ - pr_info("Adding slots 0..%i, each memory region with %dK size\n", - (max_mem_slots - 1), MEM_REGION_SIZE >> 10); + ksft_print_msg("Adding slots 0..%i, each memory region with %dK size\n", + (max_mem_slots - 1), MEM_REGION_SIZE >> 10); =20 mem =3D mmap(NULL, (size_t)max_mem_slots * MEM_REGION_SIZE + alignment, PROT_READ | PROT_WRITE, @@ -455,12 +472,21 @@ static void test_invalid_guest_memfd(struct kvm_vm *v= m, int memfd, TEST_ASSERT(r =3D=3D -1 && errno =3D=3D EINVAL, "%s", msg); } =20 -static void test_add_private_memory_region(void) +static bool has_cap_guest_memfd(void) +{ + return kvm_has_cap(KVM_CAP_GUEST_MEMFD) && + (kvm_check_cap(KVM_CAP_VM_TYPES) & BIT(KVM_X86_SW_PROTECTED_VM)); +} + +TEST(add_private_memory_region) { struct kvm_vm *vm, *vm2; int memfd, i; =20 - pr_info("Testing ADD of KVM_MEM_GUEST_MEMFD memory regions\n"); + if (!has_cap_guest_memfd()) + SKIP(return, "Missing KVM_MEM_GUEST_MEMFD / KVM_X86_SW_PROTECTED_VM"); + + ksft_print_msg("Testing ADD of KVM_MEM_GUEST_MEMFD memory regions\n"); =20 vm =3D vm_create_barebones_type(KVM_X86_SW_PROTECTED_VM); =20 @@ -491,13 +517,16 @@ static void test_add_private_memory_region(void) kvm_vm_free(vm); } =20 -static void test_add_overlapping_private_memory_regions(void) +TEST(add_overlapping_private_memory_regions) { struct kvm_vm *vm; int memfd; int r; =20 - pr_info("Testing ADD of overlapping KVM_MEM_GUEST_MEMFD memory regions\n"= ); + if (!has_cap_guest_memfd()) + SKIP(return, "Missing KVM_MEM_GUEST_MEMFD / KVM_X86_SW_PROTECTED_VM"); + + ksft_print_msg("Testing ADD of overlapping KVM_MEM_GUEST_MEMFD memory reg= ions\n"); =20 vm =3D vm_create_barebones_type(KVM_X86_SW_PROTECTED_VM); =20 @@ -536,46 +565,15 @@ static void test_add_overlapping_private_memory_regio= ns(void) close(memfd); kvm_vm_free(vm); } + #endif =20 int main(int argc, char *argv[]) { -#ifdef __x86_64__ - int i, loops; - - /* - * FIXME: the zero-memslot test fails on aarch64 and s390x because - * KVM_RUN fails with ENOEXEC or EFAULT. - */ - test_zero_memory_regions(); -#endif - - test_invalid_memory_region_flags(); - - test_add_max_memory_regions(); - -#ifdef __x86_64__ - if (kvm_has_cap(KVM_CAP_GUEST_MEMFD) && - (kvm_check_cap(KVM_CAP_VM_TYPES) & BIT(KVM_X86_SW_PROTECTED_VM))) { - test_add_private_memory_region(); - test_add_overlapping_private_memory_regions(); - } else { - pr_info("Skipping tests for KVM_MEM_GUEST_MEMFD memory regions\n"); - } - if (argc > 1) loops =3D atoi_positive("Number of iterations", argv[1]); else loops =3D 10; =20 - pr_info("Testing MOVE of in-use region, %d loops\n", loops); - for (i =3D 0; i < loops; i++) - test_move_memory_region(); - - pr_info("Testing DELETE of in-use region, %d loops\n", loops); - for (i =3D 0; i < loops; i++) - test_delete_memory_region(); -#endif - - return 0; + return test_harness_run(argc, argv); } --=20 2.44.0