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

Commit 957446af authored by Joerg Roedel's avatar Joerg Roedel Committed by Avi Kivity
Browse files

KVM: MMU: Check for root_level instead of long mode 



The walk_addr function checks for !is_long_mode in its 64
bit version. But what is meant here is a check for pae
paging. Change the condition to really check for pae paging
so that it also works with nested nested paging.

Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 7b914098

arch/x86/kvm/paging_tmpl.h

+2 −2
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ walk: 
	walker->level = vcpu->arch.mmu.root_level;

	pte = vcpu->arch.cr3;

#if PTTYPE == 64

	if (!is_long_mode(vcpu)) {

	if (vcpu->arch.mmu.root_level == PT32E_ROOT_LEVEL) {

		pte = kvm_pdptr_read(vcpu, (addr >> 30) & 3);

		trace_kvm_mmu_paging_element(pte, walker->level);

		if (!is_present_gpte(pte)) {
@@ -205,7 +205,7 @@ walk: 
				(PTTYPE == 64 || is_pse(vcpu))) ||

		    ((walker->level == PT_PDPE_LEVEL) &&

				is_large_pte(pte) &&

				is_long_mode(vcpu))) {

				vcpu->arch.mmu.root_level == PT64_ROOT_LEVEL)) {

			int lvl = walker->level;



			walker->gfn = gpte_to_gfn_lvl(pte, lvl);