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 AEE99C71157 for ; Tue, 17 Jun 2025 11:32:52 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F1D4610E4E3; Tue, 17 Jun 2025 11:32:51 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="kzkXwuL1"; 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 C4E8F10E4E3 for ; Tue, 17 Jun 2025 11:32:50 +0000 (UTC) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 7BAB25C61E5; Tue, 17 Jun 2025 11:30:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 32DEFC4CEE3; Tue, 17 Jun 2025 11:32:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750159969; bh=CRnbVtr0GLb3lzwVaUxRD662hwv3QeuvoQMwpeWJVEU=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=kzkXwuL1P9QjyVWGow80aEJoOUAhmHjnyJjnxodlDQK10dgSZTFCk9cUHzT6a+xEI F4zaSAlMkQVtSgZKqGqp6f4J4dWVQNSt5+oYMNV5WUyzGJLNmq+QQdPlRnApG4baEb 8Wo7h32OsM5SlumGiOB5doGG0MqgC333Y5Qd7ykvbR5MfovNQx6HgAz+7FPo/Q+6Bv Bj+9MsrH2tz0ybMehGhQeP799yQ/J7kKd85Y3srd4EitEdzbtRnSV8sKxLhWvEF1pk J8QgypJY63uKLSp3o+pohBAWSC3hKHrBIKw1/EbVNQIDBQzCjZn/UVKoVdV40eJCZz x9VcIgMi/7nng== Date: Tue, 17 Jun 2025 17:02:40 +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 6/9] tee: add tee_shm_alloc_dma_mem() Message-ID: References: <20250610131600.2972232-1-jens.wiklander@linaro.org> <20250610131600.2972232-7-jens.wiklander@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20250610131600.2972232-7-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:50PM +0200, Jens Wiklander wrote: > Add tee_shm_alloc_dma_mem() to allocate DMA memory. The memory is > represented by a tee_shm object using the new flag TEE_SHM_DMA_MEM to > identify it as DMA memory. The allocated memory will later be lent to > the TEE to be used as protected memory. > > Signed-off-by: Jens Wiklander > --- > drivers/tee/tee_shm.c | 85 +++++++++++++++++++++++++++++++++++++++- > include/linux/tee_core.h | 5 +++ > 2 files changed, 88 insertions(+), 2 deletions(-) > > diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c > index e63095e84644..60b0f3932cee 100644 > --- a/drivers/tee/tee_shm.c > +++ b/drivers/tee/tee_shm.c > @@ -5,6 +5,8 @@ > #include > #include > #include > +#include > +#include > #include > #include > #include > @@ -13,9 +15,14 @@ > #include > #include > #include > -#include > #include "tee_private.h" > > +struct tee_shm_dma_mem { > + struct tee_shm shm; > + dma_addr_t dma_addr; > + struct page *page; > +}; > + > static void shm_put_kernel_pages(struct page **pages, size_t page_count) > { > size_t n; > @@ -48,7 +55,16 @@ static void tee_shm_release(struct tee_device *teedev, struct tee_shm *shm) > { > void *p = shm; > > - if (shm->flags & TEE_SHM_DMA_BUF) { > + if (shm->flags & TEE_SHM_DMA_MEM) { > +#if IS_ENABLED(CONFIG_TEE_DMABUF_HEAPS) nit: this config check can be merged into the above if check. > + struct tee_shm_dma_mem *dma_mem; > + > + dma_mem = container_of(shm, struct tee_shm_dma_mem, shm); > + p = dma_mem; > + dma_free_pages(&teedev->dev, shm->size, dma_mem->page, > + dma_mem->dma_addr, DMA_BIDIRECTIONAL); > +#endif > + } else if (shm->flags & TEE_SHM_DMA_BUF) { Do we need a similar config check for this flag too? With these addressed, feel free to add: Reviewed-by: Sumit Garg -Sumit > struct tee_shm_dmabuf_ref *ref; > > ref = container_of(shm, struct tee_shm_dmabuf_ref, shm); > @@ -303,6 +319,71 @@ struct tee_shm *tee_shm_alloc_priv_buf(struct tee_context *ctx, size_t size) > } > EXPORT_SYMBOL_GPL(tee_shm_alloc_priv_buf); > > +#if IS_ENABLED(CONFIG_TEE_DMABUF_HEAPS) > +/** > + * tee_shm_alloc_dma_mem() - Allocate DMA memory as shared memory object > + * @ctx: Context that allocates the shared memory > + * @page_count: Number of pages > + * > + * The allocated memory is expected to be lent (made inaccessible to the > + * kernel) to the TEE while it's used and returned (accessible to the > + * kernel again) before it's freed. > + * > + * This function should normally only be used internally in the TEE > + * drivers. > + * > + * @returns a pointer to 'struct tee_shm' > + */ > +struct tee_shm *tee_shm_alloc_dma_mem(struct tee_context *ctx, > + size_t page_count) > +{ > + struct tee_device *teedev = ctx->teedev; > + struct tee_shm_dma_mem *dma_mem; > + dma_addr_t dma_addr; > + struct page *page; > + > + if (!tee_device_get(teedev)) > + return ERR_PTR(-EINVAL); > + > + page = dma_alloc_pages(&teedev->dev, page_count * PAGE_SIZE, > + &dma_addr, DMA_BIDIRECTIONAL, GFP_KERNEL); > + if (!page) > + goto err_put_teedev; > + > + dma_mem = kzalloc(sizeof(*dma_mem), GFP_KERNEL); > + if (!dma_mem) > + goto err_free_pages; > + > + refcount_set(&dma_mem->shm.refcount, 1); > + dma_mem->shm.ctx = ctx; > + dma_mem->shm.paddr = page_to_phys(page); > + dma_mem->dma_addr = dma_addr; > + dma_mem->page = page; > + dma_mem->shm.size = page_count * PAGE_SIZE; > + dma_mem->shm.flags = TEE_SHM_DMA_MEM; > + > + teedev_ctx_get(ctx); > + > + return &dma_mem->shm; > + > +err_free_pages: > + dma_free_pages(&teedev->dev, page_count * PAGE_SIZE, page, dma_addr, > + DMA_BIDIRECTIONAL); > +err_put_teedev: > + tee_device_put(teedev); > + > + return ERR_PTR(-ENOMEM); > +} > +EXPORT_SYMBOL_GPL(tee_shm_alloc_dma_mem); > +#else > +struct tee_shm *tee_shm_alloc_dma_mem(struct tee_context *ctx, > + size_t page_count) > +{ > + return ERR_PTR(-EINVAL); > +} > +EXPORT_SYMBOL_GPL(tee_shm_alloc_dma_mem); > +#endif > + > 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 f17710196c4c..e46a53e753af 100644 > --- a/include/linux/tee_core.h > +++ b/include/linux/tee_core.h > @@ -29,6 +29,8 @@ > #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_DMA_MEM BIT(5) /* Memory allocated with */ > + /* dma_alloc_pages() */ > > #define TEE_DEVICE_FLAG_REGISTERED 0x1 > #define TEE_MAX_DEV_NAME_LEN 32 > @@ -310,6 +312,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_dma_mem(struct tee_context *ctx, > + size_t page_count); > + > 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 >