Commit 9f6b8029 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

KVM: use kvm_memslots whenever possible 



kvm_memslots provides lockdep checking.  Use it consistently instead of
explicit dereferencing of kvm->memslots.

Reviewed-by: default avatarRadim Krcmar <rkrcmar@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent a47d2b07

arch/arm/kvm/mmu.c

+2 −1
Original line number Diff line number Diff line
@@ -1155,7 +1155,8 @@ static void stage2_wp_range(struct kvm *kvm, phys_addr_t addr, phys_addr_t end) 
 */

void kvm_mmu_wp_memory_region(struct kvm *kvm, int slot)

{

	struct kvm_memory_slot *memslot = id_to_memslot(kvm->memslots, slot);

	struct kvm_memslots *slots = kvm_memslots(kvm);

	struct kvm_memory_slot *memslot = id_to_memslot(slots, slot);

	phys_addr_t start = memslot->base_gfn << PAGE_SHIFT;

	phys_addr_t end = (memslot->base_gfn + memslot->npages) << PAGE_SHIFT;

arch/mips/kvm/mips.c

+3 −1
Original line number Diff line number Diff line
@@ -968,6 +968,7 @@ long kvm_arch_vcpu_ioctl(struct file *filp, unsigned int ioctl, 
/* 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)

{

	struct kvm_memslots *slots;

	struct kvm_memory_slot *memslot;

	unsigned long ga, ga_end;

	int is_dirty = 0;
@@ -982,7 +983,8 @@ int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm, struct kvm_dirty_log *log) 


	/* If nothing is dirty, don't bother messing with page tables. */

	if (is_dirty) {

		memslot = id_to_memslot(kvm->memslots, log->slot);

		slots = kvm_memslots(kvm);

		memslot = id_to_memslot(slots, log->slot);



		ga = memslot->base_gfn << PAGE_SHIFT;

		ga_end = ga + (memslot->npages << PAGE_SHIFT);

arch/powerpc/kvm/book3s_64_mmu_hv.c

+1 −1
Original line number Diff line number Diff line
@@ -650,7 +650,7 @@ static void kvmppc_rmap_reset(struct kvm *kvm) 
	int srcu_idx;



	srcu_idx = srcu_read_lock(&kvm->srcu);

	slots = kvm->memslots;

	slots = kvm_memslots(kvm);

	kvm_for_each_memslot(memslot, slots) {

		/*

		 * This assumes it is acceptable to lose reference and

arch/powerpc/kvm/book3s_hv.c

+6 −2
Original line number Diff line number Diff line
@@ -2321,6 +2321,7 @@ static int kvm_vm_ioctl_get_smmu_info_hv(struct kvm *kvm, 
static int kvm_vm_ioctl_get_dirty_log_hv(struct kvm *kvm,

					 struct kvm_dirty_log *log)

{

	struct kvm_memslots *slots;

	struct kvm_memory_slot *memslot;

	int r;

	unsigned long n;
@@ -2331,7 +2332,8 @@ static int kvm_vm_ioctl_get_dirty_log_hv(struct kvm *kvm, 
	if (log->slot >= KVM_USER_MEM_SLOTS)

		goto out;



	memslot = id_to_memslot(kvm->memslots, log->slot);

	slots = kvm_memslots(kvm);

	memslot = id_to_memslot(slots, log->slot);

	r = -ENOENT;

	if (!memslot->dirty_bitmap)

		goto out;
@@ -2384,6 +2386,7 @@ static void kvmppc_core_commit_memory_region_hv(struct kvm *kvm, 
				const struct kvm_memory_slot *old)

{

	unsigned long npages = mem->memory_size >> PAGE_SHIFT;

	struct kvm_memslots *slots;

	struct kvm_memory_slot *memslot;



	if (npages && old->npages) {
@@ -2393,7 +2396,8 @@ static void kvmppc_core_commit_memory_region_hv(struct kvm *kvm, 
		 * since the rmap array starts out as all zeroes,

		 * i.e. no pages are dirty.

		 */

		memslot = id_to_memslot(kvm->memslots, mem->slot);

		slots = kvm_memslots(kvm);

		memslot = id_to_memslot(slots, mem->slot);

		kvmppc_hv_get_dirty_log(kvm, memslot, NULL);

	}

}

arch/powerpc/kvm/book3s_pr.c

+3 −1
Original line number Diff line number Diff line
@@ -1530,6 +1530,7 @@ static int kvmppc_vcpu_run_pr(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu) 
static int kvm_vm_ioctl_get_dirty_log_pr(struct kvm *kvm,

					 struct kvm_dirty_log *log)

{

	struct kvm_memslots *slots;

	struct kvm_memory_slot *memslot;

	struct kvm_vcpu *vcpu;

	ulong ga, ga_end;
@@ -1545,7 +1546,8 @@ static int kvm_vm_ioctl_get_dirty_log_pr(struct kvm *kvm, 


	/* If nothing is dirty, don't bother messing with page tables. */

	if (is_dirty) {

		memslot = id_to_memslot(kvm->memslots, log->slot);

		slots = kvm_memslots(kvm);

		memslot = id_to_memslot(slots, log->slot);



		ga = memslot->base_gfn << PAGE_SHIFT;

		ga_end = ga + (memslot->npages << PAGE_SHIFT);