Commit 69c9ea93 authored Jun 07, 2013 by Xiao Guangrong Committed by Gleb Natapov Jun 27, 2013

KVM: MMU: init kvm generation close to mmio wrap-around value



Then it has the chance to trigger mmio generation number wrap-around

Signed-off-by: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Reviewed-by: Gleb Natapov <gleb@redhat.com>
Reviewed-by: Marcelo Tosatti <mtosatti@redhat.com>
[Change from MMIO_MAX_GEN - 13 to MMIO_MAX_GEN - 150, because 13 is
 very close to the number of calls to KVM_SET_USER_MEMORY_REGION
 before the guest is started and there is any chance to create any
 spte. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

parent 089504c0

arch/x86/kvm/mmu.c

+6 −1

Original line number	Original line	Diff line number	Diff line
	@@ -235,7 +235,12 @@ static unsigned int get_mmio_spte_generation(u64 spte)

	static unsigned int kvm_current_mmio_generation(struct kvm *kvm)		static unsigned int kvm_current_mmio_generation(struct kvm *kvm)
	{		{
	return kvm_memslots(kvm)->generation & MMIO_GEN_MASK;		/*
			* Init kvm generation close to MMIO_MAX_GEN to easily test the
			* code of handling generation number wrap-around.
			*/
			return (kvm_memslots(kvm)->generation +
			MMIO_MAX_GEN - 150) & MMIO_GEN_MASK;
	}		}

	static void mark_mmio_spte(struct kvm kvm, u64 sptep, u64 gfn,		static void mark_mmio_spte(struct kvm kvm, u64 sptep, u64 gfn,