rpms
/
kernel
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix 32-bit guest hang on 32-bit PAE host (#677167)

This commit is contained in:
Chuck Ebbert 2011-02-15 12:26:16 -05:00
parent d84ac0f64e
commit b4877f1260
2 changed files with 59 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
kernel.spec
View File

@ -832,6 +832,9 @@ Patch13705: sunrpc-kernel-panic-when-mount-nfsv4.patch
# rhbz #650151 (F13)
Patch13706: bridge-fix-mglist-corruption-that-leads-to-memory-corruption.patch
# Fix 32-bit guest hang on 32-bit PAE host (#677167)
Patch13707: kvm-mmu-fix-32-bit-legacy-paging-with-npt.patch
%endif
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@ -1569,6 +1572,9 @@ ApplyPatch sunrpc-kernel-panic-when-mount-nfsv4.patch
# rhbz #650151 (F13)
ApplyPatch bridge-fix-mglist-corruption-that-leads-to-memory-corruption.patch
# Fix 32-bit guest hang on 32-bit PAE host (#677167)
ApplyPatch kvm-mmu-fix-32-bit-legacy-paging-with-npt.patch
# END OF PATCH APPLICATIONS
%endif
@ -2155,6 +2161,9 @@ fi
# and build.
%changelog
* Sat Feb 12 2011 Chuck Ebbert <cebbert@redhat.com>
- Fix 32-bit guest hang on 32-bit PAE host (#677167)
* Sat Feb 12 2011 Chuck Ebbert <cebbert@redhat.com>
- bridge: Fix mglist corruption that leads to memory corruption (F13#650151)

50
kvm-mmu-fix-32-bit-legacy-paging-with-npt.patch Normal file
View File

@ -0,0 +1,50 @@
From: Joerg Roedel <joerg.roedel@amd.com>
Date: Thu, 2 Sep 2010 15:29:45 +0000 (+0200)
Subject: KVM: MMU: Fix 32 bit legacy paging with NPT
X-Git-Tag: v2.6.37-rc1~142^2~75
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=f87f928882d080eaec8b0d76aecff003d664697d
KVM: MMU: Fix 32 bit legacy paging with NPT
This patch fixes 32 bit legacy paging with NPT enabled. The
mmu_check_root call on the top-level of the loop causes
root_gfn to take values (in the tdp_enabled path) which are
outside of guest memory. So the mmu_check_root call fails at
some point in the loop interation causing the guest to
tiple-fault.
This patch changes the mmu_check_root calls to the places
where they are really necessary. As a side-effect it
introduces a check for the root of a pae page table too.
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
---
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index d2dad65..b2136f9 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -2387,6 +2387,10 @@ static int mmu_alloc_roots(struct kvm_vcpu *vcpu)
return 0;
}
direct = !is_paging(vcpu);
+
+ if (mmu_check_root(vcpu, root_gfn))
+ return 1;
+
for (i = 0; i < 4; ++i) {
hpa_t root = vcpu->arch.mmu.pae_root[i];
@@ -2398,10 +2402,10 @@ static int mmu_alloc_roots(struct kvm_vcpu *vcpu)
continue;
}
root_gfn = pdptr >> PAGE_SHIFT;
+ if (mmu_check_root(vcpu, root_gfn))
+ return 1;
} else if (vcpu->arch.mmu.root_level == 0)
root_gfn = 0;
- if (mmu_check_root(vcpu, root_gfn))
- return 1;
if (tdp_enabled) {
direct = 1;
root_gfn = i << 30;