patches/kernel/0007-KVM-x86-fix-APIC-page-invalidation.patch

   1 From b6f813dded8f92cf6df31e1bcad4600b11dd4ae3 Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= <rkrcmar@redhat.com>
   3 Date: Thu, 30 Nov 2017 19:05:45 +0100
   4 Subject: [PATCH 007/233] KVM: x86: fix APIC page invalidation
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 Implementation of the unpinned APIC page didn't update the VMCS address
  10 cache when invalidation was done through range mmu notifiers.
  11 This became a problem when the page notifier was removed.
  12
  13 Re-introduce the arch-specific helper and call it from ...range_start.
  14
  15 Fixes: 38b9917350cb ("kvm: vmx: Implement set_apic_access_page_addr")
  16 Fixes: 369ea8242c0f ("mm/rmap: update to new mmu_notifier semantic v2")
  17 Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
  18 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
  19 ---
  20  arch/x86/include/asm/kvm_host.h |  3 +++
  21  arch/x86/kvm/x86.c              | 14 ++++++++++++++
  22  virt/kvm/kvm_main.c             |  8 ++++++++
  23  3 files changed, 25 insertions(+)
  24
  25 diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
  26 index 92c9032502d8..b69af3df978a 100644
  27 --- a/arch/x86/include/asm/kvm_host.h
  28 +++ b/arch/x86/include/asm/kvm_host.h
  29 @@ -1437,4 +1437,7 @@ static inline int kvm_cpu_get_apicid(int mps_cpu)
  30  #endif
  31  }
  32
  33 +void kvm_arch_mmu_notifier_invalidate_range(struct kvm *kvm,
  34 +               unsigned long start, unsigned long end);
  35 +
  36  #endif /* _ASM_X86_KVM_HOST_H */
  37 diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
  38 index 7351cdc46cc7..703cd4171921 100644
  39 --- a/arch/x86/kvm/x86.c
  40 +++ b/arch/x86/kvm/x86.c
  41 @@ -6711,6 +6711,20 @@ static void kvm_vcpu_flush_tlb(struct kvm_vcpu *vcpu)
  42         kvm_x86_ops->tlb_flush(vcpu);
  43  }
  44
  45 +void kvm_arch_mmu_notifier_invalidate_range(struct kvm *kvm,
  46 +               unsigned long start, unsigned long end)
  47 +{
  48 +       unsigned long apic_address;
  49 +
  50 +       /*
  51 +        * The physical address of apic access page is stored in the VMCS.
  52 +        * Update it when it becomes invalid.
  53 +        */
  54 +       apic_address = gfn_to_hva(kvm, APIC_DEFAULT_PHYS_BASE >> PAGE_SHIFT);
  55 +       if (start <= apic_address && apic_address < end)
  56 +               kvm_make_all_cpus_request(kvm, KVM_REQ_APIC_PAGE_RELOAD);
  57 +}
  58 +
  59  void kvm_vcpu_reload_apic_access_page(struct kvm_vcpu *vcpu)
  60  {
  61         struct page *page = NULL;
  62 diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
  63 index bfa9c4d34102..d0085c9d6297 100644
  64 --- a/virt/kvm/kvm_main.c
  65 +++ b/virt/kvm/kvm_main.c
  66 @@ -136,6 +136,11 @@ static void kvm_uevent_notify_change(unsigned int type, struct kvm *kvm);
  67  static unsigned long long kvm_createvm_count;
  68  static unsigned long long kvm_active_vms;
  69
  70 +__weak void kvm_arch_mmu_notifier_invalidate_range(struct kvm *kvm,
  71 +               unsigned long start, unsigned long end)
  72 +{
  73 +}
  74 +
  75  bool kvm_is_reserved_pfn(kvm_pfn_t pfn)
  76  {
  77         if (pfn_valid(pfn))
  78 @@ -361,6 +366,9 @@ static void kvm_mmu_notifier_invalidate_range_start(struct mmu_notifier *mn,
  79                 kvm_flush_remote_tlbs(kvm);
  80
  81         spin_unlock(&kvm->mmu_lock);
  82 +
  83 +       kvm_arch_mmu_notifier_invalidate_range(kvm, start, end);
  84 +
  85         srcu_read_unlock(&kvm->srcu, idx);
  86  }
  87
  88 --
  89 2.14.2
  90