| Message ID | 20230526234435.662652-9-yuzhao@google.com (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | mm/kvm: locklessly clear the accessed bit | expand |
On Fri, May 26, 2023, Yu Zhao wrote: > tdp_mmu_enabled and shadow_accessed_mask are needed to implement > kvm_arch_has_test_clear_young(). > > Signed-off-by: Yu Zhao <yuzhao@google.com> > --- > arch/x86/include/asm/kvm_host.h | 6 ++++++ > arch/x86/kvm/mmu.h | 6 ------ > arch/x86/kvm/mmu/spte.h | 1 - > 3 files changed, 6 insertions(+), 7 deletions(-) > > diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h > index fb9d1f2d6136..753c67072c47 100644 > --- a/arch/x86/include/asm/kvm_host.h > +++ b/arch/x86/include/asm/kvm_host.h > @@ -1772,6 +1772,7 @@ struct kvm_arch_async_pf { > > extern u32 __read_mostly kvm_nr_uret_msrs; > extern u64 __read_mostly host_efer; > +extern u64 __read_mostly shadow_accessed_mask; > extern bool __read_mostly allow_smaller_maxphyaddr; > extern bool __read_mostly enable_apicv; > extern struct kvm_x86_ops kvm_x86_ops; > @@ -1855,6 +1856,11 @@ void kvm_fire_mask_notifiers(struct kvm *kvm, unsigned irqchip, unsigned pin, > bool mask); > > extern bool tdp_enabled; > +#ifdef CONFIG_X86_64 > +extern bool tdp_mmu_enabled; > +#else > +#define tdp_mmu_enabled false > +#endif I would much prefer that these be kept in kvm/mmu.h. And looking at all the arch code, there's no reason to make kvm_arch_has_test_clear_young() a runtime callback, all of the logic is constant relative to when KVM is loaded. So rather than have generic KVM pull from arch code, what if we have arch code push info to generic KVM? We could even avoid #ifdefs if arch code passed in its handler. That might result in an extra indirect branch though, so it might be better to just use a flag? E.g. the x86 conversion would be something like this. --- arch/x86/kvm/mmu/mmu.c | 5 +++++ arch/x86/kvm/mmu/tdp_mmu.c | 2 +- arch/x86/kvm/mmu/tdp_mmu.h | 1 + include/linux/kvm_host.h | 24 ++++-------------------- virt/kvm/kvm_main.c | 14 ++++++++++---- 5 files changed, 21 insertions(+), 25 deletions(-) diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index c8ebe542c565..84a4a83540f0 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -5809,6 +5809,11 @@ void kvm_configure_mmu(bool enable_tdp, int tdp_forced_root_level, max_huge_page_level = PG_LEVEL_1G; else max_huge_page_level = PG_LEVEL_2M; + + if (tdp_mmu_enabled && kvm_ad_enabled()) + kvm_init_test_clear_young(kvm_tdp_mmu_test_clear_young); + else + kvm_init_test_clear_young(NULL); } EXPORT_SYMBOL_GPL(kvm_configure_mmu); diff --git a/arch/x86/kvm/mmu/tdp_mmu.c b/arch/x86/kvm/mmu/tdp_mmu.c index f463d54228f8..e878c88f0e02 100644 --- a/arch/x86/kvm/mmu/tdp_mmu.c +++ b/arch/x86/kvm/mmu/tdp_mmu.c @@ -1308,7 +1308,7 @@ bool kvm_tdp_mmu_test_age_gfn(struct kvm *kvm, struct kvm_gfn_range *range) return kvm_tdp_mmu_handle_gfn(kvm, range, test_age_gfn); } -bool kvm_arch_test_clear_young(struct kvm *kvm, struct kvm_gfn_range *range) +bool kvm_tdp_mmu_test_clear_young(struct kvm *kvm, struct kvm_gfn_range *range) { struct kvm_mmu_page *root; int offset = ffs(shadow_accessed_mask) - 1; diff --git a/arch/x86/kvm/mmu/tdp_mmu.h b/arch/x86/kvm/mmu/tdp_mmu.h index 0a63b1afabd3..aaa0b75b3896 100644 --- a/arch/x86/kvm/mmu/tdp_mmu.h +++ b/arch/x86/kvm/mmu/tdp_mmu.h @@ -34,6 +34,7 @@ bool kvm_tdp_mmu_unmap_gfn_range(struct kvm *kvm, struct kvm_gfn_range *range, bool kvm_tdp_mmu_age_gfn_range(struct kvm *kvm, struct kvm_gfn_range *range); bool kvm_tdp_mmu_test_age_gfn(struct kvm *kvm, struct kvm_gfn_range *range); bool kvm_tdp_mmu_set_spte_gfn(struct kvm *kvm, struct kvm_gfn_range *range); +bool kvm_tdp_mmu_test_clear_young(struct kvm *kvm, struct kvm_gfn_range *range); bool kvm_tdp_mmu_wrprot_slot(struct kvm *kvm, const struct kvm_memory_slot *slot, int min_level); diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 1714f82a0c47..7a0922cbc36f 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -264,31 +264,15 @@ struct kvm_gfn_range { pte_t pte; bool may_block; }; + +typedef bool (*hva_handler_t)(struct kvm *kvm, struct kvm_gfn_range *range); + bool kvm_unmap_gfn_range(struct kvm *kvm, struct kvm_gfn_range *range); bool kvm_age_gfn(struct kvm *kvm, struct kvm_gfn_range *range); bool kvm_test_age_gfn(struct kvm *kvm, struct kvm_gfn_range *range); bool kvm_set_spte_gfn(struct kvm *kvm, struct kvm_gfn_range *range); bool kvm_should_clear_young(struct kvm_gfn_range *range, gfn_t gfn); -bool kvm_arch_test_clear_young(struct kvm *kvm, struct kvm_gfn_range *range); -#endif - -/* - * Architectures that implement kvm_arch_test_clear_young() should override - * kvm_arch_has_test_clear_young(). - * - * kvm_arch_has_test_clear_young() is allowed to return false positive, i.e., it - * can return true if kvm_arch_test_clear_young() is supported but disabled due - * to some runtime constraint. In this case, kvm_arch_test_clear_young() should - * return true; otherwise, it should return false. - * - * For each young KVM PTE, kvm_arch_test_clear_young() should call - * kvm_should_clear_young() to decide whether to clear the accessed bit. - */ -#ifndef kvm_arch_has_test_clear_young -static inline bool kvm_arch_has_test_clear_young(void) -{ - return false; -} +void kvm_init_test_clear_young(hva_handler_t arch_test_clear_young); #endif enum { diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index ef2790469fda..ac83cfb30771 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -530,8 +530,6 @@ static void kvm_mmu_notifier_invalidate_range(struct mmu_notifier *mn, srcu_read_unlock(&kvm->srcu, idx); } -typedef bool (*hva_handler_t)(struct kvm *kvm, struct kvm_gfn_range *range); - typedef void (*on_lock_fn_t)(struct kvm *kvm, unsigned long start, unsigned long end); @@ -859,6 +857,14 @@ bool kvm_should_clear_young(struct kvm_gfn_range *range, gfn_t gfn) return args->clear; } +static hva_handler_t kvm_test_clear_young; + +void kvm_init_test_clear_young(hva_handler_t arch_test_clear_young) +{ + WARN_ON_ONCE(!list_empty(&vm_list)); + kvm_test_clear_young = arch_test_clear_young; +} + static int kvm_mmu_notifier_test_clear_young(struct mmu_notifier *mn, struct mm_struct *mm, unsigned long start, unsigned long end, bool clear, unsigned long *bitmap) @@ -873,7 +879,7 @@ static int kvm_mmu_notifier_test_clear_young(struct mmu_notifier *mn, struct mm_ trace_kvm_age_hva(start, end); - if (kvm_arch_has_test_clear_young()) { + if (kvm_test_clear_young) { struct test_clear_young_args args = { .bitmap = bitmap, .end = end, @@ -882,7 +888,7 @@ static int kvm_mmu_notifier_test_clear_young(struct mmu_notifier *mn, struct mm_ range.args = &args; range.lockless = true; - range.handler = kvm_arch_test_clear_young; + range.handler = kvm_test_clear_young; if (!__kvm_handle_hva_range(kvm, &range)) return args.young ? MMU_NOTIFIER_RANGE_LOCKLESS : 0; base-commit: 39ca80f27cc0d2a37b4e3d07bbf763d4954934d7 --
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index fb9d1f2d6136..753c67072c47 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -1772,6 +1772,7 @@ struct kvm_arch_async_pf { extern u32 __read_mostly kvm_nr_uret_msrs; extern u64 __read_mostly host_efer; +extern u64 __read_mostly shadow_accessed_mask; extern bool __read_mostly allow_smaller_maxphyaddr; extern bool __read_mostly enable_apicv; extern struct kvm_x86_ops kvm_x86_ops; @@ -1855,6 +1856,11 @@ void kvm_fire_mask_notifiers(struct kvm *kvm, unsigned irqchip, unsigned pin, bool mask); extern bool tdp_enabled; +#ifdef CONFIG_X86_64 +extern bool tdp_mmu_enabled; +#else +#define tdp_mmu_enabled false +#endif u64 vcpu_tsc_khz(struct kvm_vcpu *vcpu); diff --git a/arch/x86/kvm/mmu.h b/arch/x86/kvm/mmu.h index 92d5a1924fc1..84aedb2671ef 100644 --- a/arch/x86/kvm/mmu.h +++ b/arch/x86/kvm/mmu.h @@ -253,12 +253,6 @@ static inline bool kvm_shadow_root_allocated(struct kvm *kvm) return smp_load_acquire(&kvm->arch.shadow_root_allocated); } -#ifdef CONFIG_X86_64 -extern bool tdp_mmu_enabled; -#else -#define tdp_mmu_enabled false -#endif - static inline bool kvm_memslots_have_rmaps(struct kvm *kvm) { return !tdp_mmu_enabled || kvm_shadow_root_allocated(kvm); diff --git a/arch/x86/kvm/mmu/spte.h b/arch/x86/kvm/mmu/spte.h index 1279db2eab44..a82c4fa1c47b 100644 --- a/arch/x86/kvm/mmu/spte.h +++ b/arch/x86/kvm/mmu/spte.h @@ -153,7 +153,6 @@ extern u64 __read_mostly shadow_mmu_writable_mask; extern u64 __read_mostly shadow_nx_mask; extern u64 __read_mostly shadow_x_mask; /* mutual exclusive with nx_mask */ extern u64 __read_mostly shadow_user_mask; -extern u64 __read_mostly shadow_accessed_mask; extern u64 __read_mostly shadow_dirty_mask; extern u64 __read_mostly shadow_mmio_value; extern u64 __read_mostly shadow_mmio_mask;
tdp_mmu_enabled and shadow_accessed_mask are needed to implement kvm_arch_has_test_clear_young(). Signed-off-by: Yu Zhao <yuzhao@google.com> --- arch/x86/include/asm/kvm_host.h | 6 ++++++ arch/x86/kvm/mmu.h | 6 ------ arch/x86/kvm/mmu/spte.h | 1 - 3 files changed, 6 insertions(+), 7 deletions(-)