Commit 91ca7672 authored by Lai Jiangshan's avatar Lai Jiangshan Committed by Sean Christopherson
Browse files

kvm: x86/mmu: Remove @no_dirty_log from FNAME(prefetch_gpte) 



FNAME(prefetch_gpte) is always called with @no_dirty_log=true.

Signed-off-by: default avatarLai Jiangshan <jiangshan.ljs@antgroup.com>
Link: https://lore.kernel.org/r/20230216235321.735214-4-jiangshanlai@gmail.com


Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
parent 9fd4a4e3

arch/x86/kvm/mmu/paging_tmpl.h

+3 −4
Original line number Diff line number Diff line
@@ -519,7 +519,7 @@ static int FNAME(walk_addr)(struct guest_walker *walker, 


static bool

FNAME(prefetch_gpte)(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp,

		     u64 *spte, pt_element_t gpte, bool no_dirty_log)

		     u64 *spte, pt_element_t gpte)

{

	struct kvm_memory_slot *slot;

	unsigned pte_access;
@@ -535,8 +535,7 @@ FNAME(prefetch_gpte)(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp, 
	pte_access = sp->role.access & FNAME(gpte_access)(gpte);

	FNAME(protect_clean_gpte)(vcpu->arch.mmu, &pte_access, gpte);



	slot = gfn_to_memslot_dirty_bitmap(vcpu, gfn,

			no_dirty_log && (pte_access & ACC_WRITE_MASK));

	slot = gfn_to_memslot_dirty_bitmap(vcpu, gfn, pte_access & ACC_WRITE_MASK);

	if (!slot)

		return false;
@@ -605,7 +604,7 @@ static void FNAME(pte_prefetch)(struct kvm_vcpu *vcpu, struct guest_walker *gw, 
		if (is_shadow_present_pte(*spte))

			continue;



		if (!FNAME(prefetch_gpte)(vcpu, sp, spte, gptep[i], true))

		if (!FNAME(prefetch_gpte)(vcpu, sp, spte, gptep[i]))

			break;

	}

}