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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 861C3C35FFC for ; Tue, 25 Mar 2025 07:47:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=VLCbgkIxmuM/zVJC5WqdP/M363EEdPs0zOuZMbWmfYE=; b=BxZ1Rn9VGvg+/g0vj5vEPuUPFy ehrVS5bsvE6Hhhc+LK6ORFO3ucF9hI4atd+LMWMatmIHi64Aos9vWbRiC/xq+69mSUoqRqCMkSqZ1 wfqxex2SkmpG+iE0/S4r24S41oSsZ/mlfiB2nWtWLIqcPAtz/ZB7fYH98tMBVomQv5Nl3TRlI/XHZ OtKKI79nyeuYP9yjsuRjOinXJjdJ4lz9VvryCcj4eS84ANQ7pwmlPzNxep1ECzOY0NxgOX8D+Tv6c X3Fnoprl5MiWFpZ4E6cZpON0l+IukaFudsQbEU4p//isD2NOoKBmKCUVPVyWHEZEl+SWHjjnnyDS9 YD554zSQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1twz0Y-000000057wA-3xaA; Tue, 25 Mar 2025 07:47:34 +0000 Received: from nyc.source.kernel.org ([147.75.193.91]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1twyyo-000000057bl-4AuU for linux-arm-kernel@lists.infradead.org; Tue, 25 Mar 2025 07:45:48 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 3EAD2A4A557; Tue, 25 Mar 2025 07:40:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C60B7C4CEE8; Tue, 25 Mar 2025 07:45:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1742888746; bh=COv3ALd0K+Klf9VX67K/rQCTmju5YgCqlTdzWPNwzUE=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=CmV8JNGH7Vcd7sDcWXD3QdzPpQ44/Z4BDNs9o6G3stDLHsydKUsfaTkn5pVxB4LPA 8bRlP+4KjK7bp+4NSt/vU8sD7VicmTvEh1mRkaPB4cHTWKjQ0erj5Whm43Hn4IR/lG n4FQx6G25IIjt6rmj2JZELJ4TH8vJ+Gc/no9tWf/ut0j83e6BRUaXIj+SrtahRx5Jc Xc14v+l0DLaqJDsqJrx3zrrK6WoAVXunGAC88ehMCShTerowJG2KDCV82MqmyX4lSJ eXJdt5BhH/qM4beSZDGs9q+xElFI6D7w7eRvIn1A57pPIG/DiyhT0zEF0hhLfU1bSv th6orop3f5Pjg== Date: Tue, 25 Mar 2025 13:15:35 +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 Subject: Re: [PATCH v6 10/10] optee: smc abi: dynamic restricted memory allocation Message-ID: References: <20250305130634.1850178-1-jens.wiklander@linaro.org> <20250305130634.1850178-11-jens.wiklander@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20250305130634.1850178-11-jens.wiklander@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250325_004547_180784_0BBAF838 X-CRM114-Status: GOOD ( 23.32 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Wed, Mar 05, 2025 at 02:04:16PM +0100, Jens Wiklander wrote: > Add support in the OP-TEE backend driver for dynamic restricted memory > allocation using the SMC ABI. > > Signed-off-by: Jens Wiklander > --- > drivers/tee/optee/smc_abi.c | 96 +++++++++++++++++++++++++++++++------ > 1 file changed, 81 insertions(+), 15 deletions(-) > > diff --git a/drivers/tee/optee/smc_abi.c b/drivers/tee/optee/smc_abi.c > index a14ff0b7d3b3..aa574ee6e277 100644 > --- a/drivers/tee/optee/smc_abi.c > +++ b/drivers/tee/optee/smc_abi.c > @@ -1001,6 +1001,69 @@ static int optee_smc_do_call_with_arg(struct tee_context *ctx, > return rc; > } > > +static int optee_smc_lend_rstmem(struct optee *optee, struct tee_shm *rstmem, > + u16 *end_points, unsigned int ep_count, > + 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_RSTMEM; > + 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 = rstmem->paddr; > + msg_arg->params[1].u.tmem.size = rstmem->size; > + msg_arg->params[1].u.tmem.shm_ref = (u_long)rstmem; > + > + rc = optee->ops->do_call_with_arg(optee->ctx, shm, offs, false); > + if (rc) > + goto out; > + if (msg_arg->ret != TEEC_SUCCESS) { > + rc = -EINVAL; > + goto out; > + } > + rstmem->sec_world_id = (u_long)rstmem; > + > +out: > + optee_free_msg_arg(optee->ctx, entry, offs); > + return rc; > +} > + > +static int optee_smc_reclaim_rstmem(struct optee *optee, struct tee_shm *rstmem) > +{ > + struct optee_shm_arg_entry *entry; > + struct optee_msg_arg *msg_arg; > + struct tee_shm *shm; > + u_int offs; > + int rc; > + > + msg_arg = optee_get_msg_arg(optee->ctx, 1, &entry, &shm, &offs); > + if (IS_ERR(msg_arg)) > + return PTR_ERR(msg_arg); > + > + msg_arg->cmd = OPTEE_MSG_CMD_RECLAIM_RSTMEM; > + msg_arg->params[0].attr = OPTEE_MSG_ATTR_TYPE_RMEM_INPUT; > + msg_arg->params[0].u.rmem.shm_ref = (u_long)rstmem; > + > + rc = optee->ops->do_call_with_arg(optee->ctx, shm, offs, false); > + if (rc) > + goto out; > + if (msg_arg->ret != TEEC_SUCCESS) > + rc = -EINVAL; > + > +out: > + optee_free_msg_arg(optee->ctx, entry, offs); > + return rc; > +} > + > /* > * 5. Asynchronous notification > */ > @@ -1252,6 +1315,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_rstmem = optee_smc_lend_rstmem, > + .reclaim_rstmem = optee_smc_reclaim_rstmem, > }; > > static int enable_async_notif(optee_invoke_fn *invoke_fn) > @@ -1622,11 +1687,13 @@ static inline int optee_load_fw(struct platform_device *pdev, > > static int optee_sdp_pool_init(struct optee *optee) > { > + bool sdp = optee->smc.sec_caps & OPTEE_SMC_SEC_CAP_SDP; > + bool dyn_sdp = optee->smc.sec_caps & OPTEE_SMC_SEC_CAP_DYNAMIC_RSTMEM; > enum tee_dma_heap_id heap_id = TEE_DMA_HEAP_SECURE_VIDEO_PLAY; > - struct tee_rstmem_pool *pool; > - int rc; > + struct tee_rstmem_pool *pool = ERR_PTR(-EINVAL); > + int rc = -EINVAL; > > - if (optee->smc.sec_caps & OPTEE_SMC_SEC_CAP_SDP) { > + if (sdp) { > union { > struct arm_smccc_res smccc; > struct optee_smc_get_sdp_config_result result; > @@ -1634,25 +1701,24 @@ static int optee_sdp_pool_init(struct optee *optee) > > optee->smc.invoke_fn(OPTEE_SMC_GET_SDP_CONFIG, 0, 0, 0, 0, 0, 0, > 0, &res.smccc); > - if (res.result.status != OPTEE_SMC_RETURN_OK) { > - pr_err("Secure Data Path service not available\n"); > - return 0; > - } > + if (res.result.status == OPTEE_SMC_RETURN_OK) > + pool = tee_rstmem_static_pool_alloc(res.result.start, > + res.result.size); > + } > > - pool = tee_rstmem_static_pool_alloc(res.result.start, > - res.result.size); > - if (IS_ERR(pool)) > - return PTR_ERR(pool); > + if (dyn_sdp && IS_ERR(pool)) > + pool = optee_rstmem_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 (rc && (sdp || dyn_sdp)) > + pr_err("Secure Data Path service not available\n"); Rather than an error message we should just use pr_info(). -Sumit > + > return 0; > -err: > - pool->ops->destroy_pool(pool); > - return rc; > } > > static int optee_probe(struct platform_device *pdev) > -- > 2.43.0 >