* [PATCH v3 07/12] optee: use driver internal tee_contex for some rpc
[not found] <20220125162938.838382-1-jens.wiklander@linaro.org>
@ 2022-01-25 16:29 ` Jens Wiklander
2022-01-27 6:32 ` Sumit Garg
0 siblings, 1 reply; 3+ messages in thread
From: Jens Wiklander @ 2022-01-25 16:29 UTC (permalink / raw)
To: linux-kernel, op-tee
Cc: Sumit Garg, Herbert Xu, Devaraj Rangasamy, Rijo Thomas,
David Howells, Tyler Hicks, Jens Wiklander, stable
Uses the new driver internal tee_context when allocating driver private
shared memory. This decouples the shared memory object from its original
tee_context. This is needed when the life time of such a memory
allocation outlives the client tee_context.
Fixes: 217e0250cccb ("tee: use reference counting for tee_context")
Cc: stable@vger.kernel.org
Reviewed-by: Sumit Garg <sumit.garg@linaro.org>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
---
drivers/tee/optee/ffa_abi.c | 17 +++++++++--------
drivers/tee/optee/smc_abi.c | 7 ++++---
2 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/drivers/tee/optee/ffa_abi.c b/drivers/tee/optee/ffa_abi.c
index 954e88866968..fb7345941024 100644
--- a/drivers/tee/optee/ffa_abi.c
+++ b/drivers/tee/optee/ffa_abi.c
@@ -424,6 +424,7 @@ static struct tee_shm_pool *optee_ffa_shm_pool_alloc_pages(void)
*/
static void handle_ffa_rpc_func_cmd_shm_alloc(struct tee_context *ctx,
+ struct optee *optee,
struct optee_msg_arg *arg)
{
struct tee_shm *shm;
@@ -439,7 +440,8 @@ static void handle_ffa_rpc_func_cmd_shm_alloc(struct tee_context *ctx,
shm = optee_rpc_cmd_alloc_suppl(ctx, arg->params[0].u.value.b);
break;
case OPTEE_RPC_SHM_TYPE_KERNEL:
- shm = tee_shm_alloc_priv_buf(ctx, arg->params[0].u.value.b);
+ shm = tee_shm_alloc_priv_buf(optee->ctx,
+ arg->params[0].u.value.b);
break;
default:
arg->ret = TEEC_ERROR_BAD_PARAMETERS;
@@ -492,14 +494,13 @@ static void handle_ffa_rpc_func_cmd_shm_free(struct tee_context *ctx,
}
static void handle_ffa_rpc_func_cmd(struct tee_context *ctx,
+ struct optee *optee,
struct optee_msg_arg *arg)
{
- struct optee *optee = tee_get_drvdata(ctx->teedev);
-
arg->ret_origin = TEEC_ORIGIN_COMMS;
switch (arg->cmd) {
case OPTEE_RPC_CMD_SHM_ALLOC:
- handle_ffa_rpc_func_cmd_shm_alloc(ctx, arg);
+ handle_ffa_rpc_func_cmd_shm_alloc(ctx, optee, arg);
break;
case OPTEE_RPC_CMD_SHM_FREE:
handle_ffa_rpc_func_cmd_shm_free(ctx, optee, arg);
@@ -509,12 +510,12 @@ static void handle_ffa_rpc_func_cmd(struct tee_context *ctx,
}
}
-static void optee_handle_ffa_rpc(struct tee_context *ctx, u32 cmd,
- struct optee_msg_arg *arg)
+static void optee_handle_ffa_rpc(struct tee_context *ctx, struct optee *optee,
+ u32 cmd, struct optee_msg_arg *arg)
{
switch (cmd) {
case OPTEE_FFA_YIELDING_CALL_RETURN_RPC_CMD:
- handle_ffa_rpc_func_cmd(ctx, arg);
+ handle_ffa_rpc_func_cmd(ctx, optee, arg);
break;
case OPTEE_FFA_YIELDING_CALL_RETURN_INTERRUPT:
/* Interrupt delivered by now */
@@ -581,7 +582,7 @@ static int optee_ffa_yielding_call(struct tee_context *ctx,
* above.
*/
cond_resched();
- optee_handle_ffa_rpc(ctx, data->data1, rpc_arg);
+ optee_handle_ffa_rpc(ctx, optee, data->data1, rpc_arg);
cmd = OPTEE_FFA_YIELDING_CALL_RESUME;
data->data0 = cmd;
data->data1 = 0;
diff --git a/drivers/tee/optee/smc_abi.c b/drivers/tee/optee/smc_abi.c
index b1082a34cda2..0dc383c974a3 100644
--- a/drivers/tee/optee/smc_abi.c
+++ b/drivers/tee/optee/smc_abi.c
@@ -621,6 +621,7 @@ static void handle_rpc_func_cmd_shm_free(struct tee_context *ctx,
}
static void handle_rpc_func_cmd_shm_alloc(struct tee_context *ctx,
+ struct optee *optee,
struct optee_msg_arg *arg,
struct optee_call_ctx *call_ctx)
{
@@ -650,7 +651,7 @@ static void handle_rpc_func_cmd_shm_alloc(struct tee_context *ctx,
shm = optee_rpc_cmd_alloc_suppl(ctx, sz);
break;
case OPTEE_RPC_SHM_TYPE_KERNEL:
- shm = tee_shm_alloc_priv_buf(ctx, sz);
+ shm = tee_shm_alloc_priv_buf(optee->ctx, sz);
break;
default:
arg->ret = TEEC_ERROR_BAD_PARAMETERS;
@@ -746,7 +747,7 @@ static void handle_rpc_func_cmd(struct tee_context *ctx, struct optee *optee,
switch (arg->cmd) {
case OPTEE_RPC_CMD_SHM_ALLOC:
free_pages_list(call_ctx);
- handle_rpc_func_cmd_shm_alloc(ctx, arg, call_ctx);
+ handle_rpc_func_cmd_shm_alloc(ctx, optee, arg, call_ctx);
break;
case OPTEE_RPC_CMD_SHM_FREE:
handle_rpc_func_cmd_shm_free(ctx, arg);
@@ -775,7 +776,7 @@ static void optee_handle_rpc(struct tee_context *ctx,
switch (OPTEE_SMC_RETURN_GET_RPC_FUNC(param->a0)) {
case OPTEE_SMC_RPC_FUNC_ALLOC:
- shm = tee_shm_alloc_priv_buf(ctx, param->a1);
+ shm = tee_shm_alloc_priv_buf(optee->ctx, param->a1);
if (!IS_ERR(shm) && !tee_shm_get_pa(shm, 0, &pa)) {
reg_pair_from_64(¶m->a1, ¶m->a2, pa);
reg_pair_from_64(¶m->a4, ¶m->a5,
--
2.31.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v3 07/12] optee: use driver internal tee_contex for some rpc
2022-01-25 16:29 ` [PATCH v3 07/12] optee: use driver internal tee_contex for some rpc Jens Wiklander
@ 2022-01-27 6:32 ` Sumit Garg
2022-01-27 12:39 ` Jens Wiklander
0 siblings, 1 reply; 3+ messages in thread
From: Sumit Garg @ 2022-01-27 6:32 UTC (permalink / raw)
To: Jens Wiklander
Cc: linux-kernel, op-tee, Herbert Xu, Devaraj Rangasamy, Rijo Thomas,
David Howells, Tyler Hicks, stable, Lars Persson
+Lars
Hi Jens,
On Tue, 25 Jan 2022 at 21:59, Jens Wiklander <jens.wiklander@linaro.org> wrote:
>
> Uses the new driver internal tee_context when allocating driver private
> shared memory. This decouples the shared memory object from its original
> tee_context. This is needed when the life time of such a memory
> allocation outlives the client tee_context.
>
> Fixes: 217e0250cccb ("tee: use reference counting for tee_context")
> Cc: stable@vger.kernel.org
> Reviewed-by: Sumit Garg <sumit.garg@linaro.org>
> Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
> ---
> drivers/tee/optee/ffa_abi.c | 17 +++++++++--------
> drivers/tee/optee/smc_abi.c | 7 ++++---
> 2 files changed, 13 insertions(+), 11 deletions(-)
>
As this commit fixes multiple issues seen earlier due to pre-allocated
SHM cache in client's context. I think it makes sense to separate this
as a standalone fix with few bits from patch #6 to target 5.17
release. As otherwise it will take a long path via 5.18 and then
backport to stable trees. In the meantime there can be other side
effects noticed similar to one from Lars.
-Sumit
> diff --git a/drivers/tee/optee/ffa_abi.c b/drivers/tee/optee/ffa_abi.c
> index 954e88866968..fb7345941024 100644
> --- a/drivers/tee/optee/ffa_abi.c
> +++ b/drivers/tee/optee/ffa_abi.c
> @@ -424,6 +424,7 @@ static struct tee_shm_pool *optee_ffa_shm_pool_alloc_pages(void)
> */
>
> static void handle_ffa_rpc_func_cmd_shm_alloc(struct tee_context *ctx,
> + struct optee *optee,
> struct optee_msg_arg *arg)
> {
> struct tee_shm *shm;
> @@ -439,7 +440,8 @@ static void handle_ffa_rpc_func_cmd_shm_alloc(struct tee_context *ctx,
> shm = optee_rpc_cmd_alloc_suppl(ctx, arg->params[0].u.value.b);
> break;
> case OPTEE_RPC_SHM_TYPE_KERNEL:
> - shm = tee_shm_alloc_priv_buf(ctx, arg->params[0].u.value.b);
> + shm = tee_shm_alloc_priv_buf(optee->ctx,
> + arg->params[0].u.value.b);
> break;
> default:
> arg->ret = TEEC_ERROR_BAD_PARAMETERS;
> @@ -492,14 +494,13 @@ static void handle_ffa_rpc_func_cmd_shm_free(struct tee_context *ctx,
> }
>
> static void handle_ffa_rpc_func_cmd(struct tee_context *ctx,
> + struct optee *optee,
> struct optee_msg_arg *arg)
> {
> - struct optee *optee = tee_get_drvdata(ctx->teedev);
> -
> arg->ret_origin = TEEC_ORIGIN_COMMS;
> switch (arg->cmd) {
> case OPTEE_RPC_CMD_SHM_ALLOC:
> - handle_ffa_rpc_func_cmd_shm_alloc(ctx, arg);
> + handle_ffa_rpc_func_cmd_shm_alloc(ctx, optee, arg);
> break;
> case OPTEE_RPC_CMD_SHM_FREE:
> handle_ffa_rpc_func_cmd_shm_free(ctx, optee, arg);
> @@ -509,12 +510,12 @@ static void handle_ffa_rpc_func_cmd(struct tee_context *ctx,
> }
> }
>
> -static void optee_handle_ffa_rpc(struct tee_context *ctx, u32 cmd,
> - struct optee_msg_arg *arg)
> +static void optee_handle_ffa_rpc(struct tee_context *ctx, struct optee *optee,
> + u32 cmd, struct optee_msg_arg *arg)
> {
> switch (cmd) {
> case OPTEE_FFA_YIELDING_CALL_RETURN_RPC_CMD:
> - handle_ffa_rpc_func_cmd(ctx, arg);
> + handle_ffa_rpc_func_cmd(ctx, optee, arg);
> break;
> case OPTEE_FFA_YIELDING_CALL_RETURN_INTERRUPT:
> /* Interrupt delivered by now */
> @@ -581,7 +582,7 @@ static int optee_ffa_yielding_call(struct tee_context *ctx,
> * above.
> */
> cond_resched();
> - optee_handle_ffa_rpc(ctx, data->data1, rpc_arg);
> + optee_handle_ffa_rpc(ctx, optee, data->data1, rpc_arg);
> cmd = OPTEE_FFA_YIELDING_CALL_RESUME;
> data->data0 = cmd;
> data->data1 = 0;
> diff --git a/drivers/tee/optee/smc_abi.c b/drivers/tee/optee/smc_abi.c
> index b1082a34cda2..0dc383c974a3 100644
> --- a/drivers/tee/optee/smc_abi.c
> +++ b/drivers/tee/optee/smc_abi.c
> @@ -621,6 +621,7 @@ static void handle_rpc_func_cmd_shm_free(struct tee_context *ctx,
> }
>
> static void handle_rpc_func_cmd_shm_alloc(struct tee_context *ctx,
> + struct optee *optee,
> struct optee_msg_arg *arg,
> struct optee_call_ctx *call_ctx)
> {
> @@ -650,7 +651,7 @@ static void handle_rpc_func_cmd_shm_alloc(struct tee_context *ctx,
> shm = optee_rpc_cmd_alloc_suppl(ctx, sz);
> break;
> case OPTEE_RPC_SHM_TYPE_KERNEL:
> - shm = tee_shm_alloc_priv_buf(ctx, sz);
> + shm = tee_shm_alloc_priv_buf(optee->ctx, sz);
> break;
> default:
> arg->ret = TEEC_ERROR_BAD_PARAMETERS;
> @@ -746,7 +747,7 @@ static void handle_rpc_func_cmd(struct tee_context *ctx, struct optee *optee,
> switch (arg->cmd) {
> case OPTEE_RPC_CMD_SHM_ALLOC:
> free_pages_list(call_ctx);
> - handle_rpc_func_cmd_shm_alloc(ctx, arg, call_ctx);
> + handle_rpc_func_cmd_shm_alloc(ctx, optee, arg, call_ctx);
> break;
> case OPTEE_RPC_CMD_SHM_FREE:
> handle_rpc_func_cmd_shm_free(ctx, arg);
> @@ -775,7 +776,7 @@ static void optee_handle_rpc(struct tee_context *ctx,
>
> switch (OPTEE_SMC_RETURN_GET_RPC_FUNC(param->a0)) {
> case OPTEE_SMC_RPC_FUNC_ALLOC:
> - shm = tee_shm_alloc_priv_buf(ctx, param->a1);
> + shm = tee_shm_alloc_priv_buf(optee->ctx, param->a1);
> if (!IS_ERR(shm) && !tee_shm_get_pa(shm, 0, &pa)) {
> reg_pair_from_64(¶m->a1, ¶m->a2, pa);
> reg_pair_from_64(¶m->a4, ¶m->a5,
> --
> 2.31.1
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v3 07/12] optee: use driver internal tee_contex for some rpc
2022-01-27 6:32 ` Sumit Garg
@ 2022-01-27 12:39 ` Jens Wiklander
0 siblings, 0 replies; 3+ messages in thread
From: Jens Wiklander @ 2022-01-27 12:39 UTC (permalink / raw)
To: Sumit Garg
Cc: linux-kernel, op-tee, Herbert Xu, Devaraj Rangasamy, Rijo Thomas,
David Howells, Tyler Hicks, stable, Lars Persson
On Thu, Jan 27, 2022 at 7:32 AM Sumit Garg <sumit.garg@linaro.org> wrote:
>
> +Lars
>
> Hi Jens,
>
> On Tue, 25 Jan 2022 at 21:59, Jens Wiklander <jens.wiklander@linaro.org> wrote:
> >
> > Uses the new driver internal tee_context when allocating driver private
> > shared memory. This decouples the shared memory object from its original
> > tee_context. This is needed when the life time of such a memory
> > allocation outlives the client tee_context.
> >
> > Fixes: 217e0250cccb ("tee: use reference counting for tee_context")
> > Cc: stable@vger.kernel.org
> > Reviewed-by: Sumit Garg <sumit.garg@linaro.org>
> > Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
> > ---
> > drivers/tee/optee/ffa_abi.c | 17 +++++++++--------
> > drivers/tee/optee/smc_abi.c | 7 ++++---
> > 2 files changed, 13 insertions(+), 11 deletions(-)
> >
>
> As this commit fixes multiple issues seen earlier due to pre-allocated
> SHM cache in client's context. I think it makes sense to separate this
> as a standalone fix with few bits from patch #6 to target 5.17
> release. As otherwise it will take a long path via 5.18 and then
> backport to stable trees. In the meantime there can be other side
> effects noticed similar to one from Lars.
The few bits needed from #6 is actually the entire "optee: add driver
private tee_context". I'll combine the two and send them as a separate
patch, that way it's easier to keep track of what's needed for the
stable trees.
Thanks,
Jens
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-01-27 12:39 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <20220125162938.838382-1-jens.wiklander@linaro.org>
2022-01-25 16:29 ` [PATCH v3 07/12] optee: use driver internal tee_contex for some rpc Jens Wiklander
2022-01-27 6:32 ` Sumit Garg
2022-01-27 12:39 ` Jens Wiklander
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).