KVM: update to new mmu_notifier semantic v2
Calls to mmu_notifier_invalidate_page() were replaced by calls to mmu_notifier_invalidate_range() and are now bracketed by calls to mmu_notifier_invalidate_range_start()/end() Remove now useless invalidate_page callback. Changed since v1 (Linus Torvalds) - remove now useless kvm_arch_mmu_notifier_invalidate_page() Signed-off-by: Jérôme Glisse <jglisse@redhat.com> Tested-by: Mike Galbraith <efault@gmx.de> Tested-by: Adam Borowski <kilobyte@angband.pl> Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: Radim Krčmář <rkrcmar@redhat.com> Cc: kvm@vger.kernel.org Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Andrea Arcangeli <aarcange@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Родитель
a81461b054
Коммит
fb1522e099
|
@ -225,12 +225,6 @@ int kvm_arm_copy_reg_indices(struct kvm_vcpu *vcpu, u64 __user *indices);
|
||||||
int kvm_age_hva(struct kvm *kvm, unsigned long start, unsigned long end);
|
int kvm_age_hva(struct kvm *kvm, unsigned long start, unsigned long end);
|
||||||
int kvm_test_age_hva(struct kvm *kvm, unsigned long hva);
|
int kvm_test_age_hva(struct kvm *kvm, unsigned long hva);
|
||||||
|
|
||||||
/* We do not have shadow page tables, hence the empty hooks */
|
|
||||||
static inline void kvm_arch_mmu_notifier_invalidate_page(struct kvm *kvm,
|
|
||||||
unsigned long address)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
struct kvm_vcpu *kvm_arm_get_running_vcpu(void);
|
struct kvm_vcpu *kvm_arm_get_running_vcpu(void);
|
||||||
struct kvm_vcpu __percpu **kvm_get_running_vcpus(void);
|
struct kvm_vcpu __percpu **kvm_get_running_vcpus(void);
|
||||||
void kvm_arm_halt_guest(struct kvm *kvm);
|
void kvm_arm_halt_guest(struct kvm *kvm);
|
||||||
|
|
|
@ -326,12 +326,6 @@ void kvm_set_spte_hva(struct kvm *kvm, unsigned long hva, pte_t pte);
|
||||||
int kvm_age_hva(struct kvm *kvm, unsigned long start, unsigned long end);
|
int kvm_age_hva(struct kvm *kvm, unsigned long start, unsigned long end);
|
||||||
int kvm_test_age_hva(struct kvm *kvm, unsigned long hva);
|
int kvm_test_age_hva(struct kvm *kvm, unsigned long hva);
|
||||||
|
|
||||||
/* We do not have shadow page tables, hence the empty hooks */
|
|
||||||
static inline void kvm_arch_mmu_notifier_invalidate_page(struct kvm *kvm,
|
|
||||||
unsigned long address)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
struct kvm_vcpu *kvm_arm_get_running_vcpu(void);
|
struct kvm_vcpu *kvm_arm_get_running_vcpu(void);
|
||||||
struct kvm_vcpu * __percpu *kvm_get_running_vcpus(void);
|
struct kvm_vcpu * __percpu *kvm_get_running_vcpus(void);
|
||||||
void kvm_arm_halt_guest(struct kvm *kvm);
|
void kvm_arm_halt_guest(struct kvm *kvm);
|
||||||
|
|
|
@ -938,11 +938,6 @@ void kvm_set_spte_hva(struct kvm *kvm, unsigned long hva, pte_t pte);
|
||||||
int kvm_age_hva(struct kvm *kvm, unsigned long start, unsigned long end);
|
int kvm_age_hva(struct kvm *kvm, unsigned long start, unsigned long end);
|
||||||
int kvm_test_age_hva(struct kvm *kvm, unsigned long hva);
|
int kvm_test_age_hva(struct kvm *kvm, unsigned long hva);
|
||||||
|
|
||||||
static inline void kvm_arch_mmu_notifier_invalidate_page(struct kvm *kvm,
|
|
||||||
unsigned long address)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Emulation */
|
/* Emulation */
|
||||||
int kvm_get_inst(u32 *opc, struct kvm_vcpu *vcpu, u32 *out);
|
int kvm_get_inst(u32 *opc, struct kvm_vcpu *vcpu, u32 *out);
|
||||||
enum emulation_result update_pc(struct kvm_vcpu *vcpu, u32 cause);
|
enum emulation_result update_pc(struct kvm_vcpu *vcpu, u32 cause);
|
||||||
|
|
|
@ -67,11 +67,6 @@ extern int kvm_age_hva(struct kvm *kvm, unsigned long start, unsigned long end);
|
||||||
extern int kvm_test_age_hva(struct kvm *kvm, unsigned long hva);
|
extern int kvm_test_age_hva(struct kvm *kvm, unsigned long hva);
|
||||||
extern void kvm_set_spte_hva(struct kvm *kvm, unsigned long hva, pte_t pte);
|
extern void kvm_set_spte_hva(struct kvm *kvm, unsigned long hva, pte_t pte);
|
||||||
|
|
||||||
static inline void kvm_arch_mmu_notifier_invalidate_page(struct kvm *kvm,
|
|
||||||
unsigned long address)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
#define HPTEG_CACHE_NUM (1 << 15)
|
#define HPTEG_CACHE_NUM (1 << 15)
|
||||||
#define HPTEG_HASH_BITS_PTE 13
|
#define HPTEG_HASH_BITS_PTE 13
|
||||||
#define HPTEG_HASH_BITS_PTE_LONG 12
|
#define HPTEG_HASH_BITS_PTE_LONG 12
|
||||||
|
|
|
@ -1375,8 +1375,6 @@ int kvm_arch_interrupt_allowed(struct kvm_vcpu *vcpu);
|
||||||
int kvm_cpu_get_interrupt(struct kvm_vcpu *v);
|
int kvm_cpu_get_interrupt(struct kvm_vcpu *v);
|
||||||
void kvm_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event);
|
void kvm_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event);
|
||||||
void kvm_vcpu_reload_apic_access_page(struct kvm_vcpu *vcpu);
|
void kvm_vcpu_reload_apic_access_page(struct kvm_vcpu *vcpu);
|
||||||
void kvm_arch_mmu_notifier_invalidate_page(struct kvm *kvm,
|
|
||||||
unsigned long address);
|
|
||||||
|
|
||||||
void kvm_define_shared_msr(unsigned index, u32 msr);
|
void kvm_define_shared_msr(unsigned index, u32 msr);
|
||||||
int kvm_set_shared_msr(unsigned index, u64 val, u64 mask);
|
int kvm_set_shared_msr(unsigned index, u64 val, u64 mask);
|
||||||
|
|
|
@ -6734,17 +6734,6 @@ void kvm_vcpu_reload_apic_access_page(struct kvm_vcpu *vcpu)
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(kvm_vcpu_reload_apic_access_page);
|
EXPORT_SYMBOL_GPL(kvm_vcpu_reload_apic_access_page);
|
||||||
|
|
||||||
void kvm_arch_mmu_notifier_invalidate_page(struct kvm *kvm,
|
|
||||||
unsigned long address)
|
|
||||||
{
|
|
||||||
/*
|
|
||||||
* The physical address of apic access page is stored in the VMCS.
|
|
||||||
* Update it when it becomes invalid.
|
|
||||||
*/
|
|
||||||
if (address == gfn_to_hva(kvm, APIC_DEFAULT_PHYS_BASE >> PAGE_SHIFT))
|
|
||||||
kvm_make_all_cpus_request(kvm, KVM_REQ_APIC_PAGE_RELOAD);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Returns 1 to let vcpu_run() continue the guest execution loop without
|
* Returns 1 to let vcpu_run() continue the guest execution loop without
|
||||||
* exiting to the userspace. Otherwise, the value will be returned to the
|
* exiting to the userspace. Otherwise, the value will be returned to the
|
||||||
|
|
|
@ -322,47 +322,6 @@ static inline struct kvm *mmu_notifier_to_kvm(struct mmu_notifier *mn)
|
||||||
return container_of(mn, struct kvm, mmu_notifier);
|
return container_of(mn, struct kvm, mmu_notifier);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void kvm_mmu_notifier_invalidate_page(struct mmu_notifier *mn,
|
|
||||||
struct mm_struct *mm,
|
|
||||||
unsigned long address)
|
|
||||||
{
|
|
||||||
struct kvm *kvm = mmu_notifier_to_kvm(mn);
|
|
||||||
int need_tlb_flush, idx;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* When ->invalidate_page runs, the linux pte has been zapped
|
|
||||||
* already but the page is still allocated until
|
|
||||||
* ->invalidate_page returns. So if we increase the sequence
|
|
||||||
* here the kvm page fault will notice if the spte can't be
|
|
||||||
* established because the page is going to be freed. If
|
|
||||||
* instead the kvm page fault establishes the spte before
|
|
||||||
* ->invalidate_page runs, kvm_unmap_hva will release it
|
|
||||||
* before returning.
|
|
||||||
*
|
|
||||||
* The sequence increase only need to be seen at spin_unlock
|
|
||||||
* time, and not at spin_lock time.
|
|
||||||
*
|
|
||||||
* Increasing the sequence after the spin_unlock would be
|
|
||||||
* unsafe because the kvm page fault could then establish the
|
|
||||||
* pte after kvm_unmap_hva returned, without noticing the page
|
|
||||||
* is going to be freed.
|
|
||||||
*/
|
|
||||||
idx = srcu_read_lock(&kvm->srcu);
|
|
||||||
spin_lock(&kvm->mmu_lock);
|
|
||||||
|
|
||||||
kvm->mmu_notifier_seq++;
|
|
||||||
need_tlb_flush = kvm_unmap_hva(kvm, address) | kvm->tlbs_dirty;
|
|
||||||
/* we've to flush the tlb before the pages can be freed */
|
|
||||||
if (need_tlb_flush)
|
|
||||||
kvm_flush_remote_tlbs(kvm);
|
|
||||||
|
|
||||||
spin_unlock(&kvm->mmu_lock);
|
|
||||||
|
|
||||||
kvm_arch_mmu_notifier_invalidate_page(kvm, address);
|
|
||||||
|
|
||||||
srcu_read_unlock(&kvm->srcu, idx);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void kvm_mmu_notifier_change_pte(struct mmu_notifier *mn,
|
static void kvm_mmu_notifier_change_pte(struct mmu_notifier *mn,
|
||||||
struct mm_struct *mm,
|
struct mm_struct *mm,
|
||||||
unsigned long address,
|
unsigned long address,
|
||||||
|
@ -510,7 +469,6 @@ static void kvm_mmu_notifier_release(struct mmu_notifier *mn,
|
||||||
}
|
}
|
||||||
|
|
||||||
static const struct mmu_notifier_ops kvm_mmu_notifier_ops = {
|
static const struct mmu_notifier_ops kvm_mmu_notifier_ops = {
|
||||||
.invalidate_page = kvm_mmu_notifier_invalidate_page,
|
|
||||||
.invalidate_range_start = kvm_mmu_notifier_invalidate_range_start,
|
.invalidate_range_start = kvm_mmu_notifier_invalidate_range_start,
|
||||||
.invalidate_range_end = kvm_mmu_notifier_invalidate_range_end,
|
.invalidate_range_end = kvm_mmu_notifier_invalidate_range_end,
|
||||||
.clear_flush_young = kvm_mmu_notifier_clear_flush_young,
|
.clear_flush_young = kvm_mmu_notifier_clear_flush_young,
|
||||||
|
|
Загрузка…
Ссылка в новой задаче