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

Commit e12091ce authored by Takuya Yoshikawa's avatar Takuya Yoshikawa Committed by Gleb Natapov
Browse files

KVM: Remove unused slot_bitmap from kvm_mmu_page 



Not needed any more.

Reviewed-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: default avatarTakuya Yoshikawa <yoshikawa_takuya_b1@lab.ntt.co.jp>
Signed-off-by: default avatarGleb Natapov <gleb@redhat.com>
parent b99db1d3

Documentation/virtual/kvm/mmu.txt

+0 −7
Original line number Diff line number Diff line
@@ -187,13 +187,6 @@ Shadow pages contain the following information: 
    perform a reverse map from a pte to a gfn. When role.direct is set, any

    element of this array can be calculated from the gfn field when used, in

    this case, the array of gfns is not allocated. See role.direct and gfn.

  slot_bitmap:

    A bitmap containing one bit per memory slot.  If the page contains a pte

    mapping a page from memory slot n, then bit n of slot_bitmap will be set

    (if a page is aliased among several slots, then it is not guaranteed that

    all slots will be marked).

    Used during dirty logging to avoid scanning a shadow page if none if its

    pages need tracking.

  root_count:

    A counter keeping track of how many hardware registers (guest cr3 or

    pdptrs) are now pointing at the page.  While this counter is nonzero, the

arch/x86/include/asm/kvm_host.h

+0 −5
Original line number Diff line number Diff line
@@ -219,11 +219,6 @@ struct kvm_mmu_page { 
	u64 *spt;

	/* hold the gfn of each spte inside spt */

	gfn_t *gfns;

	/*

	 * One bit set per slot which has memory

	 * in this shadow page.

	 */

	DECLARE_BITMAP(slot_bitmap, KVM_MEM_SLOTS_NUM);

	bool unsync;

	int root_count;          /* Currently serving as active root */

	unsigned int unsync_children;

arch/x86/kvm/mmu.c

+0 −10
Original line number Diff line number Diff line
@@ -1522,7 +1522,6 @@ static struct kvm_mmu_page *kvm_mmu_alloc_page(struct kvm_vcpu *vcpu, 
		sp->gfns = mmu_memory_cache_alloc(&vcpu->arch.mmu_page_cache);

	set_page_private(virt_to_page(sp->spt), (unsigned long)sp);

	list_add(&sp->link, &vcpu->kvm->arch.active_mmu_pages);

	bitmap_zero(sp->slot_bitmap, KVM_MEM_SLOTS_NUM);

	sp->parent_ptes = 0;

	mmu_page_add_parent_pte(vcpu, sp, parent_pte);

	kvm_mod_used_mmu_pages(vcpu->kvm, +1);
@@ -2183,14 +2182,6 @@ int kvm_mmu_unprotect_page(struct kvm *kvm, gfn_t gfn) 
}

EXPORT_SYMBOL_GPL(kvm_mmu_unprotect_page);



static void page_header_update_slot(struct kvm *kvm, void *pte, gfn_t gfn)

{

	int slot = memslot_id(kvm, gfn);

	struct kvm_mmu_page *sp = page_header(__pa(pte));



	__set_bit(slot, sp->slot_bitmap);

}



/*

 * The function is based on mtrr_type_lookup() in

 * arch/x86/kernel/cpu/mtrr/generic.c
@@ -2472,7 +2463,6 @@ static void mmu_set_spte(struct kvm_vcpu *vcpu, u64 *sptep, 
		++vcpu->kvm->stat.lpages;



	if (is_shadow_present_pte(*sptep)) {

		page_header_update_slot(vcpu->kvm, sptep, gfn);

		if (!was_rmapped) {

			rmap_count = rmap_add(vcpu, sptep, gfn);

			if (rmap_count > RMAP_RECYCLE_THRESHOLD)