diff options
author | Radim Krčmář <rkrcmar@redhat.com> | 2017-11-30 13:05:45 -0500 |
---|---|---|
committer | Radim Krčmář <rkrcmar@redhat.com> | 2017-12-06 10:10:34 -0500 |
commit | b1394e745b9453dcb5b0671c205b770e87dedb87 (patch) | |
tree | 21d291d84206ccfc3c38f476b6d23753df90e94c | |
parent | d29899a30f987de46bcdab3ca4513de2479629e5 (diff) |
KVM: x86: fix APIC page invalidation
Implementation of the unpinned APIC page didn't update the VMCS address
cache when invalidation was done through range mmu notifiers.
This became a problem when the page notifier was removed.
Re-introduce the arch-specific helper and call it from ...range_start.
Reported-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Fixes: 38b9917350cb ("kvm: vmx: Implement set_apic_access_page_addr")
Fixes: 369ea8242c0f ("mm/rmap: update to new mmu_notifier semantic v2")
Cc: <stable@vger.kernel.org>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Andrea Arcangeli <aarcange@redhat.com>
Tested-by: Wanpeng Li <wanpeng.li@hotmail.com>
Tested-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
-rw-r--r-- | arch/x86/include/asm/kvm_host.h | 3 | ||||
-rw-r--r-- | arch/x86/kvm/x86.c | 14 | ||||
-rw-r--r-- | virt/kvm/kvm_main.c | 8 |
3 files changed, 25 insertions, 0 deletions
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index 62527e053ee4..516798431328 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h | |||
@@ -1448,4 +1448,7 @@ static inline int kvm_cpu_get_apicid(int mps_cpu) | |||
1448 | #define put_smstate(type, buf, offset, val) \ | 1448 | #define put_smstate(type, buf, offset, val) \ |
1449 | *(type *)((buf) + (offset) - 0x7e00) = val | 1449 | *(type *)((buf) + (offset) - 0x7e00) = val |
1450 | 1450 | ||
1451 | void kvm_arch_mmu_notifier_invalidate_range(struct kvm *kvm, | ||
1452 | unsigned long start, unsigned long end); | ||
1453 | |||
1451 | #endif /* _ASM_X86_KVM_HOST_H */ | 1454 | #endif /* _ASM_X86_KVM_HOST_H */ |
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 6ca747abfa2f..faf843c9b916 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c | |||
@@ -6764,6 +6764,20 @@ static void kvm_vcpu_flush_tlb(struct kvm_vcpu *vcpu) | |||
6764 | kvm_x86_ops->tlb_flush(vcpu); | 6764 | kvm_x86_ops->tlb_flush(vcpu); |
6765 | } | 6765 | } |
6766 | 6766 | ||
6767 | void kvm_arch_mmu_notifier_invalidate_range(struct kvm *kvm, | ||
6768 | unsigned long start, unsigned long end) | ||
6769 | { | ||
6770 | unsigned long apic_address; | ||
6771 | |||
6772 | /* | ||
6773 | * The physical address of apic access page is stored in the VMCS. | ||
6774 | * Update it when it becomes invalid. | ||
6775 | */ | ||
6776 | apic_address = gfn_to_hva(kvm, APIC_DEFAULT_PHYS_BASE >> PAGE_SHIFT); | ||
6777 | if (start <= apic_address && apic_address < end) | ||
6778 | kvm_make_all_cpus_request(kvm, KVM_REQ_APIC_PAGE_RELOAD); | ||
6779 | } | ||
6780 | |||
6767 | void kvm_vcpu_reload_apic_access_page(struct kvm_vcpu *vcpu) | 6781 | void kvm_vcpu_reload_apic_access_page(struct kvm_vcpu *vcpu) |
6768 | { | 6782 | { |
6769 | struct page *page = NULL; | 6783 | struct page *page = NULL; |
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index c422c10cd1dd..210bf820385a 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c | |||
@@ -135,6 +135,11 @@ static void kvm_uevent_notify_change(unsigned int type, struct kvm *kvm); | |||
135 | static unsigned long long kvm_createvm_count; | 135 | static unsigned long long kvm_createvm_count; |
136 | static unsigned long long kvm_active_vms; | 136 | static unsigned long long kvm_active_vms; |
137 | 137 | ||
138 | __weak void kvm_arch_mmu_notifier_invalidate_range(struct kvm *kvm, | ||
139 | unsigned long start, unsigned long end) | ||
140 | { | ||
141 | } | ||
142 | |||
138 | bool kvm_is_reserved_pfn(kvm_pfn_t pfn) | 143 | bool kvm_is_reserved_pfn(kvm_pfn_t pfn) |
139 | { | 144 | { |
140 | if (pfn_valid(pfn)) | 145 | if (pfn_valid(pfn)) |
@@ -360,6 +365,9 @@ static void kvm_mmu_notifier_invalidate_range_start(struct mmu_notifier *mn, | |||
360 | kvm_flush_remote_tlbs(kvm); | 365 | kvm_flush_remote_tlbs(kvm); |
361 | 366 | ||
362 | spin_unlock(&kvm->mmu_lock); | 367 | spin_unlock(&kvm->mmu_lock); |
368 | |||
369 | kvm_arch_mmu_notifier_invalidate_range(kvm, start, end); | ||
370 | |||
363 | srcu_read_unlock(&kvm->srcu, idx); | 371 | srcu_read_unlock(&kvm->srcu, idx); |
364 | } | 372 | } |
365 | 373 | ||