* [PATCH v8 01/14] tee: tee_device_alloc(): copy dma_mask from parent device
2025-05-02 9:59 [PATCH v8 00/14] TEE subsystem for protected dma-buf allocations Jens Wiklander
@ 2025-05-02 9:59 ` Jens Wiklander
2025-05-02 13:36 ` Robin Murphy
2025-05-02 9:59 ` [PATCH v8 02/14] optee: pass parent device to tee_device_alloc() Jens Wiklander
` (12 subsequent siblings)
13 siblings, 1 reply; 28+ messages in thread
From: Jens Wiklander @ 2025-05-02 9:59 UTC (permalink / raw)
To: linux-kernel, linux-media, dri-devel, linaro-mm-sig, op-tee,
linux-arm-kernel
Cc: Olivier Masse, Thierry Reding, Yong Wu, Sumit Semwal,
Benjamin Gaignard, Brian Starkey, John Stultz, T . J . Mercier,
Christian König, Sumit Garg, Matthias Brugger,
AngeloGioacchino Del Regno, azarrabi, Simona Vetter, Daniel Stone,
Rouven Czerwinski, Jens Wiklander
If a parent device is supplied to tee_device_alloc(), copy the dma_mask
field into the new device. This avoids future warnings when mapping a
DMA-buf for the device.
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
Reviewed-by: Sumit Garg <sumit.garg@kernel.org>
---
drivers/tee/tee_core.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/tee/tee_core.c b/drivers/tee/tee_core.c
index d113679b1e2d..685afcaa3ea1 100644
--- a/drivers/tee/tee_core.c
+++ b/drivers/tee/tee_core.c
@@ -922,6 +922,8 @@ struct tee_device *tee_device_alloc(const struct tee_desc *teedesc,
teedev->dev.class = &tee_class;
teedev->dev.release = tee_release_device;
teedev->dev.parent = dev;
+ if (dev)
+ teedev->dev.dma_mask = dev->dma_mask;
teedev->dev.devt = MKDEV(MAJOR(tee_devt), teedev->id);
--
2.43.0
^ permalink raw reply related [flat|nested] 28+ messages in thread* Re: [PATCH v8 01/14] tee: tee_device_alloc(): copy dma_mask from parent device
2025-05-02 9:59 ` [PATCH v8 01/14] tee: tee_device_alloc(): copy dma_mask from parent device Jens Wiklander
@ 2025-05-02 13:36 ` Robin Murphy
2025-05-05 12:10 ` Jens Wiklander
0 siblings, 1 reply; 28+ messages in thread
From: Robin Murphy @ 2025-05-02 13:36 UTC (permalink / raw)
To: Jens Wiklander, linux-kernel, linux-media, dri-devel,
linaro-mm-sig, op-tee, linux-arm-kernel
Cc: Olivier Masse, Thierry Reding, Yong Wu, Sumit Semwal,
Benjamin Gaignard, Brian Starkey, John Stultz, T . J . Mercier,
Christian König, Sumit Garg, Matthias Brugger,
AngeloGioacchino Del Regno, azarrabi, Simona Vetter, Daniel Stone,
Rouven Czerwinski
On 02/05/2025 10:59 am, Jens Wiklander wrote:
> If a parent device is supplied to tee_device_alloc(), copy the dma_mask
> field into the new device. This avoids future warnings when mapping a
> DMA-buf for the device.
That also sounds dodgy. If the parent device is the hardware device
physically performing the DMA, then that is the device which should be
passed to the DMA API. Trying to copy random bits of one device's
configuration to another device and hoping it will work is not robust -
not only is DMA-relevant information all over the place, including in
archdata and/or bus/IOMMU driver-private data, but it can also opens up
a whole can of subtle lifecycle issues...
> Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
> Reviewed-by: Sumit Garg <sumit.garg@kernel.org>
> ---
> drivers/tee/tee_core.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/tee/tee_core.c b/drivers/tee/tee_core.c
> index d113679b1e2d..685afcaa3ea1 100644
> --- a/drivers/tee/tee_core.c
> +++ b/drivers/tee/tee_core.c
> @@ -922,6 +922,8 @@ struct tee_device *tee_device_alloc(const struct tee_desc *teedesc,
> teedev->dev.class = &tee_class;
> teedev->dev.release = tee_release_device;
> teedev->dev.parent = dev;
> + if (dev)
> + teedev->dev.dma_mask = dev->dma_mask;
...for instance, I don't see any obvious guarantee that "dev" can't go
away during the lifetime of "teedev" and leave this pointer dangling.
Thanks,
Robin.
>
> teedev->dev.devt = MKDEV(MAJOR(tee_devt), teedev->id);
>
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v8 01/14] tee: tee_device_alloc(): copy dma_mask from parent device
2025-05-02 13:36 ` Robin Murphy
@ 2025-05-05 12:10 ` Jens Wiklander
0 siblings, 0 replies; 28+ messages in thread
From: Jens Wiklander @ 2025-05-05 12:10 UTC (permalink / raw)
To: Robin Murphy
Cc: linux-kernel, linux-media, dri-devel, linaro-mm-sig, op-tee,
linux-arm-kernel, Olivier Masse, Thierry Reding, Yong Wu,
Sumit Semwal, Benjamin Gaignard, Brian Starkey, John Stultz,
T . J . Mercier, Christian König, Sumit Garg,
Matthias Brugger, AngeloGioacchino Del Regno, azarrabi,
Simona Vetter, Daniel Stone, Rouven Czerwinski
Hi,
On Fri, May 2, 2025 at 3:36 PM Robin Murphy <robin.murphy@arm.com> wrote:
>
> On 02/05/2025 10:59 am, Jens Wiklander wrote:
> > If a parent device is supplied to tee_device_alloc(), copy the dma_mask
> > field into the new device. This avoids future warnings when mapping a
> > DMA-buf for the device.
>
> That also sounds dodgy. If the parent device is the hardware device
> physically performing the DMA, then that is the device which should be
> passed to the DMA API. Trying to copy random bits of one device's
> configuration to another device and hoping it will work is not robust -
> not only is DMA-relevant information all over the place, including in
> archdata and/or bus/IOMMU driver-private data, but it can also opens up
> a whole can of subtle lifecycle issues...
We have a reference to the parent device until the teedev goes away.
The dma_maks needed by tee_shm_register_fd() in
https://lore.kernel.org/lkml/20250502100049.1746335-9-jens.wiklander@linaro.org/
to be able to extract the PA from a DMA-buf allocated from another DMA
heap. We can drop this patch and support for unrelated DMA heaps in
tee_shm_register_fd() without losing critical features from the patch
set if we can't handle dma_mask in this way.
>
> > Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
> > Reviewed-by: Sumit Garg <sumit.garg@kernel.org>
> > ---
> > drivers/tee/tee_core.c | 2 ++
> > 1 file changed, 2 insertions(+)
> >
> > diff --git a/drivers/tee/tee_core.c b/drivers/tee/tee_core.c
> > index d113679b1e2d..685afcaa3ea1 100644
> > --- a/drivers/tee/tee_core.c
> > +++ b/drivers/tee/tee_core.c
> > @@ -922,6 +922,8 @@ struct tee_device *tee_device_alloc(const struct tee_desc *teedesc,
> > teedev->dev.class = &tee_class;
> > teedev->dev.release = tee_release_device;
> > teedev->dev.parent = dev;
> > + if (dev)
> > + teedev->dev.dma_mask = dev->dma_mask;
>
> ...for instance, I don't see any obvious guarantee that "dev" can't go
> away during the lifetime of "teedev" and leave this pointer dangling.
A successful call to tee_device_alloc() must be followed by a call to
tee_device_register() or tee_device_unregister(). The former calls
cdev_device_add(), which results in a call to device_add() and an
increased reference to teedev->dev.parent, "dev" in question.
Thanks,
Jens
>
> Thanks,
> Robin.
>
> >
> > teedev->dev.devt = MKDEV(MAJOR(tee_devt), teedev->id);
> >
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH v8 02/14] optee: pass parent device to tee_device_alloc()
2025-05-02 9:59 [PATCH v8 00/14] TEE subsystem for protected dma-buf allocations Jens Wiklander
2025-05-02 9:59 ` [PATCH v8 01/14] tee: tee_device_alloc(): copy dma_mask from parent device Jens Wiklander
@ 2025-05-02 9:59 ` Jens Wiklander
2025-05-02 9:59 ` [PATCH v8 03/14] optee: account for direction while converting parameters Jens Wiklander
` (11 subsequent siblings)
13 siblings, 0 replies; 28+ messages in thread
From: Jens Wiklander @ 2025-05-02 9:59 UTC (permalink / raw)
To: linux-kernel, linux-media, dri-devel, linaro-mm-sig, op-tee,
linux-arm-kernel
Cc: Olivier Masse, Thierry Reding, Yong Wu, Sumit Semwal,
Benjamin Gaignard, Brian Starkey, John Stultz, T . J . Mercier,
Christian König, Sumit Garg, Matthias Brugger,
AngeloGioacchino Del Regno, azarrabi, Simona Vetter, Daniel Stone,
Rouven Czerwinski, Jens Wiklander
During probing of the OP-TEE driver, pass the parent device to
tee_device_alloc() so the dma_mask of the new devices can be updated
accordingly.
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
Reviewed-by: Sumit Garg <sumit.garg@kernel.org>
---
drivers/tee/optee/ffa_abi.c | 8 ++++----
drivers/tee/optee/smc_abi.c | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/tee/optee/ffa_abi.c b/drivers/tee/optee/ffa_abi.c
index f3af5666bb11..4ca1d5161b82 100644
--- a/drivers/tee/optee/ffa_abi.c
+++ b/drivers/tee/optee/ffa_abi.c
@@ -914,16 +914,16 @@ static int optee_ffa_probe(struct ffa_device *ffa_dev)
(sec_caps & OPTEE_FFA_SEC_CAP_RPMB_PROBE))
optee->in_kernel_rpmb_routing = true;
- teedev = tee_device_alloc(&optee_ffa_clnt_desc, NULL, optee->pool,
- optee);
+ teedev = tee_device_alloc(&optee_ffa_clnt_desc, &ffa_dev->dev,
+ optee->pool, optee);
if (IS_ERR(teedev)) {
rc = PTR_ERR(teedev);
goto err_free_pool;
}
optee->teedev = teedev;
- teedev = tee_device_alloc(&optee_ffa_supp_desc, NULL, optee->pool,
- optee);
+ teedev = tee_device_alloc(&optee_ffa_supp_desc, &ffa_dev->dev,
+ optee->pool, optee);
if (IS_ERR(teedev)) {
rc = PTR_ERR(teedev);
goto err_unreg_teedev;
diff --git a/drivers/tee/optee/smc_abi.c b/drivers/tee/optee/smc_abi.c
index f0c3ac1103bb..165fadd9abc9 100644
--- a/drivers/tee/optee/smc_abi.c
+++ b/drivers/tee/optee/smc_abi.c
@@ -1691,14 +1691,14 @@ static int optee_probe(struct platform_device *pdev)
(sec_caps & OPTEE_SMC_SEC_CAP_RPMB_PROBE))
optee->in_kernel_rpmb_routing = true;
- teedev = tee_device_alloc(&optee_clnt_desc, NULL, pool, optee);
+ teedev = tee_device_alloc(&optee_clnt_desc, &pdev->dev, pool, optee);
if (IS_ERR(teedev)) {
rc = PTR_ERR(teedev);
goto err_free_optee;
}
optee->teedev = teedev;
- teedev = tee_device_alloc(&optee_supp_desc, NULL, pool, optee);
+ teedev = tee_device_alloc(&optee_supp_desc, &pdev->dev, pool, optee);
if (IS_ERR(teedev)) {
rc = PTR_ERR(teedev);
goto err_unreg_teedev;
--
2.43.0
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH v8 03/14] optee: account for direction while converting parameters
2025-05-02 9:59 [PATCH v8 00/14] TEE subsystem for protected dma-buf allocations Jens Wiklander
2025-05-02 9:59 ` [PATCH v8 01/14] tee: tee_device_alloc(): copy dma_mask from parent device Jens Wiklander
2025-05-02 9:59 ` [PATCH v8 02/14] optee: pass parent device to tee_device_alloc() Jens Wiklander
@ 2025-05-02 9:59 ` Jens Wiklander
2025-05-07 12:42 ` Sumit Garg
2025-05-02 9:59 ` [PATCH v8 04/14] optee: sync secure world ABI headers Jens Wiklander
` (10 subsequent siblings)
13 siblings, 1 reply; 28+ messages in thread
From: Jens Wiklander @ 2025-05-02 9:59 UTC (permalink / raw)
To: linux-kernel, linux-media, dri-devel, linaro-mm-sig, op-tee,
linux-arm-kernel
Cc: Olivier Masse, Thierry Reding, Yong Wu, Sumit Semwal,
Benjamin Gaignard, Brian Starkey, John Stultz, T . J . Mercier,
Christian König, Sumit Garg, Matthias Brugger,
AngeloGioacchino Del Regno, azarrabi, Simona Vetter, Daniel Stone,
Rouven Czerwinski, Jens Wiklander
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.
This is needed in a later patch where 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 used restricted
memory pool and that doesn't translate back well.
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 4ca1d5161b82..e4b08cd195f3 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 165fadd9abc9..cfdae266548b 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
^ permalink raw reply related [flat|nested] 28+ messages in thread* Re: [PATCH v8 03/14] optee: account for direction while converting parameters
2025-05-02 9:59 ` [PATCH v8 03/14] optee: account for direction while converting parameters Jens Wiklander
@ 2025-05-07 12:42 ` Sumit Garg
2025-05-07 13:07 ` Jens Wiklander
0 siblings, 1 reply; 28+ messages in thread
From: Sumit Garg @ 2025-05-07 12:42 UTC (permalink / raw)
To: Jens Wiklander
Cc: linux-kernel, linux-media, dri-devel, linaro-mm-sig, op-tee,
linux-arm-kernel, Olivier Masse, Thierry Reding, Yong Wu,
Sumit Semwal, Benjamin Gaignard, Brian Starkey, John Stultz,
T . J . Mercier, Christian König, Matthias Brugger,
AngeloGioacchino Del Regno, azarrabi, Simona Vetter, Daniel Stone,
Rouven Czerwinski
Hi Jens,
On Fri, May 02, 2025 at 11:59:17AM +0200, Jens Wiklander 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.
>
> This is needed in a later patch where 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 used restricted
> memory pool and that doesn't translate back well.
>
> 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(-)
>
Thinking about it a bit more, as you mentioned in v6 that this patch
isn't strictly required for this series, can we drop this from this
series and rather followup with a separate patch? If you agree then I
can give a try on simplifying this patch?
-Sumit
> 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 4ca1d5161b82..e4b08cd195f3 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 165fadd9abc9..cfdae266548b 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
>
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: [PATCH v8 03/14] optee: account for direction while converting parameters
2025-05-07 12:42 ` Sumit Garg
@ 2025-05-07 13:07 ` Jens Wiklander
0 siblings, 0 replies; 28+ messages in thread
From: Jens Wiklander @ 2025-05-07 13:07 UTC (permalink / raw)
To: Sumit Garg
Cc: linux-kernel, linux-media, dri-devel, linaro-mm-sig, op-tee,
linux-arm-kernel, Olivier Masse, Thierry Reding, Yong Wu,
Sumit Semwal, Benjamin Gaignard, Brian Starkey, John Stultz,
T . J . Mercier, Christian König, Matthias Brugger,
AngeloGioacchino Del Regno, azarrabi, Simona Vetter, Daniel Stone,
Rouven Czerwinski
Hi Sumit,
On Wed, May 7, 2025 at 2:42 PM Sumit Garg <sumit.garg@kernel.org> wrote:
>
> Hi Jens,
>
> On Fri, May 02, 2025 at 11:59:17AM +0200, Jens Wiklander 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.
> >
> > This is needed in a later patch where 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 used restricted
> > memory pool and that doesn't translate back well.
> >
> > 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(-)
> >
>
> Thinking about it a bit more, as you mentioned in v6 that this patch
> isn't strictly required for this series, can we drop this from this
> series and rather followup with a separate patch? If you agree then I
> can give a try on simplifying this patch?
Sure. Who knows, perhaps it will be ready before a version of the
patch is accepted?
Cheers,
Jens
>
> -Sumit
>
> > 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 4ca1d5161b82..e4b08cd195f3 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 165fadd9abc9..cfdae266548b 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
> >
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH v8 04/14] optee: sync secure world ABI headers
2025-05-02 9:59 [PATCH v8 00/14] TEE subsystem for protected dma-buf allocations Jens Wiklander
` (2 preceding siblings ...)
2025-05-02 9:59 ` [PATCH v8 03/14] optee: account for direction while converting parameters Jens Wiklander
@ 2025-05-02 9:59 ` Jens Wiklander
2025-05-02 9:59 ` [PATCH v8 05/14] dma-buf: dma-heap: export declared functions Jens Wiklander
` (9 subsequent siblings)
13 siblings, 0 replies; 28+ messages in thread
From: Jens Wiklander @ 2025-05-02 9:59 UTC (permalink / raw)
To: linux-kernel, linux-media, dri-devel, linaro-mm-sig, op-tee,
linux-arm-kernel
Cc: Olivier Masse, Thierry Reding, Yong Wu, Sumit Semwal,
Benjamin Gaignard, Brian Starkey, John Stultz, T . J . Mercier,
Christian König, Sumit Garg, Matthias Brugger,
AngeloGioacchino Del Regno, azarrabi, Simona Vetter, Daniel Stone,
Rouven Czerwinski, Jens Wiklander
Update the header files describing the secure world ABI, both with and
without FF-A. The ABI is extended to deal with protected memory, but as
usual backward compatible.
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
---
drivers/tee/optee/optee_ffa.h | 27 +++++++++---
drivers/tee/optee/optee_msg.h | 83 ++++++++++++++++++++++++++++++-----
drivers/tee/optee/optee_smc.h | 69 ++++++++++++++++++++++++++++-
3 files changed, 161 insertions(+), 18 deletions(-)
diff --git a/drivers/tee/optee/optee_ffa.h b/drivers/tee/optee/optee_ffa.h
index 257735ae5b56..cc257e7956a3 100644
--- a/drivers/tee/optee/optee_ffa.h
+++ b/drivers/tee/optee/optee_ffa.h
@@ -81,7 +81,7 @@
* as the second MSG arg struct for
* OPTEE_FFA_YIELDING_CALL_WITH_ARG.
* Bit[31:8]: Reserved (MBZ)
- * w5: Bitfield of secure world capabilities OPTEE_FFA_SEC_CAP_* below,
+ * w5: Bitfield of OP-TEE capabilities OPTEE_FFA_SEC_CAP_*
* w6: The maximum secure world notification number
* w7: Not used (MBZ)
*/
@@ -94,6 +94,8 @@
#define OPTEE_FFA_SEC_CAP_ASYNC_NOTIF BIT(1)
/* OP-TEE supports probing for RPMB device if needed */
#define OPTEE_FFA_SEC_CAP_RPMB_PROBE BIT(2)
+/* OP-TEE supports Protected Memory for secure data path */
+#define OPTEE_FFA_SEC_CAP_PROTMEM BIT(3)
#define OPTEE_FFA_EXCHANGE_CAPABILITIES OPTEE_FFA_BLOCKING_CALL(2)
@@ -108,7 +110,7 @@
*
* Return register usage:
* w3: Error code, 0 on success
- * w4-w7: Note used (MBZ)
+ * w4-w7: Not used (MBZ)
*/
#define OPTEE_FFA_UNREGISTER_SHM OPTEE_FFA_BLOCKING_CALL(3)
@@ -119,16 +121,31 @@
* Call register usage:
* w3: Service ID, OPTEE_FFA_ENABLE_ASYNC_NOTIF
* w4: Notification value to request bottom half processing, should be
- * less than OPTEE_FFA_MAX_ASYNC_NOTIF_VALUE.
+ * less than OPTEE_FFA_MAX_ASYNC_NOTIF_VALUE
* w5-w7: Not used (MBZ)
*
* Return register usage:
* w3: Error code, 0 on success
- * w4-w7: Note used (MBZ)
+ * w4-w7: Not used (MBZ)
*/
#define OPTEE_FFA_ENABLE_ASYNC_NOTIF OPTEE_FFA_BLOCKING_CALL(5)
-#define OPTEE_FFA_MAX_ASYNC_NOTIF_VALUE 64
+#define OPTEE_FFA_MAX_ASYNC_NOTIF_VALUE 64
+
+/*
+ * Release Protected memory
+ *
+ * Call register usage:
+ * w3: Service ID, OPTEE_FFA_RECLAIM_PROTMEM
+ * w4: Shared memory handle, lower bits
+ * w5: Shared memory handle, higher bits
+ * w6-w7: Not used (MBZ)
+ *
+ * Return register usage:
+ * w3: Error code, 0 on success
+ * w4-w7: Note used (MBZ)
+ */
+#define OPTEE_FFA_RELEASE_PROTMEM OPTEE_FFA_BLOCKING_CALL(8)
/*
* Call with struct optee_msg_arg as argument in the supplied shared memory
diff --git a/drivers/tee/optee/optee_msg.h b/drivers/tee/optee/optee_msg.h
index e8840a82b983..22d71d6f110d 100644
--- a/drivers/tee/optee/optee_msg.h
+++ b/drivers/tee/optee/optee_msg.h
@@ -133,13 +133,13 @@ struct optee_msg_param_rmem {
};
/**
- * struct optee_msg_param_fmem - ffa memory reference parameter
+ * struct optee_msg_param_fmem - FF-A memory reference parameter
* @offs_lower: Lower bits of offset into shared memory reference
* @offs_upper: Upper bits of offset into shared memory reference
* @internal_offs: Internal offset into the first page of shared memory
* reference
* @size: Size of the buffer
- * @global_id: Global identifier of Shared memory
+ * @global_id: Global identifier of the shared memory
*/
struct optee_msg_param_fmem {
u32 offs_low;
@@ -165,7 +165,7 @@ struct optee_msg_param_value {
* @attr: attributes
* @tmem: parameter by temporary memory reference
* @rmem: parameter by registered memory reference
- * @fmem: parameter by ffa registered memory reference
+ * @fmem: parameter by FF-A registered memory reference
* @value: parameter by opaque value
* @octets: parameter by octet string
*
@@ -296,6 +296,18 @@ struct optee_msg_arg {
*/
#define OPTEE_MSG_FUNCID_GET_OS_REVISION 0x0001
+/*
+ * Values used in OPTEE_MSG_CMD_LEND_PROTMEM below
+ * OPTEE_MSG_PROTMEM_RESERVED Reserved
+ * OPTEE_MSG_PROTMEM_SECURE_VIDEO_PLAY Secure Video Playback
+ * OPTEE_MSG_PROTMEM_TRUSTED_UI Trused UI
+ * OPTEE_MSG_PROTMEM_SECURE_VIDEO_RECORD Secure Video Recording
+ */
+#define OPTEE_MSG_PROTMEM_RESERVED 0
+#define OPTEE_MSG_PROTMEM_SECURE_VIDEO_PLAY 1
+#define OPTEE_MSG_PROTMEM_TRUSTED_UI 2
+#define OPTEE_MSG_PROTMEM_SECURE_VIDEO_RECORD 3
+
/*
* Do a secure call with struct optee_msg_arg as argument
* The OPTEE_MSG_CMD_* below defines what goes in struct optee_msg_arg::cmd
@@ -337,15 +349,62 @@ struct optee_msg_arg {
* OPTEE_MSG_CMD_STOP_ASYNC_NOTIF informs secure world that from now is
* normal world unable to process asynchronous notifications. Typically
* used when the driver is shut down.
+ *
+ * OPTEE_MSG_CMD_LEND_PROTMEM lends protected memory. The passed normal
+ * physical memory is protected from normal world access. The memory
+ * should be unmapped prior to this call since it becomes inaccessible
+ * during the request.
+ * Parameters are passed as:
+ * [in] param[0].attr OPTEE_MSG_ATTR_TYPE_VALUE_INPUT
+ * [in] param[0].u.value.a OPTEE_MSG_PROTMEM_* defined above
+ * [in] param[1].attr OPTEE_MSG_ATTR_TYPE_TMEM_INPUT
+ * [in] param[1].u.tmem.buf_ptr physical address
+ * [in] param[1].u.tmem.size size
+ * [in] param[1].u.tmem.shm_ref holds protected memory reference
+ *
+ * OPTEE_MSG_CMD_RECLAIM_PROTMEM reclaims a previously lent protected
+ * memory reference. The physical memory is accessible by the normal world
+ * after this function has return and can be mapped again. The information
+ * is passed as:
+ * [in] param[0].attr OPTEE_MSG_ATTR_TYPE_VALUE_INPUT
+ * [in] param[0].u.value.a holds protected memory cookie
+ *
+ * OPTEE_MSG_CMD_GET_PROTMEM_CONFIG get configuration for a specific
+ * protected memory use case. Parameters are passed as:
+ * [in] param[0].attr OPTEE_MSG_ATTR_TYPE_VALUE_INOUT
+ * [in] param[0].value.a OPTEE_MSG_PROTMEM_*
+ * [in] param[1].attr OPTEE_MSG_ATTR_TYPE_{R,F}MEM_OUTPUT
+ * [in] param[1].u.{r,f}mem Buffer or NULL
+ * [in] param[1].u.{r,f}mem.size Provided size of buffer or 0 for query
+ * output for the protected use case:
+ * [out] param[0].value.a Minimal size of protected memory
+ * [out] param[0].value.b Required alignment of size and start of
+ * protected memory
+ * [out] param[1].{r,f}mem.size Size of output data
+ * [out] param[1].{r,f}mem If non-NULL, contains an array of
+ * uint16_t holding endpoints that
+ * must be included when lending
+ * memory for this use case
+ *
+ * OPTEE_MSG_CMD_ASSIGN_PROTMEM assigns use-case to protected memory
+ * previously lent using the FFA_LEND framework ABI. Parameters are passed
+ * as:
+ * [in] param[0].attr OPTEE_MSG_ATTR_TYPE_VALUE_INPUT
+ * [in] param[0].u.value.a holds protected memory cookie
+ * [in] param[0].u.value.b OPTEE_MSG_PROTMEM_* defined above
*/
-#define OPTEE_MSG_CMD_OPEN_SESSION 0
-#define OPTEE_MSG_CMD_INVOKE_COMMAND 1
-#define OPTEE_MSG_CMD_CLOSE_SESSION 2
-#define OPTEE_MSG_CMD_CANCEL 3
-#define OPTEE_MSG_CMD_REGISTER_SHM 4
-#define OPTEE_MSG_CMD_UNREGISTER_SHM 5
-#define OPTEE_MSG_CMD_DO_BOTTOM_HALF 6
-#define OPTEE_MSG_CMD_STOP_ASYNC_NOTIF 7
-#define OPTEE_MSG_FUNCID_CALL_WITH_ARG 0x0004
+#define OPTEE_MSG_CMD_OPEN_SESSION 0
+#define OPTEE_MSG_CMD_INVOKE_COMMAND 1
+#define OPTEE_MSG_CMD_CLOSE_SESSION 2
+#define OPTEE_MSG_CMD_CANCEL 3
+#define OPTEE_MSG_CMD_REGISTER_SHM 4
+#define OPTEE_MSG_CMD_UNREGISTER_SHM 5
+#define OPTEE_MSG_CMD_DO_BOTTOM_HALF 6
+#define OPTEE_MSG_CMD_STOP_ASYNC_NOTIF 7
+#define OPTEE_MSG_CMD_LEND_PROTMEM 8
+#define OPTEE_MSG_CMD_RECLAIM_PROTMEM 9
+#define OPTEE_MSG_CMD_GET_PROTMEM_CONFIG 10
+#define OPTEE_MSG_CMD_ASSIGN_PROTMEM 11
+#define OPTEE_MSG_FUNCID_CALL_WITH_ARG 0x0004
#endif /* _OPTEE_MSG_H */
diff --git a/drivers/tee/optee/optee_smc.h b/drivers/tee/optee/optee_smc.h
index 879426300821..8d3a22bafbdd 100644
--- a/drivers/tee/optee/optee_smc.h
+++ b/drivers/tee/optee/optee_smc.h
@@ -264,7 +264,6 @@ struct optee_smc_get_shm_config_result {
#define OPTEE_SMC_SEC_CAP_HAVE_RESERVED_SHM BIT(0)
/* Secure world can communicate via previously unregistered shared memory */
#define OPTEE_SMC_SEC_CAP_UNREGISTERED_SHM BIT(1)
-
/*
* Secure world supports commands "register/unregister shared memory",
* secure world accepts command buffers located in any parts of non-secure RAM
@@ -280,6 +279,10 @@ struct optee_smc_get_shm_config_result {
#define OPTEE_SMC_SEC_CAP_RPC_ARG BIT(6)
/* Secure world supports probing for RPMB device if needed */
#define OPTEE_SMC_SEC_CAP_RPMB_PROBE BIT(7)
+/* Secure world supports protected memory */
+#define OPTEE_SMC_SEC_CAP_PROTMEM BIT(8)
+/* Secure world supports dynamic protected memory */
+#define OPTEE_SMC_SEC_CAP_DYNAMIC_PROTMEM BIT(9)
#define OPTEE_SMC_FUNCID_EXCHANGE_CAPABILITIES 9
#define OPTEE_SMC_EXCHANGE_CAPABILITIES \
@@ -451,6 +454,70 @@ struct optee_smc_disable_shm_cache_result {
/* See OPTEE_SMC_CALL_WITH_REGD_ARG above */
#define OPTEE_SMC_FUNCID_CALL_WITH_REGD_ARG 19
+/*
+ * Get protected memory config
+ *
+ * Returns the protected memory config.
+ *
+ * Call register usage:
+ * a0 SMC Function ID, OPTEE_SMC_GET_PROTMEM_CONFIG
+ * a2-6 Not used, must be zero
+ * a7 Hypervisor Client ID register
+ *
+ * Have config return register usage:
+ * a0 OPTEE_SMC_RETURN_OK
+ * a1 Physical address of start of protected memory
+ * a2 Size of protected memory
+ * a3 Not used
+ * a4-7 Preserved
+ *
+ * Not available register usage:
+ * a0 OPTEE_SMC_RETURN_ENOTAVAIL
+ * a1-3 Not used
+ * a4-7 Preserved
+ */
+#define OPTEE_SMC_FUNCID_GET_PROTMEM_CONFIG 20
+#define OPTEE_SMC_GET_PROTMEM_CONFIG \
+ OPTEE_SMC_FAST_CALL_VAL(OPTEE_SMC_FUNCID_GET_PROTMEM_CONFIG)
+
+struct optee_smc_get_protmem_config_result {
+ unsigned long status;
+ unsigned long start;
+ unsigned long size;
+};
+
+/*
+ * Get dynamic protected memory config
+ *
+ * Returns the dynamic protected memory config.
+ *
+ * Call register usage:
+ * a0 SMC Function ID, OPTEE_SMC_GET_DYN_PROTMEM_CONFIG
+ * a2-6 Not used, must be zero
+ * a7 Hypervisor Client ID register
+ *
+ * Have config return register usage:
+ * a0 OPTEE_SMC_RETURN_OK
+ * a1 Minimal size of protected memory
+ * a2 Required alignment of size and start of registered protected memory
+ * a3 Not used
+ * a4-7 Preserved
+ *
+ * Not available register usage:
+ * a0 OPTEE_SMC_RETURN_ENOTAVAIL
+ * a1-3 Not used
+ * a4-7 Preserved
+ */
+
+#define OPTEE_SMC_FUNCID_GET_DYN_PROTMEM_CONFIG 21
+#define OPTEE_SMC_GET_DYN_PROTMEM_CONFIG \
+ OPTEE_SMC_FAST_CALL_VAL(OPTEE_SMC_FUNCID_GET_DYN_PROTMEM_CONFIG)
+
+struct optee_smc_get_dyn_protmem_config_result {
+ unsigned long status;
+ unsigned long size;
+ unsigned long align;
+};
/*
* Resume from RPC (for example after processing a foreign interrupt)
--
2.43.0
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH v8 05/14] dma-buf: dma-heap: export declared functions
2025-05-02 9:59 [PATCH v8 00/14] TEE subsystem for protected dma-buf allocations Jens Wiklander
` (3 preceding siblings ...)
2025-05-02 9:59 ` [PATCH v8 04/14] optee: sync secure world ABI headers Jens Wiklander
@ 2025-05-02 9:59 ` Jens Wiklander
2025-05-02 9:59 ` [PATCH v8 06/14] tee: implement protected DMA-heap Jens Wiklander
` (8 subsequent siblings)
13 siblings, 0 replies; 28+ messages in thread
From: Jens Wiklander @ 2025-05-02 9:59 UTC (permalink / raw)
To: linux-kernel, linux-media, dri-devel, linaro-mm-sig, op-tee,
linux-arm-kernel
Cc: Olivier Masse, Thierry Reding, Yong Wu, Sumit Semwal,
Benjamin Gaignard, Brian Starkey, John Stultz, T . J . Mercier,
Christian König, Sumit Garg, Matthias Brugger,
AngeloGioacchino Del Regno, azarrabi, Simona Vetter, Daniel Stone,
Rouven Czerwinski, Jens Wiklander
Export the dma-buf heap functions declared in <linux/dma-heap.h>.
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
---
drivers/dma-buf/dma-heap.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/dma-buf/dma-heap.c b/drivers/dma-buf/dma-heap.c
index 3cbe87d4a464..cdddf0e24dce 100644
--- a/drivers/dma-buf/dma-heap.c
+++ b/drivers/dma-buf/dma-heap.c
@@ -202,6 +202,7 @@ void *dma_heap_get_drvdata(struct dma_heap *heap)
{
return heap->priv;
}
+EXPORT_SYMBOL(dma_heap_get_drvdata);
/**
* dma_heap_get_name - get heap name
@@ -214,6 +215,7 @@ const char *dma_heap_get_name(struct dma_heap *heap)
{
return heap->name;
}
+EXPORT_SYMBOL(dma_heap_get_name);
/**
* dma_heap_add - adds a heap to dmabuf heaps
@@ -303,6 +305,7 @@ struct dma_heap *dma_heap_add(const struct dma_heap_export_info *exp_info)
kfree(heap);
return err_ret;
}
+EXPORT_SYMBOL(dma_heap_add);
static char *dma_heap_devnode(const struct device *dev, umode_t *mode)
{
--
2.43.0
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH v8 06/14] tee: implement protected DMA-heap
2025-05-02 9:59 [PATCH v8 00/14] TEE subsystem for protected dma-buf allocations Jens Wiklander
` (4 preceding siblings ...)
2025-05-02 9:59 ` [PATCH v8 05/14] dma-buf: dma-heap: export declared functions Jens Wiklander
@ 2025-05-02 9:59 ` Jens Wiklander
2025-05-02 13:59 ` Robin Murphy
2025-05-02 9:59 ` [PATCH v8 07/14] tee: refactor params_from_user() Jens Wiklander
` (7 subsequent siblings)
13 siblings, 1 reply; 28+ messages in thread
From: Jens Wiklander @ 2025-05-02 9:59 UTC (permalink / raw)
To: linux-kernel, linux-media, dri-devel, linaro-mm-sig, op-tee,
linux-arm-kernel
Cc: Olivier Masse, Thierry Reding, Yong Wu, Sumit Semwal,
Benjamin Gaignard, Brian Starkey, John Stultz, T . J . Mercier,
Christian König, Sumit Garg, Matthias Brugger,
AngeloGioacchino Del Regno, azarrabi, Simona Vetter, Daniel Stone,
Rouven Czerwinski, Jens Wiklander
Implement DMA heap for protected DMA-buf allocation in the TEE
subsystem.
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 or differently privileged mode than the kernel itself. This
interface allows to allocate and manage such protected memory buffers
via interaction with a TEE implementation.
The protected 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.
The DMA-heaps are enabled explicitly by the TEE backend driver. The TEE
backend drivers needs to implement protected memory pool to manage the
protected memory.
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
---
drivers/tee/Makefile | 1 +
drivers/tee/tee_heap.c | 470 ++++++++++++++++++++++++++++++++++++++
drivers/tee/tee_private.h | 6 +
include/linux/tee_core.h | 65 ++++++
4 files changed, 542 insertions(+)
create mode 100644 drivers/tee/tee_heap.c
diff --git a/drivers/tee/Makefile b/drivers/tee/Makefile
index 5488cba30bd2..949a6a79fb06 100644
--- a/drivers/tee/Makefile
+++ b/drivers/tee/Makefile
@@ -1,6 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
obj-$(CONFIG_TEE) += tee.o
tee-objs += tee_core.o
+tee-objs += tee_heap.o
tee-objs += tee_shm.o
tee-objs += tee_shm_pool.o
obj-$(CONFIG_OPTEE) += optee/
diff --git a/drivers/tee/tee_heap.c b/drivers/tee/tee_heap.c
new file mode 100644
index 000000000000..d91f0b6be760
--- /dev/null
+++ b/drivers/tee/tee_heap.c
@@ -0,0 +1,470 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (c) 2025, Linaro Limited
+ */
+
+#include <linux/dma-buf.h>
+#include <linux/dma-heap.h>
+#include <linux/genalloc.h>
+#include <linux/module.h>
+#include <linux/scatterlist.h>
+#include <linux/slab.h>
+#include <linux/tee_core.h>
+#include <linux/xarray.h>
+
+#include "tee_private.h"
+
+struct tee_dma_heap {
+ struct dma_heap *heap;
+ enum tee_dma_heap_id id;
+ struct tee_protmem_pool *pool;
+ struct tee_device *teedev;
+ /* Protects pool and teedev above */
+ struct mutex mu;
+};
+
+struct tee_heap_buffer {
+ struct tee_protmem_pool *pool;
+ struct tee_device *teedev;
+ size_t size;
+ size_t offs;
+ struct sg_table table;
+};
+
+struct tee_heap_attachment {
+ struct sg_table table;
+ struct device *dev;
+};
+
+struct tee_protmem_static_pool {
+ struct tee_protmem_pool pool;
+ struct gen_pool *gen_pool;
+ phys_addr_t pa_base;
+};
+
+#if IS_ENABLED(CONFIG_DMABUF_HEAPS)
+static DEFINE_XARRAY_ALLOC(tee_dma_heap);
+
+static int copy_sg_table(struct sg_table *dst, struct sg_table *src)
+{
+ struct scatterlist *dst_sg;
+ struct scatterlist *src_sg;
+ int ret;
+ int i;
+
+ ret = sg_alloc_table(dst, src->orig_nents, GFP_KERNEL);
+ if (ret)
+ return ret;
+
+ dst_sg = dst->sgl;
+ for_each_sgtable_sg(src, src_sg, i) {
+ sg_set_page(dst_sg, sg_page(src_sg), src_sg->length,
+ src_sg->offset);
+ dst_sg = sg_next(dst_sg);
+ }
+
+ return 0;
+}
+
+static int tee_heap_attach(struct dma_buf *dmabuf,
+ struct dma_buf_attachment *attachment)
+{
+ struct tee_heap_buffer *buf = dmabuf->priv;
+ struct tee_heap_attachment *a;
+ int ret;
+
+ a = kzalloc(sizeof(*a), GFP_KERNEL);
+ if (!a)
+ return -ENOMEM;
+
+ ret = copy_sg_table(&a->table, &buf->table);
+ if (ret) {
+ kfree(a);
+ return ret;
+ }
+
+ a->dev = attachment->dev;
+ attachment->priv = a;
+
+ return 0;
+}
+
+static void tee_heap_detach(struct dma_buf *dmabuf,
+ struct dma_buf_attachment *attachment)
+{
+ struct tee_heap_attachment *a = attachment->priv;
+
+ sg_free_table(&a->table);
+ kfree(a);
+}
+
+static struct sg_table *
+tee_heap_map_dma_buf(struct dma_buf_attachment *attachment,
+ enum dma_data_direction direction)
+{
+ struct tee_heap_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 tee_heap_unmap_dma_buf(struct dma_buf_attachment *attachment,
+ struct sg_table *table,
+ enum dma_data_direction direction)
+{
+ struct tee_heap_attachment *a = attachment->priv;
+
+ WARN_ON(&a->table != table);
+
+ dma_unmap_sgtable(attachment->dev, table, direction,
+ DMA_ATTR_SKIP_CPU_SYNC);
+}
+
+static void tee_heap_buf_free(struct dma_buf *dmabuf)
+{
+ struct tee_heap_buffer *buf = dmabuf->priv;
+ struct tee_device *teedev = buf->teedev;
+
+ buf->pool->ops->free(buf->pool, &buf->table);
+ tee_device_put(teedev);
+}
+
+static const struct dma_buf_ops tee_heap_buf_ops = {
+ .attach = tee_heap_attach,
+ .detach = tee_heap_detach,
+ .map_dma_buf = tee_heap_map_dma_buf,
+ .unmap_dma_buf = tee_heap_unmap_dma_buf,
+ .release = tee_heap_buf_free,
+};
+
+static struct dma_buf *tee_dma_heap_alloc(struct dma_heap *heap,
+ unsigned long len, u32 fd_flags,
+ u64 heap_flags)
+{
+ struct tee_dma_heap *h = dma_heap_get_drvdata(heap);
+ DEFINE_DMA_BUF_EXPORT_INFO(exp_info);
+ struct tee_device *teedev = NULL;
+ struct tee_heap_buffer *buf;
+ struct tee_protmem_pool *pool;
+ struct dma_buf *dmabuf;
+ int rc;
+
+ mutex_lock(&h->mu);
+ if (tee_device_get(h->teedev)) {
+ teedev = h->teedev;
+ pool = h->pool;
+ }
+ mutex_unlock(&h->mu);
+
+ if (!teedev)
+ return ERR_PTR(-EINVAL);
+
+ buf = kzalloc(sizeof(*buf), GFP_KERNEL);
+ if (!buf) {
+ dmabuf = ERR_PTR(-ENOMEM);
+ goto err;
+ }
+ buf->size = len;
+ buf->pool = pool;
+ buf->teedev = teedev;
+
+ rc = pool->ops->alloc(pool, &buf->table, len, &buf->offs);
+ if (rc) {
+ dmabuf = ERR_PTR(rc);
+ goto err_kfree;
+ }
+
+ exp_info.ops = &tee_heap_buf_ops;
+ exp_info.size = len;
+ exp_info.priv = buf;
+ exp_info.flags = fd_flags;
+ dmabuf = dma_buf_export(&exp_info);
+ if (IS_ERR(dmabuf))
+ goto err_protmem_free;
+
+ return dmabuf;
+
+err_protmem_free:
+ pool->ops->free(pool, &buf->table);
+err_kfree:
+ kfree(buf);
+err:
+ tee_device_put(h->teedev);
+ return dmabuf;
+}
+
+static const struct dma_heap_ops tee_dma_heap_ops = {
+ .allocate = tee_dma_heap_alloc,
+};
+
+static const char *heap_id_2_name(enum tee_dma_heap_id id)
+{
+ switch (id) {
+ case TEE_DMA_HEAP_SECURE_VIDEO_PLAY:
+ return "protected,secure-video";
+ case TEE_DMA_HEAP_TRUSTED_UI:
+ return "protected,trusted-ui";
+ case TEE_DMA_HEAP_SECURE_VIDEO_RECORD:
+ return "protected,secure-video-record";
+ default:
+ return NULL;
+ }
+}
+
+static int alloc_dma_heap(struct tee_device *teedev, enum tee_dma_heap_id id,
+ struct tee_protmem_pool *pool)
+{
+ struct dma_heap_export_info exp_info = {
+ .ops = &tee_dma_heap_ops,
+ .name = heap_id_2_name(id),
+ };
+ struct tee_dma_heap *h;
+ int rc;
+
+ if (!exp_info.name)
+ return -EINVAL;
+
+ if (xa_reserve(&tee_dma_heap, id, GFP_KERNEL)) {
+ if (!xa_load(&tee_dma_heap, id))
+ return -EEXIST;
+ return -ENOMEM;
+ }
+
+ h = kzalloc(sizeof(*h), GFP_KERNEL);
+ if (!h)
+ return -ENOMEM;
+ h->id = id;
+ h->teedev = teedev;
+ h->pool = pool;
+ mutex_init(&h->mu);
+
+ exp_info.priv = h;
+ h->heap = dma_heap_add(&exp_info);
+ if (IS_ERR(h->heap)) {
+ rc = PTR_ERR(h->heap);
+ kfree(h);
+
+ return rc;
+ }
+
+ /* "can't fail" due to the call to xa_reserve() above */
+ return WARN(xa_store(&tee_dma_heap, id, h, GFP_KERNEL),
+ "xa_store() failed");
+}
+
+int tee_device_register_dma_heap(struct tee_device *teedev,
+ enum tee_dma_heap_id id,
+ struct tee_protmem_pool *pool)
+{
+ struct tee_dma_heap *h;
+ int rc;
+
+ h = xa_load(&tee_dma_heap, id);
+ if (h) {
+ mutex_lock(&h->mu);
+ if (h->teedev) {
+ rc = -EBUSY;
+ } else {
+ h->teedev = teedev;
+ h->pool = pool;
+ rc = 0;
+ }
+ mutex_unlock(&h->mu);
+ } else {
+ rc = alloc_dma_heap(teedev, id, pool);
+ }
+
+ if (rc)
+ dev_err(&teedev->dev, "can't register DMA heap id %d (%s)\n",
+ id, heap_id_2_name(id));
+
+ return rc;
+}
+EXPORT_SYMBOL_GPL(tee_device_register_dma_heap);
+
+void tee_device_unregister_all_dma_heaps(struct tee_device *teedev)
+{
+ struct tee_protmem_pool *pool;
+ struct tee_dma_heap *h;
+ u_long i;
+
+ xa_for_each(&tee_dma_heap, i, h) {
+ if (h) {
+ pool = NULL;
+ mutex_lock(&h->mu);
+ if (h->teedev == teedev) {
+ pool = h->pool;
+ h->teedev = NULL;
+ h->pool = NULL;
+ }
+ mutex_unlock(&h->mu);
+ if (pool)
+ pool->ops->destroy_pool(pool);
+ }
+ }
+}
+EXPORT_SYMBOL_GPL(tee_device_unregister_all_dma_heaps);
+
+int tee_heap_update_from_dma_buf(struct tee_device *teedev,
+ struct dma_buf *dmabuf, size_t *offset,
+ struct tee_shm *shm,
+ struct tee_shm **parent_shm)
+{
+ struct tee_heap_buffer *buf;
+ int rc;
+
+ /* The DMA-buf must be from our heap */
+ if (dmabuf->ops != &tee_heap_buf_ops)
+ return -EINVAL;
+
+ buf = dmabuf->priv;
+ /* The buffer must be from the same teedev */
+ if (buf->teedev != teedev)
+ return -EINVAL;
+
+ shm->size = buf->size;
+
+ rc = buf->pool->ops->update_shm(buf->pool, &buf->table, buf->offs, shm,
+ parent_shm);
+ if (!rc && *parent_shm)
+ *offset = buf->offs;
+
+ return rc;
+}
+#else
+int tee_device_register_dma_heap(struct tee_device *teedev __always_unused,
+ enum tee_dma_heap_id id __always_unused,
+ struct tee_protmem_pool *pool __always_unused)
+{
+ return -EINVAL;
+}
+EXPORT_SYMBOL_GPL(tee_device_register_dma_heap);
+
+void
+tee_device_unregister_all_dma_heaps(struct tee_device *teedev __always_unused)
+{
+}
+EXPORT_SYMBOL_GPL(tee_device_unregister_all_dma_heaps);
+
+int tee_heap_update_from_dma_buf(struct tee_device *teedev __always_unused,
+ struct dma_buf *dmabuf __always_unused,
+ size_t *offset __always_unused,
+ struct tee_shm *shm __always_unused,
+ struct tee_shm **parent_shm __always_unused)
+{
+ return -EINVAL;
+}
+#endif
+
+static struct tee_protmem_static_pool *
+to_protmem_static_pool(struct tee_protmem_pool *pool)
+{
+ return container_of(pool, struct tee_protmem_static_pool, pool);
+}
+
+static int protmem_pool_op_static_alloc(struct tee_protmem_pool *pool,
+ struct sg_table *sgt, size_t size,
+ size_t *offs)
+{
+ struct tee_protmem_static_pool *stp = to_protmem_static_pool(pool);
+ phys_addr_t pa;
+ int ret;
+
+ pa = gen_pool_alloc(stp->gen_pool, size);
+ if (!pa)
+ return -ENOMEM;
+
+ ret = sg_alloc_table(sgt, 1, GFP_KERNEL);
+ if (ret) {
+ gen_pool_free(stp->gen_pool, pa, size);
+ return ret;
+ }
+
+ sg_set_page(sgt->sgl, phys_to_page(pa), size, 0);
+ *offs = pa - stp->pa_base;
+
+ return 0;
+}
+
+static void protmem_pool_op_static_free(struct tee_protmem_pool *pool,
+ struct sg_table *sgt)
+{
+ struct tee_protmem_static_pool *stp = to_protmem_static_pool(pool);
+ struct scatterlist *sg;
+ int i;
+
+ for_each_sgtable_sg(sgt, sg, i)
+ gen_pool_free(stp->gen_pool, sg_phys(sg), sg->length);
+ sg_free_table(sgt);
+}
+
+static int protmem_pool_op_static_update_shm(struct tee_protmem_pool *pool,
+ struct sg_table *sgt, size_t offs,
+ struct tee_shm *shm,
+ struct tee_shm **parent_shm)
+{
+ struct tee_protmem_static_pool *stp = to_protmem_static_pool(pool);
+
+ shm->paddr = stp->pa_base + offs;
+ *parent_shm = NULL;
+
+ return 0;
+}
+
+static void protmem_pool_op_static_destroy_pool(struct tee_protmem_pool *pool)
+{
+ struct tee_protmem_static_pool *stp = to_protmem_static_pool(pool);
+
+ gen_pool_destroy(stp->gen_pool);
+ kfree(stp);
+}
+
+static struct tee_protmem_pool_ops protmem_pool_ops_static = {
+ .alloc = protmem_pool_op_static_alloc,
+ .free = protmem_pool_op_static_free,
+ .update_shm = protmem_pool_op_static_update_shm,
+ .destroy_pool = protmem_pool_op_static_destroy_pool,
+};
+
+struct tee_protmem_pool *tee_protmem_static_pool_alloc(phys_addr_t paddr,
+ size_t size)
+{
+ const size_t page_mask = PAGE_SIZE - 1;
+ struct tee_protmem_static_pool *stp;
+ int rc;
+
+ /* Check it's page aligned */
+ if ((paddr | size) & page_mask)
+ return ERR_PTR(-EINVAL);
+
+ stp = kzalloc(sizeof(*stp), GFP_KERNEL);
+ if (!stp)
+ return ERR_PTR(-ENOMEM);
+
+ stp->gen_pool = gen_pool_create(PAGE_SHIFT, -1);
+ if (!stp->gen_pool) {
+ rc = -ENOMEM;
+ goto err_free;
+ }
+
+ rc = gen_pool_add(stp->gen_pool, paddr, size, -1);
+ if (rc)
+ goto err_free_pool;
+
+ stp->pool.ops = &protmem_pool_ops_static;
+ stp->pa_base = paddr;
+ return &stp->pool;
+
+err_free_pool:
+ gen_pool_destroy(stp->gen_pool);
+err_free:
+ kfree(stp);
+
+ return ERR_PTR(rc);
+}
+EXPORT_SYMBOL_GPL(tee_protmem_static_pool_alloc);
diff --git a/drivers/tee/tee_private.h b/drivers/tee/tee_private.h
index 9bc50605227c..6c6ff5d5eed2 100644
--- a/drivers/tee/tee_private.h
+++ b/drivers/tee/tee_private.h
@@ -8,6 +8,7 @@
#include <linux/cdev.h>
#include <linux/completion.h>
#include <linux/device.h>
+#include <linux/dma-buf.h>
#include <linux/kref.h>
#include <linux/mutex.h>
#include <linux/types.h>
@@ -24,4 +25,9 @@ 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);
+int tee_heap_update_from_dma_buf(struct tee_device *teedev,
+ struct dma_buf *dmabuf, size_t *offset,
+ struct tee_shm *shm,
+ struct tee_shm **parent_shm);
+
#endif /*TEE_PRIVATE_H*/
diff --git a/include/linux/tee_core.h b/include/linux/tee_core.h
index a38494d6b5f4..b8b99c97e00c 100644
--- a/include/linux/tee_core.h
+++ b/include/linux/tee_core.h
@@ -8,9 +8,11 @@
#include <linux/cdev.h>
#include <linux/device.h>
+#include <linux/dma-buf.h>
#include <linux/idr.h>
#include <linux/kref.h>
#include <linux/list.h>
+#include <linux/scatterlist.h>
#include <linux/tee.h>
#include <linux/tee_drv.h>
#include <linux/types.h>
@@ -30,6 +32,12 @@
#define TEE_DEVICE_FLAG_REGISTERED 0x1
#define TEE_MAX_DEV_NAME_LEN 32
+enum tee_dma_heap_id {
+ TEE_DMA_HEAP_SECURE_VIDEO_PLAY = 1,
+ TEE_DMA_HEAP_TRUSTED_UI,
+ TEE_DMA_HEAP_SECURE_VIDEO_RECORD,
+};
+
/**
* struct tee_device - TEE Device representation
* @name: name of device
@@ -116,6 +124,36 @@ struct tee_desc {
u32 flags;
};
+/**
+ * struct tee_protmem_pool - protected memory pool
+ * @ops: operations
+ *
+ * This is an abstract interface where this struct is expected to be
+ * embedded in another struct specific to the implementation.
+ */
+struct tee_protmem_pool {
+ const struct tee_protmem_pool_ops *ops;
+};
+
+/**
+ * struct tee_protmem_pool_ops - protected memory pool operations
+ * @alloc: called when allocating protected memory
+ * @free: called when freeing protected memory
+ * @update_shm: called when registering a dma-buf to update the @shm
+ * with physical address of the buffer or to return the
+ * @parent_shm of the memory pool
+ * @destroy_pool: called when destroying the pool
+ */
+struct tee_protmem_pool_ops {
+ int (*alloc)(struct tee_protmem_pool *pool, struct sg_table *sgt,
+ size_t size, size_t *offs);
+ void (*free)(struct tee_protmem_pool *pool, struct sg_table *sgt);
+ int (*update_shm)(struct tee_protmem_pool *pool, struct sg_table *sgt,
+ size_t offs, struct tee_shm *shm,
+ struct tee_shm **parent_shm);
+ void (*destroy_pool)(struct tee_protmem_pool *pool);
+};
+
/**
* tee_device_alloc() - Allocate a new struct tee_device instance
* @teedesc: Descriptor for this driver
@@ -154,6 +192,11 @@ int tee_device_register(struct tee_device *teedev);
*/
void tee_device_unregister(struct tee_device *teedev);
+int tee_device_register_dma_heap(struct tee_device *teedev,
+ enum tee_dma_heap_id id,
+ struct tee_protmem_pool *pool);
+void tee_device_unregister_all_dma_heaps(struct tee_device *teedev);
+
/**
* tee_device_set_dev_groups() - Set device attribute groups
* @teedev: Device to register
@@ -229,6 +272,28 @@ static inline void tee_shm_pool_free(struct tee_shm_pool *pool)
pool->ops->destroy_pool(pool);
}
+/**
+ * tee_protmem_static_pool_alloc() - Create a protected 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_protmem_pool *tee_protmem_static_pool_alloc(phys_addr_t paddr,
+ size_t size);
+
+/**
+ * tee_protmem_pool_free() - Free a protected memory pool
+ * @pool: The protected memory pool to free
+ *
+ * There must be no remaining protected memory allocated from this pool
+ * when this function is called.
+ */
+static inline void tee_protmem_pool_free(struct tee_protmem_pool *pool)
+{
+ pool->ops->destroy_pool(pool);
+}
+
/**
* tee_get_drvdata() - Return driver_data pointer
* @returns the driver_data pointer supplied to tee_register().
--
2.43.0
^ permalink raw reply related [flat|nested] 28+ messages in thread* Re: [PATCH v8 06/14] tee: implement protected DMA-heap
2025-05-02 9:59 ` [PATCH v8 06/14] tee: implement protected DMA-heap Jens Wiklander
@ 2025-05-02 13:59 ` Robin Murphy
2025-05-06 6:50 ` Jens Wiklander
0 siblings, 1 reply; 28+ messages in thread
From: Robin Murphy @ 2025-05-02 13:59 UTC (permalink / raw)
To: Jens Wiklander, linux-kernel, linux-media, dri-devel,
linaro-mm-sig, op-tee, linux-arm-kernel
Cc: Olivier Masse, Thierry Reding, Yong Wu, Sumit Semwal,
Benjamin Gaignard, Brian Starkey, John Stultz, T . J . Mercier,
Christian König, Sumit Garg, Matthias Brugger,
AngeloGioacchino Del Regno, azarrabi, Simona Vetter, Daniel Stone,
Rouven Czerwinski
On 02/05/2025 10:59 am, Jens Wiklander wrote:
> Implement DMA heap for protected DMA-buf allocation in the TEE
> subsystem.
>
> 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 or differently privileged mode than the kernel itself. This
> interface allows to allocate and manage such protected memory buffers
> via interaction with a TEE implementation.
>
> The protected 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.
>
> The DMA-heaps are enabled explicitly by the TEE backend driver. The TEE
> backend drivers needs to implement protected memory pool to manage the
> protected memory.
[...]> +static struct sg_table *
> +tee_heap_map_dma_buf(struct dma_buf_attachment *attachment,
> + enum dma_data_direction direction)
> +{
> + struct tee_heap_attachment *a = attachment->priv;
> + int ret;
> +
> + ret = dma_map_sgtable(attachment->dev, &a->table, direction,
> + DMA_ATTR_SKIP_CPU_SYNC);
If the memory is inaccessible to the kernel, what does this DMA mapping
even mean? What happens when it tries to perform cache maintenance or
bounce-buffering on inaccessible memory (which presumably doesn't even
have a VA if it's not usable as normal kernel memory)?
If we're simply housekeeping the TEE's resources on its behalf, and
giving it back some token to tell it which resource to go do its thing
with, then that's really not "DMA" as far as the kernel is concerned.
[...]
> +static int protmem_pool_op_static_alloc(struct tee_protmem_pool *pool,
> + struct sg_table *sgt, size_t size,
> + size_t *offs)
> +{
> + struct tee_protmem_static_pool *stp = to_protmem_static_pool(pool);
> + phys_addr_t pa;
> + int ret;
> +
> + pa = gen_pool_alloc(stp->gen_pool, size);
> + if (!pa)
> + return -ENOMEM;
> +
> + ret = sg_alloc_table(sgt, 1, GFP_KERNEL);
> + if (ret) {
> + gen_pool_free(stp->gen_pool, pa, size);
> + return ret;
> + }
> +
> + sg_set_page(sgt->sgl, phys_to_page(pa), size, 0);
Where does "pa" come from here (i.e. what's the provenance of the
initial "paddr" passed to tee_protmem_static_pool_alloc())? In general
we can't call {phys,pfn}_to_page() an arbitrary addresses without
checking pfn_valid() first. A bogus address might even crash
__pfn_to_page() itself under CONFIG_SPARSEMEM.
Thanks,
Robin.
> + *offs = pa - stp->pa_base;
> +
> + return 0;
> +}
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: [PATCH v8 06/14] tee: implement protected DMA-heap
2025-05-02 13:59 ` Robin Murphy
@ 2025-05-06 6:50 ` Jens Wiklander
0 siblings, 0 replies; 28+ messages in thread
From: Jens Wiklander @ 2025-05-06 6:50 UTC (permalink / raw)
To: Robin Murphy
Cc: linux-kernel, linux-media, dri-devel, linaro-mm-sig, op-tee,
linux-arm-kernel, Olivier Masse, Thierry Reding, Yong Wu,
Sumit Semwal, Benjamin Gaignard, Brian Starkey, John Stultz,
T . J . Mercier, Christian König, Sumit Garg,
Matthias Brugger, AngeloGioacchino Del Regno, azarrabi,
Simona Vetter, Daniel Stone, Rouven Czerwinski
Hi,
On Fri, May 2, 2025 at 3:59 PM Robin Murphy <robin.murphy@arm.com> wrote:
>
> On 02/05/2025 10:59 am, Jens Wiklander wrote:
> > Implement DMA heap for protected DMA-buf allocation in the TEE
> > subsystem.
> >
> > 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 or differently privileged mode than the kernel itself. This
> > interface allows to allocate and manage such protected memory buffers
> > via interaction with a TEE implementation.
> >
> > The protected 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.
> >
> > The DMA-heaps are enabled explicitly by the TEE backend driver. The TEE
> > backend drivers needs to implement protected memory pool to manage the
> > protected memory.
>
> [...]> +static struct sg_table *
> > +tee_heap_map_dma_buf(struct dma_buf_attachment *attachment,
> > + enum dma_data_direction direction)
> > +{
> > + struct tee_heap_attachment *a = attachment->priv;
> > + int ret;
> > +
> > + ret = dma_map_sgtable(attachment->dev, &a->table, direction,
> > + DMA_ATTR_SKIP_CPU_SYNC);
>
> If the memory is inaccessible to the kernel, what does this DMA mapping
> even mean? What happens when it tries to perform cache maintenance or
> bounce-buffering on inaccessible memory (which presumably doesn't even
> have a VA if it's not usable as normal kernel memory)?
Doesn't DMA_ATTR_SKIP_CPU_SYNC say that the kernel shouldn't perform
cache maintenance on the buffer since it's already in the device
domain? The device is expected to be permitted to access the memory.
>
> If we're simply housekeeping the TEE's resources on its behalf, and
> giving it back some token to tell it which resource to go do its thing
> with, then that's really not "DMA" as far as the kernel is concerned.
These buffers are supposed to be passed to devices that might be under
only partial control of the kernel.
>
> [...]
> > +static int protmem_pool_op_static_alloc(struct tee_protmem_pool *pool,
> > + struct sg_table *sgt, size_t size,
> > + size_t *offs)
> > +{
> > + struct tee_protmem_static_pool *stp = to_protmem_static_pool(pool);
> > + phys_addr_t pa;
> > + int ret;
> > +
> > + pa = gen_pool_alloc(stp->gen_pool, size);
> > + if (!pa)
> > + return -ENOMEM;
> > +
> > + ret = sg_alloc_table(sgt, 1, GFP_KERNEL);
> > + if (ret) {
> > + gen_pool_free(stp->gen_pool, pa, size);
> > + return ret;
> > + }
> > +
> > + sg_set_page(sgt->sgl, phys_to_page(pa), size, 0);
>
> Where does "pa" come from here (i.e. what's the provenance of the
> initial "paddr" passed to tee_protmem_static_pool_alloc())? In general
> we can't call {phys,pfn}_to_page() an arbitrary addresses without
> checking pfn_valid() first. A bogus address might even crash
> __pfn_to_page() itself under CONFIG_SPARSEMEM.
That's a good point. Would it be enough to check the address with
pfn_valid() in tee_protmem_static_pool_alloc()?
I expect that the memory is normally carved out of DDR and made secure
or protected in a platform-specific way, either at boot with a static
carveout or dynamically after boot.
Thanks,
Jens
>
> Thanks,
> Robin.
>
> > + *offs = pa - stp->pa_base;
> > +
> > + return 0;
> > +}
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH v8 07/14] tee: refactor params_from_user()
2025-05-02 9:59 [PATCH v8 00/14] TEE subsystem for protected dma-buf allocations Jens Wiklander
` (5 preceding siblings ...)
2025-05-02 9:59 ` [PATCH v8 06/14] tee: implement protected DMA-heap Jens Wiklander
@ 2025-05-02 9:59 ` Jens Wiklander
2025-05-07 12:53 ` Sumit Garg
2025-05-02 9:59 ` [PATCH v8 08/14] tee: new ioctl to a register tee_shm from a dmabuf file descriptor Jens Wiklander
` (6 subsequent siblings)
13 siblings, 1 reply; 28+ messages in thread
From: Jens Wiklander @ 2025-05-02 9:59 UTC (permalink / raw)
To: linux-kernel, linux-media, dri-devel, linaro-mm-sig, op-tee,
linux-arm-kernel
Cc: Olivier Masse, Thierry Reding, Yong Wu, Sumit Semwal,
Benjamin Gaignard, Brian Starkey, John Stultz, T . J . Mercier,
Christian König, Sumit Garg, Matthias Brugger,
AngeloGioacchino Del Regno, azarrabi, Simona Vetter, Daniel Stone,
Rouven Czerwinski, Jens Wiklander
Break out the memref handling into a separate helper function.
No change in behavior.
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
---
drivers/tee/tee_core.c | 94 ++++++++++++++++++++++++------------------
1 file changed, 54 insertions(+), 40 deletions(-)
diff --git a/drivers/tee/tee_core.c b/drivers/tee/tee_core.c
index 685afcaa3ea1..820e394b9054 100644
--- a/drivers/tee/tee_core.c
+++ b/drivers/tee/tee_core.c
@@ -353,6 +353,55 @@ tee_ioctl_shm_register(struct tee_context *ctx,
return ret;
}
+static int param_from_user_memref(struct tee_context *ctx,
+ struct tee_param_memref *memref,
+ struct tee_ioctl_param *ip)
+{
+ struct tee_shm *shm;
+
+ /*
+ * If a NULL pointer is passed to a TA in the TEE,
+ * the ip.c IOCTL parameters is set to TEE_MEMREF_NULL
+ * indicating a NULL memory reference.
+ */
+ if (ip->c != TEE_MEMREF_NULL) {
+ /*
+ * If we fail to get a pointer to a shared
+ * memory object (and increase the ref count)
+ * from an identifier we return an error. All
+ * pointers that has been added in params have
+ * an increased ref count. It's the callers
+ * responibility to do tee_shm_put() on all
+ * resolved pointers.
+ */
+ shm = tee_shm_get_from_id(ctx, ip->c);
+ if (IS_ERR(shm))
+ return PTR_ERR(shm);
+
+ /*
+ * Ensure offset + size does not overflow
+ * offset and does not overflow the size of
+ * the referred shared memory object.
+ */
+ if ((ip->a + ip->b) < ip->a ||
+ (ip->a + ip->b) > shm->size) {
+ tee_shm_put(shm);
+ return -EINVAL;
+ }
+ } else if (ctx->cap_memref_null) {
+ /* Pass NULL pointer to OP-TEE */
+ shm = NULL;
+ } else {
+ return -EINVAL;
+ }
+
+ memref->shm_offs = ip->a;
+ memref->size = ip->b;
+ memref->shm = shm;
+
+ return 0;
+}
+
static int params_from_user(struct tee_context *ctx, struct tee_param *params,
size_t num_params,
struct tee_ioctl_param __user *uparams)
@@ -360,8 +409,8 @@ static int params_from_user(struct tee_context *ctx, struct tee_param *params,
size_t n;
for (n = 0; n < num_params; n++) {
- struct tee_shm *shm;
struct tee_ioctl_param ip;
+ int rc;
if (copy_from_user(&ip, uparams + n, sizeof(ip)))
return -EFAULT;
@@ -384,45 +433,10 @@ static int params_from_user(struct tee_context *ctx, struct tee_param *params,
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 a NULL pointer is passed to a TA in the TEE,
- * the ip.c IOCTL parameters is set to TEE_MEMREF_NULL
- * indicating a NULL memory reference.
- */
- if (ip.c != TEE_MEMREF_NULL) {
- /*
- * If we fail to get a pointer to a shared
- * memory object (and increase the ref count)
- * from an identifier we return an error. All
- * pointers that has been added in params have
- * an increased ref count. It's the callers
- * responibility to do tee_shm_put() on all
- * resolved pointers.
- */
- shm = tee_shm_get_from_id(ctx, ip.c);
- if (IS_ERR(shm))
- return PTR_ERR(shm);
-
- /*
- * Ensure offset + size does not overflow
- * offset and does not overflow the size of
- * the referred shared memory object.
- */
- if ((ip.a + ip.b) < ip.a ||
- (ip.a + ip.b) > shm->size) {
- tee_shm_put(shm);
- return -EINVAL;
- }
- } else if (ctx->cap_memref_null) {
- /* Pass NULL pointer to OP-TEE */
- shm = NULL;
- } else {
- return -EINVAL;
- }
-
- params[n].u.memref.shm_offs = ip.a;
- params[n].u.memref.size = ip.b;
- params[n].u.memref.shm = shm;
+ rc = param_from_user_memref(ctx, ¶ms[n].u.memref,
+ &ip);
+ if (rc)
+ return rc;
break;
default:
/* Unknown attribute */
--
2.43.0
^ permalink raw reply related [flat|nested] 28+ messages in thread* Re: [PATCH v8 07/14] tee: refactor params_from_user()
2025-05-02 9:59 ` [PATCH v8 07/14] tee: refactor params_from_user() Jens Wiklander
@ 2025-05-07 12:53 ` Sumit Garg
0 siblings, 0 replies; 28+ messages in thread
From: Sumit Garg @ 2025-05-07 12:53 UTC (permalink / raw)
To: Jens Wiklander
Cc: linux-kernel, linux-media, dri-devel, linaro-mm-sig, op-tee,
linux-arm-kernel, Olivier Masse, Thierry Reding, Yong Wu,
Sumit Semwal, Benjamin Gaignard, Brian Starkey, John Stultz,
T . J . Mercier, Christian König, Matthias Brugger,
AngeloGioacchino Del Regno, azarrabi, Simona Vetter, Daniel Stone,
Rouven Czerwinski
On Fri, May 02, 2025 at 11:59:21AM +0200, Jens Wiklander wrote:
> Break out the memref handling into a separate helper function.
> No change in behavior.
>
> Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
> ---
> drivers/tee/tee_core.c | 94 ++++++++++++++++++++++++------------------
> 1 file changed, 54 insertions(+), 40 deletions(-)
Reviewed-by: Sumit Garg <sumit.garg@oss.qualcomm.com>
-Sumit
>
> diff --git a/drivers/tee/tee_core.c b/drivers/tee/tee_core.c
> index 685afcaa3ea1..820e394b9054 100644
> --- a/drivers/tee/tee_core.c
> +++ b/drivers/tee/tee_core.c
> @@ -353,6 +353,55 @@ tee_ioctl_shm_register(struct tee_context *ctx,
> return ret;
> }
>
> +static int param_from_user_memref(struct tee_context *ctx,
> + struct tee_param_memref *memref,
> + struct tee_ioctl_param *ip)
> +{
> + struct tee_shm *shm;
> +
> + /*
> + * If a NULL pointer is passed to a TA in the TEE,
> + * the ip.c IOCTL parameters is set to TEE_MEMREF_NULL
> + * indicating a NULL memory reference.
> + */
> + if (ip->c != TEE_MEMREF_NULL) {
> + /*
> + * If we fail to get a pointer to a shared
> + * memory object (and increase the ref count)
> + * from an identifier we return an error. All
> + * pointers that has been added in params have
> + * an increased ref count. It's the callers
> + * responibility to do tee_shm_put() on all
> + * resolved pointers.
> + */
> + shm = tee_shm_get_from_id(ctx, ip->c);
> + if (IS_ERR(shm))
> + return PTR_ERR(shm);
> +
> + /*
> + * Ensure offset + size does not overflow
> + * offset and does not overflow the size of
> + * the referred shared memory object.
> + */
> + if ((ip->a + ip->b) < ip->a ||
> + (ip->a + ip->b) > shm->size) {
> + tee_shm_put(shm);
> + return -EINVAL;
> + }
> + } else if (ctx->cap_memref_null) {
> + /* Pass NULL pointer to OP-TEE */
> + shm = NULL;
> + } else {
> + return -EINVAL;
> + }
> +
> + memref->shm_offs = ip->a;
> + memref->size = ip->b;
> + memref->shm = shm;
> +
> + return 0;
> +}
> +
> static int params_from_user(struct tee_context *ctx, struct tee_param *params,
> size_t num_params,
> struct tee_ioctl_param __user *uparams)
> @@ -360,8 +409,8 @@ static int params_from_user(struct tee_context *ctx, struct tee_param *params,
> size_t n;
>
> for (n = 0; n < num_params; n++) {
> - struct tee_shm *shm;
> struct tee_ioctl_param ip;
> + int rc;
>
> if (copy_from_user(&ip, uparams + n, sizeof(ip)))
> return -EFAULT;
> @@ -384,45 +433,10 @@ static int params_from_user(struct tee_context *ctx, struct tee_param *params,
> 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 a NULL pointer is passed to a TA in the TEE,
> - * the ip.c IOCTL parameters is set to TEE_MEMREF_NULL
> - * indicating a NULL memory reference.
> - */
> - if (ip.c != TEE_MEMREF_NULL) {
> - /*
> - * If we fail to get a pointer to a shared
> - * memory object (and increase the ref count)
> - * from an identifier we return an error. All
> - * pointers that has been added in params have
> - * an increased ref count. It's the callers
> - * responibility to do tee_shm_put() on all
> - * resolved pointers.
> - */
> - shm = tee_shm_get_from_id(ctx, ip.c);
> - if (IS_ERR(shm))
> - return PTR_ERR(shm);
> -
> - /*
> - * Ensure offset + size does not overflow
> - * offset and does not overflow the size of
> - * the referred shared memory object.
> - */
> - if ((ip.a + ip.b) < ip.a ||
> - (ip.a + ip.b) > shm->size) {
> - tee_shm_put(shm);
> - return -EINVAL;
> - }
> - } else if (ctx->cap_memref_null) {
> - /* Pass NULL pointer to OP-TEE */
> - shm = NULL;
> - } else {
> - return -EINVAL;
> - }
> -
> - params[n].u.memref.shm_offs = ip.a;
> - params[n].u.memref.size = ip.b;
> - params[n].u.memref.shm = shm;
> + rc = param_from_user_memref(ctx, ¶ms[n].u.memref,
> + &ip);
> + if (rc)
> + return rc;
> break;
> default:
> /* Unknown attribute */
> --
> 2.43.0
>
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH v8 08/14] tee: new ioctl to a register tee_shm from a dmabuf file descriptor
2025-05-02 9:59 [PATCH v8 00/14] TEE subsystem for protected dma-buf allocations Jens Wiklander
` (6 preceding siblings ...)
2025-05-02 9:59 ` [PATCH v8 07/14] tee: refactor params_from_user() Jens Wiklander
@ 2025-05-02 9:59 ` Jens Wiklander
2025-05-02 9:59 ` [PATCH v8 09/14] cma: export cma_alloc() and cma_release() Jens Wiklander
` (5 subsequent siblings)
13 siblings, 0 replies; 28+ messages in thread
From: Jens Wiklander @ 2025-05-02 9:59 UTC (permalink / raw)
To: linux-kernel, linux-media, dri-devel, linaro-mm-sig, op-tee,
linux-arm-kernel
Cc: Olivier Masse, Thierry Reding, Yong Wu, Sumit Semwal,
Benjamin Gaignard, Brian Starkey, John Stultz, T . J . Mercier,
Christian König, Sumit Garg, Matthias Brugger,
AngeloGioacchino Del Regno, azarrabi, Simona Vetter, Daniel Stone,
Rouven Czerwinski, Etienne Carriere, Jens Wiklander
From: Etienne Carriere <etienne.carriere@foss.st.com>
Add a userspace API to create a tee_shm object that refers to a dmabuf
reference.
Userspace registers the dmabuf file descriptor as in a tee_shm object.
The registration is completed with a tee_shm returned file descriptor.
Userspace is free to close the dmabuf file descriptor after it has been
registered since all the resources are now held via the new tee_shm
object.
Closing the tee_shm file descriptor will eventually release all
resources used by the tee_shm object when all references are released.
The new IOCTL, TEE_IOC_SHM_REGISTER_FD, supports dmabuf references to
physically contiguous memory buffers. Dmabuf references acquired from
the TEE DMA-heap can be used as protected memory for Secure Video Path
and such use cases. It depends on the TEE and the TEE driver if dmabuf
references acquired by other means can be used.
A new tee_shm flag is added to identify tee_shm objects built from a
registered dmabuf, TEE_SHM_DMA_BUF.
Signed-off-by: Etienne Carriere <etienne.carriere@foss.st.com>
Signed-off-by: Olivier Masse <olivier.masse@nxp.com>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
---
drivers/tee/tee_core.c | 63 +++++++++++++++++++++-
drivers/tee/tee_private.h | 10 ++++
drivers/tee/tee_shm.c | 111 ++++++++++++++++++++++++++++++++++++--
include/linux/tee_core.h | 1 +
include/linux/tee_drv.h | 10 ++++
include/uapi/linux/tee.h | 31 +++++++++++
6 files changed, 221 insertions(+), 5 deletions(-)
diff --git a/drivers/tee/tee_core.c b/drivers/tee/tee_core.c
index 820e394b9054..d26612ac060b 100644
--- a/drivers/tee/tee_core.c
+++ b/drivers/tee/tee_core.c
@@ -353,11 +353,49 @@ tee_ioctl_shm_register(struct tee_context *ctx,
return ret;
}
+static int
+tee_ioctl_shm_register_fd(struct tee_context *ctx,
+ struct tee_ioctl_shm_register_fd_data __user *udata)
+{
+ struct tee_ioctl_shm_register_fd_data data;
+ struct tee_shm *shm;
+ long ret;
+
+ if (copy_from_user(&data, udata, sizeof(data)))
+ return -EFAULT;
+
+ /* Currently no input flags are supported */
+ if (data.flags)
+ return -EINVAL;
+
+ shm = tee_shm_register_fd(ctx, data.fd);
+ if (IS_ERR(shm))
+ return -EINVAL;
+
+ data.id = shm->id;
+ data.flags = shm->flags;
+ data.size = shm->size;
+
+ if (copy_to_user(udata, &data, sizeof(data)))
+ ret = -EFAULT;
+ else
+ ret = tee_shm_get_fd(shm);
+
+ /*
+ * When user space closes the file descriptor the shared memory
+ * should be freed or if tee_shm_get_fd() failed then it will
+ * be freed immediately.
+ */
+ tee_shm_put(shm);
+ return ret;
+}
+
static int param_from_user_memref(struct tee_context *ctx,
struct tee_param_memref *memref,
struct tee_ioctl_param *ip)
{
struct tee_shm *shm;
+ size_t offs = 0;
/*
* If a NULL pointer is passed to a TA in the TEE,
@@ -388,6 +426,26 @@ static int param_from_user_memref(struct tee_context *ctx,
tee_shm_put(shm);
return -EINVAL;
}
+
+ if (shm->flags & TEE_SHM_DMA_BUF) {
+ struct tee_shm_dmabuf_ref *ref;
+
+ ref = container_of(shm, struct tee_shm_dmabuf_ref, shm);
+ if (ref->parent_shm) {
+ /*
+ * The shm already has one reference to
+ * ref->parent_shm so we are clear of 0.
+ * We're getting another reference since
+ * this shm will be used in the parameter
+ * list instead of the shm we got with
+ * tee_shm_get_from_id() above.
+ */
+ refcount_inc(&ref->parent_shm->refcount);
+ tee_shm_put(shm);
+ shm = ref->parent_shm;
+ offs = ref->offset;
+ }
+ }
} else if (ctx->cap_memref_null) {
/* Pass NULL pointer to OP-TEE */
shm = NULL;
@@ -395,7 +453,7 @@ static int param_from_user_memref(struct tee_context *ctx,
return -EINVAL;
}
- memref->shm_offs = ip->a;
+ memref->shm_offs = ip->a + offs;
memref->size = ip->b;
memref->shm = shm;
@@ -841,6 +899,8 @@ static long tee_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
return tee_ioctl_shm_alloc(ctx, uarg);
case TEE_IOC_SHM_REGISTER:
return tee_ioctl_shm_register(ctx, uarg);
+ case TEE_IOC_SHM_REGISTER_FD:
+ return tee_ioctl_shm_register_fd(ctx, uarg);
case TEE_IOC_OPEN_SESSION:
return tee_ioctl_open_session(ctx, uarg);
case TEE_IOC_INVOKE:
@@ -1302,3 +1362,4 @@ MODULE_AUTHOR("Linaro");
MODULE_DESCRIPTION("TEE Driver");
MODULE_VERSION("1.0");
MODULE_LICENSE("GPL v2");
+MODULE_IMPORT_NS("DMA_BUF");
diff --git a/drivers/tee/tee_private.h b/drivers/tee/tee_private.h
index 6c6ff5d5eed2..308467705da6 100644
--- a/drivers/tee/tee_private.h
+++ b/drivers/tee/tee_private.h
@@ -13,6 +13,16 @@
#include <linux/mutex.h>
#include <linux/types.h>
+/* extra references appended to shm object for registered shared memory */
+struct tee_shm_dmabuf_ref {
+ struct tee_shm shm;
+ size_t offset;
+ struct dma_buf *dmabuf;
+ struct dma_buf_attachment *attach;
+ struct sg_table *sgt;
+ struct tee_shm *parent_shm;
+};
+
int tee_shm_get_fd(struct tee_shm *shm);
bool tee_device_get(struct tee_device *teedev);
diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c
index daf6e5cfd59a..e1ed52ee0a16 100644
--- a/drivers/tee/tee_shm.c
+++ b/drivers/tee/tee_shm.c
@@ -4,6 +4,7 @@
*/
#include <linux/anon_inodes.h>
#include <linux/device.h>
+#include <linux/dma-buf.h>
#include <linux/idr.h>
#include <linux/io.h>
#include <linux/mm.h>
@@ -45,7 +46,23 @@ static void release_registered_pages(struct tee_shm *shm)
static void tee_shm_release(struct tee_device *teedev, struct tee_shm *shm)
{
- if (shm->flags & TEE_SHM_POOL) {
+ struct tee_shm *parent_shm = NULL;
+ void *p = shm;
+
+ if (shm->flags & TEE_SHM_DMA_BUF) {
+ struct tee_shm_dmabuf_ref *ref;
+
+ ref = container_of(shm, struct tee_shm_dmabuf_ref, shm);
+ parent_shm = ref->parent_shm;
+ p = ref;
+ if (ref->attach) {
+ dma_buf_unmap_attachment(ref->attach, ref->sgt,
+ DMA_BIDIRECTIONAL);
+
+ dma_buf_detach(ref->dmabuf, ref->attach);
+ }
+ dma_buf_put(ref->dmabuf);
+ } else if (shm->flags & TEE_SHM_POOL) {
teedev->pool->ops->free(teedev->pool, shm);
} else if (shm->flags & TEE_SHM_DYNAMIC) {
int rc = teedev->desc->ops->shm_unregister(shm->ctx, shm);
@@ -57,9 +74,10 @@ static void tee_shm_release(struct tee_device *teedev, struct tee_shm *shm)
release_registered_pages(shm);
}
- teedev_ctx_put(shm->ctx);
+ if (shm->ctx)
+ teedev_ctx_put(shm->ctx);
- kfree(shm);
+ kfree(p);
tee_device_put(teedev);
}
@@ -169,7 +187,7 @@ struct tee_shm *tee_shm_alloc_user_buf(struct tee_context *ctx, size_t size)
* tee_client_invoke_func(). The memory allocated is later freed with a
* call to tee_shm_free().
*
- * @returns a pointer to 'struct tee_shm'
+ * @returns a pointer to 'struct tee_shm' on success, and ERR_PTR on failure
*/
struct tee_shm *tee_shm_alloc_kernel_buf(struct tee_context *ctx, size_t size)
{
@@ -179,6 +197,91 @@ struct tee_shm *tee_shm_alloc_kernel_buf(struct tee_context *ctx, size_t size)
}
EXPORT_SYMBOL_GPL(tee_shm_alloc_kernel_buf);
+struct tee_shm *tee_shm_register_fd(struct tee_context *ctx, int fd)
+{
+ struct tee_shm_dmabuf_ref *ref;
+ int rc;
+
+ if (!tee_device_get(ctx->teedev))
+ return ERR_PTR(-EINVAL);
+
+ teedev_ctx_get(ctx);
+
+ ref = kzalloc(sizeof(*ref), GFP_KERNEL);
+ if (!ref) {
+ rc = -ENOMEM;
+ goto err_put_tee;
+ }
+
+ refcount_set(&ref->shm.refcount, 1);
+ ref->shm.ctx = ctx;
+ ref->shm.id = -1;
+ ref->shm.flags = TEE_SHM_DMA_BUF;
+
+ ref->dmabuf = dma_buf_get(fd);
+ if (IS_ERR(ref->dmabuf)) {
+ rc = PTR_ERR(ref->dmabuf);
+ goto err_kfree_ref;
+ }
+
+ rc = tee_heap_update_from_dma_buf(ctx->teedev, ref->dmabuf,
+ &ref->offset, &ref->shm,
+ &ref->parent_shm);
+ if (!rc)
+ goto out;
+ if (rc != -EINVAL)
+ goto err_put_dmabuf;
+
+ ref->attach = dma_buf_attach(ref->dmabuf, &ctx->teedev->dev);
+ if (IS_ERR(ref->attach)) {
+ rc = PTR_ERR(ref->attach);
+ goto err_put_dmabuf;
+ }
+
+ ref->sgt = dma_buf_map_attachment(ref->attach, DMA_BIDIRECTIONAL);
+ if (IS_ERR(ref->sgt)) {
+ rc = PTR_ERR(ref->sgt);
+ goto err_detach;
+ }
+
+ if (sg_nents(ref->sgt->sgl) != 1) {
+ rc = -EINVAL;
+ goto err_unmap_attachement;
+ }
+
+ ref->shm.paddr = page_to_phys(sg_page(ref->sgt->sgl));
+ ref->shm.size = ref->sgt->sgl->length;
+
+out:
+ mutex_lock(&ref->shm.ctx->teedev->mutex);
+ ref->shm.id = idr_alloc(&ref->shm.ctx->teedev->idr, &ref->shm,
+ 1, 0, GFP_KERNEL);
+ mutex_unlock(&ref->shm.ctx->teedev->mutex);
+ if (ref->shm.id < 0) {
+ rc = ref->shm.id;
+ if (ref->attach)
+ goto err_unmap_attachement;
+ goto err_put_dmabuf;
+ }
+
+ return &ref->shm;
+
+err_unmap_attachement:
+ dma_buf_unmap_attachment(ref->attach, ref->sgt, DMA_BIDIRECTIONAL);
+err_detach:
+ dma_buf_detach(ref->dmabuf, ref->attach);
+err_put_dmabuf:
+ dma_buf_put(ref->dmabuf);
+err_kfree_ref:
+ kfree(ref);
+err_put_tee:
+ teedev_ctx_put(ctx);
+ tee_device_put(ctx->teedev);
+
+ return ERR_PTR(rc);
+}
+EXPORT_SYMBOL_GPL(tee_shm_register_fd);
+
/**
* tee_shm_alloc_priv_buf() - Allocate shared memory for a privately shared
* kernel buffer
diff --git a/include/linux/tee_core.h b/include/linux/tee_core.h
index b8b99c97e00c..02c07f661349 100644
--- a/include/linux/tee_core.h
+++ b/include/linux/tee_core.h
@@ -28,6 +28,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_DMA_BUF BIT(4) /* Memory with dma-buf handle */
#define TEE_DEVICE_FLAG_REGISTERED 0x1
#define TEE_MAX_DEV_NAME_LEN 32
diff --git a/include/linux/tee_drv.h b/include/linux/tee_drv.h
index a54c203000ed..824f1251de60 100644
--- a/include/linux/tee_drv.h
+++ b/include/linux/tee_drv.h
@@ -116,6 +116,16 @@ struct tee_shm *tee_shm_alloc_kernel_buf(struct tee_context *ctx, size_t size);
struct tee_shm *tee_shm_register_kernel_buf(struct tee_context *ctx,
void *addr, size_t length);
+/**
+ * tee_shm_register_fd() - Register shared memory from file descriptor
+ *
+ * @ctx: Context that allocates the shared memory
+ * @fd: Shared memory file descriptor reference
+ *
+ * @returns a pointer to 'struct tee_shm' on success, and ERR_PTR on failure
+ */
+struct tee_shm *tee_shm_register_fd(struct tee_context *ctx, int fd);
+
/**
* tee_shm_free() - Free shared memory
* @shm: Handle to shared memory to free
diff --git a/include/uapi/linux/tee.h b/include/uapi/linux/tee.h
index d0430bee8292..8ec5f46fbfbe 100644
--- a/include/uapi/linux/tee.h
+++ b/include/uapi/linux/tee.h
@@ -118,6 +118,37 @@ struct tee_ioctl_shm_alloc_data {
#define TEE_IOC_SHM_ALLOC _IOWR(TEE_IOC_MAGIC, TEE_IOC_BASE + 1, \
struct tee_ioctl_shm_alloc_data)
+/**
+ * struct tee_ioctl_shm_register_fd_data - Shared memory registering argument
+ * @fd: [in] File descriptor identifying dmabuf reference
+ * @size: [out] Size of referenced memory
+ * @flags: [in] Flags to/from allocation.
+ * @id: [out] Identifier of the shared memory
+ *
+ * The flags field should currently be zero as input. Updated by the call
+ * with actual flags as defined by TEE_IOCTL_SHM_* above.
+ * This structure is used as argument for TEE_IOC_SHM_REGISTER_FD below.
+ */
+struct tee_ioctl_shm_register_fd_data {
+ __s64 fd;
+ __u64 size;
+ __u32 flags;
+ __s32 id;
+};
+
+/**
+ * TEE_IOC_SHM_REGISTER_FD - register a shared memory from a file descriptor
+ *
+ * Returns a file descriptor on success or < 0 on failure
+ *
+ * The returned file descriptor refers to the shared memory object in the
+ * kernel. The supplied file deccriptor can be closed if it's not needed
+ * for other purposes. The shared memory is freed when the descriptor is
+ * closed.
+ */
+#define TEE_IOC_SHM_REGISTER_FD _IOWR(TEE_IOC_MAGIC, TEE_IOC_BASE + 8, \
+ struct tee_ioctl_shm_register_fd_data)
+
/**
* struct tee_ioctl_buf_data - Variable sized buffer
* @buf_ptr: [in] A __user pointer to a buffer
--
2.43.0
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH v8 09/14] cma: export cma_alloc() and cma_release()
2025-05-02 9:59 [PATCH v8 00/14] TEE subsystem for protected dma-buf allocations Jens Wiklander
` (7 preceding siblings ...)
2025-05-02 9:59 ` [PATCH v8 08/14] tee: new ioctl to a register tee_shm from a dmabuf file descriptor Jens Wiklander
@ 2025-05-02 9:59 ` Jens Wiklander
2025-05-02 15:49 ` Matthew Wilcox
2025-05-02 9:59 ` [PATCH v8 10/14] dma-contiguous: export dma_contiguous_default_area Jens Wiklander
` (4 subsequent siblings)
13 siblings, 1 reply; 28+ messages in thread
From: Jens Wiklander @ 2025-05-02 9:59 UTC (permalink / raw)
To: linux-kernel, linux-media, dri-devel, linaro-mm-sig, op-tee,
linux-arm-kernel
Cc: Olivier Masse, Thierry Reding, Yong Wu, Sumit Semwal,
Benjamin Gaignard, Brian Starkey, John Stultz, T . J . Mercier,
Christian König, Sumit Garg, Matthias Brugger,
AngeloGioacchino Del Regno, azarrabi, Simona Vetter, Daniel Stone,
Rouven Czerwinski, Jens Wiklander, Andrew Morton, linux-mm
Export the two functions cma_alloc() and cma_release().
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-mm@kvack.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
---
mm/cma.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/mm/cma.c b/mm/cma.c
index 15632939f20a..c60901e73a26 100644
--- a/mm/cma.c
+++ b/mm/cma.c
@@ -915,6 +915,7 @@ struct page *cma_alloc(struct cma *cma, unsigned long count,
{
return __cma_alloc(cma, count, align, GFP_KERNEL | (no_warn ? __GFP_NOWARN : 0));
}
+EXPORT_SYMBOL(cma_alloc);
struct folio *cma_alloc_folio(struct cma *cma, int order, gfp_t gfp)
{
@@ -1002,6 +1003,7 @@ bool cma_release(struct cma *cma, const struct page *pages,
return true;
}
+EXPORT_SYMBOL(cma_release);
bool cma_free_folio(struct cma *cma, const struct folio *folio)
{
--
2.43.0
^ permalink raw reply related [flat|nested] 28+ messages in thread* Re: [PATCH v8 09/14] cma: export cma_alloc() and cma_release()
2025-05-02 9:59 ` [PATCH v8 09/14] cma: export cma_alloc() and cma_release() Jens Wiklander
@ 2025-05-02 15:49 ` Matthew Wilcox
2025-05-05 11:38 ` Jens Wiklander
0 siblings, 1 reply; 28+ messages in thread
From: Matthew Wilcox @ 2025-05-02 15:49 UTC (permalink / raw)
To: Jens Wiklander
Cc: linux-kernel, linux-media, dri-devel, linaro-mm-sig, op-tee,
linux-arm-kernel, Olivier Masse, Thierry Reding, Yong Wu,
Sumit Semwal, Benjamin Gaignard, Brian Starkey, John Stultz,
T . J . Mercier, Christian König, Sumit Garg,
Matthias Brugger, AngeloGioacchino Del Regno, azarrabi,
Simona Vetter, Daniel Stone, Rouven Czerwinski, Andrew Morton,
linux-mm
On Fri, May 02, 2025 at 11:59:23AM +0200, Jens Wiklander wrote:
> Export the two functions cma_alloc() and cma_release().
Why? This is clearly part of a larger series, but you've given those of
us who are subscribed to linux-mm absolutely no information about why
you want to do this.
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v8 09/14] cma: export cma_alloc() and cma_release()
2025-05-02 15:49 ` Matthew Wilcox
@ 2025-05-05 11:38 ` Jens Wiklander
0 siblings, 0 replies; 28+ messages in thread
From: Jens Wiklander @ 2025-05-05 11:38 UTC (permalink / raw)
To: Matthew Wilcox
Cc: linux-kernel, linux-media, dri-devel, linaro-mm-sig, op-tee,
linux-arm-kernel, Olivier Masse, Thierry Reding, Yong Wu,
Sumit Semwal, Benjamin Gaignard, Brian Starkey, John Stultz,
T . J . Mercier, Christian König, Sumit Garg,
Matthias Brugger, AngeloGioacchino Del Regno, azarrabi,
Simona Vetter, Daniel Stone, Rouven Czerwinski, Andrew Morton,
linux-mm
Hi,
On Fri, May 2, 2025 at 5:50 PM Matthew Wilcox <willy@infradead.org> wrote:
>
> On Fri, May 02, 2025 at 11:59:23AM +0200, Jens Wiklander wrote:
> > Export the two functions cma_alloc() and cma_release().
>
> Why? This is clearly part of a larger series, but you've given those of
> us who are subscribed to linux-mm absolutely no information about why
> you want to do this.
I'm sorry, it's part of this patch: set
https://lore.kernel.org/lkml/20250502100049.1746335-1-jens.wiklander@linaro.org/
I'll CC a bit more in the next version of the patch set.
It's needed if the TEE subsystem is built as a load module.
Thanks,
Jens
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH v8 10/14] dma-contiguous: export dma_contiguous_default_area
2025-05-02 9:59 [PATCH v8 00/14] TEE subsystem for protected dma-buf allocations Jens Wiklander
` (8 preceding siblings ...)
2025-05-02 9:59 ` [PATCH v8 09/14] cma: export cma_alloc() and cma_release() Jens Wiklander
@ 2025-05-02 9:59 ` Jens Wiklander
2025-05-02 13:11 ` Robin Murphy
2025-05-02 9:59 ` [PATCH v8 11/14] tee: add tee_shm_alloc_cma_phys_mem() Jens Wiklander
` (3 subsequent siblings)
13 siblings, 1 reply; 28+ messages in thread
From: Jens Wiklander @ 2025-05-02 9:59 UTC (permalink / raw)
To: linux-kernel, linux-media, dri-devel, linaro-mm-sig, op-tee,
linux-arm-kernel
Cc: Olivier Masse, Thierry Reding, Yong Wu, Sumit Semwal,
Benjamin Gaignard, Brian Starkey, John Stultz, T . J . Mercier,
Christian König, Sumit Garg, Matthias Brugger,
AngeloGioacchino Del Regno, azarrabi, Simona Vetter, Daniel Stone,
Rouven Czerwinski, Jens Wiklander, Marek Szyprowski, Robin Murphy,
iommu
Export the global variable dma_contiguous_default_area so
dev_get_cma_area() can be called a module.
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Robin Murphy <robin.murphy@arm.com>
Cc: iommu@lists.linux.dev
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
---
kernel/dma/contiguous.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/kernel/dma/contiguous.c b/kernel/dma/contiguous.c
index 8df0dfaaca18..eb361794a9c5 100644
--- a/kernel/dma/contiguous.c
+++ b/kernel/dma/contiguous.c
@@ -53,6 +53,7 @@
#endif
struct cma *dma_contiguous_default_area;
+EXPORT_SYMBOL(dma_contiguous_default_area);
/*
* Default global CMA area size can be defined in kernel's .config.
--
2.43.0
^ permalink raw reply related [flat|nested] 28+ messages in thread* Re: [PATCH v8 10/14] dma-contiguous: export dma_contiguous_default_area
2025-05-02 9:59 ` [PATCH v8 10/14] dma-contiguous: export dma_contiguous_default_area Jens Wiklander
@ 2025-05-02 13:11 ` Robin Murphy
2025-05-05 10:00 ` Jens Wiklander
0 siblings, 1 reply; 28+ messages in thread
From: Robin Murphy @ 2025-05-02 13:11 UTC (permalink / raw)
To: Jens Wiklander, linux-kernel, linux-media, dri-devel,
linaro-mm-sig, op-tee, linux-arm-kernel
Cc: Olivier Masse, Thierry Reding, Yong Wu, Sumit Semwal,
Benjamin Gaignard, Brian Starkey, John Stultz, T . J . Mercier,
Christian König, Sumit Garg, Matthias Brugger,
AngeloGioacchino Del Regno, azarrabi, Simona Vetter, Daniel Stone,
Rouven Czerwinski, Marek Szyprowski, iommu
On 02/05/2025 10:59 am, Jens Wiklander wrote:
> Export the global variable dma_contiguous_default_area so
> dev_get_cma_area() can be called a module.
What dma_map_ops implementation is in a module? Without any other
context, I can't help thinking this smells of something sketchy.
Thanks,
Robin.
> Cc: Marek Szyprowski <m.szyprowski@samsung.com>
> Cc: Robin Murphy <robin.murphy@arm.com>
> Cc: iommu@lists.linux.dev
> Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
> ---
> kernel/dma/contiguous.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/kernel/dma/contiguous.c b/kernel/dma/contiguous.c
> index 8df0dfaaca18..eb361794a9c5 100644
> --- a/kernel/dma/contiguous.c
> +++ b/kernel/dma/contiguous.c
> @@ -53,6 +53,7 @@
> #endif
>
> struct cma *dma_contiguous_default_area;
> +EXPORT_SYMBOL(dma_contiguous_default_area);
>
> /*
> * Default global CMA area size can be defined in kernel's .config.
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v8 10/14] dma-contiguous: export dma_contiguous_default_area
2025-05-02 13:11 ` Robin Murphy
@ 2025-05-05 10:00 ` Jens Wiklander
0 siblings, 0 replies; 28+ messages in thread
From: Jens Wiklander @ 2025-05-05 10:00 UTC (permalink / raw)
To: Robin Murphy
Cc: linux-kernel, linux-media, dri-devel, linaro-mm-sig, op-tee,
linux-arm-kernel, Olivier Masse, Thierry Reding, Yong Wu,
Sumit Semwal, Benjamin Gaignard, Brian Starkey, John Stultz,
T . J . Mercier, Christian König, Sumit Garg,
Matthias Brugger, AngeloGioacchino Del Regno, azarrabi,
Simona Vetter, Daniel Stone, Rouven Czerwinski, Marek Szyprowski,
iommu
Hi,
On Fri, May 2, 2025 at 3:11 PM Robin Murphy <robin.murphy@arm.com> wrote:
>
> On 02/05/2025 10:59 am, Jens Wiklander wrote:
> > Export the global variable dma_contiguous_default_area so
> > dev_get_cma_area() can be called a module.
>
> What dma_map_ops implementation is in a module? Without any other
> context, I can't help thinking this smells of something sketchy.
I see that you found the rest of the patch set
https://lore.kernel.org/lkml/20250502100049.1746335-1-jens.wiklander@linaro.org/
Thanks,
Jens
>
> Thanks,
> Robin.
>
> > Cc: Marek Szyprowski <m.szyprowski@samsung.com>
> > Cc: Robin Murphy <robin.murphy@arm.com>
> > Cc: iommu@lists.linux.dev
> > Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
> > ---
> > kernel/dma/contiguous.c | 1 +
> > 1 file changed, 1 insertion(+)
> >
> > diff --git a/kernel/dma/contiguous.c b/kernel/dma/contiguous.c
> > index 8df0dfaaca18..eb361794a9c5 100644
> > --- a/kernel/dma/contiguous.c
> > +++ b/kernel/dma/contiguous.c
> > @@ -53,6 +53,7 @@
> > #endif
> >
> > struct cma *dma_contiguous_default_area;
> > +EXPORT_SYMBOL(dma_contiguous_default_area);
> >
> > /*
> > * Default global CMA area size can be defined in kernel's .config.
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH v8 11/14] tee: add tee_shm_alloc_cma_phys_mem()
2025-05-02 9:59 [PATCH v8 00/14] TEE subsystem for protected dma-buf allocations Jens Wiklander
` (9 preceding siblings ...)
2025-05-02 9:59 ` [PATCH v8 10/14] dma-contiguous: export dma_contiguous_default_area Jens Wiklander
@ 2025-05-02 9:59 ` Jens Wiklander
2025-05-02 15:11 ` Robin Murphy
2025-05-02 9:59 ` [PATCH v8 12/14] optee: support protected memory allocation Jens Wiklander
` (2 subsequent siblings)
13 siblings, 1 reply; 28+ messages in thread
From: Jens Wiklander @ 2025-05-02 9:59 UTC (permalink / raw)
To: linux-kernel, linux-media, dri-devel, linaro-mm-sig, op-tee,
linux-arm-kernel
Cc: Olivier Masse, Thierry Reding, Yong Wu, Sumit Semwal,
Benjamin Gaignard, Brian Starkey, John Stultz, T . J . Mercier,
Christian König, Sumit Garg, Matthias Brugger,
AngeloGioacchino Del Regno, azarrabi, Simona Vetter, Daniel Stone,
Rouven Czerwinski, Jens Wiklander
Add tee_shm_alloc_cma_phys_mem() to allocate a physical memory using
from the default CMA pool. The memory is represented by a tee_shm object
using the new flag TEE_SHM_CMA_BUF to identify it as physical memory
from CMA.
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
---
drivers/tee/tee_shm.c | 55 ++++++++++++++++++++++++++++++++++++++--
include/linux/tee_core.h | 4 +++
2 files changed, 57 insertions(+), 2 deletions(-)
diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c
index e1ed52ee0a16..faaa0a87bb18 100644
--- a/drivers/tee/tee_shm.c
+++ b/drivers/tee/tee_shm.c
@@ -3,8 +3,11 @@
* Copyright (c) 2015-2017, 2019-2021 Linaro Limited
*/
#include <linux/anon_inodes.h>
+#include <linux/cma.h>
#include <linux/device.h>
#include <linux/dma-buf.h>
+#include <linux/dma-map-ops.h>
+#include <linux/highmem.h>
#include <linux/idr.h>
#include <linux/io.h>
#include <linux/mm.h>
@@ -13,7 +16,6 @@
#include <linux/tee_core.h>
#include <linux/uaccess.h>
#include <linux/uio.h>
-#include <linux/highmem.h>
#include "tee_private.h"
static void shm_put_kernel_pages(struct page **pages, size_t page_count)
@@ -49,7 +51,14 @@ static void tee_shm_release(struct tee_device *teedev, struct tee_shm *shm)
struct tee_shm *parent_shm = NULL;
void *p = shm;
- if (shm->flags & TEE_SHM_DMA_BUF) {
+ if (shm->flags & TEE_SHM_CMA_BUF) {
+#if IS_ENABLED(CONFIG_CMA)
+ struct page *page = phys_to_page(shm->paddr);
+ struct cma *cma = dev_get_cma_area(&shm->ctx->teedev->dev);
+
+ cma_release(cma, page, shm->size / PAGE_SIZE);
+#endif
+ } else if (shm->flags & TEE_SHM_DMA_BUF) {
struct tee_shm_dmabuf_ref *ref;
ref = container_of(shm, struct tee_shm_dmabuf_ref, shm);
@@ -306,6 +315,48 @@ struct tee_shm *tee_shm_alloc_priv_buf(struct tee_context *ctx, size_t size)
}
EXPORT_SYMBOL_GPL(tee_shm_alloc_priv_buf);
+struct tee_shm *tee_shm_alloc_cma_phys_mem(struct tee_context *ctx,
+ size_t page_count, size_t align)
+{
+#if IS_ENABLED(CONFIG_CMA)
+ struct tee_device *teedev = ctx->teedev;
+ struct cma *cma = dev_get_cma_area(&teedev->dev);
+ struct tee_shm *shm;
+ struct page *page;
+
+ if (!tee_device_get(teedev))
+ return ERR_PTR(-EINVAL);
+
+ page = cma_alloc(cma, page_count, align, true/*no_warn*/);
+ if (!page)
+ goto err_put_teedev;
+
+ shm = kzalloc(sizeof(*shm), GFP_KERNEL);
+ if (!shm)
+ goto err_cma_crelease;
+
+ refcount_set(&shm->refcount, 1);
+ shm->ctx = ctx;
+ shm->paddr = page_to_phys(page);
+ shm->size = page_count * PAGE_SIZE;
+ shm->flags = TEE_SHM_CMA_BUF;
+
+ teedev_ctx_get(ctx);
+
+ return shm;
+
+err_cma_crelease:
+ cma_release(cma, page, page_count);
+err_put_teedev:
+ tee_device_put(teedev);
+
+ return ERR_PTR(-ENOMEM);
+#else
+ return ERR_PTR(-EINVAL);
+#endif
+}
+EXPORT_SYMBOL_GPL(tee_shm_alloc_cma_phys_mem);
+
int tee_dyn_shm_alloc_helper(struct tee_shm *shm, size_t size, size_t align,
int (*shm_register)(struct tee_context *ctx,
struct tee_shm *shm,
diff --git a/include/linux/tee_core.h b/include/linux/tee_core.h
index 02c07f661349..3a4e1b00fcc7 100644
--- a/include/linux/tee_core.h
+++ b/include/linux/tee_core.h
@@ -29,6 +29,7 @@
#define TEE_SHM_POOL BIT(2) /* Memory allocated from pool */
#define TEE_SHM_PRIV BIT(3) /* Memory private to TEE driver */
#define TEE_SHM_DMA_BUF BIT(4) /* Memory with dma-buf handle */
+#define TEE_SHM_CMA_BUF BIT(5) /* CMA allocated memory */
#define TEE_DEVICE_FLAG_REGISTERED 0x1
#define TEE_MAX_DEV_NAME_LEN 32
@@ -310,6 +311,9 @@ void *tee_get_drvdata(struct tee_device *teedev);
*/
struct tee_shm *tee_shm_alloc_priv_buf(struct tee_context *ctx, size_t size);
+struct tee_shm *tee_shm_alloc_cma_phys_mem(struct tee_context *ctx,
+ size_t page_count, size_t align);
+
int tee_dyn_shm_alloc_helper(struct tee_shm *shm, size_t size, size_t align,
int (*shm_register)(struct tee_context *ctx,
struct tee_shm *shm,
--
2.43.0
^ permalink raw reply related [flat|nested] 28+ messages in thread* Re: [PATCH v8 11/14] tee: add tee_shm_alloc_cma_phys_mem()
2025-05-02 9:59 ` [PATCH v8 11/14] tee: add tee_shm_alloc_cma_phys_mem() Jens Wiklander
@ 2025-05-02 15:11 ` Robin Murphy
2025-05-07 16:32 ` Jens Wiklander
0 siblings, 1 reply; 28+ messages in thread
From: Robin Murphy @ 2025-05-02 15:11 UTC (permalink / raw)
To: Jens Wiklander, linux-kernel, linux-media, dri-devel,
linaro-mm-sig, op-tee, linux-arm-kernel
Cc: Olivier Masse, Thierry Reding, Yong Wu, Sumit Semwal,
Benjamin Gaignard, Brian Starkey, John Stultz, T . J . Mercier,
Christian König, Sumit Garg, Matthias Brugger,
AngeloGioacchino Del Regno, azarrabi, Simona Vetter, Daniel Stone,
Rouven Czerwinski
On 02/05/2025 10:59 am, Jens Wiklander wrote:
> Add tee_shm_alloc_cma_phys_mem() to allocate a physical memory using
> from the default CMA pool. The memory is represented by a tee_shm object
> using the new flag TEE_SHM_CMA_BUF to identify it as physical memory
> from CMA.
If and when it's possible to dynamically delegate any old kernel memory
to the TEE, it's far from clear why that should involve poking around in
CMA internals...
> Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
> ---
> drivers/tee/tee_shm.c | 55 ++++++++++++++++++++++++++++++++++++++--
> include/linux/tee_core.h | 4 +++
> 2 files changed, 57 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c
> index e1ed52ee0a16..faaa0a87bb18 100644
> --- a/drivers/tee/tee_shm.c
> +++ b/drivers/tee/tee_shm.c
> @@ -3,8 +3,11 @@
> * Copyright (c) 2015-2017, 2019-2021 Linaro Limited
> */
> #include <linux/anon_inodes.h>
> +#include <linux/cma.h>
> #include <linux/device.h>
> #include <linux/dma-buf.h>
> +#include <linux/dma-map-ops.h>
> +#include <linux/highmem.h>
> #include <linux/idr.h>
> #include <linux/io.h>
> #include <linux/mm.h>
> @@ -13,7 +16,6 @@
> #include <linux/tee_core.h>
> #include <linux/uaccess.h>
> #include <linux/uio.h>
> -#include <linux/highmem.h>
> #include "tee_private.h"
>
> static void shm_put_kernel_pages(struct page **pages, size_t page_count)
> @@ -49,7 +51,14 @@ static void tee_shm_release(struct tee_device *teedev, struct tee_shm *shm)
> struct tee_shm *parent_shm = NULL;
> void *p = shm;
>
> - if (shm->flags & TEE_SHM_DMA_BUF) {
> + if (shm->flags & TEE_SHM_CMA_BUF) {
> +#if IS_ENABLED(CONFIG_CMA)
> + struct page *page = phys_to_page(shm->paddr);
> + struct cma *cma = dev_get_cma_area(&shm->ctx->teedev->dev);
If you want dma_contiguous_default_area as the commit message implies,
use dma_contiguous_default_area. Appearing to support per-device CMA
pools but relying on the device not having one is pretty yucky.
But again, why? If you want page-backed DMA-able memory, with all the
other assumptions being made here, you may as well just rely on
dma_alloc_pages(DMA_ATTR_SKIP_CPU_SYNC) doing what you want, while also
being potentially more flexible for !CMA and non-invasive. Or at the
very least, could the TEE delegation not be composed on top of the
existing CMA heap allocator?
Thanks,
Robin.
> +
> + cma_release(cma, page, shm->size / PAGE_SIZE);
> +#endif
> + } else if (shm->flags & TEE_SHM_DMA_BUF) {
> struct tee_shm_dmabuf_ref *ref;
>
> ref = container_of(shm, struct tee_shm_dmabuf_ref, shm);
> @@ -306,6 +315,48 @@ struct tee_shm *tee_shm_alloc_priv_buf(struct tee_context *ctx, size_t size)
> }
> EXPORT_SYMBOL_GPL(tee_shm_alloc_priv_buf);
>
> +struct tee_shm *tee_shm_alloc_cma_phys_mem(struct tee_context *ctx,
> + size_t page_count, size_t align)
> +{
> +#if IS_ENABLED(CONFIG_CMA)
> + struct tee_device *teedev = ctx->teedev;
> + struct cma *cma = dev_get_cma_area(&teedev->dev);
> + struct tee_shm *shm;
> + struct page *page;
> +
> + if (!tee_device_get(teedev))
> + return ERR_PTR(-EINVAL);
> +
> + page = cma_alloc(cma, page_count, align, true/*no_warn*/);
> + if (!page)
> + goto err_put_teedev;
> +
> + shm = kzalloc(sizeof(*shm), GFP_KERNEL);
> + if (!shm)
> + goto err_cma_crelease;
> +
> + refcount_set(&shm->refcount, 1);
> + shm->ctx = ctx;
> + shm->paddr = page_to_phys(page);
> + shm->size = page_count * PAGE_SIZE;
> + shm->flags = TEE_SHM_CMA_BUF;
> +
> + teedev_ctx_get(ctx);
> +
> + return shm;
> +
> +err_cma_crelease:
> + cma_release(cma, page, page_count);
> +err_put_teedev:
> + tee_device_put(teedev);
> +
> + return ERR_PTR(-ENOMEM);
> +#else
> + return ERR_PTR(-EINVAL);
> +#endif
> +}
> +EXPORT_SYMBOL_GPL(tee_shm_alloc_cma_phys_mem);
> +
> int tee_dyn_shm_alloc_helper(struct tee_shm *shm, size_t size, size_t align,
> int (*shm_register)(struct tee_context *ctx,
> struct tee_shm *shm,
> diff --git a/include/linux/tee_core.h b/include/linux/tee_core.h
> index 02c07f661349..3a4e1b00fcc7 100644
> --- a/include/linux/tee_core.h
> +++ b/include/linux/tee_core.h
> @@ -29,6 +29,7 @@
> #define TEE_SHM_POOL BIT(2) /* Memory allocated from pool */
> #define TEE_SHM_PRIV BIT(3) /* Memory private to TEE driver */
> #define TEE_SHM_DMA_BUF BIT(4) /* Memory with dma-buf handle */
> +#define TEE_SHM_CMA_BUF BIT(5) /* CMA allocated memory */
>
> #define TEE_DEVICE_FLAG_REGISTERED 0x1
> #define TEE_MAX_DEV_NAME_LEN 32
> @@ -310,6 +311,9 @@ void *tee_get_drvdata(struct tee_device *teedev);
> */
> struct tee_shm *tee_shm_alloc_priv_buf(struct tee_context *ctx, size_t size);
>
> +struct tee_shm *tee_shm_alloc_cma_phys_mem(struct tee_context *ctx,
> + size_t page_count, size_t align);
> +
> int tee_dyn_shm_alloc_helper(struct tee_shm *shm, size_t size, size_t align,
> int (*shm_register)(struct tee_context *ctx,
> struct tee_shm *shm,
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: [PATCH v8 11/14] tee: add tee_shm_alloc_cma_phys_mem()
2025-05-02 15:11 ` Robin Murphy
@ 2025-05-07 16:32 ` Jens Wiklander
0 siblings, 0 replies; 28+ messages in thread
From: Jens Wiklander @ 2025-05-07 16:32 UTC (permalink / raw)
To: Robin Murphy
Cc: linux-kernel, linux-media, dri-devel, linaro-mm-sig, op-tee,
linux-arm-kernel, Olivier Masse, Thierry Reding, Yong Wu,
Sumit Semwal, Benjamin Gaignard, Brian Starkey, John Stultz,
T . J . Mercier, Christian König, Sumit Garg,
Matthias Brugger, AngeloGioacchino Del Regno, azarrabi,
Simona Vetter, Daniel Stone, Rouven Czerwinski
Hi,
On Fri, May 2, 2025 at 5:11 PM Robin Murphy <robin.murphy@arm.com> wrote:
>
> On 02/05/2025 10:59 am, Jens Wiklander wrote:
> > Add tee_shm_alloc_cma_phys_mem() to allocate a physical memory using
> > from the default CMA pool. The memory is represented by a tee_shm object
> > using the new flag TEE_SHM_CMA_BUF to identify it as physical memory
> > from CMA.
>
> If and when it's possible to dynamically delegate any old kernel memory
> to the TEE, it's far from clear why that should involve poking around in
> CMA internals...
>
> > Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
> > ---
> > drivers/tee/tee_shm.c | 55 ++++++++++++++++++++++++++++++++++++++--
> > include/linux/tee_core.h | 4 +++
> > 2 files changed, 57 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c
> > index e1ed52ee0a16..faaa0a87bb18 100644
> > --- a/drivers/tee/tee_shm.c
> > +++ b/drivers/tee/tee_shm.c
> > @@ -3,8 +3,11 @@
> > * Copyright (c) 2015-2017, 2019-2021 Linaro Limited
> > */
> > #include <linux/anon_inodes.h>
> > +#include <linux/cma.h>
> > #include <linux/device.h>
> > #include <linux/dma-buf.h>
> > +#include <linux/dma-map-ops.h>
> > +#include <linux/highmem.h>
> > #include <linux/idr.h>
> > #include <linux/io.h>
> > #include <linux/mm.h>
> > @@ -13,7 +16,6 @@
> > #include <linux/tee_core.h>
> > #include <linux/uaccess.h>
> > #include <linux/uio.h>
> > -#include <linux/highmem.h>
> > #include "tee_private.h"
> >
> > static void shm_put_kernel_pages(struct page **pages, size_t page_count)
> > @@ -49,7 +51,14 @@ static void tee_shm_release(struct tee_device *teedev, struct tee_shm *shm)
> > struct tee_shm *parent_shm = NULL;
> > void *p = shm;
> >
> > - if (shm->flags & TEE_SHM_DMA_BUF) {
> > + if (shm->flags & TEE_SHM_CMA_BUF) {
> > +#if IS_ENABLED(CONFIG_CMA)
> > + struct page *page = phys_to_page(shm->paddr);
> > + struct cma *cma = dev_get_cma_area(&shm->ctx->teedev->dev);
>
> If you want dma_contiguous_default_area as the commit message implies,
> use dma_contiguous_default_area. Appearing to support per-device CMA
> pools but relying on the device not having one is pretty yucky.
>
> But again, why? If you want page-backed DMA-able memory, with all the
> other assumptions being made here, you may as well just rely on
> dma_alloc_pages(DMA_ATTR_SKIP_CPU_SYNC) doing what you want, while also
> being potentially more flexible for !CMA and non-invasive. Or at the
> very least, could the TEE delegation not be composed on top of the
> existing CMA heap allocator?
Thanks for suggesting dma_alloc_pages(). I'll use that in the next
version of the patch set.
Cheers,
Jens
>
> Thanks,
> Robin.
>
> > +
> > + cma_release(cma, page, shm->size / PAGE_SIZE);
> > +#endif
> > + } else if (shm->flags & TEE_SHM_DMA_BUF) {
> > struct tee_shm_dmabuf_ref *ref;
> >
> > ref = container_of(shm, struct tee_shm_dmabuf_ref, shm);
> > @@ -306,6 +315,48 @@ struct tee_shm *tee_shm_alloc_priv_buf(struct tee_context *ctx, size_t size)
> > }
> > EXPORT_SYMBOL_GPL(tee_shm_alloc_priv_buf);
> >
> > +struct tee_shm *tee_shm_alloc_cma_phys_mem(struct tee_context *ctx,
> > + size_t page_count, size_t align)
> > +{
> > +#if IS_ENABLED(CONFIG_CMA)
> > + struct tee_device *teedev = ctx->teedev;
> > + struct cma *cma = dev_get_cma_area(&teedev->dev);
> > + struct tee_shm *shm;
> > + struct page *page;
> > +
> > + if (!tee_device_get(teedev))
> > + return ERR_PTR(-EINVAL);
> > +
> > + page = cma_alloc(cma, page_count, align, true/*no_warn*/);
> > + if (!page)
> > + goto err_put_teedev;
> > +
> > + shm = kzalloc(sizeof(*shm), GFP_KERNEL);
> > + if (!shm)
> > + goto err_cma_crelease;
> > +
> > + refcount_set(&shm->refcount, 1);
> > + shm->ctx = ctx;
> > + shm->paddr = page_to_phys(page);
> > + shm->size = page_count * PAGE_SIZE;
> > + shm->flags = TEE_SHM_CMA_BUF;
> > +
> > + teedev_ctx_get(ctx);
> > +
> > + return shm;
> > +
> > +err_cma_crelease:
> > + cma_release(cma, page, page_count);
> > +err_put_teedev:
> > + tee_device_put(teedev);
> > +
> > + return ERR_PTR(-ENOMEM);
> > +#else
> > + return ERR_PTR(-EINVAL);
> > +#endif
> > +}
> > +EXPORT_SYMBOL_GPL(tee_shm_alloc_cma_phys_mem);
> > +
> > int tee_dyn_shm_alloc_helper(struct tee_shm *shm, size_t size, size_t align,
> > int (*shm_register)(struct tee_context *ctx,
> > struct tee_shm *shm,
> > diff --git a/include/linux/tee_core.h b/include/linux/tee_core.h
> > index 02c07f661349..3a4e1b00fcc7 100644
> > --- a/include/linux/tee_core.h
> > +++ b/include/linux/tee_core.h
> > @@ -29,6 +29,7 @@
> > #define TEE_SHM_POOL BIT(2) /* Memory allocated from pool */
> > #define TEE_SHM_PRIV BIT(3) /* Memory private to TEE driver */
> > #define TEE_SHM_DMA_BUF BIT(4) /* Memory with dma-buf handle */
> > +#define TEE_SHM_CMA_BUF BIT(5) /* CMA allocated memory */
> >
> > #define TEE_DEVICE_FLAG_REGISTERED 0x1
> > #define TEE_MAX_DEV_NAME_LEN 32
> > @@ -310,6 +311,9 @@ void *tee_get_drvdata(struct tee_device *teedev);
> > */
> > struct tee_shm *tee_shm_alloc_priv_buf(struct tee_context *ctx, size_t size);
> >
> > +struct tee_shm *tee_shm_alloc_cma_phys_mem(struct tee_context *ctx,
> > + size_t page_count, size_t align);
> > +
> > int tee_dyn_shm_alloc_helper(struct tee_shm *shm, size_t size, size_t align,
> > int (*shm_register)(struct tee_context *ctx,
> > struct tee_shm *shm,
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH v8 12/14] optee: support protected memory allocation
2025-05-02 9:59 [PATCH v8 00/14] TEE subsystem for protected dma-buf allocations Jens Wiklander
` (10 preceding siblings ...)
2025-05-02 9:59 ` [PATCH v8 11/14] tee: add tee_shm_alloc_cma_phys_mem() Jens Wiklander
@ 2025-05-02 9:59 ` Jens Wiklander
2025-05-02 9:59 ` [PATCH v8 13/14] optee: FF-A: dynamic " Jens Wiklander
2025-05-02 9:59 ` [PATCH v8 14/14] optee: smc abi: " Jens Wiklander
13 siblings, 0 replies; 28+ messages in thread
From: Jens Wiklander @ 2025-05-02 9:59 UTC (permalink / raw)
To: linux-kernel, linux-media, dri-devel, linaro-mm-sig, op-tee,
linux-arm-kernel
Cc: Olivier Masse, Thierry Reding, Yong Wu, Sumit Semwal,
Benjamin Gaignard, Brian Starkey, John Stultz, T . J . Mercier,
Christian König, Sumit Garg, Matthias Brugger,
AngeloGioacchino Del Regno, azarrabi, Simona Vetter, Daniel Stone,
Rouven Czerwinski, Jens Wiklander
Add support in the OP-TEE backend driver for protected memory
allocation. The support is limited to only the SMC ABI and for secure
video buffers.
OP-TEE is probed for the range of protected physical memory and a
memory pool allocator is initialized if OP-TEE have support for such
memory.
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
---
drivers/tee/optee/core.c | 1 +
drivers/tee/optee/smc_abi.c | 44 +++++++++++++++++++++++++++++++++++--
2 files changed, 43 insertions(+), 2 deletions(-)
diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c
index c75fddc83576..c7fd8040480e 100644
--- a/drivers/tee/optee/core.c
+++ b/drivers/tee/optee/core.c
@@ -181,6 +181,7 @@ void optee_remove_common(struct optee *optee)
tee_device_unregister(optee->supp_teedev);
tee_device_unregister(optee->teedev);
+ tee_device_unregister_all_dma_heaps(optee->teedev);
tee_shm_pool_free(optee->pool);
optee_supp_uninit(&optee->supp);
mutex_destroy(&optee->call_queue.mutex);
diff --git a/drivers/tee/optee/smc_abi.c b/drivers/tee/optee/smc_abi.c
index cfdae266548b..7acb43852c4b 100644
--- a/drivers/tee/optee/smc_abi.c
+++ b/drivers/tee/optee/smc_abi.c
@@ -1620,6 +1620,41 @@ static inline int optee_load_fw(struct platform_device *pdev,
}
#endif
+static int optee_protmem_pool_init(struct optee *optee)
+{
+ enum tee_dma_heap_id heap_id = TEE_DMA_HEAP_SECURE_VIDEO_PLAY;
+ struct tee_protmem_pool *pool;
+ int rc;
+
+ if (optee->smc.sec_caps & OPTEE_SMC_SEC_CAP_PROTMEM) {
+ union {
+ struct arm_smccc_res smccc;
+ struct optee_smc_get_protmem_config_result result;
+ } res;
+
+ optee->smc.invoke_fn(OPTEE_SMC_GET_PROTMEM_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");
+ return 0;
+ }
+
+ pool = tee_protmem_static_pool_alloc(res.result.start,
+ res.result.size);
+ if (IS_ERR(pool))
+ return PTR_ERR(pool);
+
+ rc = tee_device_register_dma_heap(optee->teedev, heap_id, pool);
+ if (rc)
+ goto err;
+ }
+
+ return 0;
+err:
+ pool->ops->destroy_pool(pool);
+ return rc;
+}
+
static int optee_probe(struct platform_device *pdev)
{
optee_invoke_fn *invoke_fn;
@@ -1715,7 +1750,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;
@@ -1788,6 +1823,10 @@ static int optee_probe(struct platform_device *pdev)
pr_info("Asynchronous notifications enabled\n");
}
+ rc = optee_protmem_pool_init(optee);
+ if (rc)
+ goto err_notif_uninit;
+
/*
* Ensure that there are no pre-existing shm objects before enabling
* the shm cache so that there's no chance of receiving an invalid
@@ -1823,6 +1862,7 @@ static int optee_probe(struct platform_device *pdev)
optee_disable_shm_cache(optee);
optee_smc_notif_uninit_irq(optee);
optee_unregister_devices();
+ tee_device_unregister_all_dma_heaps(optee->teedev);
err_notif_uninit:
optee_notif_uninit(optee);
err_close_ctx:
@@ -1839,7 +1879,7 @@ static int optee_probe(struct platform_device *pdev)
tee_device_unregister(optee->teedev);
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
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH v8 13/14] optee: FF-A: dynamic protected memory allocation
2025-05-02 9:59 [PATCH v8 00/14] TEE subsystem for protected dma-buf allocations Jens Wiklander
` (11 preceding siblings ...)
2025-05-02 9:59 ` [PATCH v8 12/14] optee: support protected memory allocation Jens Wiklander
@ 2025-05-02 9:59 ` Jens Wiklander
2025-05-02 9:59 ` [PATCH v8 14/14] optee: smc abi: " Jens Wiklander
13 siblings, 0 replies; 28+ messages in thread
From: Jens Wiklander @ 2025-05-02 9:59 UTC (permalink / raw)
To: linux-kernel, linux-media, dri-devel, linaro-mm-sig, op-tee,
linux-arm-kernel
Cc: Olivier Masse, Thierry Reding, Yong Wu, Sumit Semwal,
Benjamin Gaignard, Brian Starkey, John Stultz, T . J . Mercier,
Christian König, Sumit Garg, Matthias Brugger,
AngeloGioacchino Del Regno, azarrabi, Simona Vetter, Daniel Stone,
Rouven Czerwinski, Jens Wiklander
Add support in the OP-TEE backend driver dynamic protected memory
allocation with FF-A.
The protected memory pools for dynamically allocated protected memory
are instantiated when requested by user-space. This instantiation can
fail if OP-TEE doesn't support the requested use-case of protected
memory.
Restricted memory pools based on a static carveout or dynamic allocation
can coexist for different use-cases. We use only dynamic allocation with
FF-A.
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
---
drivers/tee/optee/Makefile | 1 +
drivers/tee/optee/ffa_abi.c | 147 ++++++++++++-
drivers/tee/optee/optee_private.h | 13 +-
drivers/tee/optee/protmem.c | 330 ++++++++++++++++++++++++++++++
4 files changed, 488 insertions(+), 3 deletions(-)
create mode 100644 drivers/tee/optee/protmem.c
diff --git a/drivers/tee/optee/Makefile b/drivers/tee/optee/Makefile
index a6eff388d300..ad7049c1c107 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 += protmem.o
optee-objs += supp.o
optee-objs += device.o
optee-objs += smc_abi.o
diff --git a/drivers/tee/optee/ffa_abi.c b/drivers/tee/optee/ffa_abi.c
index e4b08cd195f3..e1f02fc42c2f 100644
--- a/drivers/tee/optee/ffa_abi.c
+++ b/drivers/tee/optee/ffa_abi.c
@@ -672,6 +672,124 @@ 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_protmem(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_PROTMEM;
+ 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_protmem(struct optee *optee, struct tee_shm *protmem,
+ u16 *end_points, unsigned int ep_count,
+ u32 use_case)
+{
+ 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 = 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(protmem->paddr);
+ sg_init_table(&sgl, 1);
+ sg_set_page(&sgl, page, protmem->size, 0);
+
+ args.sg = &sgl;
+ rc = mem_ops->memory_lend(&args);
+ kfree(mem_attr);
+ if (rc)
+ return rc;
+
+ rc = do_call_lend_protmem(optee, args.g_handle, use_case);
+ if (rc)
+ goto err_reclaim;
+
+ rc = optee_shm_add_ffa_handle(optee, protmem, args.g_handle);
+ if (rc)
+ goto err_unreg;
+
+ protmem->sec_world_id = args.g_handle;
+
+ return 0;
+
+err_unreg:
+ data = (struct ffa_send_direct_data){
+ .data0 = OPTEE_FFA_RELEASE_PROTMEM,
+ .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_protmem(struct optee *optee,
+ struct tee_shm *protmem)
+{
+ 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 = protmem->sec_world_id;
+ struct ffa_send_direct_data data = {
+ .data0 = OPTEE_FFA_RELEASE_PROTMEM,
+ .data1 = (u32)global_handle,
+ .data2 = (u32)(global_handle >> 32)
+ };
+ int rc;
+
+ optee_shm_rem_ffa_handle(optee, global_handle);
+ protmem->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
*
@@ -833,6 +951,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_protmem = optee_ffa_lend_protmem,
+ .reclaim_protmem = optee_ffa_reclaim_protmem,
};
static void optee_ffa_remove(struct ffa_device *ffa_dev)
@@ -891,6 +1011,25 @@ static int optee_ffa_async_notif_init(struct ffa_device *ffa_dev,
return rc;
}
+static int optee_ffa_protmem_pool_init(struct optee *optee, u32 sec_caps)
+{
+ enum tee_dma_heap_id id = TEE_DMA_HEAP_SECURE_VIDEO_PLAY;
+ struct tee_protmem_pool *pool;
+ int rc = 0;
+
+ if (sec_caps & OPTEE_FFA_SEC_CAP_PROTMEM) {
+ pool = optee_protmem_alloc_cma_pool(optee, id);
+ if (IS_ERR(pool))
+ return PTR_ERR(pool);
+
+ rc = tee_device_register_dma_heap(optee->teedev, id, pool);
+ if (rc)
+ pool->ops->destroy_pool(pool);
+ }
+
+ return rc;
+}
+
static int optee_ffa_probe(struct ffa_device *ffa_dev)
{
const struct ffa_notifier_ops *notif_ops;
@@ -941,7 +1080,7 @@ static int optee_ffa_probe(struct ffa_device *ffa_dev)
optee->pool, optee);
if (IS_ERR(teedev)) {
rc = PTR_ERR(teedev);
- goto err_free_pool;
+ goto err_free_shm_pool;
}
optee->teedev = teedev;
@@ -988,6 +1127,9 @@ static int optee_ffa_probe(struct ffa_device *ffa_dev)
rc);
}
+ if (optee_ffa_protmem_pool_init(optee, sec_caps))
+ pr_info("Protected memory service not available\n");
+
rc = optee_enumerate_devices(PTA_CMD_GET_DEVICES);
if (rc)
goto err_unregister_devices;
@@ -1001,6 +1143,7 @@ static int optee_ffa_probe(struct ffa_device *ffa_dev)
err_unregister_devices:
optee_unregister_devices();
+ tee_device_unregister_all_dma_heaps(optee->teedev);
if (optee->ffa.bottom_half_value != U32_MAX)
notif_ops->notify_relinquish(ffa_dev,
optee->ffa.bottom_half_value);
@@ -1018,7 +1161,7 @@ static int optee_ffa_probe(struct ffa_device *ffa_dev)
tee_device_unregister(optee->supp_teedev);
err_unreg_teedev:
tee_device_unregister(optee->teedev);
-err_free_pool:
+err_free_shm_pool:
tee_shm_pool_free(pool);
err_free_optee:
kfree(optee);
diff --git a/drivers/tee/optee/optee_private.h b/drivers/tee/optee/optee_private.h
index 20eda508dbac..7c53433f6562 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_protmem: lends physically contiguous memory as restricted
+ * memory, inaccessible by the kernel
+ * @reclaim_protmem: reclaims restricted memory previously lent with
+ * @lend_protmem() 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,10 @@ struct optee_ops {
size_t num_params,
const struct optee_msg_param *msg_params,
bool update_out);
+ int (*lend_protmem)(struct optee *optee, struct tee_shm *protmem,
+ u16 *end_points, unsigned int ep_count,
+ u32 use_case);
+ int (*reclaim_protmem)(struct optee *optee, struct tee_shm *protmem);
};
/**
@@ -285,6 +294,8 @@ u32 optee_supp_thrd_req(struct tee_context *ctx, u32 func, size_t num_params,
void optee_supp_init(struct optee_supp *supp);
void optee_supp_uninit(struct optee_supp *supp);
void optee_supp_release(struct optee_supp *supp);
+struct tee_protmem_pool *optee_protmem_alloc_cma_pool(struct optee *optee,
+ enum tee_dma_heap_id id);
int optee_supp_recv(struct tee_context *ctx, u32 *func, u32 *num_params,
struct tee_param *param);
diff --git a/drivers/tee/optee/protmem.c b/drivers/tee/optee/protmem.c
new file mode 100644
index 000000000000..e8d6b750a881
--- /dev/null
+++ b/drivers/tee/optee/protmem.c
@@ -0,0 +1,330 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (c) 2025, Linaro Limited
+ */
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#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_protmem_cma_pool {
+ struct tee_protmem_pool pool;
+ struct gen_pool *gen_pool;
+ struct optee *optee;
+ size_t page_count;
+ u16 *end_points;
+ u_int end_point_count;
+ u_int align;
+ refcount_t refcount;
+ u32 use_case;
+ struct tee_shm *protmem;
+ /* Protects when initializing and tearing down this struct */
+ struct mutex mutex;
+};
+
+static struct optee_protmem_cma_pool *
+to_protmem_cma_pool(struct tee_protmem_pool *pool)
+{
+ return container_of(pool, struct optee_protmem_cma_pool, pool);
+}
+
+static int init_cma_protmem(struct optee_protmem_cma_pool *rp)
+{
+ int rc;
+
+ rp->protmem = tee_shm_alloc_cma_phys_mem(rp->optee->ctx, rp->page_count,
+ rp->align);
+ if (IS_ERR(rp->protmem)) {
+ rc = PTR_ERR(rp->protmem);
+ goto err_null_protmem;
+ }
+
+ /*
+ * TODO unmap the memory range since the physical memory will
+ * become inaccesible after the lend_protmem() call.
+ */
+ rc = rp->optee->ops->lend_protmem(rp->optee, rp->protmem,
+ rp->end_points,
+ rp->end_point_count, rp->use_case);
+ if (rc)
+ goto err_put_shm;
+ rp->protmem->flags |= TEE_SHM_DYNAMIC;
+
+ rp->gen_pool = gen_pool_create(PAGE_SHIFT, -1);
+ if (!rp->gen_pool) {
+ rc = -ENOMEM;
+ goto err_reclaim;
+ }
+
+ rc = gen_pool_add(rp->gen_pool, rp->protmem->paddr,
+ rp->protmem->size, -1);
+ if (rc)
+ goto err_free_pool;
+
+ refcount_set(&rp->refcount, 1);
+ return 0;
+
+err_free_pool:
+ gen_pool_destroy(rp->gen_pool);
+ rp->gen_pool = NULL;
+err_reclaim:
+ rp->optee->ops->reclaim_protmem(rp->optee, rp->protmem);
+err_put_shm:
+ tee_shm_put(rp->protmem);
+err_null_protmem:
+ rp->protmem = NULL;
+ return rc;
+}
+
+static int get_cma_protmem(struct optee_protmem_cma_pool *rp)
+{
+ int rc = 0;
+
+ if (!refcount_inc_not_zero(&rp->refcount)) {
+ mutex_lock(&rp->mutex);
+ if (rp->gen_pool) {
+ /*
+ * 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_protmem(rp);
+ }
+ mutex_unlock(&rp->mutex);
+ }
+
+ return rc;
+}
+
+static void release_cma_protmem(struct optee_protmem_cma_pool *rp)
+{
+ gen_pool_destroy(rp->gen_pool);
+ rp->gen_pool = NULL;
+
+ rp->optee->ops->reclaim_protmem(rp->optee, rp->protmem);
+ rp->protmem->flags &= ~TEE_SHM_DYNAMIC;
+
+ WARN(refcount_read(&rp->protmem->refcount) != 1, "Unexpected refcount");
+ tee_shm_put(rp->protmem);
+ rp->protmem = NULL;
+}
+
+static void put_cma_protmem(struct optee_protmem_cma_pool *rp)
+{
+ if (refcount_dec_and_test(&rp->refcount)) {
+ mutex_lock(&rp->mutex);
+ if (rp->gen_pool)
+ release_cma_protmem(rp);
+ mutex_unlock(&rp->mutex);
+ }
+}
+
+static int protmem_pool_op_cma_alloc(struct tee_protmem_pool *pool,
+ struct sg_table *sgt, size_t size,
+ size_t *offs)
+{
+ struct optee_protmem_cma_pool *rp = to_protmem_cma_pool(pool);
+ size_t sz = ALIGN(size, PAGE_SIZE);
+ phys_addr_t pa;
+ int rc;
+
+ rc = get_cma_protmem(rp);
+ if (rc)
+ return rc;
+
+ pa = gen_pool_alloc(rp->gen_pool, sz);
+ if (!pa) {
+ rc = -ENOMEM;
+ goto err_put;
+ }
+
+ rc = sg_alloc_table(sgt, 1, GFP_KERNEL);
+ if (rc)
+ goto err_free;
+
+ sg_set_page(sgt->sgl, phys_to_page(pa), size, 0);
+ *offs = pa - rp->protmem->paddr;
+
+ return 0;
+err_free:
+ gen_pool_free(rp->gen_pool, pa, size);
+err_put:
+ put_cma_protmem(rp);
+
+ return rc;
+}
+
+static void protmem_pool_op_cma_free(struct tee_protmem_pool *pool,
+ struct sg_table *sgt)
+{
+ struct optee_protmem_cma_pool *rp = to_protmem_cma_pool(pool);
+ struct scatterlist *sg;
+ int i;
+
+ for_each_sgtable_sg(sgt, sg, i)
+ gen_pool_free(rp->gen_pool, sg_phys(sg), sg->length);
+ sg_free_table(sgt);
+ put_cma_protmem(rp);
+}
+
+static int protmem_pool_op_cma_update_shm(struct tee_protmem_pool *pool,
+ struct sg_table *sgt, size_t offs,
+ struct tee_shm *shm,
+ struct tee_shm **parent_shm)
+{
+ struct optee_protmem_cma_pool *rp = to_protmem_cma_pool(pool);
+
+ *parent_shm = rp->protmem;
+
+ return 0;
+}
+
+static void pool_op_cma_destroy_pool(struct tee_protmem_pool *pool)
+{
+ struct optee_protmem_cma_pool *rp = to_protmem_cma_pool(pool);
+
+ mutex_destroy(&rp->mutex);
+ kfree(rp);
+}
+
+static struct tee_protmem_pool_ops protmem_pool_ops_cma = {
+ .alloc = protmem_pool_op_cma_alloc,
+ .free = protmem_pool_op_cma_free,
+ .update_shm = protmem_pool_op_cma_update_shm,
+ .destroy_pool = pool_op_cma_destroy_pool,
+};
+
+static int get_protmem_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_PROTMEM_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;
+}
+
+struct tee_protmem_pool *optee_protmem_alloc_cma_pool(struct optee *optee,
+ enum tee_dma_heap_id id)
+{
+ struct optee_protmem_cma_pool *rp;
+ u32 use_case = id;
+ size_t min_size;
+ int rc;
+
+ rp = kzalloc(sizeof(*rp), GFP_KERNEL);
+ if (!rp)
+ return ERR_PTR(-ENOMEM);
+ rp->use_case = use_case;
+
+ rc = get_protmem_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_protmem_config(optee, use_case, &min_size, &rp->align,
+ rp->end_points, &rp->end_point_count);
+ if (rc)
+ goto err_kfree_eps;
+ }
+
+ rp->pool.ops = &protmem_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);
+}
--
2.43.0
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH v8 14/14] optee: smc abi: dynamic protected memory allocation
2025-05-02 9:59 [PATCH v8 00/14] TEE subsystem for protected dma-buf allocations Jens Wiklander
` (12 preceding siblings ...)
2025-05-02 9:59 ` [PATCH v8 13/14] optee: FF-A: dynamic " Jens Wiklander
@ 2025-05-02 9:59 ` Jens Wiklander
13 siblings, 0 replies; 28+ messages in thread
From: Jens Wiklander @ 2025-05-02 9:59 UTC (permalink / raw)
To: linux-kernel, linux-media, dri-devel, linaro-mm-sig, op-tee,
linux-arm-kernel
Cc: Olivier Masse, Thierry Reding, Yong Wu, Sumit Semwal,
Benjamin Gaignard, Brian Starkey, John Stultz, T . J . Mercier,
Christian König, Sumit Garg, Matthias Brugger,
AngeloGioacchino Del Regno, azarrabi, Simona Vetter, Daniel Stone,
Rouven Czerwinski, Jens Wiklander
Add support in the OP-TEE backend driver for dynamic protected memory
allocation using the SMC ABI.
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
---
drivers/tee/optee/smc_abi.c | 103 +++++++++++++++++++++++++++++-------
1 file changed, 85 insertions(+), 18 deletions(-)
diff --git a/drivers/tee/optee/smc_abi.c b/drivers/tee/optee/smc_abi.c
index 7acb43852c4b..766e7f5a3953 100644
--- a/drivers/tee/optee/smc_abi.c
+++ b/drivers/tee/optee/smc_abi.c
@@ -1001,6 +1001,70 @@ static int optee_smc_do_call_with_arg(struct tee_context *ctx,
return rc;
}
+static int optee_smc_lend_protmem(struct optee *optee, struct tee_shm *protmem,
+ u16 *end_points, unsigned int ep_count,
+ 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, 2, &entry, &shm, &offs);
+ if (IS_ERR(msg_arg))
+ return PTR_ERR(msg_arg);
+
+ msg_arg->cmd = OPTEE_MSG_CMD_LEND_PROTMEM;
+ msg_arg->params[0].attr = OPTEE_MSG_ATTR_TYPE_VALUE_INPUT;
+ msg_arg->params[0].u.value.a = use_case;
+ msg_arg->params[1].attr = OPTEE_MSG_ATTR_TYPE_TMEM_INPUT;
+ msg_arg->params[1].u.tmem.buf_ptr = protmem->paddr;
+ msg_arg->params[1].u.tmem.size = protmem->size;
+ msg_arg->params[1].u.tmem.shm_ref = (u_long)protmem;
+
+ 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;
+ }
+ protmem->sec_world_id = (u_long)protmem;
+
+out:
+ optee_free_msg_arg(optee->ctx, entry, offs);
+ return rc;
+}
+
+static int optee_smc_reclaim_protmem(struct optee *optee,
+ struct tee_shm *protmem)
+{
+ 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_PROTMEM;
+ msg_arg->params[0].attr = OPTEE_MSG_ATTR_TYPE_RMEM_INPUT;
+ msg_arg->params[0].u.rmem.shm_ref = (u_long)protmem;
+
+ 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
*/
@@ -1252,6 +1316,8 @@ 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_protmem = optee_smc_lend_protmem,
+ .reclaim_protmem = optee_smc_reclaim_protmem,
};
static int enable_async_notif(optee_invoke_fn *invoke_fn)
@@ -1622,11 +1688,14 @@ static inline int optee_load_fw(struct platform_device *pdev,
static int optee_protmem_pool_init(struct optee *optee)
{
+ bool protm = optee->smc.sec_caps & OPTEE_SMC_SEC_CAP_PROTMEM;
+ bool dyn_protm = optee->smc.sec_caps &
+ OPTEE_SMC_SEC_CAP_DYNAMIC_PROTMEM;
enum tee_dma_heap_id heap_id = TEE_DMA_HEAP_SECURE_VIDEO_PLAY;
- struct tee_protmem_pool *pool;
- int rc;
+ struct tee_protmem_pool *pool = ERR_PTR(-EINVAL);
+ int rc = -EINVAL;
- if (optee->smc.sec_caps & OPTEE_SMC_SEC_CAP_PROTMEM) {
+ if (protm) {
union {
struct arm_smccc_res smccc;
struct optee_smc_get_protmem_config_result result;
@@ -1634,25 +1703,24 @@ static int optee_protmem_pool_init(struct optee *optee)
optee->smc.invoke_fn(OPTEE_SMC_GET_PROTMEM_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");
- return 0;
- }
+ if (res.result.status == OPTEE_SMC_RETURN_OK)
+ pool = tee_protmem_static_pool_alloc(res.result.start,
+ res.result.size);
+ }
- pool = tee_protmem_static_pool_alloc(res.result.start,
- res.result.size);
- if (IS_ERR(pool))
- return PTR_ERR(pool);
+ if (dyn_protm && IS_ERR(pool))
+ pool = optee_protmem_alloc_cma_pool(optee, heap_id);
+ if (!IS_ERR(pool)) {
rc = tee_device_register_dma_heap(optee->teedev, heap_id, pool);
if (rc)
- goto err;
+ pool->ops->destroy_pool(pool);
}
+ if (protm || dyn_protm)
+ return rc;
+
return 0;
-err:
- pool->ops->destroy_pool(pool);
- return rc;
}
static int optee_probe(struct platform_device *pdev)
@@ -1823,9 +1891,8 @@ static int optee_probe(struct platform_device *pdev)
pr_info("Asynchronous notifications enabled\n");
}
- rc = optee_protmem_pool_init(optee);
- if (rc)
- goto err_notif_uninit;
+ if (optee_protmem_pool_init(optee))
+ pr_info("Protected memory service not available\n");
/*
* Ensure that there are no pre-existing shm objects before enabling
--
2.43.0
^ permalink raw reply related [flat|nested] 28+ messages in thread