diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2014-08-20 14:29:21 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-10-30 09:40:10 -0700 |
| commit | 4145cd5e895191ac5ae3188d83297e0cb7840153 (patch) | |
| tree | fd16b58174cc22a356892e00979218f45d1aa3f3 /arch/x86/kvm/mmu.c | |
| parent | 553de4db2e53d670bad8c23bbc181bca7e9fbaf8 (diff) | |
| download | linux-stable-4145cd5e895191ac5ae3188d83297e0cb7840153.tar.gz linux-stable-4145cd5e895191ac5ae3188d83297e0cb7840153.tar.bz2 linux-stable-4145cd5e895191ac5ae3188d83297e0cb7840153.zip | |
KVM: do not bias the generation number in kvm_current_mmio_generation
commit 00f034a12fdd81210d58116326d92780aac5c238 upstream.
The next patch will give a meaning (a la seqcount) to the low bit of the
generation number. Ensure that it matches between kvm->memslots->generation
and kvm_current_mmio_generation().
Reviewed-by: David Matlack <dmatlack@google.com>
Reviewed-by: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/x86/kvm/mmu.c')
| -rw-r--r-- | arch/x86/kvm/mmu.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index 60938f682a96..1cd2a5fbde07 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c @@ -240,12 +240,7 @@ static unsigned int get_mmio_spte_generation(u64 spte) static unsigned int kvm_current_mmio_generation(struct kvm *kvm) { - /* - * 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; + return kvm_memslots(kvm)->generation & MMIO_GEN_MASK; } static void mark_mmio_spte(struct kvm *kvm, u64 *sptep, u64 gfn, |