On Fri, Oct 16, 2020 at 9:50 AM Paolo Bonzini <pbonzini@xxxxxxxxxx> wrote:
>
> On 14/10/20 20:26, Ben Gardon wrote:
> > arch/x86/include/asm/kvm_host.h | 14 +
> > arch/x86/kvm/Makefile | 3 +-
> > arch/x86/kvm/mmu/mmu.c | 487 +++++++------
> > arch/x86/kvm/mmu/mmu_internal.h | 242 +++++++
> > arch/x86/kvm/mmu/paging_tmpl.h | 3 +-
> > arch/x86/kvm/mmu/tdp_iter.c | 181 +++++
> > arch/x86/kvm/mmu/tdp_iter.h | 60 ++
> > arch/x86/kvm/mmu/tdp_mmu.c | 1154 +++++++++++++++++++++++++++++++
> > arch/x86/kvm/mmu/tdp_mmu.h | 48 ++
> > include/linux/kvm_host.h | 2 +
> > virt/kvm/kvm_main.c | 12 +-
> > 11 files changed, 1944 insertions(+), 262 deletions(-)
> > create mode 100644 arch/x86/kvm/mmu/tdp_iter.c
> > create mode 100644 arch/x86/kvm/mmu/tdp_iter.h
> > create mode 100644 arch/x86/kvm/mmu/tdp_mmu.c
> > create mode 100644 arch/x86/kvm/mmu/tdp_mmu.h
> >
>
> My implementation of tdp_iter_set_spte was completely different, but
> of course that's not an issue; I would still like to understand and
> comment on why the bool arguments to __tdp_mmu_set_spte are needed.
The simplest explanation for those options to not mark the page as
dirty in the dirty bitmap or not mark the page accessed is simply that
the legacy MMU doesn't do it, but I will outline why it doesn't more
specifically.
Let's consider dirty logging first. When getting the dirty log, we
follow the following steps:
1. Atomically get and clear an unsigned long of the dirty bitmap
2. For each GFN in the range of pages covered by the unsigned long mask:
3. Clear the dirty or writable bit on the SPTE
4. Copy the mask of dirty pages to be returned to userspace
If we mark the page as dirty in the dirty bitmap in step 3, we'll
report the page as dirty twice - once in this dirty log call, and
again in the next one. This can lead to unexpected behavior:
1. Pause all vCPUs
2. Get the dirty log <--- Returns all pages dirtied before the vCPUs were paused
3. Get the dirty log again <--- Unexpectedly returns a non-zero number
of dirty pages even though no pages were actually dirtied
I believe a similar process happens for access tracking though MMU
notifiers which would lead to incorrect behavior if we called
kvm_set_pfn_accessed during the handler for notifier_clear_young or
notifier_clear_flush_young
>
> Apart from splitting tdp_mmu_iter_flush_cond_resched from
> tdp_mmu_iter_cond_resched, my remaining changes on top are pretty
> small and mostly cosmetic. I'll give it another go next week
> and send it Linus's way if everything's all right.
Fantastic, thank you!
>
> Paolo
>
> diff --git a/arch/x86/kvm/mmu/tdp_mmu.c b/arch/x86/kvm/mmu/tdp_mmu.c
> index f8525c89fc95..baf260421a56 100644
> --- a/arch/x86/kvm/mmu/tdp_mmu.c
> +++ b/arch/x86/kvm/mmu/tdp_mmu.c
> @@ -7,20 +7,15 @@
> #include "tdp_mmu.h"
> #include "spte.h"
>
> +#ifdef CONFIG_X86_64
> static bool __read_mostly tdp_mmu_enabled = false;
> +module_param_named(tdp_mmu, tdp_mmu_enabled, bool, 0644);
> +#endif
>
> static bool is_tdp_mmu_enabled(void)
> {
> #ifdef CONFIG_X86_64
> - if (!READ_ONCE(tdp_mmu_enabled))
> - return false;
> -
> - if (WARN_ONCE(!tdp_enabled,
> - "Creating a VM with TDP MMU enabled requires TDP."))
> - return false;
> -
> - return true;
> -
> + return tdp_enabled && READ_ONCE(tdp_mmu_enabled);
> #else
> return false;
> #endif /* CONFIG_X86_64 */
> @@ -277,8 +277,8 @@ static void __handle_changed_spte(struct kvm *kvm, int as_id, gfn_t gfn,
> unaccount_huge_nx_page(kvm, sp);
>
> for (i = 0; i < PT64_ENT_PER_PAGE; i++) {
> - old_child_spte = *(pt + i);
> - *(pt + i) = 0;
> + old_child_spte = READ_ONCE(*(pt + i));
> + WRITE_ONCE(*(pt + i), 0);
> handle_changed_spte(kvm, as_id,
> gfn + (i * KVM_PAGES_PER_HPAGE(level - 1)),
> old_child_spte, 0, level - 1);
> @@ -309,7 +309,7 @@ static inline void __tdp_mmu_set_spte(struct kvm *kvm, struct tdp_iter *iter,
> struct kvm_mmu_page *root = sptep_to_sp(root_pt);
> int as_id = kvm_mmu_page_as_id(root);
>
> - *iter->sptep = new_spte;
> + WRITE_ONCE(*iter->sptep, new_spte);
>
> __handle_changed_spte(kvm, as_id, iter->gfn, iter->old_spte, new_spte,
> iter->level);
> @@ -361,16 +361,28 @@ static inline void tdp_mmu_set_spte_no_dirty_log(struct kvm *kvm,
> for_each_tdp_pte(_iter, __va(_mmu->root_hpa), \
> _mmu->shadow_root_level, _start, _end)
>
> -static bool tdp_mmu_iter_cond_resched(struct kvm *kvm, struct tdp_iter *iter)
> +/*
> + * Flush the TLB if the process should drop kvm->mmu_lock.
> + * Return whether the caller still needs to flush the tlb.
> + */
> +static bool tdp_mmu_iter_flush_cond_resched(struct kvm *kvm, struct tdp_iter *iter)
> {
> if (need_resched() || spin_needbreak(&kvm->mmu_lock)) {
> kvm_flush_remote_tlbs(kvm);
> cond_resched_lock(&kvm->mmu_lock);
> tdp_iter_refresh_walk(iter);
> + return false;
> + } else {
> return true;
> }
> +}
>
> - return false;
> +static void tdp_mmu_iter_cond_resched(struct kvm *kvm, struct tdp_iter *iter)
> +{
> + if (need_resched() || spin_needbreak(&kvm->mmu_lock)) {
> + cond_resched_lock(&kvm->mmu_lock);
> + tdp_iter_refresh_walk(iter);
> + }
> }
>
> /*
> @@ -407,7 +419,7 @@ static bool zap_gfn_range(struct kvm *kvm, struct kvm_mmu_page *root,
> tdp_mmu_set_spte(kvm, &iter, 0);
>
> if (can_yield)
> - flush_needed = !tdp_mmu_iter_cond_resched(kvm, &iter);
> + flush_needed = tdp_mmu_iter_flush_cond_resched(kvm, &iter);
> else
> flush_needed = true;
> }
> @@ -479,7 +479,10 @@ static int tdp_mmu_map_handle_target_level(struct kvm_vcpu *vcpu, int write,
> map_writable, !shadow_accessed_mask,
> &new_spte);
>
> - tdp_mmu_set_spte(vcpu->kvm, iter, new_spte);
> + if (new_spte == iter->old_spte)
> + ret = RET_PF_SPURIOUS;
> + else
> + tdp_mmu_set_spte(vcpu->kvm, iter, new_spte);
>
> /*
> * If the page fault was caused by a write but the page is write
> @@ -496,7 +496,7 @@ static int tdp_mmu_map_handle_target_level(struct kvm_vcpu *vcpu, int write,
> }
>
> /* If a MMIO SPTE is installed, the MMIO will need to be emulated. */
> - if (unlikely(is_mmio_spte(new_spte)))
> + else if (unlikely(is_mmio_spte(new_spte)))
> ret = RET_PF_EMULATE;
>
> trace_kvm_mmu_set_spte(iter->level, iter->gfn, iter->sptep);
> @@ -528,8 +528,10 @@ int kvm_tdp_mmu_map(struct kvm_vcpu *vcpu, gpa_t gpa, u32 error_code,
> int level;
> int req_level;
>
> - BUG_ON(!VALID_PAGE(vcpu->arch.mmu->root_hpa));
> - BUG_ON(!is_tdp_mmu_root(vcpu->kvm, vcpu->arch.mmu->root_hpa));
> + if (WARN_ON(!VALID_PAGE(vcpu->arch.mmu->root_hpa)))
> + return RET_PF_ENTRY;
> + if (WARN_ON(!is_tdp_mmu_root(vcpu->kvm, vcpu->arch.mmu->root_hpa)))
> + return RET_PF_ENTRY;
>
> level = kvm_mmu_hugepage_adjust(vcpu, gfn, max_level, &pfn,
> huge_page_disallowed, &req_level);
> @@ -579,7 +581,8 @@ int kvm_tdp_mmu_map(struct kvm_vcpu *vcpu, gpa_t gpa, u32 error_code,
> }
> }
>
> - BUG_ON(iter.level != level);
> + if (WARN_ON(iter.level != level))
> + return RET_PF_RETRY;
>
> ret = tdp_mmu_map_handle_target_level(vcpu, write, map_writable, &iter,
> pfn, prefault);
> @@ -817,9 +829,8 @@ bool kvm_tdp_mmu_wrprot_slot(struct kvm *kvm, struct kvm_memory_slot *slot,
> */
> kvm_mmu_get_root(kvm, root);
>
> - spte_set = wrprot_gfn_range(kvm, root, slot->base_gfn,
> - slot->base_gfn + slot->npages, min_level) ||
> - spte_set;
> + spte_set |= wrprot_gfn_range(kvm, root, slot->base_gfn,
> + slot->base_gfn + slot->npages, min_level);
>
> kvm_mmu_put_root(kvm, root);
> }
> @@ -886,8 +897,8 @@ bool kvm_tdp_mmu_clear_dirty_slot(struct kvm *kvm, struct kvm_memory_slot *slot)
> */
> kvm_mmu_get_root(kvm, root);
>
> - spte_set = clear_dirty_gfn_range(kvm, root, slot->base_gfn,
> - slot->base_gfn + slot->npages) || spte_set;
> + spte_set |= clear_dirty_gfn_range(kvm, root, slot->base_gfn,
> + slot->base_gfn + slot->npages);
>
> kvm_mmu_put_root(kvm, root);
> }
> @@ -1009,8 +1020,8 @@ bool kvm_tdp_mmu_slot_set_dirty(struct kvm *kvm, struct kvm_memory_slot *slot)
> */
> kvm_mmu_get_root(kvm, root);
>
> - spte_set = set_dirty_gfn_range(kvm, root, slot->base_gfn,
> - slot->base_gfn + slot->npages) || spte_set;
> + spte_set |= set_dirty_gfn_range(kvm, root, slot->base_gfn,
> + slot->base_gfn + slot->npages);
>
> kvm_mmu_put_root(kvm, root);
> }
> @@ -1042,9 +1053,9 @@ static void zap_collapsible_spte_range(struct kvm *kvm,
> continue;
>
> tdp_mmu_set_spte(kvm, &iter, 0);
> - spte_set = true;
>
> - spte_set = !tdp_mmu_iter_cond_resched(kvm, &iter);
> + spte_set = tdp_mmu_iter_flush_cond_resched(kvm, &iter);
> }
>
> if (spte_set)
>
