Skip to content

Commit f81a6d1

Browse files
committed
KVM: Open code kvm_set_memory_region() into its sole caller (ioctl() API)
Open code kvm_set_memory_region() into its sole caller in preparation for adding a dedicated API for setting internal memslots. Oppurtunistically use the fancy new guard(mutex) to avoid a local 'r' variable. Cc: Tao Su <tao1.su@linux.intel.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-2-seanjc@google.com Signed-off-by: Sean Christopherson <seanjc@google.com>
1 parent 10b2c8a commit f81a6d1

File tree

2 files changed

+2
-15
lines changed

2 files changed

+2
-15
lines changed

include/linux/kvm_host.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1192,8 +1192,6 @@ enum kvm_mr_change {
11921192
KVM_MR_FLAGS_ONLY,
11931193
};
11941194

1195-
int kvm_set_memory_region(struct kvm *kvm,
1196-
const struct kvm_userspace_memory_region2 *mem);
11971195
int __kvm_set_memory_region(struct kvm *kvm,
11981196
const struct kvm_userspace_memory_region2 *mem);
11991197
void kvm_arch_free_memslot(struct kvm *kvm, struct kvm_memory_slot *slot);

virt/kvm/kvm_main.c

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2058,25 +2058,14 @@ int __kvm_set_memory_region(struct kvm *kvm,
20582058
}
20592059
EXPORT_SYMBOL_GPL(__kvm_set_memory_region);
20602060

2061-
int kvm_set_memory_region(struct kvm *kvm,
2062-
const struct kvm_userspace_memory_region2 *mem)
2063-
{
2064-
int r;
2065-
2066-
mutex_lock(&kvm->slots_lock);
2067-
r = __kvm_set_memory_region(kvm, mem);
2068-
mutex_unlock(&kvm->slots_lock);
2069-
return r;
2070-
}
2071-
EXPORT_SYMBOL_GPL(kvm_set_memory_region);
2072-
20732061
static int kvm_vm_ioctl_set_memory_region(struct kvm *kvm,
20742062
struct kvm_userspace_memory_region2 *mem)
20752063
{
20762064
if ((u16)mem->slot >= KVM_USER_MEM_SLOTS)
20772065
return -EINVAL;
20782066

2079-
return kvm_set_memory_region(kvm, mem);
2067+
guard(mutex)(&kvm->slots_lock);
2068+
return __kvm_set_memory_region(kvm, mem);
20802069
}
20812070

20822071
#ifndef CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT

0 commit comments

Comments
 (0)