diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2025-01-20 14:36:14 +0300 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2025-01-20 14:36:14 +0300 |
| commit | 4e4f38f84e68c6cf3bb2c70be949eb79cef01b7d (patch) | |
| tree | 5a2b3931e3d0633797606c0cb28fbd970e094d1d /include/linux | |
| parent | 5cf32aff2088e650f73f6e291d96cdadd5c02c7a (diff) | |
| parent | 0cc3cb2151f9830274e7bef39a23dc1da1ecd34a (diff) | |
| download | linux-4e4f38f84e68c6cf3bb2c70be949eb79cef01b7d.tar.xz | |
Merge tag 'kvm-memslots-6.14' of https://github.com/kvm-x86/linux into HEAD
KVM kvm_set_memory_region() cleanups and hardening for 6.14:
- Add proper lockdep assertions when setting memory regions.
- Add a dedicated API for setting KVM-internal memory regions.
- Explicitly disallow all flags for KVM-internal memory regions.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/kvm_host.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 401439bb21e3..dcb59d6e8acb 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -1183,7 +1183,7 @@ struct kvm_memory_slot *kvm_vcpu_gfn_to_memslot(struct kvm_vcpu *vcpu, gfn_t gfn * -- just change its flags * * Since flags can be changed by some of these operations, the following - * differentiation is the best we can do for __kvm_set_memory_region(): + * differentiation is the best we can do for kvm_set_memory_region(): */ enum kvm_mr_change { KVM_MR_CREATE, @@ -1192,10 +1192,8 @@ enum kvm_mr_change { KVM_MR_FLAGS_ONLY, }; -int kvm_set_memory_region(struct kvm *kvm, - const struct kvm_userspace_memory_region2 *mem); -int __kvm_set_memory_region(struct kvm *kvm, - const struct kvm_userspace_memory_region2 *mem); +int kvm_set_internal_memslot(struct kvm *kvm, + const struct kvm_userspace_memory_region2 *mem); void kvm_arch_free_memslot(struct kvm *kvm, struct kvm_memory_slot *slot); void kvm_arch_memslots_updated(struct kvm *kvm, u64 gen); int kvm_arch_prepare_memory_region(struct kvm *kvm, |