Commit a0636152 authored by Junaid Shahid's avatar Junaid Shahid Committed by Greg Kroah-Hartman
Browse files

kvm: mmu: Fix race in emulated page table writes

commit 0e0fee5c


When a guest page table is updated via an emulated write,
kvm_mmu_pte_write() is called to update the shadow PTE using the just
written guest PTE value. But if two emulated guest PTE writes happened
concurrently, it is possible that the guest PTE and the shadow PTE end
up being out of sync. Emulated writes do not mark the shadow page as
unsync-ed, so this inconsistency will not be resolved even by a guest TLB
flush (unless the page was marked as unsync-ed at some other point).

This is fixed by re-reading the current value of the guest PTE after the
MMU lock has been acquired instead of just using the value that was
written prior to calling kvm_mmu_pte_write().
Signed-off-by: default avatarJunaid Shahid <>
Reviewed-by: default avatarWanpeng Li <>
Signed-off-by: default avatarPaolo Bonzini <>
Signed-off-by: default avatarGreg Kroah-Hartman <>
parent 78085d7e
......@@ -4734,9 +4734,9 @@ static bool need_remote_flush(u64 old, u64 new)
static u64 mmu_pte_write_fetch_gpte(struct kvm_vcpu *vcpu, gpa_t *gpa,
const u8 *new, int *bytes)
int *bytes)
u64 gentry;
u64 gentry = 0;
int r;
......@@ -4748,22 +4748,12 @@ static u64 mmu_pte_write_fetch_gpte(struct kvm_vcpu *vcpu, gpa_t *gpa,
/* Handle a 32-bit guest writing two halves of a 64-bit gpte */
*gpa &= ~(gpa_t)7;
*bytes = 8;
r = kvm_vcpu_read_guest(vcpu, *gpa, &gentry, 8);
if (r)
gentry = 0;
new = (const u8 *)&gentry;
switch (*bytes) {
case 4:
gentry = *(const u32 *)new;
case 8:
gentry = *(const u64 *)new;
if (*bytes == 4 || *bytes == 8) {
r = kvm_vcpu_read_guest_atomic(vcpu, *gpa, &gentry, *bytes);
if (r)
gentry = 0;
return gentry;
......@@ -4876,8 +4866,6 @@ static void kvm_mmu_pte_write(struct kvm_vcpu *vcpu, gpa_t gpa,
pgprintk("%s: gpa %llx bytes %d\n", __func__, gpa, bytes);
gentry = mmu_pte_write_fetch_gpte(vcpu, &gpa, new, &bytes);
* No need to care whether allocation memory is successful
* or not since pte prefetch is skiped if it does not have
......@@ -4886,6 +4874,9 @@ static void kvm_mmu_pte_write(struct kvm_vcpu *vcpu, gpa_t gpa,
gentry = mmu_pte_write_fetch_gpte(vcpu, &gpa, &bytes);
kvm_mmu_audit(vcpu, AUDIT_PRE_PTE_WRITE);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment