Hi Jens,

On Thu, 28 Nov 2024 at 20:39, Jens Wiklander jens.wiklander@linaro.org wrote:

Add restricted memory allocation to the TEE subsystem. Restricted memory is not be accessible by kernel during normal circumstances. A new ioctl

s/not be accessible/not accessible/

How about if we reword it as follows?

Restricted memory refers to memory buffers behind a hardware enforced firewall. It is not accessible to the kernel during normal circumstances but rather only accessible to certain hardware IPs or CPUs executing in higher privileged mode than the kernel itself. This interface allows to allocate and manage such restricted memory buffers via interaction with a TEE implementation.

TEE_IOC_RSTMEM_ALLOC is added to allocate these restricted memory buffers.

The restricted memory is allocated for a specific use-case, like Secure Video Playback, Trusted UI, or Secure Video Recording where certain hardware devices can access the memory.

More use-cases can be added in userspace ABI, but it's up to the backend drivers to provide the implementation.

Signed-off-by: Jens Wiklander jens.wiklander@linaro.org

drivers/tee/Makefile | 1 + drivers/tee/tee_core.c | 37 ++++++- drivers/tee/tee_private.h | 2 + drivers/tee/tee_rstmem.c | 201 +++++++++++++++++++++++++++++++++++++ drivers/tee/tee_shm.c | 2 + drivers/tee/tee_shm_pool.c | 69 ++++++++++++- include/linux/tee_core.h | 15 +++ include/linux/tee_drv.h | 4 +- include/uapi/linux/tee.h | 37 ++++++- 9 files changed, 363 insertions(+), 5 deletions(-) create mode 100644 drivers/tee/tee_rstmem.c

diff --git a/drivers/tee/Makefile b/drivers/tee/Makefile index 5488cba30bd2..a4c6b55444b9 100644 --- a/drivers/tee/Makefile +++ b/drivers/tee/Makefile @@ -3,6 +3,7 @@ obj-$(CONFIG_TEE) += tee.o tee-objs += tee_core.o tee-objs += tee_shm.o tee-objs += tee_shm_pool.o +tee-objs += tee_rstmem.o obj-$(CONFIG_OPTEE) += optee/ obj-$(CONFIG_AMDTEE) += amdtee/ obj-$(CONFIG_ARM_TSTEE) += tstee/ diff --git a/drivers/tee/tee_core.c b/drivers/tee/tee_core.c index d113679b1e2d..e81167826002 100644 --- a/drivers/tee/tee_core.c +++ b/drivers/tee/tee_core.c @@ -1,12 +1,13 @@ // SPDX-License-Identifier: GPL-2.0-only /*

• • Copyright (c) 2015-2016, Linaro Limited

• • Copyright (c) 2015-2022, 2024, Linaro Limited
  */

#define pr_fmt(fmt) "%s: " fmt, __func__

#include <linux/cdev.h> #include <linux/cred.h> +#include <linux/dma-buf.h> #include <linux/fs.h> #include <linux/idr.h> #include <linux/module.h> @@ -815,6 +816,38 @@ static int tee_ioctl_supp_send(struct tee_context *ctx, return rc; }

+static int +tee_ioctl_rstmem_alloc(struct tee_context *ctx,

•                  struct tee_ioctl_rstmem_alloc_data __user *udata)
  

+{

•   struct tee_ioctl_rstmem_alloc_data data;
  

•   struct dma_buf *dmabuf;
  

•   int id;
  

•   int fd;
  

•   if (copy_from_user(&data, udata, sizeof(data)))
  

•           return -EFAULT;
  

•   if (data.use_case == TEE_IOC_UC_RESERVED)
  

•           return -EINVAL;
  

•   dmabuf = tee_rstmem_alloc(ctx, data.flags, data.use_case, data.size,
  

•                             &id);
  

•   if (IS_ERR(dmabuf))
  

•           return PTR_ERR(dmabuf);
  

•   if (put_user(id, &udata->id)) {
  

•           fd = -EFAULT;
  

•           goto err;
  

•   }
  

•   fd = dma_buf_fd(dmabuf, O_CLOEXEC);
  

•   if (fd < 0)
  

•           goto err;
  

•   return fd;
  

+err:

•   dma_buf_put(dmabuf);
  

•   return fd;
  

+}

static long tee_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) { struct tee_context *ctx = filp->private_data; @@ -839,6 +872,8 @@ static long tee_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) return tee_ioctl_supp_recv(ctx, uarg); case TEE_IOC_SUPPL_SEND: return tee_ioctl_supp_send(ctx, uarg);

•   case TEE_IOC_RSTMEM_ALLOC:
  

•           return tee_ioctl_rstmem_alloc(ctx, uarg);
    default:
            return -EINVAL;
    }
  

diff --git a/drivers/tee/tee_private.h b/drivers/tee/tee_private.h index 9bc50605227c..bf97796909c0 100644 --- a/drivers/tee/tee_private.h +++ b/drivers/tee/tee_private.h @@ -23,5 +23,7 @@ void teedev_ctx_put(struct tee_context *ctx); struct tee_shm *tee_shm_alloc_user_buf(struct tee_context *ctx, size_t size); struct tee_shm *tee_shm_register_user_buf(struct tee_context *ctx, unsigned long addr, size_t length); +struct dma_buf *tee_rstmem_alloc(struct tee_context *ctx, u32 flags,

•                            u32 use_case, size_t size, int *shm_id);
  
  

#endif /*TEE_PRIVATE_H*/ diff --git a/drivers/tee/tee_rstmem.c b/drivers/tee/tee_rstmem.c new file mode 100644 index 000000000000..536bca2901e2 --- /dev/null +++ b/drivers/tee/tee_rstmem.c @@ -0,0 +1,201 @@ +// SPDX-License-Identifier: GPL-2.0-only +/*

• • Copyright (c) 2024 Linaro Limited
• */

+#include <linux/device.h> +#include <linux/dma-buf.h> +#include <linux/genalloc.h> +#include <linux/scatterlist.h> +#include <linux/slab.h> +#include <linux/tee_core.h> +#include "tee_private.h"

+struct tee_rstmem_attachment {

•   struct sg_table table;
  

•   struct device *dev;
  

+};

+static int rstmem_dma_attach(struct dma_buf *dmabuf,

•                        struct dma_buf_attachment *attachment)
  

+{

•   struct tee_shm *shm = dmabuf->priv;
  

•   struct tee_rstmem_attachment *a;
  

•   int rc;
  

•   a = kzalloc(sizeof(*a), GFP_KERNEL);
  

•   if (!a)
  

•           return -ENOMEM;
  

•   if (shm->pages) {
  

•           rc = sg_alloc_table_from_pages(&a->table, shm->pages,
  

•                                          shm->num_pages, 0,
  

•                                          shm->num_pages * PAGE_SIZE,
  

•                                          GFP_KERNEL);
  

•           if (rc)
  

•                   goto err;
  

•   } else {
  

•           rc = sg_alloc_table(&a->table, 1, GFP_KERNEL);
  

•           if (rc)
  

•                   goto err;
  

•           sg_set_page(a->table.sgl, phys_to_page(shm->paddr), shm->size,
  

•                       0);
  

•   }
  

•   a->dev = attachment->dev;
  

•   attachment->priv = a;
  

•   return 0;
  

+err:

•   kfree(a);
  

•   return rc;
  

+}

+static void rstmem_dma_detach(struct dma_buf *dmabuf,

•                         struct dma_buf_attachment *attachment)
  

+{

•   struct tee_rstmem_attachment *a = attachment->priv;
  

•   sg_free_table(&a->table);
  

•   kfree(a);
  

+}

+static struct sg_table * +rstmem_dma_map_dma_buf(struct dma_buf_attachment *attachment,

•                  enum dma_data_direction direction)
  

+{

•   struct tee_rstmem_attachment *a = attachment->priv;
  

•   int ret;
  

•   ret = dma_map_sgtable(attachment->dev, &a->table, direction,
  

•                         DMA_ATTR_SKIP_CPU_SYNC);
  

•   if (ret)
  

•           return ERR_PTR(ret);
  

•   return &a->table;
  

+}

+static void rstmem_dma_unmap_dma_buf(struct dma_buf_attachment *attachment,

•                                struct sg_table *table,
  

•                                enum dma_data_direction direction)
  

+{

•   struct tee_rstmem_attachment *a = attachment->priv;
  

•   WARN_ON(&a->table != table);
  

•   dma_unmap_sgtable(attachment->dev, table, direction,
  

•                     DMA_ATTR_SKIP_CPU_SYNC);
  

+}

+static int rstmem_dma_buf_begin_cpu_access(struct dma_buf *dmabuf,

•                                      enum dma_data_direction direction)
  

+{

•   return -EPERM;
  

+}

+static int rstmem_dma_buf_end_cpu_access(struct dma_buf *dmabuf,

•                                    enum dma_data_direction direction)
  

+{

•   return -EPERM;
  

+}

+static int rstmem_dma_buf_mmap(struct dma_buf *dmabuf,

•                          struct vm_area_struct *vma)
  

+{

•   return -EPERM;
  

+}

+static void rstmem_dma_buf_free(struct dma_buf *dmabuf) +{

•   struct tee_shm *shm = dmabuf->priv;
  

•   tee_shm_put(shm);
  

+}

+static const struct dma_buf_ops rstmem_generic_buf_ops = {

•   .attach = rstmem_dma_attach,
  

•   .detach = rstmem_dma_detach,
  

•   .map_dma_buf = rstmem_dma_map_dma_buf,
  

•   .unmap_dma_buf = rstmem_dma_unmap_dma_buf,
  

•   .begin_cpu_access = rstmem_dma_buf_begin_cpu_access,
  

•   .end_cpu_access = rstmem_dma_buf_end_cpu_access,
  

•   .mmap = rstmem_dma_buf_mmap,
  

•   .release = rstmem_dma_buf_free,
  

+};

+struct dma_buf *tee_rstmem_alloc(struct tee_context *ctx, u32 flags,

•                            u32 use_case, size_t size, int *shm_id)
  

+{

•   struct tee_device *teedev = ctx->teedev;
  

•   DEFINE_DMA_BUF_EXPORT_INFO(exp_info);
  

•   struct dma_buf *dmabuf;
  

•   struct tee_shm *shm;
  

•   void *ret;
  

•   int rc;
  

•   if (!tee_device_get(teedev))
  

•           return ERR_PTR(-EINVAL);
  

•   if (!teedev->desc->ops->rstmem_alloc ||
  

•       !teedev->desc->ops->rstmem_free) {
  

•           dmabuf = ERR_PTR(-EINVAL);
  

•           goto err;
  

•   }
  

•   shm = kzalloc(sizeof(*shm), GFP_KERNEL);
  

•   if (!shm) {
  

•           dmabuf = ERR_PTR(-ENOMEM);
  

•           goto err;
  

•   }
  

•   refcount_set(&shm->refcount, 1);
  

•   shm->flags = TEE_SHM_RESTRICTED;
  

•   shm->use_case = use_case;
  

•   shm->ctx = ctx;
  

•   mutex_lock(&teedev->mutex);
  

•   shm->id = idr_alloc(&teedev->idr, NULL, 1, 0, GFP_KERNEL);
  

•   mutex_unlock(&teedev->mutex);
  

•   if (shm->id < 0) {
  

•           dmabuf = ERR_PTR(shm->id);
  

•           goto err_kfree;
  

•   }
  

•   rc = teedev->desc->ops->rstmem_alloc(ctx, shm, flags, use_case, size);
  

•   if (rc) {
  

•           dmabuf = ERR_PTR(rc);
  

•           goto err_idr_remove;
  

•   }
  

•   mutex_lock(&teedev->mutex);
  

•   ret = idr_replace(&teedev->idr, shm, shm->id);
  

•   mutex_unlock(&teedev->mutex);
  

•   if (IS_ERR(ret)) {
  

•           dmabuf = ret;
  

•           goto err_rstmem_free;
  

•   }
  

•   teedev_ctx_get(ctx);
  

•   exp_info.ops = &rstmem_generic_buf_ops;
  

•   exp_info.size = shm->size;
  

•   exp_info.priv = shm;
  

•   dmabuf = dma_buf_export(&exp_info);
  

•   if (IS_ERR(dmabuf)) {
  

•           tee_shm_put(shm);
  

•           return dmabuf;
  

•   }
  

•   *shm_id = shm->id;
  

•   return dmabuf;
  

+err_rstmem_free:

•   teedev->desc->ops->rstmem_free(ctx, shm);
  

+err_idr_remove:

•   mutex_lock(&teedev->mutex);
  

•   idr_remove(&teedev->idr, shm->id);
  

•   mutex_unlock(&teedev->mutex);
  

+err_kfree:

•   kfree(shm);
  

+err:

•   tee_device_put(teedev);
  

•   return dmabuf;
  

+} diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c index daf6e5cfd59a..416f7f25d885 100644 --- a/drivers/tee/tee_shm.c +++ b/drivers/tee/tee_shm.c @@ -55,6 +55,8 @@ static void tee_shm_release(struct tee_device *teedev, struct tee_shm *shm) "unregister shm %p failed: %d", shm, rc);

            release_registered_pages(shm);

•   } else if (shm->flags & TEE_SHM_RESTRICTED) {
  

•           teedev->desc->ops->rstmem_free(shm->ctx, shm);
    }
  
    teedev_ctx_put(shm->ctx);
  

diff --git a/drivers/tee/tee_shm_pool.c b/drivers/tee/tee_shm_pool.c index 80004b55628d..ee57ef157a77 100644 --- a/drivers/tee/tee_shm_pool.c +++ b/drivers/tee/tee_shm_pool.c @@ -1,9 +1,8 @@ // SPDX-License-Identifier: GPL-2.0-only /*

• • Copyright (c) 2015, 2017, 2022 Linaro Limited

• • Copyright (c) 2015, 2017, 2022, 2024 Linaro Limited
  */

#include <linux/device.h> -#include <linux/dma-buf.h> #include <linux/genalloc.h> #include <linux/slab.h> #include <linux/tee_core.h> @@ -90,3 +89,69 @@ struct tee_shm_pool *tee_shm_pool_alloc_res_mem(unsigned long vaddr, return ERR_PTR(rc); } EXPORT_SYMBOL_GPL(tee_shm_pool_alloc_res_mem);

+static int rstmem_pool_op_gen_alloc(struct tee_shm_pool *pool,

•                               struct tee_shm *shm, size_t size,
  

•                               size_t align)
  

+{

•   size_t sz = ALIGN(size, PAGE_SIZE);
  

•   phys_addr_t pa;
  

•   pa = gen_pool_alloc(pool->private_data, sz);
  

•   if (!pa)
  

•           return -ENOMEM;
  

•   shm->size = sz;
  

•   shm->paddr = pa;
  

•   return 0;
  

+}

+static void rstmem_pool_op_gen_free(struct tee_shm_pool *pool,

•                               struct tee_shm *shm)
  

+{

•   gen_pool_free(pool->private_data, shm->paddr, shm->size);
  

•   shm->paddr = 0;
  

+}

+static struct tee_shm_pool_ops rstmem_pool_ops_generic = {

•   .alloc = rstmem_pool_op_gen_alloc,
  

•   .free = rstmem_pool_op_gen_free,
  

•   .destroy_pool = pool_op_gen_destroy_pool,
  

+};

+struct tee_shm_pool *tee_rstmem_gen_pool_alloc(phys_addr_t paddr, size_t size) +{

•   const size_t page_mask = PAGE_SIZE - 1;
  

•   struct tee_shm_pool *pool;
  

•   int rc;
  

•   /* Check it's page aligned */
  

•   if ((paddr | size) & page_mask)
  

•           return ERR_PTR(-EINVAL);
  

•   pool = kzalloc(sizeof(*pool), GFP_KERNEL);
  

•   if (!pool)
  

•           return ERR_PTR(-ENOMEM);
  

•   pool->private_data = gen_pool_create(PAGE_SHIFT, -1);
  

•   if (!pool->private_data) {
  

•           rc = -ENOMEM;
  

•           goto err_free;
  

•   }
  

•   rc = gen_pool_add(pool->private_data, paddr, size, -1);
  

•   if (rc)
  

•           goto err_free_pool;
  

•   pool->ops = &rstmem_pool_ops_generic;
  

•   return pool;
  

+err_free_pool:

•   gen_pool_destroy(pool->private_data);
  

+err_free:

•   kfree(pool);
  

•   return ERR_PTR(rc);
  

+} +EXPORT_SYMBOL_GPL(tee_rstmem_gen_pool_alloc); diff --git a/include/linux/tee_core.h b/include/linux/tee_core.h index a38494d6b5f4..608302f494fe 100644 --- a/include/linux/tee_core.h +++ b/include/linux/tee_core.h @@ -26,6 +26,7 @@ #define TEE_SHM_USER_MAPPED BIT(1) /* Memory mapped in user space */ #define TEE_SHM_POOL BIT(2) /* Memory allocated from pool */ #define TEE_SHM_PRIV BIT(3) /* Memory private to TEE driver */ +#define TEE_SHM_RESTRICTED BIT(4) /* Restricted memory */

#define TEE_DEVICE_FLAG_REGISTERED 0x1 #define TEE_MAX_DEV_NAME_LEN 32 @@ -76,6 +77,8 @@ struct tee_device {

• @supp_send: called for supplicant to send a response
• @shm_register: register shared memory buffer in TEE
• @shm_unregister: unregister shared memory buffer in TEE

• • @rstmem_alloc: allocate restricted memory
• • @rstmem_free: free restricted memory
  */

struct tee_driver_ops { void (*get_version)(struct tee_device *teedev, @@ -99,6 +102,9 @@ struct tee_driver_ops { struct page **pages, size_t num_pages, unsigned long start); int (*shm_unregister)(struct tee_context *ctx, struct tee_shm *shm);

•   int (*rstmem_alloc)(struct tee_context *ctx, struct tee_shm *shm,
  

•                       u32 flags, u32 use_case, size_t size);
  

•   void (*rstmem_free)(struct tee_context *ctx, struct tee_shm *shm);
  

};

/** @@ -229,6 +235,15 @@ static inline void tee_shm_pool_free(struct tee_shm_pool *pool) pool->ops->destroy_pool(pool); }

+/**

• • tee_rstmem_gen_pool_alloc() - Create a restricted memory manager
• • @paddr: Physical address of start of pool
• • @size: Size in bytes of the pool
• • @returns pointer to a 'struct tee_shm_pool' or an ERR_PTR on failure.
• */

+struct tee_shm_pool *tee_rstmem_gen_pool_alloc(phys_addr_t paddr, size_t size);

/**

• tee_get_drvdata() - Return driver_data pointer
• @returns the driver_data pointer supplied to tee_register().

diff --git a/include/linux/tee_drv.h b/include/linux/tee_drv.h index a54c203000ed..b7ee346e5e44 100644 --- a/include/linux/tee_drv.h +++ b/include/linux/tee_drv.h @@ -55,6 +55,7 @@ struct tee_context {

• @pages: locked pages from userspace
• @num_pages: number of locked pages
• @refcount: reference counter

• • @use_case: defined by TEE_IOC_UC_* in tee.h
  • @flags: defined by TEE_SHM_* in tee_core.h
  • @id: unique id of a shared memory object on this device, shared

  •         with user space
    

@@ -71,7 +72,8 @@ struct tee_shm { struct page **pages; size_t num_pages; refcount_t refcount;

•   u32 flags;
  

•   u16 use_case;
  

•   u16 flags;
  

Shouldn't we keep them u32 instead to be aligned with user-space inputs?

    int id;
    u64 sec_world_id;

}; diff --git a/include/uapi/linux/tee.h b/include/uapi/linux/tee.h index d0430bee8292..cdc8c82c9a38 100644 --- a/include/uapi/linux/tee.h +++ b/include/uapi/linux/tee.h @@ -1,5 +1,5 @@ /*

• • Copyright (c) 2015-2016, Linaro Limited

• • Copyright (c) 2015-2017, 2020, 2024, Linaro Limited
  • All rights reserved.
  • Redistribution and use in source and binary forms, with or without

@@ -48,6 +48,7 @@ #define TEE_GEN_CAP_PRIVILEGED (1 << 1)/* Privileged device (for supplicant) */ #define TEE_GEN_CAP_REG_MEM (1 << 2)/* Supports registering shared memory */ #define TEE_GEN_CAP_MEMREF_NULL (1 << 3)/* NULL MemRef support */ +#define TEE_GEN_CAP_RSTMEM (1 << 4)/* Supports restricted memory */

#define TEE_MEMREF_NULL (__u64)(-1) /* NULL MemRef Buffer */

@@ -389,6 +390,40 @@ struct tee_ioctl_shm_register_data { */ #define TEE_IOC_SHM_REGISTER _IOWR(TEE_IOC_MAGIC, TEE_IOC_BASE + 9, \ struct tee_ioctl_shm_register_data)

+#define TEE_IOC_UC_RESERVED 0 +#define TEE_IOC_UC_SECURE_VIDEO_PLAY 1 +#define TEE_IOC_UC_TRUSTED_UI 2 +#define TEE_IOC_UC_SECURE_VIDEO_RECORD 3

+/**

• • struct tee_ioctl_rstmem_alloc_data - Restricted memory allocate argument
• • @size: [in/out] Size of restricted memory to allocate
• • @flags: [in/out] Flags to/from allocate
• • @use_case [in] Restricted memory use case, TEE_IOC_UC_*
• • @id: [out] Identifier of the restricted memory
• */

+struct tee_ioctl_rstmem_alloc_data {

•   __u64 size;
  

•   __u32 flags;
  

•   __u32 use_case;
  

•   __s32 id;
  

+};

+/**

• • TEE_IOC_RSTMEM_ALLOC - allocate restricted memory
• • Allocates restricted physically memory normally not accessible by the
• • kernel.

Can we elaborate here as well on similar lines as per commit message?

-Sumit

• • Returns a file descriptor on success or < 0 on failure
• • The returned file descriptor is a dma-buf that can be attached and
• • mapped for device with permission to access the physical memory.
• */

+#define TEE_IOC_RSTMEM_ALLOC _IOWR(TEE_IOC_MAGIC, TEE_IOC_BASE + 10, \

•                                  struct tee_ioctl_rstmem_alloc_data)
  

/*

• Five syscalls are used when communicating with the TEE driver.
• open(): opens the device associated with the driver

-- 2.43.0

Hi Sumit,

On Tue, Dec 3, 2024 at 9:27 AM Sumit Garg sumit.garg@linaro.org wrote:

Hi Jens,

On Thu, 28 Nov 2024 at 20:39, Jens Wiklander jens.wiklander@linaro.org wrote:

...

The OP-TEE backend driver has two internal function pointers to convert between the subsystem type struct tee_param and the OP-TEE type struct optee_msg_param.

The conversion is done from one of the types to the other, which is then involved in some operation and finally converted back to the original type. When converting to prepare the parameters for the operation, all fields must be taken into account, but then converting back, it's enough to update only out-values and out-sizes. So, an update_out parameter is added to the conversion functions to tell if all or only some fields must be copied.

Is this patch just a refactoring of TEE params handling? Or are we fixing a real ABI issue here? Also, is this required for restricted shared memory support to work? Just asking if we want to consider it as a fix for backporting or if we can handle this refactoring patch independently of this series?

This is needed in this series. Without this patch, it might get confusing when converting back in from_msg_param() callback since an allocated restricted SHM can be using the sec_world_id of the pool and that doesn't translate back well. params_to_user() in drivers/tee/tee_core.c already takes the direction into account so it wouldn't spread to user-space.

Cheers, Jens

-Sumit

...

Signed-off-by: Jens Wiklander jens.wiklander@linaro.org

drivers/tee/optee/call.c | 10 ++-- drivers/tee/optee/ffa_abi.c | 43 +++++++++++++---- drivers/tee/optee/optee_private.h | 42 +++++++++++------ drivers/tee/optee/rpc.c | 31 +++++++++---- drivers/tee/optee/smc_abi.c | 76 +++++++++++++++++++++++-------- 5 files changed, 144 insertions(+), 58 deletions(-)

diff --git a/drivers/tee/optee/call.c b/drivers/tee/optee/call.c index 16eb953e14bb..f1533b894726 100644 --- a/drivers/tee/optee/call.c +++ b/drivers/tee/optee/call.c @@ -400,7 +400,8 @@ int optee_open_session(struct tee_context *ctx, export_uuid(msg_arg->params[1].u.octets, &client_uuid);

    rc = optee->ops->to_msg_param(optee, msg_arg->params + 2,

•                                 arg->num_params, param);
  

•                                 arg->num_params, param,
  

•                                 false /*!update_out*/);
    if (rc)
            goto out;
  
  

@@ -427,7 +428,8 @@ int optee_open_session(struct tee_context *ctx, }

    if (optee->ops->from_msg_param(optee, param, arg->num_params,

•                                  msg_arg->params + 2)) {
  

•                                  msg_arg->params + 2,
  

•                                  true /*update_out*/)) {
            arg->ret = TEEC_ERROR_COMMUNICATION;
            arg->ret_origin = TEEC_ORIGIN_COMMS;
            /* Close session again to avoid leakage */
  

@@ -541,7 +543,7 @@ int optee_invoke_func(struct tee_context *ctx, struct tee_ioctl_invoke_arg *arg, msg_arg->cancel_id = arg->cancel_id;

    rc = optee->ops->to_msg_param(optee, msg_arg->params, arg->num_params,

•                                 param);
  

•                                 param, false /*!update_out*/);
    if (rc)
            goto out;
  
  

@@ -551,7 +553,7 @@ int optee_invoke_func(struct tee_context *ctx, struct tee_ioctl_invoke_arg *arg, }

    if (optee->ops->from_msg_param(optee, param, arg->num_params,

•                                  msg_arg->params)) {
  

•                                  msg_arg->params, true /*update_out*/)) {
            msg_arg->ret = TEEC_ERROR_COMMUNICATION;
            msg_arg->ret_origin = TEEC_ORIGIN_COMMS;
    }
  

diff --git a/drivers/tee/optee/ffa_abi.c b/drivers/tee/optee/ffa_abi.c index f3af5666bb11..02e6175ac5f0 100644 --- a/drivers/tee/optee/ffa_abi.c +++ b/drivers/tee/optee/ffa_abi.c @@ -122,15 +122,21 @@ static int optee_shm_rem_ffa_handle(struct optee *optee, u64 global_id) */

static void from_msg_param_ffa_mem(struct optee *optee, struct tee_param *p,

•                              u32 attr, const struct optee_msg_param *mp)
  

•                              u32 attr, const struct optee_msg_param *mp,
  

•                              bool update_out)
  

{ struct tee_shm *shm = NULL; u64 offs_high = 0; u64 offs_low = 0;

•   if (update_out) {
  

•           if (attr == OPTEE_MSG_ATTR_TYPE_FMEM_INPUT)
  

•                   return;
  

•           goto out;
  

•   }
  

•   p->attr = TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INPUT +
              attr - OPTEE_MSG_ATTR_TYPE_FMEM_INPUT;
  

•   p->u.memref.size = mp->u.fmem.size;
  
    if (mp->u.fmem.global_id != OPTEE_MSG_FMEM_INVALID_GLOBAL_ID)
            shm = optee_shm_from_ffa_handle(optee, mp->u.fmem.global_id);
  

@@ -141,6 +147,8 @@ static void from_msg_param_ffa_mem(struct optee *optee, struct tee_param *p, offs_high = mp->u.fmem.offs_high; } p->u.memref.shm_offs = offs_low | offs_high << 32; +out:

•   p->u.memref.size = mp->u.fmem.size;
  

}

/** @@ -150,12 +158,14 @@ static void from_msg_param_ffa_mem(struct optee *optee, struct tee_param *p,

• @params: subsystem internal parameter representation
• @num_params: number of elements in the parameter arrays
• @msg_params: OPTEE_MSG parameters

• • @update_out: update parameter for output only
  • Returns 0 on success or <0 on failure
  */

static int optee_ffa_from_msg_param(struct optee *optee, struct tee_param *params, size_t num_params,

•                               const struct optee_msg_param *msg_params)
  

•                               const struct optee_msg_param *msg_params,
  

•                               bool update_out)
  

{ size_t n;

@@ -166,18 +176,20 @@ static int optee_ffa_from_msg_param(struct optee *optee,

            switch (attr) {
            case OPTEE_MSG_ATTR_TYPE_NONE:

•                   if (update_out)
  

•                           break;
                    p->attr = TEE_IOCTL_PARAM_ATTR_TYPE_NONE;
                    memset(&p->u, 0, sizeof(p->u));
                    break;
            case OPTEE_MSG_ATTR_TYPE_VALUE_INPUT:
            case OPTEE_MSG_ATTR_TYPE_VALUE_OUTPUT:
            case OPTEE_MSG_ATTR_TYPE_VALUE_INOUT:
  

•                   optee_from_msg_param_value(p, attr, mp);
  

•                   optee_from_msg_param_value(p, attr, mp, update_out);
                    break;
            case OPTEE_MSG_ATTR_TYPE_FMEM_INPUT:
            case OPTEE_MSG_ATTR_TYPE_FMEM_OUTPUT:
            case OPTEE_MSG_ATTR_TYPE_FMEM_INOUT:
  

•                   from_msg_param_ffa_mem(optee, p, attr, mp);
  

•                   from_msg_param_ffa_mem(optee, p, attr, mp, update_out);
                    break;
            default:
                    return -EINVAL;
  

@@ -188,10 +200,16 @@ static int optee_ffa_from_msg_param(struct optee *optee, }

static int to_msg_param_ffa_mem(struct optee_msg_param *mp,

•                           const struct tee_param *p)
  

•                           const struct tee_param *p, bool update_out)
  

{ struct tee_shm *shm = p->u.memref.shm;

•   if (update_out) {
  

•           if (p->attr == TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INPUT)
  

•                   return 0;
  

•           goto out;
  

•   }
  

•   mp->attr = OPTEE_MSG_ATTR_TYPE_FMEM_INPUT + p->attr -
               TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INPUT;
  
  

@@ -211,6 +229,7 @@ static int to_msg_param_ffa_mem(struct optee_msg_param *mp, memset(&mp->u, 0, sizeof(mp->u)); mp->u.fmem.global_id = OPTEE_MSG_FMEM_INVALID_GLOBAL_ID; } +out: mp->u.fmem.size = p->u.memref.size;

    return 0;

@@ -222,13 +241,15 @@ static int to_msg_param_ffa_mem(struct optee_msg_param *mp,

• @optee: main service struct
• @msg_params: OPTEE_MSG parameters
• @num_params: number of elements in the parameter arrays

• • @params: subsystem itnernal parameter representation

• • @params: subsystem internal parameter representation
• • @update_out: update parameter for output only
  • Returns 0 on success or <0 on failure
  */

static int optee_ffa_to_msg_param(struct optee *optee, struct optee_msg_param *msg_params, size_t num_params,

•                             const struct tee_param *params)
  

•                             const struct tee_param *params,
  

•                             bool update_out)
  

{ size_t n;

@@ -238,18 +259,20 @@ static int optee_ffa_to_msg_param(struct optee *optee,

            switch (p->attr) {
            case TEE_IOCTL_PARAM_ATTR_TYPE_NONE:

•                   if (update_out)
  

•                           break;
                    mp->attr = TEE_IOCTL_PARAM_ATTR_TYPE_NONE;
                    memset(&mp->u, 0, sizeof(mp->u));
                    break;
            case TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_INPUT:
            case TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_OUTPUT:
            case TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_INOUT:
  

•                   optee_to_msg_param_value(mp, p);
  

•                   optee_to_msg_param_value(mp, p, update_out);
                    break;
            case TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INPUT:
            case TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_OUTPUT:
            case TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INOUT:
  

•                   if (to_msg_param_ffa_mem(mp, p))
  

•                   if (to_msg_param_ffa_mem(mp, p, update_out))
                            return -EINVAL;
                    break;
            default:
  

diff --git a/drivers/tee/optee/optee_private.h b/drivers/tee/optee/optee_private.h index dc0f355ef72a..20eda508dbac 100644 --- a/drivers/tee/optee/optee_private.h +++ b/drivers/tee/optee/optee_private.h @@ -185,10 +185,12 @@ struct optee_ops { bool system_thread); int (*to_msg_param)(struct optee *optee, struct optee_msg_param *msg_params,

•                       size_t num_params, const struct tee_param *params);
  

•                       size_t num_params, const struct tee_param *params,
  

•                       bool update_out);
    int (*from_msg_param)(struct optee *optee, struct tee_param *params,
                          size_t num_params,
  

•                         const struct optee_msg_param *msg_params);
  

•                         const struct optee_msg_param *msg_params,
  

•                         bool update_out);
  

};

/** @@ -316,23 +318,35 @@ void optee_release(struct tee_context *ctx); void optee_release_supp(struct tee_context *ctx);

static inline void optee_from_msg_param_value(struct tee_param *p, u32 attr,

•                                         const struct optee_msg_param *mp)
  

•                                         const struct optee_msg_param *mp,
  

•                                         bool update_out)
  

{

•   p->attr = TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_INPUT +
  

•             attr - OPTEE_MSG_ATTR_TYPE_VALUE_INPUT;
  

•   p->u.value.a = mp->u.value.a;
  

•   p->u.value.b = mp->u.value.b;
  

•   p->u.value.c = mp->u.value.c;
  

•   if (!update_out)
  

•           p->attr = TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_INPUT +
  

•                     attr - OPTEE_MSG_ATTR_TYPE_VALUE_INPUT;
  

•   if (attr == OPTEE_MSG_ATTR_TYPE_VALUE_OUTPUT ||
  

•       attr == OPTEE_MSG_ATTR_TYPE_VALUE_INOUT || !update_out) {
  

•           p->u.value.a = mp->u.value.a;
  

•           p->u.value.b = mp->u.value.b;
  

•           p->u.value.c = mp->u.value.c;
  

•   }
  

}

static inline void optee_to_msg_param_value(struct optee_msg_param *mp,

•                                       const struct tee_param *p)
  

•                                       const struct tee_param *p,
  

•                                       bool update_out)
  

{

•   mp->attr = OPTEE_MSG_ATTR_TYPE_VALUE_INPUT + p->attr -
  

•              TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_INPUT;
  

•   mp->u.value.a = p->u.value.a;
  

•   mp->u.value.b = p->u.value.b;
  

•   mp->u.value.c = p->u.value.c;
  

•   if (!update_out)
  

•           mp->attr = OPTEE_MSG_ATTR_TYPE_VALUE_INPUT + p->attr -
  

•                      TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_INPUT;
  

•   if (p->attr == TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_OUTPUT ||
  

•       p->attr == TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_INOUT || !update_out) {
  

•           mp->u.value.a = p->u.value.a;
  

•           mp->u.value.b = p->u.value.b;
  

•           mp->u.value.c = p->u.value.c;
  

•   }
  

}

void optee_cq_init(struct optee_call_queue *cq, int thread_count); diff --git a/drivers/tee/optee/rpc.c b/drivers/tee/optee/rpc.c index ebbbd42b0e3e..580e6b9b0606 100644 --- a/drivers/tee/optee/rpc.c +++ b/drivers/tee/optee/rpc.c @@ -63,7 +63,7 @@ static void handle_rpc_func_cmd_i2c_transfer(struct tee_context *ctx, }

    if (optee->ops->from_msg_param(optee, params, arg->num_params,

•                                  arg->params))
  

•                                  arg->params, false /*!update_out*/))
            goto bad;
  
    for (i = 0; i < arg->num_params; i++) {
  

@@ -107,7 +107,8 @@ static void handle_rpc_func_cmd_i2c_transfer(struct tee_context *ctx, } else { params[3].u.value.a = msg.len; if (optee->ops->to_msg_param(optee, arg->params,

•                                        arg->num_params, params))
  

•                                        arg->num_params, params,
  

•                                        true /*update_out*/))
                    arg->ret = TEEC_ERROR_BAD_PARAMETERS;
            else
                    arg->ret = TEEC_SUCCESS;
  

@@ -188,6 +189,7 @@ static void handle_rpc_func_cmd_wait(struct optee_msg_arg *arg) static void handle_rpc_supp_cmd(struct tee_context *ctx, struct optee *optee, struct optee_msg_arg *arg) {

•   bool update_out = false;
    struct tee_param *params;
  
    arg->ret_origin = TEEC_ORIGIN_COMMS;
  

@@ -200,15 +202,21 @@ static void handle_rpc_supp_cmd(struct tee_context *ctx, struct optee *optee, }

    if (optee->ops->from_msg_param(optee, params, arg->num_params,

•                                  arg->params)) {
  

•                                  arg->params, update_out)) {
            arg->ret = TEEC_ERROR_BAD_PARAMETERS;
            goto out;
    }
  
    arg->ret = optee_supp_thrd_req(ctx, arg->cmd, arg->num_params, params);
  
  

•   /*
  

•    * Special treatment for OPTEE_RPC_CMD_SHM_ALLOC since input is a
  

•    * value type, but the output is a memref type.
  

•    */
  

•   if (arg->cmd != OPTEE_RPC_CMD_SHM_ALLOC)
  

•           update_out = true;
    if (optee->ops->to_msg_param(optee, arg->params, arg->num_params,
  

•                                params))
  

•                                params, update_out))
            arg->ret = TEEC_ERROR_BAD_PARAMETERS;
  

out: kfree(params); @@ -270,7 +278,7 @@ static void handle_rpc_func_rpmb_probe_reset(struct tee_context *ctx,

    if (arg->num_params != ARRAY_SIZE(params) ||
        optee->ops->from_msg_param(optee, params, arg->num_params,

•                                  arg->params) ||
  

•                                  arg->params, false /*!update_out*/) ||
        params[0].attr != TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_OUTPUT) {
            arg->ret = TEEC_ERROR_BAD_PARAMETERS;
            return;
  

@@ -280,7 +288,8 @@ static void handle_rpc_func_rpmb_probe_reset(struct tee_context *ctx, params[0].u.value.b = 0; params[0].u.value.c = 0; if (optee->ops->to_msg_param(optee, arg->params,

•                                arg->num_params, params)) {
  

•                                arg->num_params, params,
  

•                                true /*update_out*/)) {
            arg->ret = TEEC_ERROR_BAD_PARAMETERS;
            return;
    }
  

@@ -324,7 +333,7 @@ static void handle_rpc_func_rpmb_probe_next(struct tee_context *ctx,

    if (arg->num_params != ARRAY_SIZE(params) ||
        optee->ops->from_msg_param(optee, params, arg->num_params,

•                                  arg->params) ||
  

•                                  arg->params, false /*!update_out*/) ||
        params[0].attr != TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_OUTPUT ||
        params[1].attr != TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_OUTPUT) {
            arg->ret = TEEC_ERROR_BAD_PARAMETERS;
  

@@ -358,7 +367,8 @@ static void handle_rpc_func_rpmb_probe_next(struct tee_context *ctx, params[0].u.value.b = rdev->descr.capacity; params[0].u.value.c = rdev->descr.reliable_wr_count; if (optee->ops->to_msg_param(optee, arg->params,

•                                arg->num_params, params)) {
  

•                                arg->num_params, params,
  

•                                true /*update_out*/)) {
            arg->ret = TEEC_ERROR_BAD_PARAMETERS;
            return;
    }
  

@@ -384,7 +394,7 @@ static void handle_rpc_func_rpmb_frames(struct tee_context *ctx,

    if (arg->num_params != ARRAY_SIZE(params) ||
        optee->ops->from_msg_param(optee, params, arg->num_params,

•                                  arg->params) ||
  

•                                  arg->params, false /*!update_out*/) ||
        params[0].attr != TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INPUT ||
        params[1].attr != TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_OUTPUT) {
            arg->ret = TEEC_ERROR_BAD_PARAMETERS;
  

@@ -401,7 +411,8 @@ static void handle_rpc_func_rpmb_frames(struct tee_context *ctx, goto out; } if (optee->ops->to_msg_param(optee, arg->params,

•                                arg->num_params, params)) {
  

•                                arg->num_params, params,
  

•                                true /*update_out*/)) {
            arg->ret = TEEC_ERROR_BAD_PARAMETERS;
            goto out;
    }
  

diff --git a/drivers/tee/optee/smc_abi.c b/drivers/tee/optee/smc_abi.c index e9456e3e74cc..d1f79947f58a 100644 --- a/drivers/tee/optee/smc_abi.c +++ b/drivers/tee/optee/smc_abi.c @@ -81,20 +81,26 @@ static int optee_cpuhp_disable_pcpu_irq(unsigned int cpu) */

static int from_msg_param_tmp_mem(struct tee_param *p, u32 attr,

•                             const struct optee_msg_param *mp)
  

•                             const struct optee_msg_param *mp,
  

•                             bool update_out)
  

{ struct tee_shm *shm; phys_addr_t pa; int rc;

•   if (update_out) {
  

•           if (attr == OPTEE_MSG_ATTR_TYPE_TMEM_INPUT)
  

•                   return 0;
  

•           goto out;
  

•   }
  

•   p->attr = TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INPUT +
              attr - OPTEE_MSG_ATTR_TYPE_TMEM_INPUT;
  

•   p->u.memref.size = mp->u.tmem.size;
    shm = (struct tee_shm *)(unsigned long)mp->u.tmem.shm_ref;
    if (!shm) {
            p->u.memref.shm_offs = 0;
            p->u.memref.shm = NULL;
  

•           return 0;
  

•           goto out;
    }
  
    rc = tee_shm_get_pa(shm, 0, &pa);
  

@@ -103,18 +109,25 @@ static int from_msg_param_tmp_mem(struct tee_param *p, u32 attr,

    p->u.memref.shm_offs = mp->u.tmem.buf_ptr - pa;
    p->u.memref.shm = shm;

+out:

•   p->u.memref.size = mp->u.tmem.size;
    return 0;
  

}

static void from_msg_param_reg_mem(struct tee_param *p, u32 attr,

•                              const struct optee_msg_param *mp)
  

•                              const struct optee_msg_param *mp,
  

•                              bool update_out)
  

{ struct tee_shm *shm;

•   if (update_out) {
  

•           if (attr == OPTEE_MSG_ATTR_TYPE_RMEM_INPUT)
  

•                   return;
  

•           goto out;
  

•   }
  

•   p->attr = TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INPUT +
              attr - OPTEE_MSG_ATTR_TYPE_RMEM_INPUT;
  

•   p->u.memref.size = mp->u.rmem.size;
    shm = (struct tee_shm *)(unsigned long)mp->u.rmem.shm_ref;
  
    if (shm) {
  

@@ -124,6 +137,8 @@ static void from_msg_param_reg_mem(struct tee_param *p, u32 attr, p->u.memref.shm_offs = 0; p->u.memref.shm = NULL; } +out:

•   p->u.memref.size = mp->u.rmem.size;
  

}

/** @@ -133,11 +148,13 @@ static void from_msg_param_reg_mem(struct tee_param *p, u32 attr,

• @params: subsystem internal parameter representation
• @num_params: number of elements in the parameter arrays
• @msg_params: OPTEE_MSG parameters

• • @update_out: update parameter for output only
  • Returns 0 on success or <0 on failure
  */

static int optee_from_msg_param(struct optee *optee, struct tee_param *params, size_t num_params,

•                           const struct optee_msg_param *msg_params)
  

•                           const struct optee_msg_param *msg_params,
  

•                           bool update_out)
  

{ int rc; size_t n; @@ -149,25 +166,27 @@ static int optee_from_msg_param(struct optee *optee, struct tee_param *params,

            switch (attr) {
            case OPTEE_MSG_ATTR_TYPE_NONE:

•                   if (update_out)
  

•                           break;
                    p->attr = TEE_IOCTL_PARAM_ATTR_TYPE_NONE;
                    memset(&p->u, 0, sizeof(p->u));
                    break;
            case OPTEE_MSG_ATTR_TYPE_VALUE_INPUT:
            case OPTEE_MSG_ATTR_TYPE_VALUE_OUTPUT:
            case OPTEE_MSG_ATTR_TYPE_VALUE_INOUT:
  

•                   optee_from_msg_param_value(p, attr, mp);
  

•                   optee_from_msg_param_value(p, attr, mp, update_out);
                    break;
            case OPTEE_MSG_ATTR_TYPE_TMEM_INPUT:
            case OPTEE_MSG_ATTR_TYPE_TMEM_OUTPUT:
            case OPTEE_MSG_ATTR_TYPE_TMEM_INOUT:
  

•                   rc = from_msg_param_tmp_mem(p, attr, mp);
  

•                   rc = from_msg_param_tmp_mem(p, attr, mp, update_out);
                    if (rc)
                            return rc;
                    break;
            case OPTEE_MSG_ATTR_TYPE_RMEM_INPUT:
            case OPTEE_MSG_ATTR_TYPE_RMEM_OUTPUT:
            case OPTEE_MSG_ATTR_TYPE_RMEM_INOUT:
  

•                   from_msg_param_reg_mem(p, attr, mp);
  

•                   from_msg_param_reg_mem(p, attr, mp, update_out);
                    break;
  
            default:
  

@@ -178,20 +197,25 @@ static int optee_from_msg_param(struct optee *optee, struct tee_param *params, }

static int to_msg_param_tmp_mem(struct optee_msg_param *mp,

•                           const struct tee_param *p)
  

•                           const struct tee_param *p, bool update_out)
  

{ int rc; phys_addr_t pa;

•   if (update_out) {
  

•           if (p->attr == TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INPUT)
  

•                   return 0;
  

•           goto out;
  

•   }
  

•   mp->attr = OPTEE_MSG_ATTR_TYPE_TMEM_INPUT + p->attr -
               TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INPUT;
  
    mp->u.tmem.shm_ref = (unsigned long)p->u.memref.shm;
  

•   mp->u.tmem.size = p->u.memref.size;
  
    if (!p->u.memref.shm) {
            mp->u.tmem.buf_ptr = 0;
  

•           return 0;
  

•           goto out;
    }
  
    rc = tee_shm_get_pa(p->u.memref.shm, p->u.memref.shm_offs, &pa);
  

@@ -201,19 +225,27 @@ static int to_msg_param_tmp_mem(struct optee_msg_param *mp, mp->u.tmem.buf_ptr = pa; mp->attr |= OPTEE_MSG_ATTR_CACHE_PREDEFINED << OPTEE_MSG_ATTR_CACHE_SHIFT;

+out:

•   mp->u.tmem.size = p->u.memref.size;
    return 0;
  

}

static int to_msg_param_reg_mem(struct optee_msg_param *mp,

•                           const struct tee_param *p)
  

•                           const struct tee_param *p, bool update_out)
  

{

•   if (update_out) {
  

•           if (p->attr == TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INPUT)
  

•                   return 0;
  

•           goto out;
  

•   }
  

•   mp->attr = OPTEE_MSG_ATTR_TYPE_RMEM_INPUT + p->attr -
               TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INPUT;
  
    mp->u.rmem.shm_ref = (unsigned long)p->u.memref.shm;
  

•   mp->u.rmem.size = p->u.memref.size;
    mp->u.rmem.offs = p->u.memref.shm_offs;
  

+out:

•   mp->u.rmem.size = p->u.memref.size;
    return 0;
  

}

@@ -223,11 +255,13 @@ static int to_msg_param_reg_mem(struct optee_msg_param *mp,

• @msg_params: OPTEE_MSG parameters
• @num_params: number of elements in the parameter arrays
• @params: subsystem itnernal parameter representation

• • @update_out: update parameter for output only
  • Returns 0 on success or <0 on failure
  */

static int optee_to_msg_param(struct optee *optee, struct optee_msg_param *msg_params,

•                         size_t num_params, const struct tee_param *params)
  

•                         size_t num_params, const struct tee_param *params,
  

•                         bool update_out)
  

{ int rc; size_t n; @@ -238,21 +272,23 @@ static int optee_to_msg_param(struct optee *optee,

            switch (p->attr) {
            case TEE_IOCTL_PARAM_ATTR_TYPE_NONE:

•                   if (update_out)
  

•                           break;
                    mp->attr = TEE_IOCTL_PARAM_ATTR_TYPE_NONE;
                    memset(&mp->u, 0, sizeof(mp->u));
                    break;
            case TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_INPUT:
            case TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_OUTPUT:
            case TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_INOUT:
  

•                   optee_to_msg_param_value(mp, p);
  

•                   optee_to_msg_param_value(mp, p, update_out);
                    break;
            case TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INPUT:
            case TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_OUTPUT:
            case TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INOUT:
                    if (tee_shm_is_dynamic(p->u.memref.shm))
  

•                           rc = to_msg_param_reg_mem(mp, p);
  

•                           rc = to_msg_param_reg_mem(mp, p, update_out);
                    else
  

•                           rc = to_msg_param_tmp_mem(mp, p);
  

•                           rc = to_msg_param_tmp_mem(mp, p, update_out);
                    if (rc)
                            return rc;
                    break;
  

-- 2.43.0

On Tue, Dec 3, 2024 at 11:35 AM Sumit Garg sumit.garg@linaro.org wrote:

On Tue, 3 Dec 2024 at 15:58, Jens Wiklander jens.wiklander@linaro.org wrote:

...

Hi Sumit,

On Tue, Dec 3, 2024 at 9:27 AM Sumit Garg sumit.garg@linaro.org wrote:

...

Hi Jens,

On Thu, 28 Nov 2024 at 20:39, Jens Wiklander jens.wiklander@linaro.org wrote:

...

The OP-TEE backend driver has two internal function pointers to convert between the subsystem type struct tee_param and the OP-TEE type struct optee_msg_param.

The conversion is done from one of the types to the other, which is then involved in some operation and finally converted back to the original type. When converting to prepare the parameters for the operation, all fields must be taken into account, but then converting back, it's enough to update only out-values and out-sizes. So, an update_out parameter is added to the conversion functions to tell if all or only some fields must be copied.

Is this patch just a refactoring of TEE params handling? Or are we fixing a real ABI issue here? Also, is this required for restricted shared memory support to work? Just asking if we want to consider it as a fix for backporting or if we can handle this refactoring patch independently of this series?

This is needed in this series. Without this patch, it might get confusing when converting back in from_msg_param() callback since an allocated restricted SHM can be using the sec_world_id of the pool and that doesn't translate back well. params_to_user() in drivers/tee/tee_core.c already takes the direction into account so it wouldn't spread to user-space.

Thanks Jens for the clarification, if you can update the commit text accordingly will help clarify the motivation for the change.

Sure, I'll update.

Thanks, Jens

-Sumit

...

Cheers, Jens

...

-Sumit

...

Signed-off-by: Jens Wiklander jens.wiklander@linaro.org

drivers/tee/optee/call.c | 10 ++-- drivers/tee/optee/ffa_abi.c | 43 +++++++++++++---- drivers/tee/optee/optee_private.h | 42 +++++++++++------ drivers/tee/optee/rpc.c | 31 +++++++++---- drivers/tee/optee/smc_abi.c | 76 +++++++++++++++++++++++-------- 5 files changed, 144 insertions(+), 58 deletions(-)

diff --git a/drivers/tee/optee/call.c b/drivers/tee/optee/call.c index 16eb953e14bb..f1533b894726 100644 --- a/drivers/tee/optee/call.c +++ b/drivers/tee/optee/call.c @@ -400,7 +400,8 @@ int optee_open_session(struct tee_context *ctx, export_uuid(msg_arg->params[1].u.octets, &client_uuid);

    rc = optee->ops->to_msg_param(optee, msg_arg->params + 2,

•                                 arg->num_params, param);
  

•                                 arg->num_params, param,
  

•                                 false /*!update_out*/);
    if (rc)
            goto out;
  
  

@@ -427,7 +428,8 @@ int optee_open_session(struct tee_context *ctx, }

    if (optee->ops->from_msg_param(optee, param, arg->num_params,

•                                  msg_arg->params + 2)) {
  

•                                  msg_arg->params + 2,
  

•                                  true /*update_out*/)) {
            arg->ret = TEEC_ERROR_COMMUNICATION;
            arg->ret_origin = TEEC_ORIGIN_COMMS;
            /* Close session again to avoid leakage */
  

@@ -541,7 +543,7 @@ int optee_invoke_func(struct tee_context *ctx, struct tee_ioctl_invoke_arg *arg, msg_arg->cancel_id = arg->cancel_id;

    rc = optee->ops->to_msg_param(optee, msg_arg->params, arg->num_params,

•                                 param);
  

•                                 param, false /*!update_out*/);
    if (rc)
            goto out;
  
  

@@ -551,7 +553,7 @@ int optee_invoke_func(struct tee_context *ctx, struct tee_ioctl_invoke_arg *arg, }

    if (optee->ops->from_msg_param(optee, param, arg->num_params,

•                                  msg_arg->params)) {
  

•                                  msg_arg->params, true /*update_out*/)) {
            msg_arg->ret = TEEC_ERROR_COMMUNICATION;
            msg_arg->ret_origin = TEEC_ORIGIN_COMMS;
    }
  

diff --git a/drivers/tee/optee/ffa_abi.c b/drivers/tee/optee/ffa_abi.c index f3af5666bb11..02e6175ac5f0 100644 --- a/drivers/tee/optee/ffa_abi.c +++ b/drivers/tee/optee/ffa_abi.c @@ -122,15 +122,21 @@ static int optee_shm_rem_ffa_handle(struct optee *optee, u64 global_id) */

static void from_msg_param_ffa_mem(struct optee *optee, struct tee_param *p,

•                              u32 attr, const struct optee_msg_param *mp)
  

•                              u32 attr, const struct optee_msg_param *mp,
  

•                              bool update_out)
  

{ struct tee_shm *shm = NULL; u64 offs_high = 0; u64 offs_low = 0;

•   if (update_out) {
  

•           if (attr == OPTEE_MSG_ATTR_TYPE_FMEM_INPUT)
  

•                   return;
  

•           goto out;
  

•   }
  

•   p->attr = TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INPUT +
              attr - OPTEE_MSG_ATTR_TYPE_FMEM_INPUT;
  

•   p->u.memref.size = mp->u.fmem.size;
  
    if (mp->u.fmem.global_id != OPTEE_MSG_FMEM_INVALID_GLOBAL_ID)
            shm = optee_shm_from_ffa_handle(optee, mp->u.fmem.global_id);
  

@@ -141,6 +147,8 @@ static void from_msg_param_ffa_mem(struct optee *optee, struct tee_param *p, offs_high = mp->u.fmem.offs_high; } p->u.memref.shm_offs = offs_low | offs_high << 32; +out:

•   p->u.memref.size = mp->u.fmem.size;
  

}

/** @@ -150,12 +158,14 @@ static void from_msg_param_ffa_mem(struct optee *optee, struct tee_param *p,

• @params: subsystem internal parameter representation
• @num_params: number of elements in the parameter arrays
• @msg_params: OPTEE_MSG parameters

• • @update_out: update parameter for output only
  • Returns 0 on success or <0 on failure
  */

static int optee_ffa_from_msg_param(struct optee *optee, struct tee_param *params, size_t num_params,

•                               const struct optee_msg_param *msg_params)
  

•                               const struct optee_msg_param *msg_params,
  

•                               bool update_out)
  

{ size_t n;

@@ -166,18 +176,20 @@ static int optee_ffa_from_msg_param(struct optee *optee,

            switch (attr) {
            case OPTEE_MSG_ATTR_TYPE_NONE:

•                   if (update_out)
  

•                           break;
                    p->attr = TEE_IOCTL_PARAM_ATTR_TYPE_NONE;
                    memset(&p->u, 0, sizeof(p->u));
                    break;
            case OPTEE_MSG_ATTR_TYPE_VALUE_INPUT:
            case OPTEE_MSG_ATTR_TYPE_VALUE_OUTPUT:
            case OPTEE_MSG_ATTR_TYPE_VALUE_INOUT:
  

•                   optee_from_msg_param_value(p, attr, mp);
  

•                   optee_from_msg_param_value(p, attr, mp, update_out);
                    break;
            case OPTEE_MSG_ATTR_TYPE_FMEM_INPUT:
            case OPTEE_MSG_ATTR_TYPE_FMEM_OUTPUT:
            case OPTEE_MSG_ATTR_TYPE_FMEM_INOUT:
  

•                   from_msg_param_ffa_mem(optee, p, attr, mp);
  

•                   from_msg_param_ffa_mem(optee, p, attr, mp, update_out);
                    break;
            default:
                    return -EINVAL;
  

@@ -188,10 +200,16 @@ static int optee_ffa_from_msg_param(struct optee *optee, }

static int to_msg_param_ffa_mem(struct optee_msg_param *mp,

•                           const struct tee_param *p)
  

•                           const struct tee_param *p, bool update_out)
  

{ struct tee_shm *shm = p->u.memref.shm;

•   if (update_out) {
  

•           if (p->attr == TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INPUT)
  

•                   return 0;
  

•           goto out;
  

•   }
  

•   mp->attr = OPTEE_MSG_ATTR_TYPE_FMEM_INPUT + p->attr -
               TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INPUT;
  
  

@@ -211,6 +229,7 @@ static int to_msg_param_ffa_mem(struct optee_msg_param *mp, memset(&mp->u, 0, sizeof(mp->u)); mp->u.fmem.global_id = OPTEE_MSG_FMEM_INVALID_GLOBAL_ID; } +out: mp->u.fmem.size = p->u.memref.size;

    return 0;

@@ -222,13 +241,15 @@ static int to_msg_param_ffa_mem(struct optee_msg_param *mp,

• @optee: main service struct
• @msg_params: OPTEE_MSG parameters
• @num_params: number of elements in the parameter arrays

• • @params: subsystem itnernal parameter representation

• • @params: subsystem internal parameter representation
• • @update_out: update parameter for output only
  • Returns 0 on success or <0 on failure
  */

static int optee_ffa_to_msg_param(struct optee *optee, struct optee_msg_param *msg_params, size_t num_params,

•                             const struct tee_param *params)
  

•                             const struct tee_param *params,
  

•                             bool update_out)
  

{ size_t n;

@@ -238,18 +259,20 @@ static int optee_ffa_to_msg_param(struct optee *optee,

            switch (p->attr) {
            case TEE_IOCTL_PARAM_ATTR_TYPE_NONE:

•                   if (update_out)
  

•                           break;
                    mp->attr = TEE_IOCTL_PARAM_ATTR_TYPE_NONE;
                    memset(&mp->u, 0, sizeof(mp->u));
                    break;
            case TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_INPUT:
            case TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_OUTPUT:
            case TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_INOUT:
  

•                   optee_to_msg_param_value(mp, p);
  

•                   optee_to_msg_param_value(mp, p, update_out);
                    break;
            case TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INPUT:
            case TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_OUTPUT:
            case TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INOUT:
  

•                   if (to_msg_param_ffa_mem(mp, p))
  

•                   if (to_msg_param_ffa_mem(mp, p, update_out))
                            return -EINVAL;
                    break;
            default:
  

diff --git a/drivers/tee/optee/optee_private.h b/drivers/tee/optee/optee_private.h index dc0f355ef72a..20eda508dbac 100644 --- a/drivers/tee/optee/optee_private.h +++ b/drivers/tee/optee/optee_private.h @@ -185,10 +185,12 @@ struct optee_ops { bool system_thread); int (*to_msg_param)(struct optee *optee, struct optee_msg_param *msg_params,

•                       size_t num_params, const struct tee_param *params);
  

•                       size_t num_params, const struct tee_param *params,
  

•                       bool update_out);
    int (*from_msg_param)(struct optee *optee, struct tee_param *params,
                          size_t num_params,
  

•                         const struct optee_msg_param *msg_params);
  

•                         const struct optee_msg_param *msg_params,
  

•                         bool update_out);
  

};

/** @@ -316,23 +318,35 @@ void optee_release(struct tee_context *ctx); void optee_release_supp(struct tee_context *ctx);

static inline void optee_from_msg_param_value(struct tee_param *p, u32 attr,

•                                         const struct optee_msg_param *mp)
  

•                                         const struct optee_msg_param *mp,
  

•                                         bool update_out)
  

{

•   p->attr = TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_INPUT +
  

•             attr - OPTEE_MSG_ATTR_TYPE_VALUE_INPUT;
  

•   p->u.value.a = mp->u.value.a;
  

•   p->u.value.b = mp->u.value.b;
  

•   p->u.value.c = mp->u.value.c;
  

•   if (!update_out)
  

•           p->attr = TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_INPUT +
  

•                     attr - OPTEE_MSG_ATTR_TYPE_VALUE_INPUT;
  

•   if (attr == OPTEE_MSG_ATTR_TYPE_VALUE_OUTPUT ||
  

•       attr == OPTEE_MSG_ATTR_TYPE_VALUE_INOUT || !update_out) {
  

•           p->u.value.a = mp->u.value.a;
  

•           p->u.value.b = mp->u.value.b;
  

•           p->u.value.c = mp->u.value.c;
  

•   }
  

}

static inline void optee_to_msg_param_value(struct optee_msg_param *mp,

•                                       const struct tee_param *p)
  

•                                       const struct tee_param *p,
  

•                                       bool update_out)
  

{

•   mp->attr = OPTEE_MSG_ATTR_TYPE_VALUE_INPUT + p->attr -
  

•              TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_INPUT;
  

•   mp->u.value.a = p->u.value.a;
  

•   mp->u.value.b = p->u.value.b;
  

•   mp->u.value.c = p->u.value.c;
  

•   if (!update_out)
  

•           mp->attr = OPTEE_MSG_ATTR_TYPE_VALUE_INPUT + p->attr -
  

•                      TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_INPUT;
  

•   if (p->attr == TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_OUTPUT ||
  

•       p->attr == TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_INOUT || !update_out) {
  

•           mp->u.value.a = p->u.value.a;
  

•           mp->u.value.b = p->u.value.b;
  

•           mp->u.value.c = p->u.value.c;
  

•   }
  

}

void optee_cq_init(struct optee_call_queue *cq, int thread_count); diff --git a/drivers/tee/optee/rpc.c b/drivers/tee/optee/rpc.c index ebbbd42b0e3e..580e6b9b0606 100644 --- a/drivers/tee/optee/rpc.c +++ b/drivers/tee/optee/rpc.c @@ -63,7 +63,7 @@ static void handle_rpc_func_cmd_i2c_transfer(struct tee_context *ctx, }

    if (optee->ops->from_msg_param(optee, params, arg->num_params,

•                                  arg->params))
  

•                                  arg->params, false /*!update_out*/))
            goto bad;
  
    for (i = 0; i < arg->num_params; i++) {
  

@@ -107,7 +107,8 @@ static void handle_rpc_func_cmd_i2c_transfer(struct tee_context *ctx, } else { params[3].u.value.a = msg.len; if (optee->ops->to_msg_param(optee, arg->params,

•                                        arg->num_params, params))
  

•                                        arg->num_params, params,
  

•                                        true /*update_out*/))
                    arg->ret = TEEC_ERROR_BAD_PARAMETERS;
            else
                    arg->ret = TEEC_SUCCESS;
  

@@ -188,6 +189,7 @@ static void handle_rpc_func_cmd_wait(struct optee_msg_arg *arg) static void handle_rpc_supp_cmd(struct tee_context *ctx, struct optee *optee, struct optee_msg_arg *arg) {

•   bool update_out = false;
    struct tee_param *params;
  
    arg->ret_origin = TEEC_ORIGIN_COMMS;
  

@@ -200,15 +202,21 @@ static void handle_rpc_supp_cmd(struct tee_context *ctx, struct optee *optee, }

    if (optee->ops->from_msg_param(optee, params, arg->num_params,

•                                  arg->params)) {
  

•                                  arg->params, update_out)) {
            arg->ret = TEEC_ERROR_BAD_PARAMETERS;
            goto out;
    }
  
    arg->ret = optee_supp_thrd_req(ctx, arg->cmd, arg->num_params, params);
  
  

•   /*
  

•    * Special treatment for OPTEE_RPC_CMD_SHM_ALLOC since input is a
  

•    * value type, but the output is a memref type.
  

•    */
  

•   if (arg->cmd != OPTEE_RPC_CMD_SHM_ALLOC)
  

•           update_out = true;
    if (optee->ops->to_msg_param(optee, arg->params, arg->num_params,
  

•                                params))
  

•                                params, update_out))
            arg->ret = TEEC_ERROR_BAD_PARAMETERS;
  

out: kfree(params); @@ -270,7 +278,7 @@ static void handle_rpc_func_rpmb_probe_reset(struct tee_context *ctx,

    if (arg->num_params != ARRAY_SIZE(params) ||
        optee->ops->from_msg_param(optee, params, arg->num_params,

•                                  arg->params) ||
  

•                                  arg->params, false /*!update_out*/) ||
        params[0].attr != TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_OUTPUT) {
            arg->ret = TEEC_ERROR_BAD_PARAMETERS;
            return;
  

@@ -280,7 +288,8 @@ static void handle_rpc_func_rpmb_probe_reset(struct tee_context *ctx, params[0].u.value.b = 0; params[0].u.value.c = 0; if (optee->ops->to_msg_param(optee, arg->params,

•                                arg->num_params, params)) {
  

•                                arg->num_params, params,
  

•                                true /*update_out*/)) {
            arg->ret = TEEC_ERROR_BAD_PARAMETERS;
            return;
    }
  

@@ -324,7 +333,7 @@ static void handle_rpc_func_rpmb_probe_next(struct tee_context *ctx,

    if (arg->num_params != ARRAY_SIZE(params) ||
        optee->ops->from_msg_param(optee, params, arg->num_params,

•                                  arg->params) ||
  

•                                  arg->params, false /*!update_out*/) ||
        params[0].attr != TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_OUTPUT ||
        params[1].attr != TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_OUTPUT) {
            arg->ret = TEEC_ERROR_BAD_PARAMETERS;
  

@@ -358,7 +367,8 @@ static void handle_rpc_func_rpmb_probe_next(struct tee_context *ctx, params[0].u.value.b = rdev->descr.capacity; params[0].u.value.c = rdev->descr.reliable_wr_count; if (optee->ops->to_msg_param(optee, arg->params,

•                                arg->num_params, params)) {
  

•                                arg->num_params, params,
  

•                                true /*update_out*/)) {
            arg->ret = TEEC_ERROR_BAD_PARAMETERS;
            return;
    }
  

@@ -384,7 +394,7 @@ static void handle_rpc_func_rpmb_frames(struct tee_context *ctx,

    if (arg->num_params != ARRAY_SIZE(params) ||
        optee->ops->from_msg_param(optee, params, arg->num_params,

•                                  arg->params) ||
  

•                                  arg->params, false /*!update_out*/) ||
        params[0].attr != TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INPUT ||
        params[1].attr != TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_OUTPUT) {
            arg->ret = TEEC_ERROR_BAD_PARAMETERS;
  

@@ -401,7 +411,8 @@ static void handle_rpc_func_rpmb_frames(struct tee_context *ctx, goto out; } if (optee->ops->to_msg_param(optee, arg->params,

•                                arg->num_params, params)) {
  

•                                arg->num_params, params,
  

•                                true /*update_out*/)) {
            arg->ret = TEEC_ERROR_BAD_PARAMETERS;
            goto out;
    }
  

diff --git a/drivers/tee/optee/smc_abi.c b/drivers/tee/optee/smc_abi.c index e9456e3e74cc..d1f79947f58a 100644 --- a/drivers/tee/optee/smc_abi.c +++ b/drivers/tee/optee/smc_abi.c @@ -81,20 +81,26 @@ static int optee_cpuhp_disable_pcpu_irq(unsigned int cpu) */

static int from_msg_param_tmp_mem(struct tee_param *p, u32 attr,

•                             const struct optee_msg_param *mp)
  

•                             const struct optee_msg_param *mp,
  

•                             bool update_out)
  

{ struct tee_shm *shm; phys_addr_t pa; int rc;

•   if (update_out) {
  

•           if (attr == OPTEE_MSG_ATTR_TYPE_TMEM_INPUT)
  

•                   return 0;
  

•           goto out;
  

•   }
  

•   p->attr = TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INPUT +
              attr - OPTEE_MSG_ATTR_TYPE_TMEM_INPUT;
  

•   p->u.memref.size = mp->u.tmem.size;
    shm = (struct tee_shm *)(unsigned long)mp->u.tmem.shm_ref;
    if (!shm) {
            p->u.memref.shm_offs = 0;
            p->u.memref.shm = NULL;
  

•           return 0;
  

•           goto out;
    }
  
    rc = tee_shm_get_pa(shm, 0, &pa);
  

@@ -103,18 +109,25 @@ static int from_msg_param_tmp_mem(struct tee_param *p, u32 attr,

    p->u.memref.shm_offs = mp->u.tmem.buf_ptr - pa;
    p->u.memref.shm = shm;

+out:

•   p->u.memref.size = mp->u.tmem.size;
    return 0;
  

}

static void from_msg_param_reg_mem(struct tee_param *p, u32 attr,

•                              const struct optee_msg_param *mp)
  

•                              const struct optee_msg_param *mp,
  

•                              bool update_out)
  

{ struct tee_shm *shm;

•   if (update_out) {
  

•           if (attr == OPTEE_MSG_ATTR_TYPE_RMEM_INPUT)
  

•                   return;
  

•           goto out;
  

•   }
  

•   p->attr = TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INPUT +
              attr - OPTEE_MSG_ATTR_TYPE_RMEM_INPUT;
  

•   p->u.memref.size = mp->u.rmem.size;
    shm = (struct tee_shm *)(unsigned long)mp->u.rmem.shm_ref;
  
    if (shm) {
  

@@ -124,6 +137,8 @@ static void from_msg_param_reg_mem(struct tee_param *p, u32 attr, p->u.memref.shm_offs = 0; p->u.memref.shm = NULL; } +out:

•   p->u.memref.size = mp->u.rmem.size;
  

}

/** @@ -133,11 +148,13 @@ static void from_msg_param_reg_mem(struct tee_param *p, u32 attr,

• @params: subsystem internal parameter representation
• @num_params: number of elements in the parameter arrays
• @msg_params: OPTEE_MSG parameters

• • @update_out: update parameter for output only
  • Returns 0 on success or <0 on failure
  */

static int optee_from_msg_param(struct optee *optee, struct tee_param *params, size_t num_params,

•                           const struct optee_msg_param *msg_params)
  

•                           const struct optee_msg_param *msg_params,
  

•                           bool update_out)
  

{ int rc; size_t n; @@ -149,25 +166,27 @@ static int optee_from_msg_param(struct optee *optee, struct tee_param *params,

            switch (attr) {
            case OPTEE_MSG_ATTR_TYPE_NONE:

•                   if (update_out)
  

•                           break;
                    p->attr = TEE_IOCTL_PARAM_ATTR_TYPE_NONE;
                    memset(&p->u, 0, sizeof(p->u));
                    break;
            case OPTEE_MSG_ATTR_TYPE_VALUE_INPUT:
            case OPTEE_MSG_ATTR_TYPE_VALUE_OUTPUT:
            case OPTEE_MSG_ATTR_TYPE_VALUE_INOUT:
  

•                   optee_from_msg_param_value(p, attr, mp);
  

•                   optee_from_msg_param_value(p, attr, mp, update_out);
                    break;
            case OPTEE_MSG_ATTR_TYPE_TMEM_INPUT:
            case OPTEE_MSG_ATTR_TYPE_TMEM_OUTPUT:
            case OPTEE_MSG_ATTR_TYPE_TMEM_INOUT:
  

•                   rc = from_msg_param_tmp_mem(p, attr, mp);
  

•                   rc = from_msg_param_tmp_mem(p, attr, mp, update_out);
                    if (rc)
                            return rc;
                    break;
            case OPTEE_MSG_ATTR_TYPE_RMEM_INPUT:
            case OPTEE_MSG_ATTR_TYPE_RMEM_OUTPUT:
            case OPTEE_MSG_ATTR_TYPE_RMEM_INOUT:
  

•                   from_msg_param_reg_mem(p, attr, mp);
  

•                   from_msg_param_reg_mem(p, attr, mp, update_out);
                    break;
  
            default:
  

@@ -178,20 +197,25 @@ static int optee_from_msg_param(struct optee *optee, struct tee_param *params, }

static int to_msg_param_tmp_mem(struct optee_msg_param *mp,

•                           const struct tee_param *p)
  

•                           const struct tee_param *p, bool update_out)
  

{ int rc; phys_addr_t pa;

•   if (update_out) {
  

•           if (p->attr == TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INPUT)
  

•                   return 0;
  

•           goto out;
  

•   }
  

•   mp->attr = OPTEE_MSG_ATTR_TYPE_TMEM_INPUT + p->attr -
               TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INPUT;
  
    mp->u.tmem.shm_ref = (unsigned long)p->u.memref.shm;
  

•   mp->u.tmem.size = p->u.memref.size;
  
    if (!p->u.memref.shm) {
            mp->u.tmem.buf_ptr = 0;
  

•           return 0;
  

•           goto out;
    }
  
    rc = tee_shm_get_pa(p->u.memref.shm, p->u.memref.shm_offs, &pa);
  

@@ -201,19 +225,27 @@ static int to_msg_param_tmp_mem(struct optee_msg_param *mp, mp->u.tmem.buf_ptr = pa; mp->attr |= OPTEE_MSG_ATTR_CACHE_PREDEFINED << OPTEE_MSG_ATTR_CACHE_SHIFT;

+out:

•   mp->u.tmem.size = p->u.memref.size;
    return 0;
  

}

static int to_msg_param_reg_mem(struct optee_msg_param *mp,

•                           const struct tee_param *p)
  

•                           const struct tee_param *p, bool update_out)
  

{

•   if (update_out) {
  

•           if (p->attr == TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INPUT)
  

•                   return 0;
  

•           goto out;
  

•   }
  

•   mp->attr = OPTEE_MSG_ATTR_TYPE_RMEM_INPUT + p->attr -
               TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INPUT;
  
    mp->u.rmem.shm_ref = (unsigned long)p->u.memref.shm;
  

•   mp->u.rmem.size = p->u.memref.size;
    mp->u.rmem.offs = p->u.memref.shm_offs;
  

+out:

•   mp->u.rmem.size = p->u.memref.size;
    return 0;
  

}

@@ -223,11 +255,13 @@ static int to_msg_param_reg_mem(struct optee_msg_param *mp,

• @msg_params: OPTEE_MSG parameters
• @num_params: number of elements in the parameter arrays
• @params: subsystem itnernal parameter representation

• • @update_out: update parameter for output only
  • Returns 0 on success or <0 on failure
  */

static int optee_to_msg_param(struct optee *optee, struct optee_msg_param *msg_params,

•                         size_t num_params, const struct tee_param *params)
  

•                         size_t num_params, const struct tee_param *params,
  

•                         bool update_out)
  

{ int rc; size_t n; @@ -238,21 +272,23 @@ static int optee_to_msg_param(struct optee *optee,

            switch (p->attr) {
            case TEE_IOCTL_PARAM_ATTR_TYPE_NONE:

•                   if (update_out)
  

•                           break;
                    mp->attr = TEE_IOCTL_PARAM_ATTR_TYPE_NONE;
                    memset(&mp->u, 0, sizeof(mp->u));
                    break;
            case TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_INPUT:
            case TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_OUTPUT:
            case TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_INOUT:
  

•                   optee_to_msg_param_value(mp, p);
  

•                   optee_to_msg_param_value(mp, p, update_out);
                    break;
            case TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INPUT:
            case TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_OUTPUT:
            case TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INOUT:
                    if (tee_shm_is_dynamic(p->u.memref.shm))
  

•                           rc = to_msg_param_reg_mem(mp, p);
  

•                           rc = to_msg_param_reg_mem(mp, p, update_out);
                    else
  

•                           rc = to_msg_param_tmp_mem(mp, p);
  

•                           rc = to_msg_param_tmp_mem(mp, p, update_out);
                    if (rc)
                            return rc;
                    break;
  

-- 2.43.0

Hi Sumit,

On Tue, Dec 3, 2024 at 9:19 AM Sumit Garg sumit.garg@linaro.org wrote:

Hi Jens,

On Thu, 28 Nov 2024 at 20:39, Jens Wiklander jens.wiklander@linaro.org wrote:

...

Add support in the OP-TEE backend driver for restricted memory allocation.

The restricted memory can be allocated from a static carveout, but also be dynamically allocated from CMA and turned into restricted memory by OP-TEE, inaccessible by the kernel. The restricted memory configuration is depends on the platform and is probed by driver.

A restricted memory pool is allocated during probe if a static carveout is available. The restricted memory pools for dynamically allocated restrict memory are instantiated when requested by user-space. This instantiation can fail if OP-TEE doesn't support the requested use-case of restricted memory.

Can we split this patch into smaller reviewable pieces as follows?

• Patch 1: Adds support for static carveout using SMC ABI
• Patch 2: Adds support for dynamic CMA pool using SMC ABI
• Patch 3: Adds support for both using FF-A ABI

OK, I'll split it.

Thanks, Jens

-Sumit

...

Signed-off-by: Jens Wiklander jens.wiklander@linaro.org

drivers/tee/optee/Makefile | 1 + drivers/tee/optee/core.c | 1 + drivers/tee/optee/ffa_abi.c | 135 ++++++++++- drivers/tee/optee/optee_private.h | 33 ++- drivers/tee/optee/rstmem.c | 380 ++++++++++++++++++++++++++++++ drivers/tee/optee/smc_abi.c | 138 ++++++++++- 6 files changed, 683 insertions(+), 5 deletions(-) create mode 100644 drivers/tee/optee/rstmem.c

diff --git a/drivers/tee/optee/Makefile b/drivers/tee/optee/Makefile index a6eff388d300..498969fb8e40 100644 --- a/drivers/tee/optee/Makefile +++ b/drivers/tee/optee/Makefile @@ -4,6 +4,7 @@ optee-objs += core.o optee-objs += call.o optee-objs += notif.o optee-objs += rpc.o +optee-objs += rstmem.o optee-objs += supp.o optee-objs += device.o optee-objs += smc_abi.o diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c index c75fddc83576..f4fa494789a4 100644 --- a/drivers/tee/optee/core.c +++ b/drivers/tee/optee/core.c @@ -182,6 +182,7 @@ void optee_remove_common(struct optee *optee) tee_device_unregister(optee->teedev);

    tee_shm_pool_free(optee->pool);

•   optee_rstmem_pools_uninit(optee);
    optee_supp_uninit(&optee->supp);
    mutex_destroy(&optee->call_queue.mutex);
    rpmb_dev_put(optee->rpmb_dev);
  

diff --git a/drivers/tee/optee/ffa_abi.c b/drivers/tee/optee/ffa_abi.c index 02e6175ac5f0..f500cf101c8d 100644 --- a/drivers/tee/optee/ffa_abi.c +++ b/drivers/tee/optee/ffa_abi.c @@ -672,6 +672,122 @@ static int optee_ffa_do_call_with_arg(struct tee_context *ctx, return optee_ffa_yielding_call(ctx, &data, rpc_arg, system_thread); }

+static int do_call_lend_rstmem(struct optee *optee, u64 cookie, u32 use_case) +{

•   struct optee_shm_arg_entry *entry;
  

•   struct optee_msg_arg *msg_arg;
  

•   struct tee_shm *shm;
  

•   u_int offs;
  

•   int rc;
  

•   msg_arg = optee_get_msg_arg(optee->ctx, 1, &entry, &shm, &offs);
  

•   if (IS_ERR(msg_arg))
  

•           return PTR_ERR(msg_arg);
  

•   msg_arg->cmd = OPTEE_MSG_CMD_ASSIGN_RSTMEM;
  

•   msg_arg->params[0].attr = OPTEE_MSG_ATTR_TYPE_VALUE_INPUT;
  

•   msg_arg->params[0].u.value.a = cookie;
  

•   msg_arg->params[0].u.value.b = use_case;
  

•   rc = optee->ops->do_call_with_arg(optee->ctx, shm, offs, false);
  

•   if (rc)
  

•           goto out;
  

•   if (msg_arg->ret != TEEC_SUCCESS) {
  

•           rc = -EINVAL;
  

•           goto out;
  

•   }
  

+out:

•   optee_free_msg_arg(optee->ctx, entry, offs);
  

•   return rc;
  

+}

+static int optee_ffa_lend_rstmem(struct optee *optee, struct tee_shm *rstmem,

•                            u16 *end_points, unsigned int ep_count)
  

+{

•   struct ffa_device *ffa_dev = optee->ffa.ffa_dev;
  

•   const struct ffa_mem_ops *mem_ops = ffa_dev->ops->mem_ops;
  

•   const struct ffa_msg_ops *msg_ops = ffa_dev->ops->msg_ops;
  

•   struct ffa_send_direct_data data;
  

•   struct ffa_mem_region_attributes *mem_attr;
  

•   struct ffa_mem_ops_args args = {
  

•           .use_txbuf = true,
  

•           .tag = rstmem->use_case,
  

•   };
  

•   struct page *page;
  

•   struct scatterlist sgl;
  

•   unsigned int n;
  

•   int rc;
  

•   mem_attr = kcalloc(ep_count, sizeof(*mem_attr), GFP_KERNEL);
  

•   for (n = 0; n < ep_count; n++) {
  

•           mem_attr[n].receiver = end_points[n];
  

•           mem_attr[n].attrs = FFA_MEM_RW;
  

•   }
  

•   args.attrs = mem_attr;
  

•   args.nattrs = ep_count;
  

•   page = phys_to_page(rstmem->paddr);
  

•   sg_init_table(&sgl, 1);
  

•   sg_set_page(&sgl, page, rstmem->size, 0);
  

•   args.sg = &sgl;
  

•   rc = mem_ops->memory_lend(&args);
  

•   kfree(mem_attr);
  

•   if (rc)
  

•           return rc;
  

•   rc = do_call_lend_rstmem(optee, args.g_handle, rstmem->use_case);
  

•   if (rc)
  

•           goto err_reclaim;
  

•   rc = optee_shm_add_ffa_handle(optee, rstmem, args.g_handle);
  

•   if (rc)
  

•           goto err_unreg;
  

•   rstmem->sec_world_id = args.g_handle;
  

•   return 0;
  

+err_unreg:

•   data = (struct ffa_send_direct_data){
  

•           .data0 = OPTEE_FFA_RELEASE_RSTMEM,
  

•           .data1 = (u32)args.g_handle,
  

•           .data2 = (u32)(args.g_handle >> 32),
  

•   };
  

•   msg_ops->sync_send_receive(ffa_dev, &data);
  

+err_reclaim:

•   mem_ops->memory_reclaim(args.g_handle, 0);
  

•   return rc;
  

+}

+static int optee_ffa_reclaim_rstmem(struct optee *optee, struct tee_shm *rstmem) +{

•   struct ffa_device *ffa_dev = optee->ffa.ffa_dev;
  

•   const struct ffa_msg_ops *msg_ops = ffa_dev->ops->msg_ops;
  

•   const struct ffa_mem_ops *mem_ops = ffa_dev->ops->mem_ops;
  

•   u64 global_handle = rstmem->sec_world_id;
  

•   struct ffa_send_direct_data data = {
  

•           .data0 = OPTEE_FFA_RELEASE_RSTMEM,
  

•           .data1 = (u32)global_handle,
  

•           .data2 = (u32)(global_handle >> 32)
  

•   };
  

•   int rc;
  

•   optee_shm_rem_ffa_handle(optee, global_handle);
  

•   rstmem->sec_world_id = 0;
  

•   rc = msg_ops->sync_send_receive(ffa_dev, &data);
  

•   if (rc)
  

•           pr_err("Release SHM id 0x%llx rc %d\n", global_handle, rc);
  

•   rc = mem_ops->memory_reclaim(global_handle, 0);
  

•   if (rc)
  

•           pr_err("mem_reclaim: 0x%llx %d", global_handle, rc);
  

•   return rc;
  

+}

/*

• 6. Driver initialization

@@ -785,7 +901,10 @@ static void optee_ffa_get_version(struct tee_device *teedev, .gen_caps = TEE_GEN_CAP_GP | TEE_GEN_CAP_REG_MEM | TEE_GEN_CAP_MEMREF_NULL, };

•   struct optee *optee = tee_get_drvdata(teedev);
  
  

•   if (optee->rstmem_pools)
  

•           v.gen_caps |= TEE_GEN_CAP_RSTMEM;
    *vers = v;
  

}

@@ -804,6 +923,8 @@ static const struct tee_driver_ops optee_ffa_clnt_ops = { .cancel_req = optee_cancel_req, .shm_register = optee_ffa_shm_register, .shm_unregister = optee_ffa_shm_unregister,

•   .rstmem_alloc = optee_rstmem_alloc,
  

•   .rstmem_free = optee_rstmem_free,
  

};

static const struct tee_desc optee_ffa_clnt_desc = { @@ -820,6 +941,8 @@ static const struct tee_driver_ops optee_ffa_supp_ops = { .supp_send = optee_supp_send, .shm_register = optee_ffa_shm_register, /* same as for clnt ops */ .shm_unregister = optee_ffa_shm_unregister_supp,

•   .rstmem_alloc = optee_rstmem_alloc,
  

•   .rstmem_free = optee_rstmem_free,
  

};

static const struct tee_desc optee_ffa_supp_desc = { @@ -833,6 +956,8 @@ static const struct optee_ops optee_ffa_ops = { .do_call_with_arg = optee_ffa_do_call_with_arg, .to_msg_param = optee_ffa_to_msg_param, .from_msg_param = optee_ffa_from_msg_param,

•   .lend_rstmem = optee_ffa_lend_rstmem,
  

•   .reclaim_rstmem = optee_ffa_reclaim_rstmem,
  

};

static void optee_ffa_remove(struct ffa_device *ffa_dev) @@ -937,11 +1062,17 @@ static int optee_ffa_probe(struct ffa_device *ffa_dev) (sec_caps & OPTEE_FFA_SEC_CAP_RPMB_PROBE)) optee->in_kernel_rpmb_routing = true;

•   if (sec_caps & OPTEE_FFA_SEC_CAP_RSTMEM) {
  

•           rc = optee_rstmem_pools_init(optee);
  

•           if (rc)
  

•                   goto err_free_pool;
  

•   }
  

•   teedev = tee_device_alloc(&optee_ffa_clnt_desc, NULL, optee->pool,
                              optee);
    if (IS_ERR(teedev)) {
            rc = PTR_ERR(teedev);
  

•           goto err_free_pool;
  

•           goto err_free_rstmem_pools;
    }
    optee->teedev = teedev;
  
  

@@ -1020,6 +1151,8 @@ static int optee_ffa_probe(struct ffa_device *ffa_dev) tee_device_unregister(optee->teedev); err_free_pool: tee_shm_pool_free(pool); +err_free_rstmem_pools:

•   optee_rstmem_pools_uninit(optee);
  

err_free_optee: kfree(optee); return rc; diff --git a/drivers/tee/optee/optee_private.h b/drivers/tee/optee/optee_private.h index 20eda508dbac..dd2a3a2224bc 100644 --- a/drivers/tee/optee/optee_private.h +++ b/drivers/tee/optee/optee_private.h @@ -174,9 +174,14 @@ struct optee;

• @do_call_with_arg: enters OP-TEE in secure world
• @to_msg_param: converts from struct tee_param to OPTEE_MSG parameters
• @from_msg_param: converts from OPTEE_MSG parameters to struct tee_param

• • @lend_rstmem: lends physically contiguous memory as restricted

• •                 memory, inaccessible by the kernel
    

• • @reclaim_rstmem: reclaims restricted memory previously lent with

• •                 @lend_rstmem() and makes it accessible by the
    

• •                 kernel again
    

  • These OPs are only supposed to be used internally in the OP-TEE driver

• • as a way of abstracting the different methogs of entering OP-TEE in

• • as a way of abstracting the different methods of entering OP-TEE in
  • secure world.
  */

struct optee_ops { @@ -191,6 +196,23 @@ struct optee_ops { size_t num_params, const struct optee_msg_param *msg_params, bool update_out);

•   int (*lend_rstmem)(struct optee *optee, struct tee_shm *rstmem,
  

•                      u16 *end_points, unsigned int ep_count);
  

•   int (*reclaim_rstmem)(struct optee *optee, struct tee_shm *rstmem);
  

+};

+/**

• • struct optee_rstmem_pools - restricted memory pools
• • @mutex: serializes write access to @xa when adding a new pool.
• • @xa: XArray of struct tee_shm_pool where the index is the

• •         use case ID TEE_IOC_UC_* supplied for TEE_IOC_RSTMEM_ALLOC.
    

• */

+struct optee_rstmem_pools {

•   /*
  

•    * Serializes write access to @xa when adding a new pool.
  

•    */
  

•   struct mutex mutex;
  

•   struct xarray xa;
  

};

/** @@ -206,6 +228,7 @@ struct optee_ops {

• @notif: notification synchronization struct
• @supp: supplicant synchronization struct for RPC to supplicant
• @pool: shared memory pool

• • @rstmem_pool: restricted memory pool for secure data path
  • @mutex: mutex protecting @rpmb_dev
  • @rpmb_dev: current RPMB device or NULL
  • @rpmb_scan_bus_done flag if device registation of RPMB dependent devices

@@ -230,6 +253,7 @@ struct optee { struct optee_notif notif; struct optee_supp supp; struct tee_shm_pool *pool;

•   struct optee_rstmem_pools *rstmem_pools;
    /* Protects rpmb_dev pointer */
    struct mutex rpmb_dev_mutex;
    struct rpmb_dev *rpmb_dev;
  

@@ -286,6 +310,9 @@ void optee_supp_init(struct optee_supp *supp); void optee_supp_uninit(struct optee_supp *supp); void optee_supp_release(struct optee_supp *supp);

+int optee_rstmem_pools_init(struct optee *optee); +void optee_rstmem_pools_uninit(struct optee *optee);

int optee_supp_recv(struct tee_context *ctx, u32 *func, u32 *num_params, struct tee_param *param); int optee_supp_send(struct tee_context *ctx, u32 ret, u32 num_params, @@ -378,6 +405,10 @@ void optee_rpc_cmd(struct tee_context *ctx, struct optee *optee, int optee_do_bottom_half(struct tee_context *ctx); int optee_stop_async_notif(struct tee_context *ctx);

+int optee_rstmem_alloc(struct tee_context *ctx, struct tee_shm *shm,

•                  u32 flags, u32 use_case, size_t size);
  

+void optee_rstmem_free(struct tee_context *ctx, struct tee_shm *shm);

/*

• Small helpers

*/ diff --git a/drivers/tee/optee/rstmem.c b/drivers/tee/optee/rstmem.c new file mode 100644 index 000000000000..cf300929171f --- /dev/null +++ b/drivers/tee/optee/rstmem.c @@ -0,0 +1,380 @@ +// SPDX-License-Identifier: GPL-2.0-only +/*

• • Copyright (c) 2024, Linaro Limited
• */

+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

+#include <linux/cma.h> +#include <linux/dma-map-ops.h> +#include <linux/errno.h> +#include <linux/genalloc.h> +#include <linux/slab.h> +#include <linux/string.h> +#include <linux/tee_core.h> +#include <linux/types.h> +#include "optee_private.h"

+struct optee_rstmem_cma_pool {

•   struct tee_shm_pool pool;
  

•   struct page *page;
  

•   struct optee *optee;
  

•   size_t page_count;
  

•   u16 *end_points;
  

•   u_int end_point_count;
  

•   u_int align;
  

•   refcount_t refcount;
  

•   struct tee_shm rstmem;
  

•   /* Protects when initializing and tearing down this struct */
  

•   struct mutex mutex;
  

+};

+static struct optee_rstmem_cma_pool * +to_rstmem_cma_pool(struct tee_shm_pool *pool) +{

•   return container_of(pool, struct optee_rstmem_cma_pool, pool);
  

+}

+static int init_cma_rstmem(struct optee_rstmem_cma_pool *rp) +{

•   struct cma *cma = dev_get_cma_area(&rp->optee->teedev->dev);
  

•   int rc;
  

•   rp->page = cma_alloc(cma, rp->page_count, rp->align, true/*no_warn*/);
  

•   if (!rp->page)
  

•           return -ENOMEM;
  

•   /*
  

•    * TODO unmap the memory range since the physical memory will
  

•    * become inaccesible after the lend_rstmem() call.
  

•    */
  

•   rp->rstmem.paddr = page_to_phys(rp->page);
  

•   rp->rstmem.size = rp->page_count * PAGE_SIZE;
  

•   rc = rp->optee->ops->lend_rstmem(rp->optee, &rp->rstmem,
  

•                                    rp->end_points, rp->end_point_count);
  

•   if (rc)
  

•           goto err_release;
  

•   rp->pool.private_data = gen_pool_create(PAGE_SHIFT, -1);
  

•   if (!rp->pool.private_data) {
  

•           rc = -ENOMEM;
  

•           goto err_reclaim;
  

•   }
  

•   rc = gen_pool_add(rp->pool.private_data, rp->rstmem.paddr,
  

•                     rp->rstmem.size, -1);
  

•   if (rc)
  

•           goto err_free_pool;
  

•   refcount_set(&rp->refcount, 1);
  

•   return 0;
  

+err_free_pool:

•   gen_pool_destroy(rp->pool.private_data);
  

+err_reclaim:

•   rp->optee->ops->reclaim_rstmem(rp->optee, &rp->rstmem);
  

+err_release:

•   cma_release(cma, rp->page, rp->page_count);
  

•   rp->rstmem.paddr = 0;
  

•   rp->rstmem.size = 0;
  

•   rp->rstmem.sec_world_id = 0;
  

•   return rc;
  

+}

+static int get_cma_rstmem(struct optee_rstmem_cma_pool *rp) +{

•   int rc = 0;
  

•   if (!refcount_inc_not_zero(&rp->refcount)) {
  

•           mutex_lock(&rp->mutex);
  

•           if (rp->pool.private_data) {
  

•                   /*
  

•                    * Another thread has already initialized the pool
  

•                    * before us, or the pool was just about to be torn
  

•                    * down. Either way we only need to increase the
  

•                    * refcount and we're done.
  

•                    */
  

•                   refcount_inc(&rp->refcount);
  

•           } else {
  

•                   rc = init_cma_rstmem(rp);
  

•           }
  

•           mutex_unlock(&rp->mutex);
  

•   }
  

•   return rc;
  

+}

+static void release_cma_rstmem(struct optee_rstmem_cma_pool *rp) +{

•   gen_pool_destroy(rp->pool.private_data);
  

•   rp->optee->ops->reclaim_rstmem(rp->optee, &rp->rstmem);
  

•   cma_release(dev_get_cma_area(&rp->optee->teedev->dev), rp->page,
  

•               rp->page_count);
  

•   rp->pool.private_data = NULL;
  

•   rp->page = NULL;
  

•   rp->rstmem.paddr = 0;
  

•   rp->rstmem.size = 0;
  

•   rp->rstmem.sec_world_id = 0;
  

+}

+static void put_cma_rstmem(struct optee_rstmem_cma_pool *rp) +{

•   if (refcount_dec_and_test(&rp->refcount)) {
  

•           mutex_lock(&rp->mutex);
  

•           if (rp->pool.private_data)
  

•                   release_cma_rstmem(rp);
  

•           mutex_unlock(&rp->mutex);
  

•   }
  

+}

+static int rstmem_pool_op_cma_alloc(struct tee_shm_pool *pool,

•                               struct tee_shm *shm, size_t size,
  

•                               size_t align)
  

+{

•   struct optee_rstmem_cma_pool *rp = to_rstmem_cma_pool(pool);
  

•   size_t sz = ALIGN(size, PAGE_SIZE);
  

•   phys_addr_t pa;
  

•   int rc;
  

•   rc = get_cma_rstmem(rp);
  

•   if (rc)
  

•           return rc;
  

•   pa = gen_pool_alloc(rp->pool.private_data, sz);
  

•   if (!pa) {
  

•           put_cma_rstmem(rp);
  

•           return -ENOMEM;
  

•   }
  

•   shm->size = sz;
  

•   shm->paddr = pa;
  

•   shm->offset = pa - page_to_phys(rp->page);
  

•   shm->sec_world_id = rp->rstmem.sec_world_id;
  

•   return 0;
  

+}

+static void rstmem_pool_op_cma_free(struct tee_shm_pool *pool,

•                               struct tee_shm *shm)
  

+{

•   struct optee_rstmem_cma_pool *rp = to_rstmem_cma_pool(pool);
  

•   gen_pool_free(rp->pool.private_data, shm->paddr, shm->size);
  

•   shm->size = 0;
  

•   shm->paddr = 0;
  

•   shm->offset = 0;
  

•   shm->sec_world_id = 0;
  

•   put_cma_rstmem(rp);
  

+}

+static void pool_op_cma_destroy_pool(struct tee_shm_pool *pool) +{

•   struct optee_rstmem_cma_pool *rp = to_rstmem_cma_pool(pool);
  

•   mutex_destroy(&rp->mutex);
  

•   kfree(rp);
  

+}

+static struct tee_shm_pool_ops rstmem_pool_ops_cma = {

•   .alloc = rstmem_pool_op_cma_alloc,
  

•   .free = rstmem_pool_op_cma_free,
  

•   .destroy_pool = pool_op_cma_destroy_pool,
  

+};

+static int get_rstmem_config(struct optee *optee, u32 use_case,

•                        size_t *min_size, u_int *min_align,
  

•                        u16 *end_points, u_int *ep_count)
  

+{

•   struct tee_param params[2] = {
  

•           [0] = {
  

•                   .attr = TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_INOUT,
  

•                   .u.value.a = use_case,
  

•           },
  

•           [1] = {
  

•                   .attr = TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_OUTPUT,
  

•           },
  

•   };
  

•   struct optee_shm_arg_entry *entry;
  

•   struct tee_shm *shm_param = NULL;
  

•   struct optee_msg_arg *msg_arg;
  

•   struct tee_shm *shm;
  

•   u_int offs;
  

•   int rc;
  

•   if (end_points && *ep_count) {
  

•           params[1].u.memref.size = *ep_count * sizeof(*end_points);
  

•           shm_param = tee_shm_alloc_priv_buf(optee->ctx,
  

•                                              params[1].u.memref.size);
  

•           if (IS_ERR(shm_param))
  

•                   return PTR_ERR(shm_param);
  

•           params[1].u.memref.shm = shm_param;
  

•   }
  

•   msg_arg = optee_get_msg_arg(optee->ctx, ARRAY_SIZE(params), &entry,
  

•                               &shm, &offs);
  

•   if (IS_ERR(msg_arg)) {
  

•           rc = PTR_ERR(msg_arg);
  

•           goto out_free_shm;
  

•   }
  

•   msg_arg->cmd = OPTEE_MSG_CMD_GET_RSTMEM_CONFIG;
  

•   rc = optee->ops->to_msg_param(optee, msg_arg->params,
  

•                                 ARRAY_SIZE(params), params,
  

•                                 false /*!update_out*/);
  

•   if (rc)
  

•           goto out_free_msg;
  

•   rc = optee->ops->do_call_with_arg(optee->ctx, shm, offs, false);
  

•   if (rc)
  

•           goto out_free_msg;
  

•   if (msg_arg->ret && msg_arg->ret != TEEC_ERROR_SHORT_BUFFER) {
  

•           rc = -EINVAL;
  

•           goto out_free_msg;
  

•   }
  

•   rc = optee->ops->from_msg_param(optee, params, ARRAY_SIZE(params),
  

•                                   msg_arg->params, true /*update_out*/);
  

•   if (rc)
  

•           goto out_free_msg;
  

•   if (!msg_arg->ret && end_points &&
  

•       *ep_count < params[1].u.memref.size / sizeof(u16)) {
  

•           rc = -EINVAL;
  

•           goto out_free_msg;
  

•   }
  

•   *min_size = params[0].u.value.a;
  

•   *min_align = params[0].u.value.b;
  

•   *ep_count = params[1].u.memref.size / sizeof(u16);
  

•   if (msg_arg->ret == TEEC_ERROR_SHORT_BUFFER) {
  

•           rc = -ENOSPC;
  

•           goto out_free_msg;
  

•   }
  

•   if (end_points)
  

•           memcpy(end_points, tee_shm_get_va(shm_param, 0),
  

•                  params[1].u.memref.size);
  

+out_free_msg:

•   optee_free_msg_arg(optee->ctx, entry, offs);
  

+out_free_shm:

•   if (shm_param)
  

•           tee_shm_free(shm_param);
  

•   return rc;
  

+}

+static struct tee_shm_pool *alloc_rstmem_pool(struct optee *optee, u32 use_case) +{

•   struct optee_rstmem_cma_pool *rp;
  

•   size_t min_size;
  

•   int rc;
  

•   rp = kzalloc(sizeof(*rp), GFP_KERNEL);
  

•   if (!rp)
  

•           return ERR_PTR(-ENOMEM);
  

•   rp->rstmem.use_case = use_case;
  

•   rc = get_rstmem_config(optee, use_case, &min_size, &rp->align, NULL,
  

•                          &rp->end_point_count);
  

•   if (rc) {
  

•           if (rc != -ENOSPC)
  

•                   goto err;
  

•           rp->end_points = kcalloc(rp->end_point_count,
  

•                                    sizeof(*rp->end_points), GFP_KERNEL);
  

•           if (!rp->end_points) {
  

•                   rc = -ENOMEM;
  

•                   goto err;
  

•           }
  

•           rc = get_rstmem_config(optee, use_case, &min_size, &rp->align,
  

•                                  rp->end_points, &rp->end_point_count);
  

•           if (rc)
  

•                   goto err_kfree_eps;
  

•   }
  

•   rp->pool.ops = &rstmem_pool_ops_cma;
  

•   rp->optee = optee;
  

•   rp->page_count = min_size / PAGE_SIZE;
  

•   mutex_init(&rp->mutex);
  

•   return &rp->pool;
  

+err_kfree_eps:

•   kfree(rp->end_points);
  

+err:

•   kfree(rp);
  

•   return ERR_PTR(rc);
  

+}

+int optee_rstmem_alloc(struct tee_context *ctx, struct tee_shm *shm,

•                  u32 flags, u32 use_case, size_t size)
  

+{

•   struct optee *optee = tee_get_drvdata(ctx->teedev);
  

•   struct tee_shm_pool *pool;
  

•   int rc;
  

•   if (!optee->rstmem_pools)
  

•           return -EINVAL;
  

•   if (flags)
  

•           return -EINVAL;
  

•   pool = xa_load(&optee->rstmem_pools->xa, use_case);
  

•   if (!pool) {
  

•           pool = alloc_rstmem_pool(optee, use_case);
  

•           if (IS_ERR(pool))
  

•                   return PTR_ERR(pool);
  

•           rc = xa_insert(&optee->rstmem_pools->xa, use_case, pool,
  

•                          GFP_KERNEL);
  

•           if (rc) {
  

•                   pool->ops->destroy_pool(pool);
  

•                   return rc;
  

•           }
  

•   }
  

•   return pool->ops->alloc(pool, shm, size, 0);
  

+}

+void optee_rstmem_free(struct tee_context *ctx, struct tee_shm *shm) +{

•   struct optee *optee = tee_get_drvdata(ctx->teedev);
  

•   struct tee_shm_pool *pool;
  

•   pool = xa_load(&optee->rstmem_pools->xa, shm->use_case);
  

•   if (pool)
  

•           pool->ops->free(pool, shm);
  

•   else
  

•           pr_err("Can't find pool for use_case %u\n", shm->use_case);
  

+}

+int optee_rstmem_pools_init(struct optee *optee) +{

•   struct optee_rstmem_pools *pools;
  

•   pools = kmalloc(sizeof(*pools), GFP_KERNEL);
  

•   if (!pools)
  

•           return -ENOMEM;
  

•   mutex_init(&pools->mutex);
  

•   xa_init(&pools->xa);
  

•   optee->rstmem_pools = pools;
  

•   return 0;
  

+}

+void optee_rstmem_pools_uninit(struct optee *optee) +{

•   if (optee->rstmem_pools) {
  

•           struct tee_shm_pool *pool;
  

•           u_long idx;
  

•           xa_for_each(&optee->rstmem_pools->xa, idx, pool) {
  

•                   xa_erase(&optee->rstmem_pools->xa, idx);
  

•                   pool->ops->destroy_pool(pool);
  

•           }
  

•           xa_destroy(&optee->rstmem_pools->xa);
  

•           mutex_destroy(&optee->rstmem_pools->mutex);
  

•           kfree(optee->rstmem_pools);
  

•           optee->rstmem_pools = NULL;
  

•   }
  

+} diff --git a/drivers/tee/optee/smc_abi.c b/drivers/tee/optee/smc_abi.c index d1f79947f58a..7fa7d9d14c94 100644 --- a/drivers/tee/optee/smc_abi.c +++ b/drivers/tee/optee/smc_abi.c @@ -1001,6 +1001,67 @@ static int optee_smc_do_call_with_arg(struct tee_context *ctx, return rc; }

+static int optee_smc_lend_rstmem(struct optee *optee, struct tee_shm *rstmem,

•                            u16 *end_points, unsigned int ep_count)
  

+{

•   struct optee_shm_arg_entry *entry;
  

•   struct optee_msg_arg *msg_arg;
  

•   struct tee_shm *shm;
  

•   u_int offs;
  

•   int rc;
  

•   msg_arg = optee_get_msg_arg(optee->ctx, 2, &entry, &shm, &offs);
  

•   if (IS_ERR(msg_arg))
  

•           return PTR_ERR(msg_arg);
  

•   msg_arg->cmd = OPTEE_MSG_CMD_LEND_RSTMEM;
  

•   msg_arg->params[0].attr = OPTEE_MSG_ATTR_TYPE_VALUE_INPUT;
  

•   msg_arg->params[0].u.value.a = OPTEE_MSG_RSTMEM_SECURE_VIDEO_PLAY;
  

•   msg_arg->params[1].attr = OPTEE_MSG_ATTR_TYPE_TMEM_INPUT;
  

•   msg_arg->params[1].u.tmem.buf_ptr = rstmem->paddr;
  

•   msg_arg->params[1].u.tmem.size = rstmem->size;
  

•   msg_arg->params[1].u.tmem.shm_ref = (u_long)rstmem;
  

•   rc = optee->ops->do_call_with_arg(optee->ctx, shm, offs, false);
  

•   if (rc)
  

•           goto out;
  

•   if (msg_arg->ret != TEEC_SUCCESS) {
  

•           rc = -EINVAL;
  

•           goto out;
  

•   }
  

+out:

•   optee_free_msg_arg(optee->ctx, entry, offs);
  

•   return rc;
  

+}

+static int optee_smc_reclaim_rstmem(struct optee *optee, struct tee_shm *rstmem) +{

•   struct optee_shm_arg_entry *entry;
  

•   struct optee_msg_arg *msg_arg;
  

•   struct tee_shm *shm;
  

•   u_int offs;
  

•   int rc;
  

•   msg_arg = optee_get_msg_arg(optee->ctx, 1, &entry, &shm, &offs);
  

•   if (IS_ERR(msg_arg))
  

•           return PTR_ERR(msg_arg);
  

•   msg_arg->cmd = OPTEE_MSG_CMD_RECLAIM_RSTMEM;
  

•   msg_arg->params[0].attr = OPTEE_MSG_ATTR_TYPE_RMEM_INPUT;
  

•   msg_arg->params[0].u.rmem.shm_ref = (u_long)rstmem;
  

•   rc = optee->ops->do_call_with_arg(optee->ctx, shm, offs, false);
  

•   if (rc)
  

•           goto out;
  

•   if (msg_arg->ret != TEEC_SUCCESS)
  

•           rc = -EINVAL;
  

+out:

•   optee_free_msg_arg(optee->ctx, entry, offs);
  

•   return rc;
  

+}

/*

• 5. Asynchronous notification

*/ @@ -1201,6 +1262,8 @@ static void optee_get_version(struct tee_device *teedev, v.gen_caps |= TEE_GEN_CAP_REG_MEM; if (optee->smc.sec_caps & OPTEE_SMC_SEC_CAP_MEMREF_NULL) v.gen_caps |= TEE_GEN_CAP_MEMREF_NULL;

•   if (optee->rstmem_pools)
  

•           v.gen_caps |= TEE_GEN_CAP_RSTMEM;
    *vers = v;
  

}

@@ -1223,6 +1286,8 @@ static const struct tee_driver_ops optee_clnt_ops = { .cancel_req = optee_cancel_req, .shm_register = optee_shm_register, .shm_unregister = optee_shm_unregister,

•   .rstmem_alloc = optee_rstmem_alloc,
  

•   .rstmem_free = optee_rstmem_free,
  

};

static const struct tee_desc optee_clnt_desc = { @@ -1239,6 +1304,8 @@ static const struct tee_driver_ops optee_supp_ops = { .supp_send = optee_supp_send, .shm_register = optee_shm_register_supp, .shm_unregister = optee_shm_unregister_supp,

•   .rstmem_alloc = optee_rstmem_alloc,
  

•   .rstmem_free = optee_rstmem_free,
  

};

static const struct tee_desc optee_supp_desc = { @@ -1252,6 +1319,9 @@ static const struct optee_ops optee_ops = { .do_call_with_arg = optee_smc_do_call_with_arg, .to_msg_param = optee_to_msg_param, .from_msg_param = optee_from_msg_param,

•   .lend_rstmem = optee_smc_lend_rstmem,
  

•   .reclaim_rstmem = optee_smc_reclaim_rstmem,
  

•   //.alloc_rstmem_pool = optee_smc_alloc_rstmem_pool,
  

};

static int enable_async_notif(optee_invoke_fn *invoke_fn) @@ -1619,6 +1689,62 @@ static inline int optee_load_fw(struct platform_device *pdev, } #endif

+static int optee_sdp_pool_init(struct optee *optee) +{

•   bool dyn_sdp = optee->smc.sec_caps & OPTEE_SMC_SEC_CAP_DYNAMIC_RSTMEM;
  

•   bool sdp = optee->smc.sec_caps & OPTEE_SMC_SEC_CAP_SDP;
  

•   struct tee_shm_pool *pool;
  

•   int rc;
  

•   /*
  

•    * optee_sdp_pools_init() must be called if secure world has any
  

•    * SDP capability. If the static carvout is available initialize
  

•    * and add a pool for that. If there's an error from secure world
  

•    * we complain but don't call optee_sdp_pools_uninit() unless we
  

•    * know that there is no SDP capability left.
  

•    */
  

•   if (!dyn_sdp && !sdp)
  

•           return 0;
  

•   rc = optee_rstmem_pools_init(optee);
  

•   if (rc)
  

•           return rc;
  

•   if (optee->smc.sec_caps & OPTEE_SMC_SEC_CAP_SDP) {
  

•           union {
  

•                   struct arm_smccc_res smccc;
  

•                   struct optee_smc_get_sdp_config_result result;
  

•           } res;
  

•           optee->smc.invoke_fn(OPTEE_SMC_GET_SDP_CONFIG, 0, 0, 0, 0, 0, 0,
  

•                                0, &res.smccc);
  

•           if (res.result.status != OPTEE_SMC_RETURN_OK) {
  

•                   pr_err("Secure Data Path service not available\n");
  

•                   if (!dyn_sdp)
  

•                           goto err;
  

•                   return 0;
  

•           }
  

•           pool = tee_rstmem_gen_pool_alloc(res.result.start,
  

•                                            res.result.size);
  

•           if (IS_ERR(pool)) {
  

•                   rc = PTR_ERR(pool);
  

•                   goto err;
  

•           }
  

•           rc = xa_insert(&optee->rstmem_pools->xa,
  

•                          TEE_IOC_UC_SECURE_VIDEO_PLAY, pool, GFP_KERNEL);
  

•           if (rc) {
  

•                   pool->ops->destroy_pool(pool);
  

•                   goto err;
  

•           }
  

•   }
  

•   return 0;
  

+err:

•   optee_rstmem_pools_uninit(optee);
  

•   return rc;
  

+}

static int optee_probe(struct platform_device *pdev) { optee_invoke_fn *invoke_fn; @@ -1714,7 +1840,7 @@ static int optee_probe(struct platform_device *pdev) optee = kzalloc(sizeof(*optee), GFP_KERNEL); if (!optee) { rc = -ENOMEM;

•           goto err_free_pool;
  

•           goto err_free_shm_pool;
    }
  
    optee->ops = &optee_ops;
  

@@ -1726,10 +1852,14 @@ static int optee_probe(struct platform_device *pdev) (sec_caps & OPTEE_SMC_SEC_CAP_RPMB_PROBE)) optee->in_kernel_rpmb_routing = true;

•   rc = optee_sdp_pool_init(optee);
  

•   if (rc)
  

•           goto err_free_optee;
  

•   teedev = tee_device_alloc(&optee_clnt_desc, NULL, pool, optee);
    if (IS_ERR(teedev)) {
            rc = PTR_ERR(teedev);
  

•           goto err_free_optee;
  

•           goto err_rstmem_pools_uninit;
    }
    optee->teedev = teedev;
  
  

@@ -1836,9 +1966,11 @@ static int optee_probe(struct platform_device *pdev) tee_device_unregister(optee->supp_teedev); err_unreg_teedev: tee_device_unregister(optee->teedev); +err_rstmem_pools_uninit:

•   optee_rstmem_pools_uninit(optee);
  

err_free_optee: kfree(optee); -err_free_pool: +err_free_shm_pool: tee_shm_pool_free(pool); if (memremaped_shm) memunmap(memremaped_shm); -- 2.43.0