Skip to contentSkip to conversation

KVM: selftests: Add tests - invalid inputs for KVM_CREATE_GUEST_MEMFD

PATCH Superseded Ackerley Tng 2 participants 2 messages Aug 21, 2023 – Aug 24, 2023

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 KVM: selftests: Add tests - invalid inputs for KVM_CREATE_GUEST_MEMFD

Test that invalid inputs for KVM_CREATE_GUEST_MEMFD, such as non-page-aligned page size and invalid flags, are rejected by the KVM_CREATE_GUEST_MEMFD with EINVAL

---
 .../testing/selftests/kvm/guest_memfd_test.c  | 33 +++++++++++++++++++
 .../selftests/kvm/include/kvm_util_base.h     | 11 +++++--
 2 files changed, 42 insertions(+), 2 deletions(-)
tools/testing/selftests/kvm/guest_memfd_test.c +33 -0
index eb93c608a7e0..a8e37f001297 100644
@@ -90,6 +90,37 @@ static void test_fallocate(int fd, size_t page_size, size_t total_size)
 	TEST_ASSERT(!ret, "fallocate to restore punched hole should succeed");
 }
 
+static void test_create_guest_memfd_invalid(struct kvm_vm *vm, size_t page_size)
+{
+	int fd;
+	uint64_t size;
+	uint64_t flags;
+	uint64_t valid_flags = 0;
+
+	for (size = 1; size < page_size; size++) {
+		fd = __vm_create_guest_memfd(vm, size, 0);
+		TEST_ASSERT(
+			fd == -1,
+			"Creating guest memfds with non-page-aligned page sizes should fail");
+		TEST_ASSERT(errno == EINVAL, "... and errno should be set to EINVAL");
+	}
+
+#ifdef CONFIG_TRANSPARENT_HUGEPAGE
+	valid_flags = KVM_GUEST_MEMFD_ALLOW_HUGEPAGE;
+#endif
+
+	for (flags = 1; flags; flags <<= 1) {
+		if (flags & valid_flags)
+			continue;
+
+		fd = __vm_create_guest_memfd(vm, page_size, flags);
+		TEST_ASSERT(
+			fd == -1,
+			"Creating guest memfds with invalid flags should fail");
+		TEST_ASSERT(errno == EINVAL, "... and errno should be set to EINVAL");
+	}
+}
+
 
 int main(int argc, char *argv[])
 {
@@ -103,6 +134,8 @@ int main(int argc, char *argv[])
 
 	vm = vm_create_barebones();
 
+	test_create_guest_memfd_invalid(vm, page_size);
+
 	fd = vm_create_guest_memfd(vm, total_size, 0);
 
 	test_file_read_write(fd);
tools/testing/selftests/kvm/include/kvm_util_base.h +9 -2
index 39b38c75b99c..8bdfadd72349 100644
@@ -474,7 +474,8 @@ static inline uint64_t vm_get_stat(struct kvm_vm *vm, const char *stat_name)
 }
 
 void vm_create_irqchip(struct kvm_vm *vm);
-static inline int vm_create_guest_memfd(struct kvm_vm *vm, uint64_t size,
+
+static inline int __vm_create_guest_memfd(struct kvm_vm *vm, uint64_t size,
 					uint64_t flags)
 {
 	struct kvm_create_guest_memfd gmem = {
@@ -482,7 +483,13 @@ static inline int vm_create_guest_memfd(struct kvm_vm *vm, uint64_t size,
 		.flags = flags,
 	};
 
-	int fd = __vm_ioctl(vm, KVM_CREATE_GUEST_MEMFD, &gmem);
+	return __vm_ioctl(vm, KVM_CREATE_GUEST_MEMFD, &gmem);
+}
+
+static inline int vm_create_guest_memfd(struct kvm_vm *vm, uint64_t size,
+					uint64_t flags)
+{
+	int fd = __vm_create_guest_memfd(vm, size, flags);
 
 	TEST_ASSERT(fd >= 0, KVM_IOCTL_ERROR(KVM_CREATE_GUEST_MEMFD, fd));
 	return fd;
Signature · 1 line
2.42.0.rc1.204.g551eb34607-goog
#1 lore raw
Quoted 15 lines · Ackerley Tng

Test that invalid inputs for KVM_CREATE_GUEST_MEMFD, such as non-page-aligned page size and invalid flags, are rejected by the KVM_CREATE_GUEST_MEMFD with EINVAL

---
 .../testing/selftests/kvm/guest_memfd_test.c  | 33 +++++++++++++++++++
 .../selftests/kvm/include/kvm_util_base.h     | 11 +++++--
 2 files changed, 42 insertions(+), 2 deletions(-)
tools/testing/selftests/kvm/guest_memfd_test.c +0 -0
index eb93c608a7e0..a8e37f001297 100644

tools/testing/selftests/kvm/guest_memfd_test.c static void test_fallocate(int fd, size_t page_size, size_t total_size) · line 96

Quoted 7 lines
tools/testing/selftests/kvm/guest_memfd_test.c +4 -0
@@ -90,6 +90,37 @@ static void test_fallocate(int fd, size_t page_size, size_t total_size)
 	TEST_ASSERT(!ret, "fallocate to restore punched hole should succeed");
 }
 
+static void test_create_guest_memfd_invalid(struct kvm_vm *vm, size_t page_size)
+{
+	int fd;
+	uint64_t size;

This should be size_t.

tools/testing/selftests/kvm/guest_memfd_test.c static void test_fallocate(int fd, size_t page_size, size_t total_size) · line 98

Quoted 2 lines
tools/testing/selftests/kvm/guest_memfd_test.c +2 -0
+	uint64_t flags;
+	uint64_t valid_flags = 0;

Revert fir/xmas-tree please.

tools/testing/selftests/kvm/guest_memfd_test.c static void test_fallocate(int fd, size_t page_size, size_t total_size) · line 102

Quoted 4 lines
tools/testing/selftests/kvm/guest_memfd_test.c +4 -0
+
+	for (size = 1; size < page_size; size++) {
+		fd = __vm_create_guest_memfd(vm, size, 0);
+		TEST_ASSERT(

No, bad Google3, bad. Never immediately wrap after an opening parenthesis.

tools/testing/selftests/kvm/guest_memfd_test.c static void test_fallocate(int fd, size_t page_size, size_t total_size) · line 105

Quoted 3 lines
tools/testing/selftests/kvm/guest_memfd_test.c +3 -0
+			fd == -1,
+			"Creating guest memfds with non-page-aligned page sizes should fail");
+		TEST_ASSERT(errno == EINVAL, "... and errno should be set to EINVAL");

Don't split/delay "errno" checks, it's all too easy for errno to get clobbered. And there's absolutely zero reason to split these, the ret+errno get printed so the odds of what went wrong not being super duper obvious are very low. What _is_ worth printing is the size.

tools/testing/selftests/kvm/guest_memfd_test.c static void test_fallocate(int fd, size_t page_size, size_t total_size) · line 110

Quoted 5 lines
tools/testing/selftests/kvm/guest_memfd_test.c +5 -0
+	}
+
+#ifdef CONFIG_TRANSPARENT_HUGEPAGE
+	valid_flags = KVM_GUEST_MEMFD_ALLOW_HUGEPAGE;
+#endif

Ugh, this is annoying. But HPAGE_PMD_SIZE wrapping with CONFIG_TRANSPARENT_HUGEPAGE and so guest_memfd() can't (easily) enforce the alignment check if THP is disabled, i.e. always letting userspace specify KVM_GUEST_MEMFD_ALLOW_HUGEPAGE would be messy.

Oh! And we should also test for unaligned huge pages, i.e. multiples of page_size that aren't PMD-aligned. At that point, I would say don't pass in @page_size to this particular testcase, e.g. have main() be something like this:

	vm = vm_create_barebones();

	test_create_guest_memfd_invalid(vm);

	page_size = getpagesize();
	total_size = page_size * 4;
	fd = vm_create_guest_memfd(vm, total_size, 0);

	test_file_read_write(fd);
	test_mmap(fd, page_size);
	test_file_size(fd, page_size, total_size);
	test_fallocate(fd, page_size, total_size);

And then in here, use get_trans_hugepagesz() to do negative testing of KVM_GUEST_MEMFD_ALLOW_HUGEPAGE.

tools/testing/selftests/kvm/guest_memfd_test.c static void test_fallocate(int fd, size_t page_size, size_t total_size) · line 113

Quoted 3 lines
tools/testing/selftests/kvm/guest_memfd_test.c +3 -0
+
+	for (flags = 1; flags; flags <<= 1) {
+		if (flags & valid_flags)

This only ever tests one flag in isolation, e.g. if it would detect if KVM did something ridiculous like

	if (flags && !(flags & KVM_GUEST_MEMFD_ALLOW_HUGEPAGE))
		return -EINVAL;

Iterating over all possible values doesn't make sense, and giving "lower" flags preference is likewise a bit silly, so what if we do (note the s/flags/flag)

	for (flag = 1; flag; flag <<= 1) {
		if (flag & valid_flags)
			continue;

		fd = __vm_create_guest_memfd(vm, page_size, flag);
		TEST_ASSERT(fd == -1 && errno == EINVAL,
			    "guest_memfd() with flags '0x%llx' should fail with EINVAL", flag);

		for_each_set_bit(bit, &valid_flags, 64) {
			fd = __vm_create_guest_memfd(vm, page_size, flag | BIT_ULL(bit));
			TEST_ASSERT(fd == -1 && errno == EINVAL,
				    "guest_memfd() with flags '0x%llx' should fail with EINVAL",
			    	    flag | BIT_ULL(bit));
		}
	}

i.e. test the invalid flag in isolation, and then also test it in combination with each valid flag. It's from from exhaustive, but it'll at least ensure we have *some* coverage if/when new flags come along.