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

Commit 5882842f authored by Dong, Eddie's avatar Dong, Eddie Committed by Avi Kivity
Browse files

KVM: MMU: Merge shadow level check in FNAME(fetch) 



Remove the redundant level check when fetching
shadow pte for present & non-present spte.

Signed-off-by: default avatarYaozu (Eddie) Dong <eddie.dong@intel.com>
Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent eb787d10

arch/x86/kvm/paging_tmpl.h

+2 −5
Original line number Diff line number Diff line
@@ -300,16 +300,13 @@ static u64 *FNAME(fetch)(struct kvm_vcpu *vcpu, gva_t addr, 
		bool new_page = 0;



		shadow_ent = ((u64 *)__va(shadow_addr)) + index;

		if (is_shadow_present_pte(*shadow_ent)) {

		if (level == PT_PAGE_TABLE_LEVEL)

			break;

		if (is_shadow_present_pte(*shadow_ent)) {

			shadow_addr = *shadow_ent & PT64_BASE_ADDR_MASK;

			continue;

		}



		if (level == PT_PAGE_TABLE_LEVEL)

			break;



		if (level - 1 == PT_PAGE_TABLE_LEVEL

		    && walker->level == PT_DIRECTORY_LEVEL) {

			metaphysical = 1;