* [PATCH v5 1/2] selftests: kvm: Add vm_get_fd() in kvm_util
2020-04-09 22:09 [PATCH v5 0/2] selftests: kvm: Introduce the mem_slot_test test Wainer dos Santos Moschetta
@ 2020-04-09 22:09 ` Wainer dos Santos Moschetta
2020-04-09 22:09 ` [PATCH v5 2/2] selftests: kvm: Add mem_slot_test test Wainer dos Santos Moschetta
2020-04-10 20:45 ` [PATCH v5 0/2] selftests: kvm: Introduce the " Sean Christopherson
2 siblings, 0 replies; 5+ messages in thread
From: Wainer dos Santos Moschetta @ 2020-04-09 22:09 UTC (permalink / raw)
To: pbonzini, kvm
Cc: drjones, david, linux-kernel, linux-kselftest, krish.sadhukhan
Introduces the vm_get_fd() function in kvm_util which returns
the VM file descriptor.
Reviewed-by: Andrew Jones <drjones@redhat.com>
Signed-off-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
---
tools/testing/selftests/kvm/include/kvm_util.h | 1 +
tools/testing/selftests/kvm/lib/kvm_util.c | 5 +++++
2 files changed, 6 insertions(+)
diff --git a/tools/testing/selftests/kvm/include/kvm_util.h b/tools/testing/selftests/kvm/include/kvm_util.h
index a99b875f50d2..4e122819ee24 100644
--- a/tools/testing/selftests/kvm/include/kvm_util.h
+++ b/tools/testing/selftests/kvm/include/kvm_util.h
@@ -254,6 +254,7 @@ bool vm_is_unrestricted_guest(struct kvm_vm *vm);
unsigned int vm_get_page_size(struct kvm_vm *vm);
unsigned int vm_get_page_shift(struct kvm_vm *vm);
unsigned int vm_get_max_gfn(struct kvm_vm *vm);
+int vm_get_fd(struct kvm_vm *vm);
unsigned int vm_calc_num_guest_pages(enum vm_guest_mode mode, size_t size);
unsigned int vm_num_host_pages(enum vm_guest_mode mode, unsigned int num_guest_pages);
diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c
index 8a3523d4434f..3e36a1eb8771 100644
--- a/tools/testing/selftests/kvm/lib/kvm_util.c
+++ b/tools/testing/selftests/kvm/lib/kvm_util.c
@@ -1734,6 +1734,11 @@ unsigned int vm_get_max_gfn(struct kvm_vm *vm)
return vm->max_gfn;
}
+int vm_get_fd(struct kvm_vm *vm)
+{
+ return vm->fd;
+}
+
static unsigned int vm_calc_num_pages(unsigned int num_pages,
unsigned int page_shift,
unsigned int new_page_shift,
--
2.17.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v5 2/2] selftests: kvm: Add mem_slot_test test
2020-04-09 22:09 [PATCH v5 0/2] selftests: kvm: Introduce the mem_slot_test test Wainer dos Santos Moschetta
2020-04-09 22:09 ` [PATCH v5 1/2] selftests: kvm: Add vm_get_fd() in kvm_util Wainer dos Santos Moschetta
@ 2020-04-09 22:09 ` Wainer dos Santos Moschetta
2020-04-10 20:45 ` [PATCH v5 0/2] selftests: kvm: Introduce the " Sean Christopherson
2 siblings, 0 replies; 5+ messages in thread
From: Wainer dos Santos Moschetta @ 2020-04-09 22:09 UTC (permalink / raw)
To: pbonzini, kvm
Cc: drjones, david, linux-kernel, linux-kselftest, krish.sadhukhan
This patch introduces the mem_slot_test test which checks
an VM can have added memory slots up to the limit defined in
KVM_CAP_NR_MEMSLOTS. Then attempt to add one more slot to
verify it fails as expected.
Signed-off-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Reviewed-by: Andrew Jones <drjones@redhat.com>
---
tools/testing/selftests/kvm/.gitignore | 1 +
tools/testing/selftests/kvm/Makefile | 3 +
tools/testing/selftests/kvm/mem_slot_test.c | 69 +++++++++++++++++++++
3 files changed, 73 insertions(+)
create mode 100644 tools/testing/selftests/kvm/mem_slot_test.c
diff --git a/tools/testing/selftests/kvm/.gitignore b/tools/testing/selftests/kvm/.gitignore
index 16877c3daabf..127d27188427 100644
--- a/tools/testing/selftests/kvm/.gitignore
+++ b/tools/testing/selftests/kvm/.gitignore
@@ -21,4 +21,5 @@
/demand_paging_test
/dirty_log_test
/kvm_create_max_vcpus
+/mem_slot_test
/steal_time
diff --git a/tools/testing/selftests/kvm/Makefile b/tools/testing/selftests/kvm/Makefile
index 712a2ddd2a27..338b6cdce1a0 100644
--- a/tools/testing/selftests/kvm/Makefile
+++ b/tools/testing/selftests/kvm/Makefile
@@ -32,12 +32,14 @@ TEST_GEN_PROGS_x86_64 += clear_dirty_log_test
TEST_GEN_PROGS_x86_64 += demand_paging_test
TEST_GEN_PROGS_x86_64 += dirty_log_test
TEST_GEN_PROGS_x86_64 += kvm_create_max_vcpus
+TEST_GEN_PROGS_x86_64 += mem_slot_test
TEST_GEN_PROGS_x86_64 += steal_time
TEST_GEN_PROGS_aarch64 += clear_dirty_log_test
TEST_GEN_PROGS_aarch64 += demand_paging_test
TEST_GEN_PROGS_aarch64 += dirty_log_test
TEST_GEN_PROGS_aarch64 += kvm_create_max_vcpus
+TEST_GEN_PROGS_aarch64 += mem_slot_test
TEST_GEN_PROGS_aarch64 += steal_time
TEST_GEN_PROGS_s390x = s390x/memop
@@ -46,6 +48,7 @@ TEST_GEN_PROGS_s390x += s390x/sync_regs_test
TEST_GEN_PROGS_s390x += demand_paging_test
TEST_GEN_PROGS_s390x += dirty_log_test
TEST_GEN_PROGS_s390x += kvm_create_max_vcpus
+TEST_GEN_PROGS_s390x += mem_slot_test
TEST_GEN_PROGS += $(TEST_GEN_PROGS_$(UNAME_M))
LIBKVM += $(LIBKVM_$(UNAME_M))
diff --git a/tools/testing/selftests/kvm/mem_slot_test.c b/tools/testing/selftests/kvm/mem_slot_test.c
new file mode 100644
index 000000000000..3cab22fa6bd6
--- /dev/null
+++ b/tools/testing/selftests/kvm/mem_slot_test.c
@@ -0,0 +1,69 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * mem_slot_test
+ *
+ * Copyright (C) 2020, Red Hat, Inc.
+ *
+ * Test suite for memory region operations.
+ */
+#define _GNU_SOURCE /* for program_invocation_short_name */
+#include <linux/kvm.h>
+#include <sys/mman.h>
+
+#include "test_util.h"
+#include "kvm_util.h"
+
+/*
+ * 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_slots(void)
+{
+ int ret;
+ struct kvm_vm *vm;
+ uint32_t max_mem_slots;
+ uint32_t slot;
+ uint64_t guest_addr = 0x0;
+ uint64_t mem_reg_npages;
+ uint64_t mem_reg_size = 0x100000; /* Aligned 1MB is needed for s390x */
+ void *mem;
+
+ max_mem_slots = 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);
+
+ vm = vm_create(VM_MODE_DEFAULT, 0, O_RDWR);
+
+ mem_reg_npages = vm_calc_num_guest_pages(VM_MODE_DEFAULT, mem_reg_size);
+
+ /* Check it can be added memory slots up to the maximum allowed */
+ pr_info("Adding slots 0..%i, each memory region with %ldK size\n",
+ (max_mem_slots - 1), mem_reg_size >> 10);
+ for (slot = 0; slot < max_mem_slots; slot++) {
+ vm_userspace_mem_region_add(vm, VM_MEM_SRC_ANONYMOUS,
+ guest_addr, slot, mem_reg_npages,
+ 0);
+ guest_addr += mem_reg_size;
+ }
+
+ /* Check it cannot be added memory slots beyond the limit */
+ mem = mmap(NULL, mem_reg_size, PROT_READ | PROT_WRITE,
+ MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+ TEST_ASSERT(mem != MAP_FAILED, "Failed to mmap() host");
+
+ ret = ioctl(vm_get_fd(vm), KVM_SET_USER_MEMORY_REGION,
+ &(struct kvm_userspace_memory_region) {slot, 0, guest_addr,
+ mem_reg_size, (uint64_t) mem});
+ TEST_ASSERT(ret == -1 && errno == EINVAL,
+ "Adding one more memory slot should fail with EINVAL");
+
+ munmap(mem, mem_reg_size);
+ kvm_vm_free(vm);
+}
+
+int main(int argc, char *argv[])
+{
+ test_add_max_slots();
+ return 0;
+}
--
2.17.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v5 0/2] selftests: kvm: Introduce the mem_slot_test test
2020-04-09 22:09 [PATCH v5 0/2] selftests: kvm: Introduce the mem_slot_test test Wainer dos Santos Moschetta
2020-04-09 22:09 ` [PATCH v5 1/2] selftests: kvm: Add vm_get_fd() in kvm_util Wainer dos Santos Moschetta
2020-04-09 22:09 ` [PATCH v5 2/2] selftests: kvm: Add mem_slot_test test Wainer dos Santos Moschetta
@ 2020-04-10 20:45 ` Sean Christopherson
2020-04-14 6:16 ` Andrew Jones
2 siblings, 1 reply; 5+ messages in thread
From: Sean Christopherson @ 2020-04-10 20:45 UTC (permalink / raw)
To: Wainer dos Santos Moschetta
Cc: pbonzini, kvm, drjones, david, linux-kernel, linux-kselftest,
krish.sadhukhan
On Thu, Apr 09, 2020 at 07:09:03PM -0300, Wainer dos Santos Moschetta wrote:
> This series introduces a new KVM selftest (mem_slot_test) that goal
> is to verify memory slots can be added up to the maximum allowed. An
> extra slot is attempted which should occur on error.
>
> The patch 01 is needed so that the VM fd can be accessed from the
> test code (for the ioctl call attempting to add an extra slot).
>
> I ran the test successfully on x86_64, aarch64, and s390x. This
> is why it is enabled to build on those arches.
Any objection to folding these patches into a series I have to clean up
set_memory_region_test (which was mentioned in a prior version) and add
this as a testcase to set_memory_region_test instead of creating a whole
new test?
A large chunk of set_memory_region_test will still be x86_64 only, but
having the test reside in common code will hopefully make it easier to
extend to other architectures.
^ permalink raw reply [flat|nested] 5+ messages in thread