Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8a33fc7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm 

Pull KVM fix from Paolo Bonzini:
 "This single patch fixes a regression caused by one of the
  optimizations introduced in 3.11, which is generally visible only on
  AMD processors"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: MMU: avoid fast page fault fixing mmio page fault
parents b7356abb 1c118b82

arch/x86/kvm/mmu.c

+7 −0
Original line number Diff line number Diff line
@@ -2810,6 +2810,13 @@ static bool handle_abnormal_pfn(struct kvm_vcpu *vcpu, gva_t gva, gfn_t gfn, 


static bool page_fault_can_be_fast(struct kvm_vcpu *vcpu, u32 error_code)

{

	/*

	 * Do not fix the mmio spte with invalid generation number which

	 * need to be updated by slow page fault path.

	 */

	if (unlikely(error_code & PFERR_RSVD_MASK))

		return false;



	/*

	 * #PF can be fast only if the shadow page table is present and it

	 * is caused by write-protect, that means we just need change the