Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e0e8afa authored by Xiao Guangrong's avatar Xiao Guangrong Committed by Avi Kivity
Browse files

KVM: MMU: remove count_rmaps() 



Nothing is checked in count_rmaps(), so remove it

Signed-off-by: default avatarXiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 365fb3fd

arch/x86/kvm/mmu.c

+0 −38
Original line number Diff line number Diff line
@@ -3606,43 +3606,6 @@ static void audit_mappings(struct kvm_vcpu *vcpu) 
						    2);

}



static int count_rmaps(struct kvm_vcpu *vcpu)

{

	struct kvm *kvm = vcpu->kvm;

	struct kvm_memslots *slots;

	int nmaps = 0;

	int i, j, k, idx;



	idx = srcu_read_lock(&kvm->srcu);

	slots = kvm_memslots(kvm);

	for (i = 0; i < KVM_MEMORY_SLOTS; ++i) {

		struct kvm_memory_slot *m = &slots->memslots[i];

		struct kvm_rmap_desc *d;



		for (j = 0; j < m->npages; ++j) {

			unsigned long *rmapp = &m->rmap[j];



			if (!*rmapp)

				continue;

			if (!(*rmapp & 1)) {

				++nmaps;

				continue;

			}

			d = (struct kvm_rmap_desc *)(*rmapp & ~1ul);

			while (d) {

				for (k = 0; k < RMAP_EXT; ++k)

					if (d->sptes[k])

						++nmaps;

					else

						break;

				d = d->more;

			}

		}

	}

	srcu_read_unlock(&kvm->srcu, idx);

	return nmaps;

}



void inspect_spte_has_rmap(struct kvm *kvm, u64 *sptep)

{

	unsigned long *rmapp;
@@ -3704,7 +3667,6 @@ static void check_mappings_rmap(struct kvm_vcpu *vcpu) 
static void audit_rmap(struct kvm_vcpu *vcpu)

{

	check_mappings_rmap(vcpu);

	count_rmaps(vcpu);

}



static void audit_write_protection(struct kvm_vcpu *vcpu)