superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

KVM: Add a dedicated API for setting KVM-internal memslots 

Add a dedicated API for setting internal memslots, and have it explicitly
disallow setting userspace memslots.  Setting a userspace memslots without
a direct command from userspace would result in all manner of issues.

No functional change intended.

Cc: Tao Su <tao1.su@linux.intel.com>
Cc: Claudio Imbrenda <imbrenda@linux.ibm.com>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: Xiaoyao Li <xiaoyao.li@intel.com>
Reviewed-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
Acked-by: Christoph Schlameuss <schlameuss@linux.ibm.com>
Link: https://lore.kernel.org/r/20250111002022.1230573-4-seanjc@google.com
Signed-off-by: Sean Christopherson <seanjc@google.com>
pull/1134/head
Sean Christopherson 2025-01-10 16:20:20 -08:00
parent d131f0042f
commit 156bffdb2b
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/kvm/x86.c
View File

@ -12827,7 +12827,7 @@ void __user * __x86_set_memory_region(struct kvm *kvm, int id, gpa_t gpa,
m.guest_phys_addr = gpa; m.guest_phys_addr = gpa;
m.userspace_addr = hva; m.userspace_addr = hva;
m.memory_size = size; m.memory_size = size;
r = __kvm_set_memory_region(kvm, &m); r = kvm_set_internal_memslot(kvm, &m);
if (r < 0) if (r < 0)
return ERR_PTR_USR(r); return ERR_PTR_USR(r);
} }

2
include/linux/kvm_host.h
View File

@ -1192,7 +1192,7 @@ enum kvm_mr_change {
KVM_MR_FLAGS_ONLY, KVM_MR_FLAGS_ONLY,
}; };
int __kvm_set_memory_region(struct kvm *kvm, int kvm_set_internal_memslot(struct kvm *kvm,
const struct kvm_userspace_memory_region2 *mem); const struct kvm_userspace_memory_region2 *mem);
void kvm_arch_free_memslot(struct kvm *kvm, struct kvm_memory_slot *slot); void kvm_arch_free_memslot(struct kvm *kvm, struct kvm_memory_slot *slot);
void kvm_arch_memslots_updated(struct kvm *kvm, u64 gen); void kvm_arch_memslots_updated(struct kvm *kvm, u64 gen);

13
virt/kvm/kvm_main.c
View File

@ -1926,7 +1926,7 @@ static bool kvm_check_memslot_overlap(struct kvm_memslots *slots, int id,
return false; return false;
} }
int __kvm_set_memory_region(struct kvm *kvm, static int __kvm_set_memory_region(struct kvm *kvm,
const struct kvm_userspace_memory_region2 *mem) const struct kvm_userspace_memory_region2 *mem)
{ {
struct kvm_memory_slot *old, *new; struct kvm_memory_slot *old, *new;
@ -2050,7 +2050,16 @@ out:
kfree(new); kfree(new);
return r; return r;
} }
EXPORT_SYMBOL_GPL(__kvm_set_memory_region);
int kvm_set_internal_memslot(struct kvm *kvm,
const struct kvm_userspace_memory_region2 *mem)
{
if (WARN_ON_ONCE(mem->slot < KVM_USER_MEM_SLOTS))
return -EINVAL;
return __kvm_set_memory_region(kvm, mem);
}
EXPORT_SYMBOL_GPL(kvm_set_internal_memslot);
static int kvm_vm_ioctl_set_memory_region(struct kvm *kvm, static int kvm_vm_ioctl_set_memory_region(struct kvm *kvm,
struct kvm_userspace_memory_region2 *mem) struct kvm_userspace_memory_region2 *mem)