2.6.36-stable review patch. If anyone has any objections, please let us know.
------------------ From: Avi Kivity <[email protected]> commit c093b8b46c5f0dd12d799f0d6a3b579863df72f6 upstream. We use the physical address instead of the base gfn for the four PAE page directories we use in unpaged mode. When the guest accesses an address above 1GB that is backed by a large host page, a BUG_ON() in kvm_mmu_set_gfn() triggers. Resolves: https://bugzilla.kernel.org/show_bug.cgi?id=21962 Reported-and-tested-by: Nicolas Prochazka <[email protected]> Signed-off-by: Avi Kivity <[email protected]> Cc: Marcelo Tosatti <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> --- arch/x86/kvm/mmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c @@ -2271,7 +2271,7 @@ static int mmu_alloc_roots(struct kvm_vc return 1; if (tdp_enabled) { direct = 1; - root_gfn = i << 30; + root_gfn = i << (30 - PAGE_SHIFT); } spin_lock(&vcpu->kvm->mmu_lock); kvm_mmu_free_some_pages(vcpu); _______________________________________________ stable mailing list [email protected] http://linux.kernel.org/mailman/listinfo/stable
