| Message ID | 20231105163040.14904-31-pbonzini@redhat.com (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | KVM: guest_memfd() and per-page attributes | expand |
| Context | Check | Description |
|---|---|---|
| conchuod/vmtest-fixes-PR | fail | merge-conflict |
On Sun, Nov 5, 2023 at 4:34 PM Paolo Bonzini <pbonzini@redhat.com> wrote: > > From: Chao Peng <chao.p.peng@linux.intel.com> > > Add helpers to invoke KVM_SET_USER_MEMORY_REGION2 directly so that tests > can validate of features that are unique to "version 2" of "set user > memory region", e.g. do negative testing on gmem_fd and gmem_offset. > > Provide a raw version as well as an assert-success version to reduce > the amount of boilerplate code need for basic usage. > > Signed-off-by: Chao Peng <chao.p.peng@linux.intel.com> > Signed-off-by: Ackerley Tng <ackerleytng@google.com> > Signed-off-by: Sean Christopherson <seanjc@google.com> > Message-Id: <20231027182217.3615211-33-seanjc@google.com> > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > --- Reviewed-by: Fuad Tabba <tabba@google.com> Tested-by: Fuad Tabba <tabba@google.com> Cheers, /fuad > .../selftests/kvm/include/kvm_util_base.h | 7 +++++ > tools/testing/selftests/kvm/lib/kvm_util.c | 29 +++++++++++++++++++ > 2 files changed, 36 insertions(+) > > diff --git a/tools/testing/selftests/kvm/include/kvm_util_base.h b/tools/testing/selftests/kvm/include/kvm_util_base.h > index 157508c071f3..8ec122f5fcc8 100644 > --- a/tools/testing/selftests/kvm/include/kvm_util_base.h > +++ b/tools/testing/selftests/kvm/include/kvm_util_base.h > @@ -522,6 +522,13 @@ void vm_set_user_memory_region(struct kvm_vm *vm, uint32_t slot, uint32_t flags, > uint64_t gpa, uint64_t size, void *hva); > int __vm_set_user_memory_region(struct kvm_vm *vm, uint32_t slot, uint32_t flags, > uint64_t gpa, uint64_t size, void *hva); > +void vm_set_user_memory_region2(struct kvm_vm *vm, uint32_t slot, uint32_t flags, > + uint64_t gpa, uint64_t size, void *hva, > + uint32_t guest_memfd, uint64_t guest_memfd_offset); > +int __vm_set_user_memory_region2(struct kvm_vm *vm, uint32_t slot, uint32_t flags, > + uint64_t gpa, uint64_t size, void *hva, > + uint32_t guest_memfd, uint64_t guest_memfd_offset); > + > void vm_userspace_mem_region_add(struct kvm_vm *vm, > enum vm_mem_backing_src_type src_type, > uint64_t guest_paddr, uint32_t slot, uint64_t npages, > diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c > index 1c74310f1d44..d05d95cc3693 100644 > --- a/tools/testing/selftests/kvm/lib/kvm_util.c > +++ b/tools/testing/selftests/kvm/lib/kvm_util.c > @@ -873,6 +873,35 @@ void vm_set_user_memory_region(struct kvm_vm *vm, uint32_t slot, uint32_t flags, > errno, strerror(errno)); > } > > +int __vm_set_user_memory_region2(struct kvm_vm *vm, uint32_t slot, uint32_t flags, > + uint64_t gpa, uint64_t size, void *hva, > + uint32_t guest_memfd, uint64_t guest_memfd_offset) > +{ > + struct kvm_userspace_memory_region2 region = { > + .slot = slot, > + .flags = flags, > + .guest_phys_addr = gpa, > + .memory_size = size, > + .userspace_addr = (uintptr_t)hva, > + .guest_memfd = guest_memfd, > + .guest_memfd_offset = guest_memfd_offset, > + }; > + > + return ioctl(vm->fd, KVM_SET_USER_MEMORY_REGION2, ®ion); > +} > + > +void vm_set_user_memory_region2(struct kvm_vm *vm, uint32_t slot, uint32_t flags, > + uint64_t gpa, uint64_t size, void *hva, > + uint32_t guest_memfd, uint64_t guest_memfd_offset) > +{ > + int ret = __vm_set_user_memory_region2(vm, slot, flags, gpa, size, hva, > + guest_memfd, guest_memfd_offset); > + > + TEST_ASSERT(!ret, "KVM_SET_USER_MEMORY_REGION2 failed, errno = %d (%s)", > + errno, strerror(errno)); > +} > + > + > /* FIXME: This thing needs to be ripped apart and rewritten. */ > void vm_mem_add(struct kvm_vm *vm, enum vm_mem_backing_src_type src_type, > uint64_t guest_paddr, uint32_t slot, uint64_t npages, > -- > 2.39.1 > >
diff --git a/tools/testing/selftests/kvm/include/kvm_util_base.h b/tools/testing/selftests/kvm/include/kvm_util_base.h index 157508c071f3..8ec122f5fcc8 100644 --- a/tools/testing/selftests/kvm/include/kvm_util_base.h +++ b/tools/testing/selftests/kvm/include/kvm_util_base.h @@ -522,6 +522,13 @@ void vm_set_user_memory_region(struct kvm_vm *vm, uint32_t slot, uint32_t flags, uint64_t gpa, uint64_t size, void *hva); int __vm_set_user_memory_region(struct kvm_vm *vm, uint32_t slot, uint32_t flags, uint64_t gpa, uint64_t size, void *hva); +void vm_set_user_memory_region2(struct kvm_vm *vm, uint32_t slot, uint32_t flags, + uint64_t gpa, uint64_t size, void *hva, + uint32_t guest_memfd, uint64_t guest_memfd_offset); +int __vm_set_user_memory_region2(struct kvm_vm *vm, uint32_t slot, uint32_t flags, + uint64_t gpa, uint64_t size, void *hva, + uint32_t guest_memfd, uint64_t guest_memfd_offset); + void vm_userspace_mem_region_add(struct kvm_vm *vm, enum vm_mem_backing_src_type src_type, uint64_t guest_paddr, uint32_t slot, uint64_t npages, diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c index 1c74310f1d44..d05d95cc3693 100644 --- a/tools/testing/selftests/kvm/lib/kvm_util.c +++ b/tools/testing/selftests/kvm/lib/kvm_util.c @@ -873,6 +873,35 @@ void vm_set_user_memory_region(struct kvm_vm *vm, uint32_t slot, uint32_t flags, errno, strerror(errno)); } +int __vm_set_user_memory_region2(struct kvm_vm *vm, uint32_t slot, uint32_t flags, + uint64_t gpa, uint64_t size, void *hva, + uint32_t guest_memfd, uint64_t guest_memfd_offset) +{ + struct kvm_userspace_memory_region2 region = { + .slot = slot, + .flags = flags, + .guest_phys_addr = gpa, + .memory_size = size, + .userspace_addr = (uintptr_t)hva, + .guest_memfd = guest_memfd, + .guest_memfd_offset = guest_memfd_offset, + }; + + return ioctl(vm->fd, KVM_SET_USER_MEMORY_REGION2, ®ion); +} + +void vm_set_user_memory_region2(struct kvm_vm *vm, uint32_t slot, uint32_t flags, + uint64_t gpa, uint64_t size, void *hva, + uint32_t guest_memfd, uint64_t guest_memfd_offset) +{ + int ret = __vm_set_user_memory_region2(vm, slot, flags, gpa, size, hva, + guest_memfd, guest_memfd_offset); + + TEST_ASSERT(!ret, "KVM_SET_USER_MEMORY_REGION2 failed, errno = %d (%s)", + errno, strerror(errno)); +} + + /* FIXME: This thing needs to be ripped apart and rewritten. */ void vm_mem_add(struct kvm_vm *vm, enum vm_mem_backing_src_type src_type, uint64_t guest_paddr, uint32_t slot, uint64_t npages,