diff options
author | Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com> | 2013-06-07 04:51:28 -0400 |
---|---|---|
committer | Gleb Natapov <gleb@redhat.com> | 2013-06-27 07:20:39 -0400 |
commit | 69c9ea93eaea95e3a2c5f1a0cf77b02c58979b9a (patch) | |
tree | 7922cd8a8027ba17eda3538eb6c7f43cb505c612 | |
parent | 089504c0d40a24fe37a108c0eda16a9e7b846f12 (diff) |
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>
-rw-r--r-- | arch/x86/kvm/mmu.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index 417f36b7c0e4..c2121017f471 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c | |||
@@ -235,7 +235,12 @@ static unsigned int get_mmio_spte_generation(u64 spte) | |||
235 | 235 | ||
236 | static unsigned int kvm_current_mmio_generation(struct kvm *kvm) | 236 | static unsigned int kvm_current_mmio_generation(struct kvm *kvm) |
237 | { | 237 | { |
238 | return kvm_memslots(kvm)->generation & MMIO_GEN_MASK; | 238 | /* |
239 | * Init kvm generation close to MMIO_MAX_GEN to easily test the | ||
240 | * code of handling generation number wrap-around. | ||
241 | */ | ||
242 | return (kvm_memslots(kvm)->generation + | ||
243 | MMIO_MAX_GEN - 150) & MMIO_GEN_MASK; | ||
239 | } | 244 | } |
240 | 245 | ||
241 | static void mark_mmio_spte(struct kvm *kvm, u64 *sptep, u64 gfn, | 246 | static void mark_mmio_spte(struct kvm *kvm, u64 *sptep, u64 gfn, |