Commit 12ec33a7 authored Nov 24, 2021 by Lai Jiangshan Committed by Paolo Bonzini Nov 26, 2021

KVM: X86: Fix when shadow_root_level=5 && guest root_level<4



If the is an L1 with nNPT in 32bit, the shadow walk starts with
pae_root.

Fixes: a717a780 ("KVM: x86/mmu: Support shadowing NPT when 5-level paging is enabled in host)
Signed-off-by: Lai Jiangshan <laijs@linux.alibaba.com>
Message-Id: <20211124122055.64424-2-jiangshanlai@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

parent 908fa88e

arch/x86/kvm/mmu/mmu.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -2173,10 +2173,10 @@ static void shadow_walk_init_using_root(struct kvm_shadow_walk_iterator *iterato
		iterator->shadow_addr = root;
		iterator->level = vcpu->arch.mmu->shadow_root_level;

		if (iterator->level == PT64_ROOT_4LEVEL &&
		if (iterator->level >= PT64_ROOT_4LEVEL &&
		vcpu->arch.mmu->root_level < PT64_ROOT_4LEVEL &&
		!vcpu->arch.mmu->direct_map)
		--iterator->level;
		iterator->level = PT32E_ROOT_LEVEL;

		if (iterator->level == PT32E_ROOT_LEVEL) {
		/*