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 BF608C5AD49 for ; Mon, 26 May 2025 09:39:42 +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-Transfer-Encoding:Content-Type:MIME-Version:References:Message-ID: Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=0e5Y+lZWGuxMgcpvDU2W0qpAx/MQJ/UJDmp+jMcRrj8=; b=fyRj5auNnSRSHdgg/9C9Z2yu9x ex5j2wQGTkCImNOAbBhLFrfO8W4gkrVTIoLpTj2SPjk8NbKryGiaeAhvO8RY2jlpdvRQ1rjJ5R/tl nJYLExRHhOTNDbBwf4GxUuTKOSo97DuX1Ld3qSvh0fEOUm2lTE9SJ979EPKSvnrsRf0e1D9j5/a+n d1tR69PfhrwUpuBOI3EN3vRo0Vd7kiSSEE9VTuGVghQfWe9VFoAvETIhbZ4CN4nxXbJNjV5FvKJZ3 z3OS7AQjN1/dh6yOhqcc4gLX4oWQMWJczinO4XRzt00l9+cWRKRQFeFGkG88B2RI8oWNHtWxUWzA0 rCj8c1Ww==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1uJUIy-00000008XT4-2RJK; Mon, 26 May 2025 09:39:36 +0000 Received: from nyc.source.kernel.org ([2604:1380:45d1:ec00::3]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1uJUDD-00000008WV1-0ZHL for linux-arm-kernel@lists.infradead.org; Mon, 26 May 2025 09:33:40 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 4B67CA4DF12; Mon, 26 May 2025 09:33:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F021BC4CEEE; Mon, 26 May 2025 09:33:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1748252017; bh=j5u6GeKfGRt01uKZ1DWq/krRDd3IxYawjOABhTomJIw=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=CFHrONzKTbnwow4S3bzcO7VcXUvND1JG7WNzhUwiL/79/1EFCNY4mOro9s/dAOOXO hpVqP+S3ihCrM5yUwGl4inEqAqShAvKpwH6gcaELHHRLfpGZnvfglnq4negLhrSDKj ffkH4Qp4Hh3QuQV7kVC7Yz/qmmu6EVJTUJFKckrQ9WaEcL1hwpLVAribKGZw+s3NDe mmB7/TD8aHKtOl4M5LS8l1JVI2KWIad8fxJO2lXBXPqWThHnCooVYmdP77Ad1IIHCL PMxuD73WteTm6D+j0tW0mJb8+4bEfg3y0CxP7uTSudEQoCtCzK8GonUTWkvTEwdDHM gDU8BP68rKMyQ== Date: Mon, 26 May 2025 15:03:21 +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 Subject: Re: [PATCH v9 6/9] tee: add tee_shm_alloc_dma_mem() Message-ID: References: <20250520152436.474778-1-jens.wiklander@linaro.org> <20250520152436.474778-7-jens.wiklander@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250526_023339_317509_EB4DEF35 X-CRM114-Status: GOOD ( 37.78 ) 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 Mon, May 26, 2025 at 11:21:47AM +0200, Jens Wiklander wrote: > On Mon, May 26, 2025 at 9:22 AM Sumit Garg wrote: > > > > On Tue, May 20, 2025 at 05:16:49PM +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 | 74 ++++++++++++++++++++++++++++++++++++++-- > > > include/linux/tee_core.h | 5 +++ > > > 2 files changed, 77 insertions(+), 2 deletions(-) > > > > > > diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c > > > index e1ed52ee0a16..92a6a35e1a1e 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; > > > @@ -49,7 +56,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_DMA_MEM) { > > > + 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); > > > > Although the kernel bot already found a randconfig issue, it looks like > > we need to add Kconfig dependencies like HAS_DMA, DMA_CMA etc. > > > > Also, I was thinking if we should rather add a new TEE subsystem > > specific Kconfig option like: TEE_DMABUF_HEAPS which can then be used to > > select whatever dependency is needed as well as act as a gating Kconfig > > for relevant features. > > You mean something like this? > > --- a/drivers/tee/Kconfig > +++ b/drivers/tee/Kconfig > @@ -13,6 +13,14 @@ menuconfig TEE > > if TEE > > +config TEE_DMABUF_HEAPS > + bool > + depends on HAS_DMA && DMABUF_HEAPS Yeah this looks fine to me but needs to be tested if DMA_CMA is a dependency here too. > + > +config TEE_STATIC_PROTMEM_POOL > + bool > + depends on HAS_IOMEM && TEE_DMABUF_HEAPS The static and dynamic protected memory pools should get auto enabled if TEE_DMABUF_HEAPS is enabled since they are pre-requisite to provide the protected heaps support. Something like: +config TEE_STATIC_PROTMEM_POOL + bool + default y if TEE_DMABUF_HEAPS + depends on HAS_IOMEM -Sumit > + > > Cheers, > Jens > > > > > -Sumit > > > > > + } 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 +320,62 @@ struct tee_shm *tee_shm_alloc_priv_buf(struct tee_context *ctx, size_t size) > > > } > > > EXPORT_SYMBOL_GPL(tee_shm_alloc_priv_buf); > > > > > > +/** > > > + * 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); > > > + > > > 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..925690e1020b 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 > > >