lkml.org 
[lkml]   [2021]   [Dec]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    Subject[PATCH 3/6] KVM: arm64: Make the hyp memory pool static
    From
    The hyp memory pool struct is sized to fit exactly the needs of the
    hypervisor stage-1 page-table allocator, so it is important it is not
    used for anything else. As it is currently used only from setup.c,
    reduce its visibility by marking it static.

    Signed-off-by: Quentin Perret <qperret@google.com>
    ---
    arch/arm64/kvm/hyp/include/nvhe/mm.h | 1 -
    arch/arm64/kvm/hyp/nvhe/setup.c | 2 +-
    2 files changed, 1 insertion(+), 2 deletions(-)

    diff --git a/arch/arm64/kvm/hyp/include/nvhe/mm.h b/arch/arm64/kvm/hyp/include/nvhe/mm.h
    index ef6a58a04235..3f60d6cc5368 100644
    --- a/arch/arm64/kvm/hyp/include/nvhe/mm.h
    +++ b/arch/arm64/kvm/hyp/include/nvhe/mm.h
    @@ -12,7 +12,6 @@

    extern struct kvm_pgtable pkvm_pgtable;
    extern hyp_spinlock_t pkvm_pgd_lock;
    -extern struct hyp_pool hpool;
    extern u64 __io_map_base;

    int hyp_create_idmap(u32 hyp_va_bits);
    diff --git a/arch/arm64/kvm/hyp/nvhe/setup.c b/arch/arm64/kvm/hyp/nvhe/setup.c
    index 51e68a040d8a..e31149965204 100644
    --- a/arch/arm64/kvm/hyp/nvhe/setup.c
    +++ b/arch/arm64/kvm/hyp/nvhe/setup.c
    @@ -18,7 +18,6 @@
    #include <nvhe/mm.h>
    #include <nvhe/trap_handler.h>

    -struct hyp_pool hpool;
    unsigned long hyp_nr_cpus;

    #define hyp_percpu_size ((unsigned long)__per_cpu_end - \
    @@ -28,6 +27,7 @@ static void *vmemmap_base;
    static void *hyp_pgt_base;
    static void *host_s2_pgt_base;
    static struct kvm_pgtable_mm_ops pkvm_pgtable_mm_ops;
    +static struct hyp_pool hpool;

    static int divide_memory_pool(void *virt, unsigned long size)
    {
    --
    2.34.1.400.ga245620fadb-goog
    \
     
     \ /
      Last update: 2021-12-08 16:23    [W:4.984 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site