lkml.org 
[lkml]   [2021]   [Mar]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    Subject[PATCH v3 14/32] KVM: arm64: Factor out vector address calculation
    From
    In order to re-map the guest vectors at EL2 when pKVM is enabled,
    refactor __kvm_vector_slot2idx() and kvm_init_vector_slot() to move all
    the address calculation logic in a static inline function.

    Acked-by: Will Deacon <will@kernel.org>
    Signed-off-by: Quentin Perret <qperret@google.com>
    ---
    arch/arm64/include/asm/kvm_mmu.h | 8 ++++++++
    arch/arm64/kvm/arm.c | 9 +--------
    2 files changed, 9 insertions(+), 8 deletions(-)

    diff --git a/arch/arm64/include/asm/kvm_mmu.h b/arch/arm64/include/asm/kvm_mmu.h
    index 90873851f677..5c42ec023cc7 100644
    --- a/arch/arm64/include/asm/kvm_mmu.h
    +++ b/arch/arm64/include/asm/kvm_mmu.h
    @@ -168,6 +168,14 @@ phys_addr_t kvm_mmu_get_httbr(void);
    phys_addr_t kvm_get_idmap_vector(void);
    int kvm_mmu_init(void);

    +static inline void *__kvm_vector_slot2addr(void *base,
    + enum arm64_hyp_spectre_vector slot)
    +{
    + int idx = slot - (slot != HYP_VECTOR_DIRECT);
    +
    + return base + (idx * SZ_2K);
    +}
    +
    struct kvm;

    #define kvm_flush_dcache_to_poc(a,l) __flush_dcache_area((a), (l))
    diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c
    index 3f8bcf8db036..26e573cdede3 100644
    --- a/arch/arm64/kvm/arm.c
    +++ b/arch/arm64/kvm/arm.c
    @@ -1345,16 +1345,9 @@ static unsigned long nvhe_percpu_order(void)
    /* A lookup table holding the hypervisor VA for each vector slot */
    static void *hyp_spectre_vector_selector[BP_HARDEN_EL2_SLOTS];

    -static int __kvm_vector_slot2idx(enum arm64_hyp_spectre_vector slot)
    -{
    - return slot - (slot != HYP_VECTOR_DIRECT);
    -}
    -
    static void kvm_init_vector_slot(void *base, enum arm64_hyp_spectre_vector slot)
    {
    - int idx = __kvm_vector_slot2idx(slot);
    -
    - hyp_spectre_vector_selector[slot] = base + (idx * SZ_2K);
    + hyp_spectre_vector_selector[slot] = __kvm_vector_slot2addr(base, slot);
    }

    static int kvm_init_vector_slots(void)
    --
    2.30.1.766.gb4fecdf3b7-goog
    \
     
     \ /
      Last update: 2021-03-02 18:24    [W:3.226 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site