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

Commit 5ed5c5c8 authored by Takuya Yoshikawa's avatar Takuya Yoshikawa Committed by Paolo Bonzini
Browse files

KVM: x86: MMU: Simplify force_pt_level calculation code in FNAME(page_fault)() 



As a bonus, an extra memory slot search can be eliminated when
is_self_change_mapping is true.

Signed-off-by: default avatarTakuya Yoshikawa <yoshikawa_takuya_b1@lab.ntt.co.jp>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent cd1872f0

arch/x86/kvm/paging_tmpl.h

+7 −8
Original line number Diff line number Diff line
@@ -743,15 +743,14 @@ static int FNAME(page_fault)(struct kvm_vcpu *vcpu, gva_t addr, u32 error_code, 
	is_self_change_mapping = FNAME(is_self_change_mapping)(vcpu,

	      &walker, user_fault, &vcpu->arch.write_fault_to_shadow_pgtable);



	if (walker.level >= PT_DIRECTORY_LEVEL)

		force_pt_level = mapping_level_dirty_bitmap(vcpu, walker.gfn)

		   || is_self_change_mapping;

	else

		force_pt_level = true;

	if (walker.level >= PT_DIRECTORY_LEVEL && !is_self_change_mapping) {

		force_pt_level = mapping_level_dirty_bitmap(vcpu, walker.gfn);

		if (!force_pt_level) {

			level = min(walker.level, mapping_level(vcpu, walker.gfn));

			walker.gfn = walker.gfn & ~(KVM_PAGES_PER_HPAGE(level) - 1);

		}

	} else

		force_pt_level = true;



	mmu_seq = vcpu->kvm->mmu_notifier_seq;

	smp_rmb();