lkml.org 
[lkml]   [2023]   [Feb]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH V3 08/14] kvm: x86/mmu: Use KVM_MMU_ROOT_XXX for kvm_mmu_invalidate_addr()
    Date
    From: Lai Jiangshan <jiangshan.ljs@antgroup.com>

    The @root_hpa for kvm_mmu_invalidate_addr() is called with @mmu->root.hpa
    or INVALID_PAGE where @mmu->root.hpa is to invalidate gva for the current
    root (the same meaning as KVM_MMU_ROOT_CURRENT) and INVALID_PAGE is to
    invalidate gva for all roots (the same meaning as KVM_MMU_ROOTS_ALL).

    Change the argument type of kvm_mmu_invalidate_addr() and use
    KVM_MMU_ROOT_XXX instead so that we can reuse the function for
    kvm_mmu_invpcid_gva() and nested_ept_invalidate_addr() for invalidating
    gva for different set of roots.

    No fuctionalities changed.

    Signed-off-by: Lai Jiangshan <jiangshan.ljs@antgroup.com>
    ---
    arch/x86/include/asm/kvm_host.h | 2 +-
    arch/x86/kvm/mmu/mmu.c | 39 +++++++++++++++++----------------
    arch/x86/kvm/x86.c | 2 +-
    3 files changed, 22 insertions(+), 21 deletions(-)

    diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
    index 5bd91c49c8b3..cce4243d6688 100644
    --- a/arch/x86/include/asm/kvm_host.h
    +++ b/arch/x86/include/asm/kvm_host.h
    @@ -2026,7 +2026,7 @@ int kvm_mmu_page_fault(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa, u64 error_code,
    void *insn, int insn_len);
    void kvm_mmu_invlpg(struct kvm_vcpu *vcpu, gva_t gva);
    void kvm_mmu_invalidate_addr(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu,
    - u64 addr, hpa_t root_hpa);
    + u64 addr, unsigned long roots);
    void kvm_mmu_invpcid_gva(struct kvm_vcpu *vcpu, gva_t gva, unsigned long pcid);
    void kvm_mmu_new_pgd(struct kvm_vcpu *vcpu, gpa_t new_pgd);

    diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c
    index a4793cb8d64a..9f261e444a32 100644
    --- a/arch/x86/kvm/mmu/mmu.c
    +++ b/arch/x86/kvm/mmu/mmu.c
    @@ -5764,10 +5764,12 @@ int noinline kvm_mmu_page_fault(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa, u64 err
    EXPORT_SYMBOL_GPL(kvm_mmu_page_fault);

    void kvm_mmu_invalidate_addr(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu,
    - u64 addr, hpa_t root_hpa)
    + u64 addr, unsigned long roots)
    {
    int i;

    + WARN_ON_ONCE(roots & ~KVM_MMU_ROOTS_ALL);
    +
    /* It's actually a GPA for vcpu->arch.guest_mmu. */
    if (mmu != &vcpu->arch.guest_mmu) {
    /* INVLPG on a non-canonical address is a NOP according to the SDM. */
    @@ -5780,31 +5782,30 @@ void kvm_mmu_invalidate_addr(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu,
    if (!mmu->invlpg)
    return;

    - if (root_hpa == INVALID_PAGE) {
    + if (roots & KVM_MMU_ROOT_CURRENT)
    mmu->invlpg(vcpu, addr, mmu->root.hpa);

    - /*
    - * INVLPG is required to invalidate any global mappings for the VA,
    - * irrespective of PCID. Since it would take us roughly similar amount
    - * of work to determine whether any of the prev_root mappings of the VA
    - * is marked global, or to just sync it blindly, so we might as well
    - * just always sync it.
    - *
    - * Mappings not reachable via the current cr3 or the prev_roots will be
    - * synced when switching to that cr3, so nothing needs to be done here
    - * for them.
    - */
    - for (i = 0; i < KVM_MMU_NUM_PREV_ROOTS; i++)
    - if (VALID_PAGE(mmu->prev_roots[i].hpa))
    - mmu->invlpg(vcpu, addr, mmu->prev_roots[i].hpa);
    - } else {
    - mmu->invlpg(vcpu, addr, root_hpa);
    + for (i = 0; i < KVM_MMU_NUM_PREV_ROOTS; i++) {
    + if ((roots & KVM_MMU_ROOT_PREVIOUS(i)) &&
    + VALID_PAGE(mmu->prev_roots[i].hpa))
    + mmu->invlpg(vcpu, addr, mmu->prev_roots[i].hpa);
    }
    }

    void kvm_mmu_invlpg(struct kvm_vcpu *vcpu, gva_t gva)
    {
    - kvm_mmu_invalidate_addr(vcpu, vcpu->arch.walk_mmu, gva, INVALID_PAGE);
    + /*
    + * INVLPG is required to invalidate any global mappings for the VA,
    + * irrespective of PCID. Since it would take us roughly similar amount
    + * of work to determine whether any of the prev_root mappings of the VA
    + * is marked global, or to just sync it blindly, so we might as well
    + * just always sync it.
    + *
    + * Mappings not reachable via the current cr3 or the prev_roots will be
    + * synced when switching to that cr3, so nothing needs to be done here
    + * for them.
    + */
    + kvm_mmu_invalidate_addr(vcpu, vcpu->arch.walk_mmu, gva, KVM_MMU_ROOTS_ALL);
    ++vcpu->stat.invlpg;
    }
    EXPORT_SYMBOL_GPL(kvm_mmu_invlpg);
    diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
    index b9663623c128..37958763ae2f 100644
    --- a/arch/x86/kvm/x86.c
    +++ b/arch/x86/kvm/x86.c
    @@ -799,7 +799,7 @@ void kvm_inject_emulated_page_fault(struct kvm_vcpu *vcpu,
    if ((fault->error_code & PFERR_PRESENT_MASK) &&
    !(fault->error_code & PFERR_RSVD_MASK))
    kvm_mmu_invalidate_addr(vcpu, fault_mmu, fault->address,
    - fault_mmu->root.hpa);
    + KVM_MMU_ROOT_CURRENT);

    fault_mmu->inject_page_fault(vcpu, fault);
    }
    --
    2.19.1.6.gb485710b
    \
     
     \ /
      Last update: 2023-03-27 00:25    [W:4.255 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site