Linaro-mm-sig

linaro-mm-sig@lists.linaro.org

6 participants
3320 discussions

Re: [PATCH net-next v2 1/6] net: ti: icssg-prueth: Add functions to create and destroy Rx/Tx queues

by Jakub Kicinski

On Mon, 1 Sep 2025 15:32:22 +0530 Meghana Malladi wrote: > if (!emac->xdpi.prog && !prog) > return 0; > > - WRITE_ONCE(emac->xdp_prog, prog); > + if (netif_running(emac->ndev)) { > + prueth_destroy_txq(emac); > + prueth_destroy_rxq(emac); > + } > + > + old_prog = xchg(&emac->xdp_prog, prog); > + if (old_prog) > + bpf_prog_put(old_prog); > + > + if (netif_running(emac->ndev)) { > + ret = prueth_create_rxq(emac); shutting the device down and freeing all rx memory for reconfig is not okay. If the system is low on memory the Rx buffer allocations may fail and system may drop off the network. You must either pre-allocate or avoid freeing the memory, and just restart the queues. > + if (ret) { > + netdev_err(emac->ndev, "Failed to create RX queue: %d\n", ret); > + return ret; > + } > + > + ret = prueth_create_txq(emac); > + if (ret) { > + netdev_err(emac->ndev, "Failed to create TX queue: %d\n", ret); > + prueth_destroy_rxq(emac); > + emac->xdp_prog = NULL; > + return ret; > + } > + } > > xdp_attachment_setup(&emac->xdpi, bpf);

5 months

Re: [PATCH] dma-buf: system_heap: use larger contiguous mappings instead of per-page mmap

by John Stultz

On Sat, Aug 30, 2025 at 4:58 PM Barry Song <21cnbao(a)gmail.com> wrote: > > From: Barry Song <v-songbaohua(a)oppo.com> > > We can allocate high-order pages, but mapping them one by > one is inefficient. This patch changes the code to map > as large a chunk as possible. The code looks somewhat > complicated mainly because supporting mmap with a > non-zero offset is a bit tricky. > > Using the micro-benchmark below, we see that mmap becomes > 3.5X faster: ... It's been awhile since I've done mm things, so take it with a pinch of salt, but this seems reasonable to me. Though, one thought below... > diff --git a/drivers/dma-buf/heaps/system_heap.c b/drivers/dma-buf/heaps/system_heap.c > index bbe7881f1360..4c782fe33fd4 100644 > --- a/drivers/dma-buf/heaps/system_heap.c > +++ b/drivers/dma-buf/heaps/system_heap.c > @@ -186,20 +186,35 @@ static int system_heap_mmap(struct dma_buf *dmabuf, struct vm_area_struct *vma) > struct system_heap_buffer *buffer = dmabuf->priv; > struct sg_table *table = &buffer->sg_table; > unsigned long addr = vma->vm_start; > - struct sg_page_iter piter; > - int ret; > + unsigned long pgoff = vma->vm_pgoff; > + struct scatterlist *sg; > + int i, ret; > + > + for_each_sgtable_sg(table, sg, i) { > + unsigned long n = sg->length >> PAGE_SHIFT; > > - for_each_sgtable_page(table, &piter, vma->vm_pgoff) { > - struct page *page = sg_page_iter_page(&piter); > + if (pgoff < n) > + break; > + pgoff -= n; > + } > + > + for (; sg && addr < vma->vm_end; sg = sg_next(sg)) { > + unsigned long n = (sg->length >> PAGE_SHIFT) - pgoff; > + struct page *page = sg_page(sg) + pgoff; > + unsigned long size = n << PAGE_SHIFT; > + > + if (addr + size > vma->vm_end) > + size = vma->vm_end - addr; > > - ret = remap_pfn_range(vma, addr, page_to_pfn(page), PAGE_SIZE, > - vma->vm_page_prot); > + ret = remap_pfn_range(vma, addr, page_to_pfn(page), > + size, vma->vm_page_prot); It feels like this sort of mapping loop for higher order pages wouldn't be a unique pattern to just this code. Would this be better worked into a helper so it would be more generally usable? Otherwise, Acked-by: John Stultz <jstultz(a)google.com> thanks -john

5 months

Re: [PATCH 3/9] mm/cma: Allow dynamically creating CMA areas

by David Hildenbrand

>> +>> +struct cma *__init cma_create(phys_addr_t base, phys_addr_t size, >> + unsigned int order_per_bit, const char *name) >> +{ >> + struct cma *cma; >> + int ret; >> + >> + ret = cma_check_memory(base, size); >> + if (ret < 0) >> + return ERR_PTR(ret); >> + >> + cma = kzalloc(sizeof(*cma), GFP_KERNEL); >> + if (!cma) >> + return ERR_PTR(-ENOMEM); >> + >> + cma_init_area(cma, name, size, order_per_bit); >> + cma->ranges[0].base_pfn = PFN_DOWN(base); >> + cma->ranges[0].early_pfn = PFN_DOWN(base); >> + cma->ranges[0].count = cma->count; >> + cma->nranges = 1; >> + >> + cma_activate_area(cma); >> + >> + return cma; >> +} >> + >> +void cma_free(struct cma *cma) >> +{ >> + kfree(cma); >> +} >> -- >> 2.50.0 > > > I agree that supporting dynamic CMA areas would be good. However, by > doing it like this, these CMA areas are invisible to the rest of the > system. E.g. cma_for_each_area() does not know about them. It seems a > bit inconsistent that there will now be some areas that are globally > known, and some that are not. Yeah, I'm not a fan of that. What is the big problem we are trying to solve here? Why do they have to be dynamic, why do they even have to support freeing? -- Cheers David / dhildenb

5 months

Re: [PATCH 3/9] mm/cma: Allow dynamically creating CMA areas

by Thierry Reding

On Tue, Sep 02, 2025 at 10:27:01AM -0700, Frank van der Linden wrote: > On Tue, Sep 2, 2025 at 8:46 AM Thierry Reding <thierry.reding(a)gmail.com> wrote: > > > > From: Thierry Reding <treding(a)nvidia.com> > > > > There is no technical reason why there should be a limited number of CMA > > regions, so extract some code into helpers and use them to create extra > > functions (cma_create() and cma_free()) that allow creating and freeing, > > respectively, CMA regions dynamically at runtime. > > > > Note that these dynamically created CMA areas are treated specially and > > do not contribute to the number of total CMA pages so that this count > > still only applies to the fixed number of CMA areas. > > > > Signed-off-by: Thierry Reding <treding(a)nvidia.com> > > --- > > include/linux/cma.h | 16 ++++++++ > > mm/cma.c | 89 ++++++++++++++++++++++++++++++++++----------- > > 2 files changed, 83 insertions(+), 22 deletions(-) [...] > I agree that supporting dynamic CMA areas would be good. However, by > doing it like this, these CMA areas are invisible to the rest of the > system. E.g. cma_for_each_area() does not know about them. It seems a > bit inconsistent that there will now be some areas that are globally > known, and some that are not. That was kind of the point of this experiment. When I started on this I ran into the case where I was running out of predefined CMA areas and as I went looking for ways on how to fix this, I realized that there's not much reason to keep a global list of these areas. And even less reason to limit the number of CMA areas to this predefined list. Very little code outside of the core CMA code even uses this. There's one instance of cma_for_each_area() that I don't grok. There's another early MMU fixup for CMA areas in 32-bit ARM that. Other than that there's a few places where the total CMA page count is shown for informational purposes and I don't know how useful that really is because totalcma_pages doesn't really track how many pages are used for CMA, but pages that could potentially be used for CMA. And that's about it. It seems like there are cases where we might really need to globally know about some of these areas, specifically ones that are allocated very early during boot and then used for very specific purposes. However, it seems to me like CMA is more universally useful than just for these cases and I don't see the usefulness of tracking these more generic uses. > I am being somewhat selfish here, as I have some WIP code that needs > the global list :-) But I think the inconsistency is a more general > point than just what I want (and the s390 code does use > cma_for_each_area()). Maybe you could keep maintaining a global > structure containing all areas? If it's really useful to be able to access all CMA areas, then we could easily just add them all to a global linked list upon activation (we may still want/need to keep the predefined list around for all those early allocation cases). That way we'd get the best of both worlds. > What do you think are the chances of running out of the global count > of areas? Well, I did run out of CMA areas during the early VPR testing because I was initially testing with 16 areas and a different allocation scheme that turned out to cause too many resizes in common cases. However, given that the default is 8 on normal systems (20 on NUMA) and is configurable, it means that even with restricting this to 4 for VPR doesn't always guarantee that all 4 are available. Again, yes, we could keep bumping that number, but why not turn this into something a bit more robust where nobody has to know or care about how many there are? > Also, you say that "these are treated specially and do not contribute > to the number of total CMA pages". But, if I'm reading this right, you > do call cma_activate_area(), which will do > init_cma_reserved_pageblock() for each pageblock in it. Which adjusts > the CMA counters for the zone they are in. But your change does not > adjust totalcma_pages for dynamically created areas. That seems > inconsistent, too. I was referring to just totalcma_pages that isn't impacted by these dynamically allocated regions. This is, again, because I don't see why that information would be useful. It's a fairly easy change to update that value, so if people prefer that, I can add that. I don't see an immediate connection between totalcma_pages and init_cma_reserved_pageblock(). I thought the latter was primarily useful for making sure that the CMA pages can be migrated, which is still critical for this use-case. Thierry

5 months

Re: [PATCH v9 06/11] firmware: qcom: scm: add support for object invocation

by kernel test robot

Hi Amirreza, kernel test robot noticed the following build warnings: [auto build test WARNING on 33bcf93b9a6b028758105680f8b538a31bc563cf] url: https://github.com/intel-lab-lkp/linux/commits/Amirreza-Zarrabi/tee-allow-a… base: 33bcf93b9a6b028758105680f8b538a31bc563cf patch link: https://lore.kernel.org/r/20250901-qcom-tee-using-tee-ss-without-mem-obj-v9… patch subject: [PATCH v9 06/11] firmware: qcom: scm: add support for object invocation config: i386-buildonly-randconfig-001-20250903 (https://download.01.org/0day-ci/archive/20250903/202509030554.WR3MNpCE-lkp@…) compiler: gcc-12 (Debian 12.2.0-14+deb12u1) 12.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250903/202509030554.WR3MNpCE-lkp@…) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp(a)intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202509030554.WR3MNpCE-lkp@intel.com/ All warnings (new ones prefixed by >>): In file included from include/linux/device.h:15, from include/linux/dma-mapping.h:5, from drivers/firmware/qcom/qcom_scm.c:13: drivers/firmware/qcom/qcom_scm.c: In function 'qcom_scm_qtee_init': >> drivers/firmware/qcom/qcom_scm.c:2208:35: warning: format '%d' expects argument of type 'int', but argument 3 has type 'long int' [-Wformat=] 2208 | dev_err(scm->dev, "qcomtee: register failed: %d\n", | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ include/linux/dev_printk.h:110:30: note: in definition of macro 'dev_printk_index_wrap' 110 | _p_func(dev, fmt, ##__VA_ARGS__); \ | ^~~ include/linux/dev_printk.h:154:56: note: in expansion of macro 'dev_fmt' 154 | dev_printk_index_wrap(_dev_err, KERN_ERR, dev, dev_fmt(fmt), ##__VA_ARGS__) | ^~~~~~~ drivers/firmware/qcom/qcom_scm.c:2208:17: note: in expansion of macro 'dev_err' 2208 | dev_err(scm->dev, "qcomtee: register failed: %d\n", | ^~~~~~~ drivers/firmware/qcom/qcom_scm.c:2208:63: note: format string is defined here 2208 | dev_err(scm->dev, "qcomtee: register failed: %d\n", | ~^ | | | int | %ld vim +2208 drivers/firmware/qcom/qcom_scm.c 2188 2189 static void qcom_scm_qtee_init(struct qcom_scm *scm) 2190 { 2191 struct platform_device *qtee_dev; 2192 u64 result, response_type; 2193 int ret; 2194 2195 /* 2196 * Probe for smcinvoke support. This will fail due to invalid buffers, 2197 * but first, it checks whether the call is supported in QTEE syscall 2198 * handler. If it is not supported, -EIO is returned. 2199 */ 2200 ret = qcom_scm_qtee_invoke_smc(0, 0, 0, 0, &result, &response_type); 2201 if (ret == -EIO) 2202 return; 2203 2204 /* Setup QTEE interface device. */ 2205 qtee_dev = platform_device_register_data(scm->dev, "qcomtee", 2206 PLATFORM_DEVID_NONE, NULL, 0); 2207 if (IS_ERR(qtee_dev)) { > 2208 dev_err(scm->dev, "qcomtee: register failed: %d\n", 2209 PTR_ERR(qtee_dev)); 2210 return; 2211 } 2212 2213 ret = devm_add_action_or_reset(scm->dev, qcom_scm_qtee_free, qtee_dev); 2214 if (ret) 2215 dev_err(scm->dev, "qcomtee: add action failed: %d\n", ret); 2216 } 2217 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

5 months, 1 week

[PATCH v1 00/10] vfio/pci: Allow MMIO regions to be exported through dma-buf

by Leon Romanovsky

Changelog: v1: * Changed commit messages. * Reused DMA_ATTR_MMIO attribute. * Returned support for multiple DMA ranges per-dMABUF. v0: https://lore.kernel.org/all/cover.1753274085.git.leonro@nvidia.com --------------------------------------------------------------------------- Based on "[PATCH v1 00/16] dma-mapping: migrate to physical address-based API" https://lore.kernel.org/all/cover.1754292567.git.leon@kernel.org series. --------------------------------------------------------------------------- This series extends the VFIO PCI subsystem to support exporting MMIO regions from PCI device BARs as dma-buf objects, enabling safe sharing of non-struct page memory with controlled lifetime management. This allows RDMA and other subsystems to import dma-buf FDs and build them into memory regions for PCI P2P operations. The series supports a use case for SPDK where a NVMe device will be owned by SPDK through VFIO but interacting with a RDMA device. The RDMA device may directly access the NVMe CMB or directly manipulate the NVMe device's doorbell using PCI P2P. However, as a general mechanism, it can support many other scenarios with VFIO. This dmabuf approach can be usable by iommufd as well for generic and safe P2P mappings. In addition to the SPDK use-case mentioned above, the capability added in this patch series can also be useful when a buffer (located in device memory such as VRAM) needs to be shared between any two dGPU devices or instances (assuming one of them is bound to VFIO PCI) as long as they are P2P DMA compatible. The implementation provides a revocable attachment mechanism using dma-buf move operations. MMIO regions are normally pinned as BARs don't change physical addresses, but access is revoked when the VFIO device is closed or a PCI reset is issued. This ensures kernel self-defense against potentially hostile userspace. The series includes significant refactoring of the PCI P2PDMA subsystem to separate core P2P functionality from memory allocation features, making it more modular and suitable for VFIO use cases that don't need struct page support. ----------------------------------------------------------------------- The series is based originally on https://lore.kernel.org/all/20250307052248.405803-1-vivek.kasireddy@intel.c… but heavily rewritten to be based on DMA physical API. ----------------------------------------------------------------------- The WIP branch can be found here: https://git.kernel.org/pub/scm/linux/kernel/git/leon/linux-rdma.git/log/?h=… Thanks Leon Romanovsky (8): PCI/P2PDMA: Remove redundant bus_offset from map state PCI/P2PDMA: Separate the mmap() support from the core logic PCI/P2PDMA: Simplify bus address mapping API PCI/P2PDMA: Refactor to separate core P2P functionality from memory allocation PCI/P2PDMA: Export pci_p2pdma_map_type() function types: move phys_vec definition to common header vfio/pci: Enable peer-to-peer DMA transactions by default vfio/pci: Add dma-buf export support for MMIO regions Vivek Kasireddy (2): vfio: Export vfio device get and put registration helpers vfio/pci: Share the core device pointer while invoking feature functions block/blk-mq-dma.c | 7 +- drivers/iommu/dma-iommu.c | 4 +- drivers/pci/p2pdma.c | 154 ++++++++---- drivers/vfio/pci/Kconfig | 20 ++ drivers/vfio/pci/Makefile | 2 + drivers/vfio/pci/vfio_pci_config.c | 22 +- drivers/vfio/pci/vfio_pci_core.c | 59 +++-- drivers/vfio/pci/vfio_pci_dmabuf.c | 390 +++++++++++++++++++++++++++++ drivers/vfio/pci/vfio_pci_priv.h | 23 ++ drivers/vfio/vfio_main.c | 2 + include/linux/dma-buf.h | 1 + include/linux/pci-p2pdma.h | 114 +++++---- include/linux/types.h | 5 + include/linux/vfio.h | 2 + include/linux/vfio_pci_core.h | 4 + include/uapi/linux/vfio.h | 25 ++ kernel/dma/direct.c | 4 +- mm/hmm.c | 2 +- 18 files changed, 715 insertions(+), 125 deletions(-) create mode 100644 drivers/vfio/pci/vfio_pci_dmabuf.c -- 2.50.1

5 months, 1 week

[PATCH v11 0/9] TEE subsystem for protected dma-buf allocations

by Jens Wiklander

Hi, This patch set allocates the protected DMA-bufs from a DMA-heap instantiated from the TEE subsystem. The TEE subsystem handles the DMA-buf allocations since it is the TEE (OP-TEE, AMD-TEE, TS-TEE, or perhaps a future QTEE) which sets up the protection for the memory used for the DMA-bufs. The DMA-heap uses a protected memory pool provided by the backend TEE driver, allowing it to choose how to allocate the protected physical memory. The allocated DMA-bufs must be imported with a new TEE_IOC_SHM_REGISTER_FD before they can be passed as arguments when requesting services from the secure world. Three use-cases (Secure Video Playback, Trusted UI, and Secure Video Recording) have been identified so far to serve as examples of what can be expected. The use-cases have predefined DMA-heap names, "protected,secure-video", "protected,trusted-ui", and "protected,secure-video-record". The backend driver registers protected memory pools for the use-cases it supports. Each use-case has its own protected memory pool since different use-cases require isolation from different parts of the system. A protected memory pool can be based on a static carveout instantiated while probing the TEE backend driver, or dynamically allocated from CMA (dma_alloc_pages()) and made protected as needed by the TEE. This can be tested on a RockPi 4B+ with the following steps: repo init -u https://github.com/jenswi-linaro/manifest.git -m rockpi4.xml \ -b prototype/sdp-v11 repo sync -j8 cd build make toolchains -j$(nproc) make all -j$(nproc) # Copy ../out/rockpi4.img to an SD card and boot the RockPi from that # Connect a monitor to the RockPi # login and at the prompt: gst-launch-1.0 videotestsrc ! \ aesenc key=1f9423681beb9a79215820f6bda73d0f \ iv=e9aa8e834d8d70b7e0d254ff670dd718 serialize-iv=true ! \ aesdec key=1f9423681beb9a79215820f6bda73d0f ! \ kmssink The aesdec module has been hacked to use an OP-TEE TA to decrypt the stream into protected DMA-bufs which are consumed by the kmssink. The primitive QEMU tests from previous patch sets can be tested on RockPi in the same way using: xtest --sdp-basic The primitive tests are tested on QEMU with the following steps: repo init -u https://github.com/jenswi-linaro/manifest.git -m qemu_v8.xml \ -b prototype/sdp-v11 repo sync -j8 cd build make toolchains -j$(nproc) make SPMC_AT_EL=1 all -j$(nproc) make SPMC_AT_EL=1 run-only # login and at the prompt: xtest --sdp-basic The SPMC_AT_EL=1 parameter configures the build with FF-A and an SPMC at S-EL1 inside OP-TEE. The parameter can be changed to SPMC_AT_EL=n to test without FF-A using the original SMC ABI instead. Please remember to do %make arm-tf-clean for TF-A to be rebuilt properly using the new configuration. https://optee.readthedocs.io/en/latest/building/prerequisites.html list dependencies required to build the above. The primitive tests are pretty basic, mostly checking that a Trusted Application in the secure world can access and manipulate the memory. There are also some negative tests for out of bounds buffers, etc. Thanks, Jens Changes since V10: * Changed the new ABI OPTEE_MSG_CMD_GET_PROTMEM_CONFIG to report a list of u32 memory attributes instead of u16 endpoints to make room for both endpoint and access permissions in each entry. * In "tee: new ioctl to a register tee_shm from a dmabuf file descriptor", remove the unused path for DMA-bufs allocated by other means than the on in the TEE SS. * In "tee: implement protected DMA-heap", handle unloading of the backend driver module implementing the heap. The heap is reference counted and also calls tee_device_get() to guarantee that the module remains available while the heap is instantiated. * In "optee: support protected memory allocation", use dma_coerce_mask_and_coherent() instead of open-coding the function. * Added Sumit's R-B to - "optee: smc abi: dynamic protected memory allocation" - "optee: FF-A: dynamic protected memory allocation" - "optee: support protected memory allocation" - "tee: implement protected DMA-heap" - "dma-buf: dma-heap: export declared functions" Changes since V9: * Adding Sumit's R-B to "optee: sync secure world ABI headers" * Update commit message as requested for "dma-buf: dma-heap: export declared functions". * In "tee: implement protected DMA-heap": - add the hidden config option TEE_DMABUF_HEAPS to tell if the TEE subsystem can support DMA heaps - add a pfn_valid() to check that the passed physical address can be used by __pfn_to_page() and friends - remove the memremap() call, the caller is should do that instead if needed * In "tee: add tee_shm_alloc_dma_mem()" guard the calls to dma_alloc_pages() and dma_free_pages() with TEE_DMABUF_HEAPS to avoid linking errors in some configurations * In "optee: support protected memory allocation": - add the hidden config option OPTEE_STATIC_PROTMEM_POOL to tell if the driver can support a static protected memory pool - optee_protmem_pool_init() is slightly refactored to make the patches that follow easier - Call devm_memremap() before calling tee_protmem_static_pool_alloc() Changes since V8: * Using dma_alloc_pages() instead of cma_alloc() so the direct dependency on CMA can be removed together with the patches "cma: export cma_alloc() and cma_release()" and "dma-contiguous: export dma_contiguous_default_area". The patch * Renaming the patch "tee: add tee_shm_alloc_cma_phys_mem()" to "tee: add tee_shm_alloc_dma_mem()" * Setting DMA mask for the OP-TEE TEE device based on input from the secure world instead of relying on the parent device so following patches are removed: "tee: tee_device_alloc(): copy dma_mask from parent device" and "optee: pass parent device to tee_device_alloc()". * Adding Sumit Garg's R-B to "tee: refactor params_from_user()" * In the patch "tee: implement protected DMA-heap", map the physical memory passed to tee_protmem_static_pool_alloc(). Changes since V7: * Adding "dma-buf: dma-heap: export declared functions", "cma: export cma_alloc() and cma_release()", and "dma-contiguous: export dma_contiguous_default_area" to export the symbols needed to keep the TEE subsystem as a load module. * Removing CONFIG_TEE_DMABUF_HEAP and CONFIG_TEE_CMA since they aren't needed any longer. * Addressing review comments in "optee: sync secure world ABI headers" * Better align protected memory pool initialization between the smc-abi and ffa-abi parts of the optee driver. * Removing the patch "optee: account for direction while converting parameters" Changes since V6: * Restricted memory is now known as protected memory since to use the same term as https://docs.vulkan.org/guide/latest/protected.html. Update all patches to consistently use protected memory. * In "tee: implement protected DMA-heap" add the hidden config option TEE_DMABUF_HEAP to tell if the DMABUF_HEAPS functions are available for the TEE subsystem * Adding "tee: refactor params_from_user()", broken out from the patch "tee: new ioctl to a register tee_shm from a dmabuf file descriptor" * For "tee: new ioctl to a register tee_shm from a dmabuf file descriptor": - Update commit message to mention protected memory - Remove and open code tee_shm_get_parent_shm() in param_from_user_memref() * In "tee: add tee_shm_alloc_cma_phys_mem" add the hidden config option TEE_CMA to tell if the CMA functions are available for the TEE subsystem * For "tee: tee_device_alloc(): copy dma_mask from parent device" and "optee: pass parent device to tee_device_alloc", added Reviewed-by: Sumit Garg <sumit.garg(a)kernel.org> Changes since V5: * Removing "tee: add restricted memory allocation" and "tee: add TEE_IOC_RSTMEM_FD_INFO" * Adding "tee: implement restricted DMA-heap", "tee: new ioctl to a register tee_shm from a dmabuf file descriptor", "tee: add tee_shm_alloc_cma_phys_mem()", "optee: pass parent device to tee_device_alloc()", and "tee: tee_device_alloc(): copy dma_mask from parent device" * The two TEE driver OPs "rstmem_alloc()" and "rstmem_free()" are replaced with a struct tee_rstmem_pool abstraction. * Replaced the the TEE_IOC_RSTMEM_ALLOC user space API with the DMA-heap API Changes since V4: * Adding the patch "tee: add TEE_IOC_RSTMEM_FD_INFO" needed by the GStreamer demo * Removing the dummy CPU access and mmap functions from the dma_buf_ops * Fixing a compile error in "optee: FF-A: dynamic restricted memory allocation" reported by kernel test robot <lkp(a)intel.com> Changes since V3: * Make the use_case and flags field in struct tee_shm u32's instead of u16's * Add more description for TEE_IOC_RSTMEM_ALLOC in the header file * Import namespace DMA_BUF in module tee, reported by lkp(a)intel.com * Added a note in the commit message for "optee: account for direction while converting parameters" why it's needed * Factor out dynamic restricted memory allocation from "optee: support restricted memory allocation" into two new commits "optee: FF-A: dynamic restricted memory allocation" and "optee: smc abi: dynamic restricted memory allocation" * Guard CMA usage with #ifdef CONFIG_CMA, effectively disabling dynamic restricted memory allocate if CMA isn't configured Changes since the V2 RFC: * Based on v6.12 * Replaced the flags for SVP and Trusted UID memory with a u32 field with unique id for each use case * Added dynamic allocation of restricted memory pools * Added OP-TEE ABI both with and without FF-A for dynamic restricted memory * Added support for FF-A with FFA_LEND Changes since the V1 RFC: * Based on v6.11 * Complete rewrite, replacing the restricted heap with TEE_IOC_RSTMEM_ALLOC Changes since Olivier's post [2]: * Based on Yong Wu's post [1] where much of dma-buf handling is done in the generic restricted heap * Simplifications and cleanup * New commit message for "dma-buf: heaps: add Linaro restricted dmabuf heap support" * Replaced the word "secure" with "restricted" where applicable Etienne Carriere (1): tee: new ioctl to a register tee_shm from a dmabuf file descriptor Jens Wiklander (8): optee: sync secure world ABI headers dma-buf: dma-heap: export declared functions tee: implement protected DMA-heap tee: refactor params_from_user() tee: add tee_shm_alloc_dma_mem() optee: support protected memory allocation optee: FF-A: dynamic protected memory allocation optee: smc abi: dynamic protected memory allocation drivers/dma-buf/dma-heap.c | 3 + drivers/tee/Kconfig | 5 + drivers/tee/Makefile | 1 + drivers/tee/optee/Kconfig | 5 + drivers/tee/optee/Makefile | 1 + drivers/tee/optee/core.c | 7 + drivers/tee/optee/ffa_abi.c | 146 ++++++++- drivers/tee/optee/optee_ffa.h | 27 +- drivers/tee/optee/optee_msg.h | 84 ++++- drivers/tee/optee/optee_private.h | 15 +- drivers/tee/optee/optee_smc.h | 37 ++- drivers/tee/optee/protmem.c | 335 ++++++++++++++++++++ drivers/tee/optee/smc_abi.c | 141 ++++++++- drivers/tee/tee_core.c | 157 +++++++--- drivers/tee/tee_heap.c | 500 ++++++++++++++++++++++++++++++ drivers/tee/tee_private.h | 14 + drivers/tee/tee_shm.c | 157 +++++++++- include/linux/tee_core.h | 59 ++++ include/linux/tee_drv.h | 10 + include/uapi/linux/tee.h | 31 ++ 20 files changed, 1668 insertions(+), 67 deletions(-) create mode 100644 drivers/tee/optee/protmem.c create mode 100644 drivers/tee/tee_heap.c base-commit: 038d61fd642278bab63ee8ef722c50d10ab01e8f -- 2.43.0

5 months, 1 week

[PATCH v3 00/14] Rust abstractions for shmem-backed GEM objects

by Lyude Paul

This is the next version of the shmem backed GEM objects series originally from Asahi, previously posted by Daniel Almeida. Along with bindings for shmem backed GEM objects. This applies on top of Danilo and Abdiel's sgtable patches: https://lkml.org/lkml/2025/8/28/1018 Asahi Lina (2): rust: helpers: Add bindings/wrappers for dma_resv_lock rust: drm: gem: shmem: Add DRM shmem helper abstraction Lyude Paul (12): rust: drm: gem: Simplify use of generics rust: drm: gem: Add DriverFile type alias rust: drm: gem: Drop Object::SIZE rust: drm: gem: Support driver-private GEM object types rust: drm: gem: Add raw_dma_resv() function drm/gem/shmem: Extract drm_gem_shmem_init() from drm_gem_shmem_create() drm/gem/shmem: Extract drm_gem_shmem_release() from drm_gem_shmem_free() rust: gem: Introduce DriverObject::Args rust: drm: gem: Introduce SGTableRef rust: Add dma_buf stub bindings rust: drm: gem: Add export() callback rust: drm: gem: Add BaseObject::prime_export() drivers/gpu/drm/drm_gem_shmem_helper.c | 98 +++++-- drivers/gpu/drm/nova/driver.rs | 8 +- drivers/gpu/drm/nova/gem.rs | 15 +- include/drm/drm_gem_shmem_helper.h | 2 + rust/bindings/bindings_helper.h | 3 + rust/helpers/dma-resv.c | 13 + rust/helpers/drm.c | 48 +++- rust/helpers/helpers.c | 1 + rust/kernel/dma_buf.rs | 39 +++ rust/kernel/drm/device.rs | 17 +- rust/kernel/drm/driver.rs | 5 +- rust/kernel/drm/gem/mod.rs | 274 +++++++++++++++---- rust/kernel/drm/gem/shmem.rs | 365 +++++++++++++++++++++++++ rust/kernel/lib.rs | 1 + 14 files changed, 783 insertions(+), 106 deletions(-) create mode 100644 rust/helpers/dma-resv.c create mode 100644 rust/kernel/dma_buf.rs create mode 100644 rust/kernel/drm/gem/shmem.rs base-commit: 09f90256e8902793f594517ef440698585eb3595 prerequisite-patch-id: 0e1b1f9a665317ff569a37df6ff49cd1880b04f8 prerequisite-patch-id: 178b864e6d1b88ee299dcc05d1a7a4c89ec7ed51 prerequisite-patch-id: 7f72c4bfd0e5f50b6d2f8ce96751782894a3ba81 prerequisite-patch-id: 62fa6de7d3ae99dc54c092087bd716e6749545fd prerequisite-patch-id: 3d14d56ca93b0831837aa26b802100a250adeac6 prerequisite-patch-id: 7a12f4b0e7588874ce589b41b70671dc261b9468 prerequisite-patch-id: c44763ec35c4e4431e769df088b98424cbddf7df prerequisite-patch-id: a9e008c179b1c2fbe76654a191e5018880383d49 prerequisite-patch-id: 1e9ce500ce25188c575be608cd39e15a59836f83 prerequisite-patch-id: 39ca3a210a6c365434924c07a0c98a074eb73b97 prerequisite-patch-id: a747e05834cdb8b8f727e1f7c8b110c636cadab8 prerequisite-patch-id: 24833689bdecd3fc7a604e13bfe203ccd2fca6f0 -- 2.50.0

5 months, 1 week

Re: [PATCH v8 09/11] qcomtee: add primordial object

by Bjorn Andersson

On Wed, Aug 20, 2025 at 04:38:56PM -0700, Amirreza Zarrabi wrote: Looking at other commits in drivers/tee/ I'd expect the subject prefix to be "tee: qcom: ". > After booting, the kernel provides a static object known as the > primordial object. This object is utilized by QTEE for native > kernel services such as yield or privileged operations. > > Acked-by: Sumit Garg <sumit.garg(a)oss.qualcomm.com> > Tested-by: Neil Armstrong <neil.armstrong(a)linaro.org> > Tested-by: Harshal Dev <quic_hdev(a)quicinc.com> > Signed-off-by: Amirreza Zarrabi <amirreza.zarrabi(a)oss.qualcomm.com> > --- > drivers/tee/qcomtee/Makefile | 1 + > drivers/tee/qcomtee/core.c | 19 ++++++++--- > drivers/tee/qcomtee/primordial_obj.c | 66 ++++++++++++++++++++++++++++++++++++ > drivers/tee/qcomtee/qcomtee.h | 3 ++ > 4 files changed, 84 insertions(+), 5 deletions(-) > > diff --git a/drivers/tee/qcomtee/Makefile b/drivers/tee/qcomtee/Makefile > index 600af2b8f1c1..78f8e899d143 100644 > --- a/drivers/tee/qcomtee/Makefile > +++ b/drivers/tee/qcomtee/Makefile > @@ -3,5 +3,6 @@ obj-$(CONFIG_QCOMTEE) += qcomtee.o > qcomtee-objs += async.o > qcomtee-objs += call.o > qcomtee-objs += core.o > +qcomtee-objs += primordial_obj.o > qcomtee-objs += shm.o > qcomtee-objs += user_obj.o > diff --git a/drivers/tee/qcomtee/core.c b/drivers/tee/qcomtee/core.c > index 578299a3eabc..561a48319f91 100644 > --- a/drivers/tee/qcomtee/core.c > +++ b/drivers/tee/qcomtee/core.c > @@ -31,10 +31,12 @@ int qcomtee_next_arg_type(struct qcomtee_arg *u, int i, > } > > /* > - * QTEE expects IDs with the QCOMTEE_MSG_OBJECT_NS_BIT set for objects > - * of the QCOMTEE_OBJECT_TYPE_CB type. > + * QTEE expects IDs with QCOMTEE_MSG_OBJECT_NS_BIT set for objects of > + * QCOMTEE_OBJECT_TYPE_CB type. The first ID with QCOMTEE_MSG_OBJECT_NS_BIT > + * set is reserved for the primordial object. > */ > -#define QCOMTEE_OBJECT_ID_START (QCOMTEE_MSG_OBJECT_NS_BIT + 1) > +#define QCOMTEE_OBJECT_PRIMORDIAL (QCOMTEE_MSG_OBJECT_NS_BIT) > +#define QCOMTEE_OBJECT_ID_START (QCOMTEE_OBJECT_PRIMORDIAL + 1) > #define QCOMTEE_OBJECT_ID_END (U32_MAX) > > #define QCOMTEE_OBJECT_SET(p, type, ...) \ > @@ -157,7 +159,9 @@ static void qcomtee_object_release(struct kref *refcount) > */ > int qcomtee_object_get(struct qcomtee_object *object) > { > - if (object != NULL_QCOMTEE_OBJECT && object != ROOT_QCOMTEE_OBJECT) > + if (object != &qcomtee_primordial_object && > + object != NULL_QCOMTEE_OBJECT && > + object != ROOT_QCOMTEE_OBJECT) > return kref_get_unless_zero(&object->refcount); > > return 0; > @@ -169,7 +173,9 @@ int qcomtee_object_get(struct qcomtee_object *object) > */ > void qcomtee_object_put(struct qcomtee_object *object) > { > - if (object != NULL_QCOMTEE_OBJECT && object != ROOT_QCOMTEE_OBJECT) > + if (object != &qcomtee_primordial_object && > + object != NULL_QCOMTEE_OBJECT && > + object != ROOT_QCOMTEE_OBJECT) > kref_put(&object->refcount, qcomtee_object_release); > } > > @@ -261,6 +267,9 @@ qcomtee_local_object_get(struct qcomtee_object_invoke_ctx *oic, > struct qcomtee *qcomtee = tee_get_drvdata(oic->ctx->teedev); > struct qcomtee_object *object; > > + if (object_id == QCOMTEE_OBJECT_PRIMORDIAL) > + return &qcomtee_primordial_object; > + > guard(rcu)(); > object = xa_load(&qcomtee->xa_local_objects, object_id); > /* It already checks for %NULL_QCOMTEE_OBJECT. */ > diff --git a/drivers/tee/qcomtee/primordial_obj.c b/drivers/tee/qcomtee/primordial_obj.c > new file mode 100644 > index 000000000000..df94fbf5f141 > --- /dev/null > +++ b/drivers/tee/qcomtee/primordial_obj.c > @@ -0,0 +1,66 @@ > +// SPDX-License-Identifier: GPL-2.0-only > +/* > + * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. > + */ > + > +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt I don't see any pr_*() functions in this file, please drop this. Regards, Bjorn > + > +#include <linux/delay.h> > + > +#include "qcomtee.h" > + > +/** > + * DOC: Primordial Object > + * > + * After boot, the kernel provides a static object of type > + * %QCOMTEE_OBJECT_TYPE_CB called the primordial object. This object is used > + * for native kernel services or privileged operations. > + * > + * We support: > + * - %QCOMTEE_OBJECT_OP_YIELD to yield by the thread running in QTEE. > + * - %QCOMTEE_OBJECT_OP_SLEEP to wait for a period of time. > + */ > + > +#define QCOMTEE_OBJECT_OP_YIELD 1 > +#define QCOMTEE_OBJECT_OP_SLEEP 2 > + > +static int > +qcomtee_primordial_obj_dispatch(struct qcomtee_object_invoke_ctx *oic, > + struct qcomtee_object *primordial_object_unused, > + u32 op, struct qcomtee_arg *args) > +{ > + int err = 0; > + > + switch (op) { > + case QCOMTEE_OBJECT_OP_YIELD: > + cond_resched(); > + /* No output object. */ > + oic->data = NULL; > + break; > + case QCOMTEE_OBJECT_OP_SLEEP: > + /* Check message format matched QCOMTEE_OBJECT_OP_SLEEP op. */ > + if (qcomtee_args_len(args) != 1 || > + args[0].type != QCOMTEE_ARG_TYPE_IB || > + args[0].b.size < sizeof(u32)) > + return -EINVAL; > + > + msleep(*(u32 *)(args[0].b.addr)); > + /* No output object. */ > + oic->data = NULL; > + break; > + default: > + err = -EINVAL; > + } > + > + return err; > +} > + > +static struct qcomtee_object_operations qcomtee_primordial_obj_ops = { > + .dispatch = qcomtee_primordial_obj_dispatch, > +}; > + > +struct qcomtee_object qcomtee_primordial_object = { > + .name = "primordial", > + .object_type = QCOMTEE_OBJECT_TYPE_CB, > + .ops = &qcomtee_primordial_obj_ops > +}; > diff --git a/drivers/tee/qcomtee/qcomtee.h b/drivers/tee/qcomtee/qcomtee.h > index f34be992e68b..084b3882017e 100644 > --- a/drivers/tee/qcomtee/qcomtee.h > +++ b/drivers/tee/qcomtee/qcomtee.h > @@ -140,4 +140,7 @@ int qcomtee_user_object_submit(struct tee_context *ctx, > struct tee_param *params, int num_params, > int req_id, int errno); > > +/* (2) Primordial Object. */ > +extern struct qcomtee_object qcomtee_primordial_object; > + > #endif /* QCOMTEE_H */ > > -- > 2.34.1 >

5 months, 2 weeks

Re: [PATCH v8 06/11] firmware: qcom: scm: add support for object invocation

by Bjorn Andersson

On Wed, Aug 20, 2025 at 04:38:53PM -0700, Amirreza Zarrabi wrote: > diff --git a/drivers/firmware/qcom/qcom_scm.c b/drivers/firmware/qcom/qcom_scm.c [..] > +static void qcom_scm_qtee_free(void *data) > +{ > + struct platform_device *qtee_dev = data; > + > + platform_device_unregister(qtee_dev); > +} > + > +static int qcom_scm_qtee_init(struct qcom_scm *scm) > +{ > + struct platform_device *qtee_dev; > + u64 result, response_type; > + int ret; > + > + /* > + * Check if QTEE supports smcinvoke: > + * This will fail due to invalid buffers, but first, it checks whether > + * the call is supported in QTEE syscall handler. > + * If not supported, -EIO is returned. > + */ > + ret = qcom_scm_qtee_invoke_smc(0, 0, 0, 0, &result, &response_type); > + if (ret == -EIO) > + return -EIO; > + > + /* Setup QTEE interface device. */ > + qtee_dev = platform_device_alloc("qcomtee", -1); > + if (!qtee_dev) > + return -ENOMEM; > + > + qtee_dev->dev.parent = scm->dev; > + > + ret = platform_device_add(qtee_dev); > + if (ret) { > + platform_device_put(qtee_dev); > + return ret; > + } Wouldn't this work instead of the alloc + parent + add? qtee_dev = platform_device_alloc_data(scm->dev, "qcomtee", -1, NULL, 0); if (IS_ERR(qtee_dev)) return PTR_ERR(qtee_dev); > + > + return devm_add_action_or_reset(scm->dev, qcom_scm_qtee_free, qtee_dev); > +} > + > /** > * qcom_scm_is_available() - Checks if SCM is available > */ > @@ -2326,6 +2450,16 @@ static int qcom_scm_probe(struct platform_device *pdev) > ret = qcom_scm_qseecom_init(scm); > WARN(ret < 0, "failed to initialize qseecom: %d\n", ret); > > + /* > + * Initialize the QTEE object interface. > + * > + * This only represents the availability for QTEE object invocation > + * and callback support. On failure, ignore the result. Any subsystem > + * depending on it may fail if it tries to access this interface. > + */ > + ret = qcom_scm_qtee_init(scm); > + dev_warn_probe(scm->dev, ret, "Failed to initialize qcomtee\n"); A successful boot of db410c (APQ8016) now has the following in the log: [ 0.161437] qcom_scm firmware:scm: error -EIO: Failed to initialize qcomtee If the target doesn't implement qtee, I'd expect that you tell me that - or preferably stay silent. Looking at the other error conditions, we find -ENOMEM, for which you should also avoid printing. In fact, I believe all other error paths of qcom_scm_qtee_init() will have printed an error already (if not, please move the error print to the place(s) where it's needed). As you're ignoring the return value, please then also change the return type of the function to void. Regards, Bjorn > + > return 0; > }

5 months, 2 weeks

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

Linaro-mm-sig