lkml.org 
[lkml]   [2022]   [Jan]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 08/12] optee: add optee_pool_op_free_helper()
    Date
    Adds a common helper function to free a tee_shm allocated using the
    helper function optee_pool_op_alloc_helper().

    Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
    ---
    drivers/tee/optee/core.c | 10 ++++++++++
    drivers/tee/optee/ffa_abi.c | 4 +---
    drivers/tee/optee/optee_private.h | 3 +++
    drivers/tee/optee/smc_abi.c | 7 +++----
    4 files changed, 17 insertions(+), 7 deletions(-)

    diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c
    index f4bccb5f0e93..daf947e98d14 100644
    --- a/drivers/tee/optee/core.c
    +++ b/drivers/tee/optee/core.c
    @@ -69,6 +69,16 @@ int optee_pool_op_alloc_helper(struct tee_shm_pool *pool, struct tee_shm *shm,
    return rc;
    }

    +void optee_pool_op_free_helper(struct tee_shm_pool *pool, struct tee_shm *shm,
    + int (*shm_unregister)(struct tee_context *ctx,
    + struct tee_shm *shm))
    +{
    + if (shm_unregister)
    + shm_unregister(shm->ctx, shm);
    + free_pages((unsigned long)shm->kaddr, get_order(shm->size));
    + shm->kaddr = NULL;
    +}
    +
    static void optee_bus_scan(struct work_struct *work)
    {
    WARN_ON(optee_enumerate_devices(PTA_CMD_GET_DEVICES_SUPP));
    diff --git a/drivers/tee/optee/ffa_abi.c b/drivers/tee/optee/ffa_abi.c
    index 5ec484b42432..4cbc45035f92 100644
    --- a/drivers/tee/optee/ffa_abi.c
    +++ b/drivers/tee/optee/ffa_abi.c
    @@ -379,9 +379,7 @@ static int pool_ffa_op_alloc(struct tee_shm_pool *pool,
    static void pool_ffa_op_free(struct tee_shm_pool *pool,
    struct tee_shm *shm)
    {
    - optee_ffa_shm_unregister(shm->ctx, shm);
    - free_pages((unsigned long)shm->kaddr, get_order(shm->size));
    - shm->kaddr = NULL;
    + optee_pool_op_free_helper(pool, shm, optee_ffa_shm_unregister);
    }

    static void pool_ffa_op_destroy_pool(struct tee_shm_pool *pool)
    diff --git a/drivers/tee/optee/optee_private.h b/drivers/tee/optee/optee_private.h
    index df3a483bbf46..e77765c78878 100644
    --- a/drivers/tee/optee/optee_private.h
    +++ b/drivers/tee/optee/optee_private.h
    @@ -236,6 +236,9 @@ int optee_pool_op_alloc_helper(struct tee_shm_pool *pool, struct tee_shm *shm,
    struct page **pages,
    size_t num_pages,
    unsigned long start));
    +void optee_pool_op_free_helper(struct tee_shm_pool *pool, struct tee_shm *shm,
    + int (*shm_unregister)(struct tee_context *ctx,
    + struct tee_shm *shm));


    void optee_remove_common(struct optee *optee);
    diff --git a/drivers/tee/optee/smc_abi.c b/drivers/tee/optee/smc_abi.c
    index f2ef76451443..0b27688d1e97 100644
    --- a/drivers/tee/optee/smc_abi.c
    +++ b/drivers/tee/optee/smc_abi.c
    @@ -548,10 +548,9 @@ static void pool_op_free(struct tee_shm_pool *pool,
    struct tee_shm *shm)
    {
    if (!(shm->flags & TEE_SHM_PRIV))
    - optee_shm_unregister(shm->ctx, shm);
    -
    - free_pages((unsigned long)shm->kaddr, get_order(shm->size));
    - shm->kaddr = NULL;
    + optee_pool_op_free_helper(pool, shm, optee_shm_unregister);
    + else
    + optee_pool_op_free_helper(pool, shm, NULL);
    }

    static void pool_op_destroy_pool(struct tee_shm_pool *pool)
    --
    2.31.1
    \
     
     \ /
      Last update: 2022-01-14 16:09    [W:4.048 / U:0.188 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site