We move sanity check and lock related parts to the arch independent code. This will help future cleanups.
Signed-off-by: Takuya Yoshikawa <[email protected]> --- arch/ia64/kvm/kvm-ia64.c | 14 ++------------ arch/powerpc/kvm/book3s.c | 14 ++------------ arch/powerpc/kvm/booke.c | 2 +- arch/s390/kvm/kvm-s390.c | 4 ++-- arch/x86/kvm/x86.c | 14 ++------------ include/linux/kvm_host.h | 4 ++-- virt/kvm/kvm_main.c | 24 ++++++++++++++++++++++++ 7 files changed, 35 insertions(+), 41 deletions(-) diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c index c3754bb..72efc39 100644 --- a/arch/ia64/kvm/kvm-ia64.c +++ b/arch/ia64/kvm/kvm-ia64.c @@ -1815,24 +1815,15 @@ static void kvm_ia64_sync_dirty_log(struct kvm *kvm, spin_unlock(&kvm->arch.dirty_log_lock); } -int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm, - struct kvm_dirty_log *log) +int kvm_arch_get_dirty_log(struct kvm *kvm, + struct kvm_dirty_log *log) { int r, i; unsigned long n; struct kvm_memory_slot *memslot; unsigned long is_dirty = 0; - mutex_lock(&kvm->slots_lock); - - r = -EINVAL; - if (log->slot >= KVM_MEMORY_SLOTS) - goto out; - memslot = &kvm->memslots->memslots[log->slot]; - r = -ENOENT; - if (!memslot->dirty_bitmap) - goto out; kvm_ia64_sync_dirty_log(kvm, memslot); @@ -1852,7 +1843,6 @@ int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm, } r = 0; out: - mutex_unlock(&kvm->slots_lock); return r; } diff --git a/arch/powerpc/kvm/book3s.c b/arch/powerpc/kvm/book3s.c index 691ac31..f9b1290 100644 --- a/arch/powerpc/kvm/book3s.c +++ b/arch/powerpc/kvm/book3s.c @@ -1239,8 +1239,8 @@ int kvm_arch_vcpu_ioctl_translate(struct kvm_vcpu *vcpu, /* * Get (and clear) the dirty memory log for a memory slot. */ -int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm, - struct kvm_dirty_log *log) +int kvm_arch_get_dirty_log(struct kvm *kvm, + struct kvm_dirty_log *log) { struct kvm_memory_slot *memslot; struct kvm_vcpu *vcpu; @@ -1249,16 +1249,7 @@ int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm, int r, i; unsigned long n; - mutex_lock(&kvm->slots_lock); - - r = -EINVAL; - if (log->slot >= KVM_MEMORY_SLOTS) - goto out; - memslot = &kvm->memslots->memslots[log->slot]; - r = -ENOENT; - if (!memslot->dirty_bitmap) - goto out; n = kvm_dirty_bitmap_bytes(memslot); @@ -1282,7 +1273,6 @@ int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm, r = 0; out: - mutex_unlock(&kvm->slots_lock); return r; } diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c index c604277..5eb64b9 100644 --- a/arch/powerpc/kvm/booke.c +++ b/arch/powerpc/kvm/booke.c @@ -596,7 +596,7 @@ int kvm_arch_vcpu_ioctl_translate(struct kvm_vcpu *vcpu, return r; } -int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm, struct kvm_dirty_log *log) +int kvm_arch_get_dirty_log(struct kvm *kvm, struct kvm_dirty_log *log) { return -ENOTSUPP; } diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index 4fe6865..09b7885 100644 --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/kvm-s390.c @@ -134,8 +134,8 @@ int kvm_dev_ioctl_check_extension(long ext) /* * Get (and clear) the dirty memory log for a memory slot. */ -int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm, - struct kvm_dirty_log *log) +int kvm_arch_get_dirty_log(struct kvm *kvm, + struct kvm_dirty_log *log) { return 0; } diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 6e6659d..ecb5350 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -3019,24 +3019,15 @@ static int kvm_vm_ioctl_reinject(struct kvm *kvm, /* * Get (and clear) the dirty memory log for a memory slot. */ -int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm, - struct kvm_dirty_log *log) +int kvm_arch_get_dirty_log(struct kvm *kvm, + struct kvm_dirty_log *log) { int r, i; struct kvm_memory_slot *memslot; unsigned long n; unsigned long is_dirty = 0; - mutex_lock(&kvm->slots_lock); - - r = -EINVAL; - if (log->slot >= KVM_MEMORY_SLOTS) - goto out; - memslot = &kvm->memslots->memslots[log->slot]; - r = -ENOENT; - if (!memslot->dirty_bitmap) - goto out; n = kvm_dirty_bitmap_bytes(memslot); @@ -3087,7 +3078,6 @@ int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm, r = 0; out: - mutex_unlock(&kvm->slots_lock); return r; } diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 91ee311..0773d56 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -342,8 +342,8 @@ long kvm_arch_vcpu_ioctl(struct file *filp, int kvm_dev_ioctl_check_extension(long ext); -int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm, - struct kvm_dirty_log *log); +int kvm_arch_get_dirty_log(struct kvm *kvm, + struct kvm_dirty_log *log); int kvm_vm_ioctl_set_memory_region(struct kvm *kvm, struct diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 39b4512..cdfe32a 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -776,6 +776,30 @@ int kvm_vm_ioctl_set_memory_region(struct kvm *kvm, return kvm_set_memory_region(kvm, mem, user_alloc); } +static int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm, + struct kvm_dirty_log *log) +{ + struct kvm_memory_slot *memslot; + int r; + + mutex_lock(&kvm->slots_lock); + + r = -EINVAL; + if (log->slot >= KVM_MEMORY_SLOTS) + goto out; + + memslot = &kvm->memslots->memslots[log->slot]; + r = -ENOENT; + if (!memslot->dirty_bitmap) + goto out; + + r = kvm_arch_get_dirty_log(kvm, log); + +out: + mutex_unlock(&kvm->slots_lock); + return r; +} + void kvm_disable_largepages(void) { largepages_enabled = false; -- 1.7.0.4 -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
