Commit 6292757f authored by Xiao Guangrong's avatar Xiao Guangrong Committed by Avi Kivity
Browse files

KVM: MMU: update 'root_hpa' out of loop in PAE shadow path 



The value of 'vcpu->arch.mmu.pae_root' is not modified, so we can update
'root_hpa' out of the loop.

Signed-off-by: default avatarXiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 7129eeca

arch/x86/kvm/mmu.c

+2 −2
Original line number Diff line number Diff line
@@ -2393,8 +2393,8 @@ static int mmu_alloc_direct_roots(struct kvm_vcpu *vcpu) 
			++sp->root_count;

			spin_unlock(&vcpu->kvm->mmu_lock);

			vcpu->arch.mmu.pae_root[i] = root | PT_PRESENT_MASK;

			vcpu->arch.mmu.root_hpa = __pa(vcpu->arch.mmu.pae_root);

		}

		vcpu->arch.mmu.root_hpa = __pa(vcpu->arch.mmu.pae_root);

	} else

		BUG();
@@ -2466,8 +2466,8 @@ static int mmu_alloc_shadow_roots(struct kvm_vcpu *vcpu) 
		spin_unlock(&vcpu->kvm->mmu_lock);



		vcpu->arch.mmu.pae_root[i] = root | pm_mask;

		vcpu->arch.mmu.root_hpa = __pa(vcpu->arch.mmu.pae_root);

	}

	vcpu->arch.mmu.root_hpa = __pa(vcpu->arch.mmu.pae_root);



	/*

	 * If we shadow a 32 bit page table with a long mode page