From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C4C19C71157 for ; Tue, 17 Jun 2025 11:38:49 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 38FBD10E60A; Tue, 17 Jun 2025 11:38:49 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="IsKgShY2"; dkim-atps=neutral Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9A78710E60C for ; Tue, 17 Jun 2025 11:38:47 +0000 (UTC) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 6C6EA5C5C03; Tue, 17 Jun 2025 11:36:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0F29AC4CEE3; Tue, 17 Jun 2025 11:38:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750160326; bh=8caphRgx/Rs0Kb+XhmCJDHdciuqN6WMkJ9hS4WogXqM=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=IsKgShY2HGqcseW/I48vr8m3HGQxCBoBbmUO8KVWAF6i4R1GO+H7i0/DfsuyYw7bg xb9DFEtIW5Q1YwyNmi1YyyQrHJtWSrFEm3bLoOl4QE2nLxvU5DqXcXAXgyuprpWU6C 4TjJFVxLjXSJ5QLW3EqsV8m471NxhS3H6lD9fKyG/2MORJuybO/2y02vk46iHCvjp8 SsCEKzDhMu8f8byZc525vTh33DaMLRGK8SnFRQYM+Hi/VBmDpd2w5Z2ucXc12Cblhy wc2KZHWZY5JQCsICR9Q96908oU0ZTHQQ0wAgodsM2Eklv+wb1YuRKGd5V6f1Woq5NF 385G3ffjQh3GA== Date: Tue, 17 Jun 2025 17:08:37 +0530 From: Sumit Garg To: Jens Wiklander Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org, op-tee@lists.trustedfirmware.org, linux-arm-kernel@lists.infradead.org, Olivier Masse , Thierry Reding , Yong Wu , Sumit Semwal , Benjamin Gaignard , Brian Starkey , John Stultz , "T . J . Mercier" , Christian =?iso-8859-1?Q?K=F6nig?= , Matthias Brugger , AngeloGioacchino Del Regno , azarrabi@qti.qualcomm.com, Simona Vetter , Daniel Stone , Rouven Czerwinski , robin.murphy@arm.com Subject: Re: [PATCH v10 9/9] optee: smc abi: dynamic protected memory allocation Message-ID: References: <20250610131600.2972232-1-jens.wiklander@linaro.org> <20250610131600.2972232-10-jens.wiklander@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20250610131600.2972232-10-jens.wiklander@linaro.org> X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Tue, Jun 10, 2025 at 03:13:53PM +0200, Jens Wiklander wrote: > Add support in the OP-TEE backend driver for dynamic protected memory > allocation using the SMC ABI. > > Signed-off-by: Jens Wiklander > --- > drivers/tee/optee/smc_abi.c | 78 +++++++++++++++++++++++++++++++++++-- > 1 file changed, 75 insertions(+), 3 deletions(-) Reviewed-by: Sumit Garg -Sumit > > diff --git a/drivers/tee/optee/smc_abi.c b/drivers/tee/optee/smc_abi.c > index cf106d15e64e..fd1d873de941 100644 > --- a/drivers/tee/optee/smc_abi.c > +++ b/drivers/tee/optee/smc_abi.c > @@ -965,6 +965,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 > */ > @@ -1216,6 +1280,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) > @@ -1628,14 +1694,20 @@ static struct tee_protmem_pool *static_protmem_pool_init(struct optee *optee) > > 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 = ERR_PTR(-EINVAL); > - int rc; > + int rc = -EINVAL; > > - if (!(optee->smc.sec_caps & OPTEE_SMC_SEC_CAP_PROTMEM)) > + if (!protm && !dyn_protm) > return 0; > > - pool = static_protmem_pool_init(optee); > + if (protm) > + pool = static_protmem_pool_init(optee); > + if (dyn_protm && IS_ERR(pool)) > + pool = optee_protmem_alloc_dyn_pool(optee, heap_id); > if (IS_ERR(pool)) > return PTR_ERR(pool); > > -- > 2.43.0 >