@@ -203,6 +203,30 @@ static void handle_exit_hypercall(struct kvm_vcpu *vcpu)
run->hypercall.ret = 0;
}
+static void test_invalidation_code_unbound(struct kvm_vm *vm)
+{
+ uint32_t fd;
+ uint64_t offset;
+ struct userspace_mem_region *region;
+
+ region = memslot2region(vm, DATA_SLOT);
+ fd = region->region.restrictedmem_fd;
+ offset = region->region.restrictedmem_offset;
+
+ kvm_vm_free(vm);
+
+ /*
+ * At this point the KVM invalidation code should have been unbound from
+ * the vm. We do allocation and truncation to exercise the restrictedmem
+ * code. There should be no issues after the unbinding happens.
+ */
+ if (fallocate(fd, 0, offset, DATA_SIZE))
+ TEST_FAIL("Unexpected error in fallocate");
+ if (fallocate(fd, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE,
+ offset, DATA_SIZE))
+ TEST_FAIL("Unexpected error in fallocate");
+}
+
static void test_mem_conversions(enum vm_mem_backing_src_type src_type)
{
struct kvm_vcpu *vcpu;
@@ -270,7 +294,7 @@ static void test_mem_conversions(enum vm_mem_backing_src_type src_type)
}
done:
- kvm_vm_free(vm);
+ test_invalidation_code_unbound(vm);
}
int main(int argc, char *argv[])
The kernel interfaces restrictedmem_bind and restrictedmem_unbind are used by KVM to bind/unbind kvm functions to restrictedmem's invalidate_start and invalidate_end callbacks. After the KVM VM is freed, the KVM functions should have been unbound from the restrictedmem_fd's callbacks. In this test, we exercise fallocate to back and unback memory using the restrictedmem fd, and we expect no problems (crashes) after the KVM functions have been unbound. Signed-off-by: Ackerley Tng <ackerleytng@google.com> --- .../kvm/x86_64/private_mem_conversions_test.c | 26 ++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-)