Commit c3586667 authored May 28, 2012 by Xiao Guangrong Committed by Avi Kivity May 28, 2012

KVM: MMU: fix huge page adapted on non-PAE host

The huge page size is 4M on non-PAE host, but 2M page size is used in
transparent_hugepage_adjust(), so the page we get after adjust the
mapping level is not the head page, the BUG_ON() will be triggered

Signed-off-by: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Signed-off-by: Avi Kivity <avi@redhat.com>

parent b48b2c3e

arch/x86/kvm/mmu.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -2595,8 +2595,7 @@ static void transparent_hugepage_adjust(struct kvm_vcpu *vcpu,
		*gfnp = gfn;
		kvm_release_pfn_clean(pfn);
		pfn &= ~mask;
		if (!get_page_unless_zero(pfn_to_page(pfn)))
		BUG();
		kvm_get_pfn(pfn);
		*pfnp = pfn;
		}
		}

Admin message