- Linaro-mm-sig - lists.linaro.org

[PATCH 5.2 47/66] dma-buf: balance refcount inbalance

by Greg Kroah-Hartman

From: Jérôme Glisse <jglisse(a)redhat.com> commit 5e383a9798990c69fc759a4930de224bb497e62c upstream. The debugfs take reference on fence without dropping them. Signed-off-by: Jérôme Glisse <jglisse(a)redhat.com> Cc: Christian König <christian.koenig(a)amd.com> Cc: Daniel Vetter <daniel.vetter(a)ffwll.ch> Cc: Sumit Semwal <sumit.semwal(a)linaro.org> Cc: linux-media(a)vger.kernel.org Cc: dri-devel(a)lists.freedesktop.org Cc: linaro-mm-sig(a)lists.linaro.org Cc: Stéphane Marchesin <marcheu(a)chromium.org> Cc: stable(a)vger.kernel.org Reviewed-by: Christian König <christian.koenig(a)amd.com> Signed-off-by: Sumit Semwal <sumit.semwal(a)linaro.org> Link: https://patchwork.freedesktop.org/patch/msgid/20181206161840.6578-1-jglisse… Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/dma-buf/dma-buf.c | 1 + 1 file changed, 1 insertion(+) --- a/drivers/dma-buf/dma-buf.c +++ b/drivers/dma-buf/dma-buf.c @@ -1057,6 +1057,7 @@ static int dma_buf_debug_show(struct seq fence->ops->get_driver_name(fence), fence->ops->get_timeline_name(fence), dma_fence_is_signaled(fence) ? "" : "un"); + dma_fence_put(fence); } rcu_read_unlock();

6 years, 4 months

1
0
0 0

Patch "dma-buf: balance refcount inbalance" has been added to the 5.2-stable tree

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled dma-buf: balance refcount inbalance to the 5.2-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=sum… The filename of the patch is: dma-buf-balance-refcount-inbalance.patch and it can be found in the queue-5.2 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable(a)vger.kernel.org> know about it. >From 5e383a9798990c69fc759a4930de224bb497e62c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= <jglisse(a)redhat.com> Date: Thu, 6 Dec 2018 11:18:40 -0500 Subject: dma-buf: balance refcount inbalance MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Jérôme Glisse <jglisse(a)redhat.com> commit 5e383a9798990c69fc759a4930de224bb497e62c upstream. The debugfs take reference on fence without dropping them. Signed-off-by: Jérôme Glisse <jglisse(a)redhat.com> Cc: Christian König <christian.koenig(a)amd.com> Cc: Daniel Vetter <daniel.vetter(a)ffwll.ch> Cc: Sumit Semwal <sumit.semwal(a)linaro.org> Cc: linux-media(a)vger.kernel.org Cc: dri-devel(a)lists.freedesktop.org Cc: linaro-mm-sig(a)lists.linaro.org Cc: Stéphane Marchesin <marcheu(a)chromium.org> Cc: stable(a)vger.kernel.org Reviewed-by: Christian König <christian.koenig(a)amd.com> Signed-off-by: Sumit Semwal <sumit.semwal(a)linaro.org> Link: https://patchwork.freedesktop.org/patch/msgid/20181206161840.6578-1-jglisse… Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/dma-buf/dma-buf.c | 1 + 1 file changed, 1 insertion(+) --- a/drivers/dma-buf/dma-buf.c +++ b/drivers/dma-buf/dma-buf.c @@ -1057,6 +1057,7 @@ static int dma_buf_debug_show(struct seq fence->ops->get_driver_name(fence), fence->ops->get_timeline_name(fence), dma_fence_is_signaled(fence) ? "" : "un"); + dma_fence_put(fence); } rcu_read_unlock(); Patches currently in stable-queue which might be from jglisse(a)redhat.com are queue-5.2/dma-buf-balance-refcount-inbalance.patch

6 years, 4 months

1
0
0 0

Patch "dma-buf: balance refcount inbalance" has been added to the 5.1-stable tree

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled dma-buf: balance refcount inbalance to the 5.1-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=sum… The filename of the patch is: dma-buf-balance-refcount-inbalance.patch and it can be found in the queue-5.1 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable(a)vger.kernel.org> know about it. >From 5e383a9798990c69fc759a4930de224bb497e62c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= <jglisse(a)redhat.com> Date: Thu, 6 Dec 2018 11:18:40 -0500 Subject: dma-buf: balance refcount inbalance MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Jérôme Glisse <jglisse(a)redhat.com> commit 5e383a9798990c69fc759a4930de224bb497e62c upstream. The debugfs take reference on fence without dropping them. Signed-off-by: Jérôme Glisse <jglisse(a)redhat.com> Cc: Christian König <christian.koenig(a)amd.com> Cc: Daniel Vetter <daniel.vetter(a)ffwll.ch> Cc: Sumit Semwal <sumit.semwal(a)linaro.org> Cc: linux-media(a)vger.kernel.org Cc: dri-devel(a)lists.freedesktop.org Cc: linaro-mm-sig(a)lists.linaro.org Cc: Stéphane Marchesin <marcheu(a)chromium.org> Cc: stable(a)vger.kernel.org Reviewed-by: Christian König <christian.koenig(a)amd.com> Signed-off-by: Sumit Semwal <sumit.semwal(a)linaro.org> Link: https://patchwork.freedesktop.org/patch/msgid/20181206161840.6578-1-jglisse… Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/dma-buf/dma-buf.c | 1 + 1 file changed, 1 insertion(+) --- a/drivers/dma-buf/dma-buf.c +++ b/drivers/dma-buf/dma-buf.c @@ -1068,6 +1068,7 @@ static int dma_buf_debug_show(struct seq fence->ops->get_driver_name(fence), fence->ops->get_timeline_name(fence), dma_fence_is_signaled(fence) ? "" : "un"); + dma_fence_put(fence); } rcu_read_unlock(); Patches currently in stable-queue which might be from jglisse(a)redhat.com are queue-5.1/dma-buf-balance-refcount-inbalance.patch

6 years, 4 months

1
0
0 0

Patch "dma-buf: balance refcount inbalance" has been added to the 4.19-stable tree

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled dma-buf: balance refcount inbalance to the 4.19-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=sum… The filename of the patch is: dma-buf-balance-refcount-inbalance.patch and it can be found in the queue-4.19 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable(a)vger.kernel.org> know about it. >From 5e383a9798990c69fc759a4930de224bb497e62c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= <jglisse(a)redhat.com> Date: Thu, 6 Dec 2018 11:18:40 -0500 Subject: dma-buf: balance refcount inbalance MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Jérôme Glisse <jglisse(a)redhat.com> commit 5e383a9798990c69fc759a4930de224bb497e62c upstream. The debugfs take reference on fence without dropping them. Signed-off-by: Jérôme Glisse <jglisse(a)redhat.com> Cc: Christian König <christian.koenig(a)amd.com> Cc: Daniel Vetter <daniel.vetter(a)ffwll.ch> Cc: Sumit Semwal <sumit.semwal(a)linaro.org> Cc: linux-media(a)vger.kernel.org Cc: dri-devel(a)lists.freedesktop.org Cc: linaro-mm-sig(a)lists.linaro.org Cc: Stéphane Marchesin <marcheu(a)chromium.org> Cc: stable(a)vger.kernel.org Reviewed-by: Christian König <christian.koenig(a)amd.com> Signed-off-by: Sumit Semwal <sumit.semwal(a)linaro.org> Link: https://patchwork.freedesktop.org/patch/msgid/20181206161840.6578-1-jglisse… Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/dma-buf/dma-buf.c | 1 + 1 file changed, 1 insertion(+) --- a/drivers/dma-buf/dma-buf.c +++ b/drivers/dma-buf/dma-buf.c @@ -1069,6 +1069,7 @@ static int dma_buf_debug_show(struct seq fence->ops->get_driver_name(fence), fence->ops->get_timeline_name(fence), dma_fence_is_signaled(fence) ? "" : "un"); + dma_fence_put(fence); } rcu_read_unlock(); Patches currently in stable-queue which might be from jglisse(a)redhat.com are queue-4.19/dma-buf-balance-refcount-inbalance.patch

6 years, 4 months

1
0
0 0

Patch "dma-buf: balance refcount inbalance" has been added to the 4.14-stable tree

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled dma-buf: balance refcount inbalance to the 4.14-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=sum… The filename of the patch is: dma-buf-balance-refcount-inbalance.patch and it can be found in the queue-4.14 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable(a)vger.kernel.org> know about it. >From 5e383a9798990c69fc759a4930de224bb497e62c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= <jglisse(a)redhat.com> Date: Thu, 6 Dec 2018 11:18:40 -0500 Subject: dma-buf: balance refcount inbalance MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Jérôme Glisse <jglisse(a)redhat.com> commit 5e383a9798990c69fc759a4930de224bb497e62c upstream. The debugfs take reference on fence without dropping them. Signed-off-by: Jérôme Glisse <jglisse(a)redhat.com> Cc: Christian König <christian.koenig(a)amd.com> Cc: Daniel Vetter <daniel.vetter(a)ffwll.ch> Cc: Sumit Semwal <sumit.semwal(a)linaro.org> Cc: linux-media(a)vger.kernel.org Cc: dri-devel(a)lists.freedesktop.org Cc: linaro-mm-sig(a)lists.linaro.org Cc: Stéphane Marchesin <marcheu(a)chromium.org> Cc: stable(a)vger.kernel.org Reviewed-by: Christian König <christian.koenig(a)amd.com> Signed-off-by: Sumit Semwal <sumit.semwal(a)linaro.org> Link: https://patchwork.freedesktop.org/patch/msgid/20181206161840.6578-1-jglisse… Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/dma-buf/dma-buf.c | 1 + 1 file changed, 1 insertion(+) --- a/drivers/dma-buf/dma-buf.c +++ b/drivers/dma-buf/dma-buf.c @@ -1115,6 +1115,7 @@ static int dma_buf_debug_show(struct seq fence->ops->get_driver_name(fence), fence->ops->get_timeline_name(fence), dma_fence_is_signaled(fence) ? "" : "un"); + dma_fence_put(fence); } rcu_read_unlock(); Patches currently in stable-queue which might be from jglisse(a)redhat.com are queue-4.14/dma-buf-balance-refcount-inbalance.patch queue-4.14/libnvdimm-pfn-fix-fsdax-mode-namespace-info-block-zero-fields.patch

6 years, 4 months

1
0
0 0

Re: [Linaro-mm-sig] memory leak in dma_buf_ioctl

by Steven Rostedt

On Thu, 25 Jul 2019 19:34:01 -0700 syzbot <syzbot+b2098bc44728a4efb3e9(a)syzkaller.appspotmail.com> wrote: > syzbot has bisected this bug to: > > commit 04cf31a759ef575f750a63777cee95500e410994 > Author: Michael Ellerman <mpe(a)ellerman.id.au> > Date: Thu Mar 24 11:04:01 2016 +0000 > > ftrace: Make ftrace_location_range() global It's sad that I have yet to find a single syzbot bisect useful. Really? setting a function from static to global will cause a memory leak in a completely unrelated area of the kernel? I'm about to set these to my /dev/null folder. -- Steve > > bisection log: https://syzkaller.appspot.com/x/bisect.txt?x=154293f4600000 > start commit: abdfd52a Merge tag 'armsoc-defconfig' of git://git.kernel... > git tree: upstream > final crash: https://syzkaller.appspot.com/x/report.txt?x=174293f4600000 > console output: https://syzkaller.appspot.com/x/log.txt?x=134293f4600000 > kernel config: https://syzkaller.appspot.com/x/.config?x=d31de3d88059b7fa > dashboard link: https://syzkaller.appspot.com/bug?extid=b2098bc44728a4efb3e9 > syz repro: https://syzkaller.appspot.com/x/repro.syz?x=12526e58600000 > C reproducer: https://syzkaller.appspot.com/x/repro.c?x=161784f0600000 > > Reported-by: syzbot+b2098bc44728a4efb3e9(a)syzkaller.appspotmail.com > Fixes: 04cf31a759ef ("ftrace: Make ftrace_location_range() global") > > For information about bisection process see: https://goo.gl/tpsmEJ#bisection

6 years, 4 months

1
0
0 0

Re: [Linaro-mm-sig] Limits for ION Memory Allocator

by Laura Abbott

On 7/17/19 12:31 PM, Alexander Popov wrote: > Hello! > > The syzkaller [1] has a trouble with fuzzing the Linux kernel with ION Memory > Allocator. > > Syzkaller uses several methods [2] to limit memory consumption of the userspace > processes calling the syscalls for testing the kernel: > - setrlimit(), > - cgroups, > - various sysctl. > But these methods don't work for ION Memory Allocator, so any userspace process > that has access to /dev/ion can bring the system to the out-of-memory state. > > An example of a program doing that: > > > #include <sys/types.h> > #include <sys/stat.h> > #include <fcntl.h> > #include <stdio.h> > #include <linux/types.h> > #include <sys/ioctl.h> > > #define ION_IOC_MAGIC 'I' > #define ION_IOC_ALLOC _IOWR(ION_IOC_MAGIC, 0, \ > struct ion_allocation_data) > > struct ion_allocation_data { > __u64 len; > __u32 heap_id_mask; > __u32 flags; > __u32 fd; > __u32 unused; > }; > > int main(void) > { > unsigned long i = 0; > int fd = -1; > struct ion_allocation_data data = { > .len = 0x13f65d8c, > .heap_id_mask = 1, > .flags = 0, > .fd = -1, > .unused = 0 > }; > > fd = open("/dev/ion", 0); > if (fd == -1) { > perror("[-] open /dev/ion"); > return 1; > } > > while (1) { > printf("iter %lu\n", i); > ioctl(fd, ION_IOC_ALLOC, &data); > i++; > } > > return 0; > } > > > I looked through the code of ion_alloc() and didn't find any limit checks. > Is it currently possible to limit ION kernel allocations for some process? > > If not, is it a right idea to do that? > Thanks! > Yes, I do think that's the right approach. We're working on moving Ion out of staging and this is something I mentioned to John Stultz. I don't think we've thought too hard about how to do the actual limiting so suggestions are welcome. Thanks, Laura > Best regards, > Alexander > > > [1]: https://github.com/google/syzkaller > [2]: https://github.com/google/syzkaller/blob/master/executor/common_linux.h >

6 years, 4 months

2
2
0 0

Re: [Linaro-mm-sig] [PATCH 1/2] staging: android: ion: Remove file ion_carveout_heap.c

by Greg KH

On Wed, Jul 03, 2019 at 01:48:41PM +0530, Nishka Dasgupta wrote: > Remove file ion_carveout_heap.c as its functions and definitions are not > used anywhere. > Issue found with Coccinelle. > > Signed-off-by: Nishka Dasgupta <nishkadg.linux(a)gmail.com> > --- > drivers/staging/android/ion/Kconfig | 9 -- > drivers/staging/android/ion/Makefile | 1 - > .../staging/android/ion/ion_carveout_heap.c | 133 ------------------ I keep trying to do this, but others point out that the ion code is "going to be fixed up soon" and that people rely on this interface now. Well, "code outside of the kernel tree" relies on this, which is not ok, but the "soon" people keep insisting on it... Odds are I should just delete all of ION, as there hasn't been any forward progress on it in a long time. Hopefully that wakes some people up... thanks, greg k-h

6 years, 5 months

4
4
0 0

Re: [Linaro-mm-sig] [PATCH 2/2] staging: android: ion: Remove file ion_chunk_heap.c

by Laura Abbott

On 7/3/19 4:18 AM, Nishka Dasgupta wrote: > Remove file ion_chunk_heap.c as its functions and definitions are not > used anywhere else. > Issue found with Coccinelle. > Acked-by: Laura Abbott <labbott(a)redhat.com> > Signed-off-by: Nishka Dasgupta <nishkadg.linux(a)gmail.com> > --- > drivers/staging/android/ion/Kconfig | 9 -- > drivers/staging/android/ion/Makefile | 1 - > drivers/staging/android/ion/ion_chunk_heap.c | 147 ------------------- > 3 files changed, 157 deletions(-) > delete mode 100644 drivers/staging/android/ion/ion_chunk_heap.c > > diff --git a/drivers/staging/android/ion/Kconfig b/drivers/staging/android/ion/Kconfig > index dff641451a89..989fe84a9f9d 100644 > --- a/drivers/staging/android/ion/Kconfig > +++ b/drivers/staging/android/ion/Kconfig > @@ -18,15 +18,6 @@ config ION_SYSTEM_HEAP > Choose this option to enable the Ion system heap. The system heap > is backed by pages from the buddy allocator. If in doubt, say Y. > > -config ION_CHUNK_HEAP > - bool "Ion chunk heap support" > - depends on ION > - help > - Choose this option to enable chunk heaps with Ion. This heap is > - similar in function the carveout heap but memory is broken down > - into smaller chunk sizes, typically corresponding to a TLB size. > - Unless you know your system has these regions, you should say N here. > - > config ION_CMA_HEAP > bool "Ion CMA heap support" > depends on ION && DMA_CMA > diff --git a/drivers/staging/android/ion/Makefile b/drivers/staging/android/ion/Makefile > index 0ac5465e2841..5f4487b1a224 100644 > --- a/drivers/staging/android/ion/Makefile > +++ b/drivers/staging/android/ion/Makefile > @@ -1,5 +1,4 @@ > # SPDX-License-Identifier: GPL-2.0 > obj-$(CONFIG_ION) += ion.o ion_heap.o > obj-$(CONFIG_ION_SYSTEM_HEAP) += ion_system_heap.o ion_page_pool.o > -obj-$(CONFIG_ION_CHUNK_HEAP) += ion_chunk_heap.o > obj-$(CONFIG_ION_CMA_HEAP) += ion_cma_heap.o > diff --git a/drivers/staging/android/ion/ion_chunk_heap.c b/drivers/staging/android/ion/ion_chunk_heap.c > deleted file mode 100644 > index 1e869f4bad45..000000000000 > --- a/drivers/staging/android/ion/ion_chunk_heap.c > +++ /dev/null > @@ -1,147 +0,0 @@ > -// SPDX-License-Identifier: GPL-2.0 > -/* > - * ION memory allocator chunk heap helper > - * > - * Copyright (C) 2012 Google, Inc. > - */ > - > -#include <linux/dma-mapping.h> > -#include <linux/err.h> > -#include <linux/genalloc.h> > -#include <linux/mm.h> > -#include <linux/scatterlist.h> > -#include <linux/slab.h> > - > -#include "ion.h" > - > -struct ion_chunk_heap { > - struct ion_heap heap; > - struct gen_pool *pool; > - unsigned long chunk_size; > - unsigned long size; > - unsigned long allocated; > -}; > - > -static int ion_chunk_heap_allocate(struct ion_heap *heap, > - struct ion_buffer *buffer, > - unsigned long size, > - unsigned long flags) > -{ > - struct ion_chunk_heap *chunk_heap = > - container_of(heap, struct ion_chunk_heap, heap); > - struct sg_table *table; > - struct scatterlist *sg; > - int ret, i; > - unsigned long num_chunks; > - unsigned long allocated_size; > - > - allocated_size = ALIGN(size, chunk_heap->chunk_size); > - num_chunks = allocated_size / chunk_heap->chunk_size; > - > - if (allocated_size > chunk_heap->size - chunk_heap->allocated) > - return -ENOMEM; > - > - table = kmalloc(sizeof(*table), GFP_KERNEL); > - if (!table) > - return -ENOMEM; > - ret = sg_alloc_table(table, num_chunks, GFP_KERNEL); > - if (ret) { > - kfree(table); > - return ret; > - } > - > - sg = table->sgl; > - for (i = 0; i < num_chunks; i++) { > - unsigned long paddr = gen_pool_alloc(chunk_heap->pool, > - chunk_heap->chunk_size); > - if (!paddr) > - goto err; > - sg_set_page(sg, pfn_to_page(PFN_DOWN(paddr)), > - chunk_heap->chunk_size, 0); > - sg = sg_next(sg); > - } > - > - buffer->sg_table = table; > - chunk_heap->allocated += allocated_size; > - return 0; > -err: > - sg = table->sgl; > - for (i -= 1; i >= 0; i--) { > - gen_pool_free(chunk_heap->pool, page_to_phys(sg_page(sg)), > - sg->length); > - sg = sg_next(sg); > - } > - sg_free_table(table); > - kfree(table); > - return -ENOMEM; > -} > - > -static void ion_chunk_heap_free(struct ion_buffer *buffer) > -{ > - struct ion_heap *heap = buffer->heap; > - struct ion_chunk_heap *chunk_heap = > - container_of(heap, struct ion_chunk_heap, heap); > - struct sg_table *table = buffer->sg_table; > - struct scatterlist *sg; > - int i; > - unsigned long allocated_size; > - > - allocated_size = ALIGN(buffer->size, chunk_heap->chunk_size); > - > - ion_heap_buffer_zero(buffer); > - > - for_each_sg(table->sgl, sg, table->nents, i) { > - gen_pool_free(chunk_heap->pool, page_to_phys(sg_page(sg)), > - sg->length); > - } > - chunk_heap->allocated -= allocated_size; > - sg_free_table(table); > - kfree(table); > -} > - > -static struct ion_heap_ops chunk_heap_ops = { > - .allocate = ion_chunk_heap_allocate, > - .free = ion_chunk_heap_free, > - .map_user = ion_heap_map_user, > - .map_kernel = ion_heap_map_kernel, > - .unmap_kernel = ion_heap_unmap_kernel, > -}; > - > -struct ion_heap *ion_chunk_heap_create(phys_addr_t base, size_t size, > - size_t chunk_size) > -{ > - struct ion_chunk_heap *chunk_heap; > - int ret; > - struct page *page; > - > - page = pfn_to_page(PFN_DOWN(base)); > - ret = ion_heap_pages_zero(page, size, pgprot_writecombine(PAGE_KERNEL)); > - if (ret) > - return ERR_PTR(ret); > - > - chunk_heap = kzalloc(sizeof(*chunk_heap), GFP_KERNEL); > - if (!chunk_heap) > - return ERR_PTR(-ENOMEM); > - > - chunk_heap->chunk_size = chunk_size; > - chunk_heap->pool = gen_pool_create(get_order(chunk_heap->chunk_size) + > - PAGE_SHIFT, -1); > - if (!chunk_heap->pool) { > - ret = -ENOMEM; > - goto error_gen_pool_create; > - } > - chunk_heap->size = size; > - chunk_heap->allocated = 0; > - > - gen_pool_add(chunk_heap->pool, base, size, -1); > - chunk_heap->heap.ops = &chunk_heap_ops; > - chunk_heap->heap.type = ION_HEAP_TYPE_CHUNK; > - chunk_heap->heap.flags = ION_HEAP_FLAG_DEFER_FREE; > - pr_debug("%s: base %pa size %zu\n", __func__, &base, size); > - > - return &chunk_heap->heap; > - > -error_gen_pool_create: > - kfree(chunk_heap); > - return ERR_PTR(ret); > -} >

6 years, 5 months

1
0
0 0

Re: [Linaro-mm-sig] [PATCH 1/2] staging: android: ion: Remove file ion_carveout_heap.c

by Greg KH

On Wed, Jul 03, 2019 at 02:14:21PM +0530, Nishka Dasgupta wrote: > On 03/07/19 2:07 PM, Greg KH wrote: > > On Wed, Jul 03, 2019 at 01:48:41PM +0530, Nishka Dasgupta wrote: > > > Remove file ion_carveout_heap.c as its functions and definitions are not > > > used anywhere. > > > Issue found with Coccinelle. > > > > > > Signed-off-by: Nishka Dasgupta <nishkadg.linux(a)gmail.com> > > > --- > > > drivers/staging/android/ion/Kconfig | 9 -- > > > drivers/staging/android/ion/Makefile | 1 - > > > .../staging/android/ion/ion_carveout_heap.c | 133 ------------------ > > > > I keep trying to do this, but others point out that the ion code is > > "going to be fixed up soon" and that people rely on this interface now. > > Well, "code outside of the kernel tree" relies on this, which is not ok, > > but the "soon" people keep insisting on it... > > > > Odds are I should just delete all of ION, as there hasn't been any > > forward progress on it in a long time. > > I'm sorry, I don't think I understand. Should I drop these patches from my > tree then? What "tree"? Let's see what the ION maintainer and developers say before rushing to anything. thanks, greg k-h

6 years, 5 months

1
0
0 0

Re: [Linaro-mm-sig] [RFC PATCH 0/2] Support for TI Page-based Address Translator

by Robin Murphy

On 07/06/2019 20:35, Andrew F. Davis wrote: > Hello all, > > So I've got a new IP on our new SoC I'm looking to make use of and would > like some help figuring out what framework best matches its function. The > IP is called a "Page-based Address Translator" or PAT. A PAT instance > (there are 5 of these things on our J721e device[0]) is basically a > really simple IOMMU sitting on the interconnect between the device bus > and what is effectively our northbridge called > MSMC (DRAM/SRAM/L3-Cache/Coherency controller). > > Simplified it looks about like this: > > CPUs > | > DRAM --- MSMC --- SRAM/L3 > | > NAVSS - (PATs) > | > --- Device Bus --------- > | | | | > Device Device Device etc.. > > Each PAT has a set a window in high memory (about 0x48_0000_0000 area) > for which any transaction with an address targeting its window will be > routed into that PAT. The PAT then does a simple calculation based on > the how far into the window the address is and the current page size, > does a lookup to an internally held table of translations, then sends the > transaction back out on the interconnect with a new address. Usually this > address should be towards somewhere in DRAM, but can be some other device > or even back into PAT (I'm not sure there is a valid use-case for this > but just a point of interest). > > My gut reaction is that this is an IOMMU which belongs in the IOMMU > subsystem. But there are a couple oddities that make me less sure it is > really suitable for the IOMMU framework. First it doesn't sit in front of > any devices, it sits in front of *all* devices, this means we would have > every device claim it as an IOMMU parent, even though many devices also > have a traditional IOMMU connected. Second, there is only a limited > window of address space per PAT, this means we will get fragmentation and > allocation failures on occasion, in this way it looks to me more like AGP > GART. Third, the window is in high-memory, so unlike some IOMMU devices > which can be used to allow DMA to high-mem from low-mem only devices, PAT > can't be used for that. Lastly it doesn't provide any isolation, if the > access does not target the PAT window it is not used (that is not to say > we don't have isolation, just that it is taken care of by other parts of > the interconnect). > > This means, to me, that PAT has one main purpose: making > physically-contiguous views of scattered pages in system memory for DMA. > But it does that really well, the whole translation table is held in a > PAT-internal SRAM giving 1 bus cycle latency and at full bus bandwidth. > > So what are my options here, is IOMMU the right way to go or not? FWIW, that sounds almost exactly like my (vague) understanding of other GARTs, and as such should be pretty well manageable via the IOMMU API - we already have tegra-gart, for example. The aperture contention issue could certainly be mitigated by letting the firmware claim it's only associated with the display and any other devices which really need it. A further interesting avenue of investigation - now that Christoph's recent work has made it much more possible - would be a second set of IOMMU DMA ops tailored for "GART-like" domains where force_aperture=0, which could behave as dma-direct wherever possible and only use IOMMU remaps when absolutely necessary. Robin. > Looking around the kernel I also see the char dev ARP/GART interface > which looks like a good fit, but also looks quite dated and my guess > deprecated at this point. Moving right along.. > > Another thing I saw is we have the support upstream of the DMM device[1] > available in some OMAPx/AM57x SoCs. I'm a little more familiar with this > device. The DMM is a bundle of IPs and in fact one of them is called > "PAT" and it even does basically the same thing this incarnation of "PAT" > does. It's upstream integration design is a bit questionable > unfortunately, the DMM support was integrated into the OMAPDRM display > driver, which does make some sense then given its support for rotation > (using TILER IP contained in DMM). The issue with this was that the > DMM/TILER/PAT IP was not part of the our display IP, but instead out at > the end of the shared device bus, inside the external memory controller. > Like this new PAT this meant that any IP that could make use of it, but > only the display framework could actually provide buffers backed by it. > This meant, for instance, if we wanted to decode some video buffer using > our video decoder we would have to allocate from DRM framework then pass > that over to the V4L2 system. This doesn't make much sense and required > the user-space to know about this odd situation and allocate from the > right spot or else have to use up valuable CMA space or waste memory with > dedicated carveouts. > > Another idea would be to have this as a special central allocator > (exposed through DMA-BUF heaps[2] or ION) that would give out normal > system memory as a DMA-BUF but remap it with PAT if a device that only > supports contiguous memory tries to attach/map that DMA-BUF. > > One last option would be to allow user-space to choose to make the buffer > contiguous when it needs. That's what the driver in this series allows. > We expose a remapping device, user-space passes it a non-contiguous > DMA-BUF handle and it passes a contiguous one back. Simple as that. > > So how do we use this, lets take Android for example, we don't know at > allocation time if a rendering buffer will end up going back into the GPU > for further processing, or if it will be consumed directly by the display. > This is a problem for us as our GPU can work with non-contiguous buffers > but our display cannot, so any buffers that could possibly go to the > display at some point currently needs to be allocated as contiguous from > the start, this leads to a lot of unneeded use of carveout/CMA memory. > With this driver on the other hand, we allocate regular non-contiguous > system memory (again using DMA-BUF heaps, but ION could work here too), > then only when a buffer is about to be sent to the display we pass the > handle to this DMA-BUF to our driver here and take the handle it gives > back and pass that to the display instead. > > As said, it is probably not the ideal solution but it does work and was > used for some early testing of the IP. > > Well, sorry for the wall of text. > Any and all suggestions very welcome and appreciated. > > Thanks, > Andrew > > [0] http://www.ti.com/lit/pdf/spruil1 > [1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/dri… > [2] https://lkml.org/lkml/2019/6/6/1211 > > Andrew F. Davis (2): > dt-bindings: soc: ti: Add TI PAT bindings > soc: ti: Add Support for the TI Page-based Address Translator (PAT) > > .../devicetree/bindings/misc/ti,pat.txt | 34 ++ > drivers/soc/ti/Kconfig | 9 + > drivers/soc/ti/Makefile | 1 + > drivers/soc/ti/ti-pat.c | 569 ++++++++++++++++++ > include/uapi/linux/ti-pat.h | 44 ++ > 5 files changed, 657 insertions(+) > create mode 100644 Documentation/devicetree/bindings/misc/ti,pat.txt > create mode 100644 drivers/soc/ti/ti-pat.c > create mode 100644 include/uapi/linux/ti-pat.h >

6 years, 5 months

1
0
0 0

Re: [Linaro-mm-sig] [PATCH] staging: android: fix style problem

by Greg KH

On Sat, Jun 15, 2019 at 01:11:56AM +0530, Saiyam Doshi wrote: > checkpatch reported "WARNING: line over 80 characters". This > patch fixes it by aligning function arguments. > > Signed-off-by: Saiyam Doshi <saiyamdoshi.in(a)gmail.com> > --- > drivers/staging/android/ion/ion_chunk_heap.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/staging/android/ion/ion_chunk_heap.c b/drivers/staging/android/ion/ion_chunk_heap.c > index 3cdde9c1a717..6aceab2e77e4 100644 > --- a/drivers/staging/android/ion/ion_chunk_heap.c > +++ b/drivers/staging/android/ion/ion_chunk_heap.c > @@ -107,7 +107,9 @@ static struct ion_heap_ops chunk_heap_ops = { > .unmap_kernel = ion_heap_unmap_kernel, > }; > > -struct ion_heap *ion_chunk_heap_create(phys_addr_t base, size_t size, size_t chunk_size) > +struct ion_heap *ion_chunk_heap_create(phys_addr_t base, > + size_t size, > + size_t chunk_size) Just break the line at "size_t size,", no need for 3 lines when 2 will do. thanks, greg k-h

6 years, 6 months

1
0
0 0

Re: [Linaro-mm-sig] [PATCH] dma-buf: refcount the attachment for cache_sgt_mapping

by Koenig, Christian

Am 12.06.19 um 10:15 schrieb Nicolin Chen: > Hi Christian, > > On Wed, Jun 12, 2019 at 08:05:53AM +0000, Koenig, Christian wrote: >> Am 12.06.19 um 10:02 schrieb Nicolin Chen: >> [SNIP] >>> We haven't used DRM/GRM_PRIME yet but I am also curious would it >>> benefit DRM also if we reduce this overhead in the dma_buf? >> No, not at all. > From you replies, in a summary, does it means that there won't be a case > of DRM having a dma_buf attaching to the same device, i.e. multiple calls > of drm_gem_prime_import() function with same parameters of dev + dma_buf? Well, there are some cases where this happens. But in those cases we intentionally want to get a new attachment :) So thinking more about it you would actually break those and that is not something we can do. > If so, we can just ignore/drop this patch. Sorry for the misunderstanding. It might be interesting for things like P2P, but even then it might be better to just cache the P2P settings instead of the full attachment. Regards, Christian. > > Thanks > Nicolin

6 years, 6 months

1
0
0 0

Re: [Linaro-mm-sig] [PATCH] dma-buf: refcount the attachment for cache_sgt_mapping

by Koenig, Christian

Am 12.06.19 um 10:02 schrieb Nicolin Chen: > Hi Christian, > > Thanks for the quick reply. > > On Wed, Jun 12, 2019 at 07:45:38AM +0000, Koenig, Christian wrote: >> Am 12.06.19 um 03:22 schrieb Nicolin Chen: >>> Commit f13e143e7444 ("dma-buf: start caching of sg_table objects v2") >>> added a support of caching the sgt pointer into an attach pointer to >>> let users reuse the sgt pointer without another mapping. However, it >>> might not totally work as most of dma-buf callers are doing attach() >>> and map_attachment() back-to-back, using drm_prime.c for example: >>> drm_gem_prime_import_dev() { >>> attach = dma_buf_attach() { >>> /* Allocating a new attach */ >>> attach = kzalloc(); >>> /* .... */ >>> return attach; >>> } >>> dma_buf_map_attachment(attach, direction) { >>> /* attach->sgt would be always empty as attach is new */ >>> if (attach->sgt) { >>> /* Reuse attach->sgt */ >>> } >>> /* Otherwise, map it */ >>> attach->sgt = map(); >>> } >>> } >>> >>> So, for a cache_sgt_mapping use case, it would need to get the same >>> attachment pointer in order to reuse its sgt pointer. So this patch >>> adds a refcount to the attach() function and lets it search for the >>> existing attach pointer by matching the dev pointer. >> I don't think that this is a good idea. >> >> We use sgt caching as workaround for locking order problems and want to >> remove it again in the long term. > Oh. I thought it was for a performance improving purpose. It may > be a misunderstanding then. > >> So what is the actual use case of this? > We have some similar downstream changes at dma_buf to reduce the > overhead from multiple clients of the same device doing attach() > and map_attachment() calls for the same dma_buf. I don't think that this is a good idea over all. A driver calling attach for the same buffer is doing something wrong in the first place and we should not work around this in the DMA-buf handling. > We haven't used DRM/GRM_PRIME yet but I am also curious would it > benefit DRM also if we reduce this overhead in the dma_buf? No, not at all. Regards, Christian. > > Thanks > Nicolin

6 years, 6 months

1
0
0 0

Re: [Linaro-mm-sig] [PATCH] dma-buf: refcount the attachment for cache_sgt_mapping

by Koenig, Christian

Am 12.06.19 um 03:22 schrieb Nicolin Chen: > Commit f13e143e7444 ("dma-buf: start caching of sg_table objects v2") > added a support of caching the sgt pointer into an attach pointer to > let users reuse the sgt pointer without another mapping. However, it > might not totally work as most of dma-buf callers are doing attach() > and map_attachment() back-to-back, using drm_prime.c for example: > drm_gem_prime_import_dev() { > attach = dma_buf_attach() { > /* Allocating a new attach */ > attach = kzalloc(); > /* .... */ > return attach; > } > dma_buf_map_attachment(attach, direction) { > /* attach->sgt would be always empty as attach is new */ > if (attach->sgt) { > /* Reuse attach->sgt */ > } > /* Otherwise, map it */ > attach->sgt = map(); > } > } > > So, for a cache_sgt_mapping use case, it would need to get the same > attachment pointer in order to reuse its sgt pointer. So this patch > adds a refcount to the attach() function and lets it search for the > existing attach pointer by matching the dev pointer. I don't think that this is a good idea. We use sgt caching as workaround for locking order problems and want to remove it again in the long term. So what is the actual use case of this? Regards, Christian. > > Signed-off-by: Nicolin Chen <nicoleotsuka(a)gmail.com> > --- > drivers/dma-buf/dma-buf.c | 23 +++++++++++++++++++++++ > include/linux/dma-buf.h | 2 ++ > 2 files changed, 25 insertions(+) > > diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c > index f4104a21b069..d0260553a31c 100644 > --- a/drivers/dma-buf/dma-buf.c > +++ b/drivers/dma-buf/dma-buf.c > @@ -559,6 +559,21 @@ struct dma_buf_attachment *dma_buf_attach(struct dma_buf *dmabuf, > if (WARN_ON(!dmabuf || !dev)) > return ERR_PTR(-EINVAL); > > + /* cache_sgt_mapping requires to reuse the same attachment pointer */ > + if (dmabuf->ops->cache_sgt_mapping) { > + mutex_lock(&dmabuf->lock); > + > + /* Search for existing attachment and increase its refcount */ > + list_for_each_entry(attach, &dmabuf->attachments, node) { > + if (dev != attach->dev) > + continue; > + atomic_inc_not_zero(&attach->refcount); > + goto unlock_attach; > + } > + > + mutex_unlock(&dmabuf->lock); > + } > + > attach = kzalloc(sizeof(*attach), GFP_KERNEL); > if (!attach) > return ERR_PTR(-ENOMEM); > @@ -575,6 +590,9 @@ struct dma_buf_attachment *dma_buf_attach(struct dma_buf *dmabuf, > } > list_add(&attach->node, &dmabuf->attachments); > > + atomic_set(&attach->refcount, 1); > + > +unlock_attach: > mutex_unlock(&dmabuf->lock); > > return attach; > @@ -599,6 +617,11 @@ void dma_buf_detach(struct dma_buf *dmabuf, struct dma_buf_attachment *attach) > if (WARN_ON(!dmabuf || !attach)) > return; > > + /* Decrease the refcount for cache_sgt_mapping use cases */ > + if (dmabuf->ops->cache_sgt_mapping && > + atomic_dec_return(&attach->refcount)) > + return; > + > if (attach->sgt) > dmabuf->ops->unmap_dma_buf(attach, attach->sgt, attach->dir); > > diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h > index 8a327566d7f4..65f12212ca2e 100644 > --- a/include/linux/dma-buf.h > +++ b/include/linux/dma-buf.h > @@ -333,6 +333,7 @@ struct dma_buf { > * @dev: device attached to the buffer. > * @node: list of dma_buf_attachment. > * @sgt: cached mapping. > + * @refcount: refcount of the attachment for the same device. > * @dir: direction of cached mapping. > * @priv: exporter specific attachment data. > * > @@ -350,6 +351,7 @@ struct dma_buf_attachment { > struct device *dev; > struct list_head node; > struct sg_table *sgt; > + atomic_t refcount; > enum dma_data_direction dir; > void *priv; > };

6 years, 6 months

1
0
0 0

Re: [Linaro-mm-sig] [PATCH 02/12] dma-buf: add dma_buf_(un)map_attachment_locked variants v3

by Hillf Danton

On Mon, 27 May 2019 18:56:20 +0800 Christian Koenig wrote: > Thanks for the comments, but you are looking at a completely outdated patchset. > > If you are interested in the newest one please ping me and I'm going to CC you > when I send out the next version. > Ping... Thanks Hillf

6 years, 6 months

1
0
0 0

dynamic DMA-buf sharing between devices

by Christian König

Hi everybody, core idea in this patch set is that DMA-buf importers can now provide an optional invalidate callback. Using this callback and the reservation object exporters can now avoid pinning DMA-buf memory for a long time while sharing it between devices. I've already send out an older version roughly a year ago, but didn't had time to further look into cleaning this up. The last time a major problem was that we would had to fix up all drivers implementing DMA-buf at once. Now I avoid this by allowing mappings to be cached in the DMA-buf attachment and so driver can optionally move over to the new interface one by one. This is also a prerequisite to my patchset enabling sharing of device memory with DMA-buf. Please review and/or comment, Christian.

6 years, 6 months

6
38
0 0

Re: [Linaro-mm-sig] [EXTERNAL] Re: [PATCH] sync_file: Return reasonable timestamp when merging signaled fences

by Chris Wilson

Quoting Michael Yang (2019-05-14 08:55:37) > On Thu, May 09, 2019 at 12:46:05PM +0100, Chris Wilson wrote: > > Quoting Michael Yang (2019-05-09 05:34:11) > > > If all the sync points were signaled in both fences a and b, > > > there was only one sync point in merged fence which is a_fence[0]. > > > The Fence structure in android framework might be confused about > > > timestamp if there were any sync points which were signaled after > > > a_fence[0]. It might be more reasonable to use timestamp of last signaled > > > sync point to represent the merged fence. > > > The issue can be found from EGL extension ANDROID_get_frame_timestamps. > > > Sometimes the return value of EGL_READS_DONE_TIME_ANDROID is head of > > > the return value of EGL_RENDERING_COMPLETE_TIME_ANDROID. > > > That means display/composition had been completed before rendering > > > was completed that is incorrect. > > > > > > Some discussion can be found at: > > > https://urldefense.proofpoint.com/v2/url?u=https-3A__android-2Dreview.googl… > > > > > > Signed-off-by: Michael Yang <michael.yang(a)imgtec.com> > > > --- > > > Hi, > > > I didn't get response since I previously sent this a month ago. > > > Could someone have a chance to look at it please? > > > Thanks. > > > drivers/dma-buf/sync_file.c | 25 +++++++++++++++++++++++-- > > > 1 file changed, 23 insertions(+), 2 deletions(-) > > > > > > diff --git a/drivers/dma-buf/sync_file.c b/drivers/dma-buf/sync_file.c > > > index 4f6305c..d46bfe1 100644 > > > --- a/drivers/dma-buf/sync_file.c > > > +++ b/drivers/dma-buf/sync_file.c > > > @@ -274,8 +274,29 @@ static struct sync_file *sync_file_merge(const char *name, struct sync_file *a, > > > for (; i_b < b_num_fences; i_b++) > > > add_fence(fences, &i, b_fences[i_b]); > > > > > > - if (i == 0) > > > - fences[i++] = dma_fence_get(a_fences[0]); > > > + /* If all the sync pts were signaled, then adding the sync_pt who > > > + * was the last signaled to the fence. > > > + */ > > > + if (i == 0) { > > > + struct dma_fence *last_signaled_sync_pt = a_fences[0]; > > > + int iter; > > > + > > > + for (iter = 1; iter < a_num_fences; iter++) { > > > > If there is more than one fence, sync_file->fence is a fence_array and > > its timestamp is what you want. If there is one fence, sync_file->fence > > is a pointer to that fence, and naturally has the right timestamp. > > > > In short, this should be handled by dma_fence_array_create() when given > > a complete set of signaled fences, it too should inherit the signaled > > status with the timestamp being taken from the last fence. It should > > also be careful to inherit the error status. > > -Chris > Thanks Chris for the inputs. For this case, there will be only one fence > in sync_file->fence after doing sync_file_merge(). Regarding to the current > implementation, dma_fence_array_create() is not called as num_fences is equal > to 1. I was wondering do you suggest that we pass a complete set of signaled > fences to sync_file_set_fence() and handle it in dma_fence_array_create(). > Thanks. No, in the case there is only one fence, we just inherit its timestamp along with its fence status. (A single fence is the degenerate case of a fence array.) -Chris

6 years, 7 months

1
0
0 0

Re: [Linaro-mm-sig] [PATCH] sync_file: Return reasonable timestamp when merging signaled fences

by Chris Wilson

Quoting Michael Yang (2019-05-09 05:34:11) > If all the sync points were signaled in both fences a and b, > there was only one sync point in merged fence which is a_fence[0]. > The Fence structure in android framework might be confused about > timestamp if there were any sync points which were signaled after > a_fence[0]. It might be more reasonable to use timestamp of last signaled > sync point to represent the merged fence. > The issue can be found from EGL extension ANDROID_get_frame_timestamps. > Sometimes the return value of EGL_READS_DONE_TIME_ANDROID is head of > the return value of EGL_RENDERING_COMPLETE_TIME_ANDROID. > That means display/composition had been completed before rendering > was completed that is incorrect. > > Some discussion can be found at: > https://android-review.googlesource.com/c/kernel/common/+/907009 > > Signed-off-by: Michael Yang <michael.yang(a)imgtec.com> > --- > Hi, > I didn't get response since I previously sent this a month ago. > Could someone have a chance to look at it please? > Thanks. > drivers/dma-buf/sync_file.c | 25 +++++++++++++++++++++++-- > 1 file changed, 23 insertions(+), 2 deletions(-) > > diff --git a/drivers/dma-buf/sync_file.c b/drivers/dma-buf/sync_file.c > index 4f6305c..d46bfe1 100644 > --- a/drivers/dma-buf/sync_file.c > +++ b/drivers/dma-buf/sync_file.c > @@ -274,8 +274,29 @@ static struct sync_file *sync_file_merge(const char *name, struct sync_file *a, > for (; i_b < b_num_fences; i_b++) > add_fence(fences, &i, b_fences[i_b]); > > - if (i == 0) > - fences[i++] = dma_fence_get(a_fences[0]); > + /* If all the sync pts were signaled, then adding the sync_pt who > + * was the last signaled to the fence. > + */ > + if (i == 0) { > + struct dma_fence *last_signaled_sync_pt = a_fences[0]; > + int iter; > + > + for (iter = 1; iter < a_num_fences; iter++) { If there is more than one fence, sync_file->fence is a fence_array and its timestamp is what you want. If there is one fence, sync_file->fence is a pointer to that fence, and naturally has the right timestamp. In short, this should be handled by dma_fence_array_create() when given a complete set of signaled fences, it too should inherit the signaled status with the timestamp being taken from the last fence. It should also be careful to inherit the error status. -Chris

6 years, 7 months

1
0
0 0

Re: [Linaro-mm-sig] [PATCH] staging: ion: solve warning symbol was not declared

by Dan Carpenter

On Mon, Apr 22, 2019 at 08:49:27PM +0200, Oscar Gomez Fuente wrote: > These changes solve warning symbol was not declared in the functions: > ion_carveout_heap_create and ion_chunk_heap_create > > Signed-off-by: Oscar Gomez Fuente <oscargomezf(a)gmail.com> > --- > drivers/staging/android/ion/ion_carveout_heap.c | 2 +- > drivers/staging/android/ion/ion_chunk_heap.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/staging/android/ion/ion_carveout_heap.c b/drivers/staging/android/ion/ion_carveout_heap.c > index bb9d614..3f359ae 100644 > --- a/drivers/staging/android/ion/ion_carveout_heap.c > +++ b/drivers/staging/android/ion/ion_carveout_heap.c > @@ -103,7 +103,7 @@ static struct ion_heap_ops carveout_heap_ops = { > .unmap_kernel = ion_heap_unmap_kernel, > }; > > -struct ion_heap *ion_carveout_heap_create(phys_addr_t base, size_t size) > +static inline struct ion_heap *ion_carveout_heap_create(phys_addr_t base, size_t size) Why are you making it inline? Btw, normally we just leave it for the compiler to choose which functions to make inline. regards, dan carpenter

6 years, 7 months

1
0
0 0

Re: [Linaro-mm-sig] dynamic DMA-buf sharing between devices

by Christian König

On top of those I have 6 more patches in the pipeline to enable VRAM P2P with DMA-buf. So that is not the end of the patch set :) Christian. Am 17.04.19 um 15:52 schrieb Chunming Zhou: > Thanks Christian, great job. I will verify it this week when I finish my > current work on hand. > > -David > > 在 2019/4/17 2:38, Christian König wrote: >> Hi everybody, >> >> core idea in this patch set is that DMA-buf importers can now provide an optional invalidate callback. Using this callback and the reservation object exporters can now avoid pinning DMA-buf memory for a long time while sharing it between devices. >> >> I've already send out an older version roughly a year ago, but didn't had time to further look into cleaning this up. >> >> The last time a major problem was that we would had to fix up all drivers implementing DMA-buf at once. >> >> Now I avoid this by allowing mappings to be cached in the DMA-buf attachment and so driver can optionally move over to the new interface one by one. >> >> This is also a prerequisite to my patchset enabling sharing of device memory with DMA-buf. >> >> Please review and/or comment, >> Christian. >> >> >> _______________________________________________ >> dri-devel mailing list >> dri-devel(a)lists.freedesktop.org >> https://lists.freedesktop.org/mailman/listinfo/dri-devel

6 years, 8 months

1
0
0 0

Re: [Linaro-mm-sig] [PATCH] staging: android: ion: refactory ion_alloc for kernel driver use

by Laura Abbott

On 3/29/19 7:26 PM, Zengtao (B) wrote: > Hi laura: > >> -----Original Message----- >> From: Laura Abbott [mailto:labbott@redhat.com] >> Sent: Friday, March 29, 2019 9:27 PM >> To: Zengtao (B) <prime.zeng(a)hisilicon.com>; sumit.semwal(a)linaro.org >> Cc: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>; Arve Hjønnevåg >> <arve(a)android.com>; Todd Kjos <tkjos(a)android.com>; Martijn Coenen >> <maco(a)android.com>; Joel Fernandes <joel(a)joelfernandes.org>; >> Christian Brauner <christian(a)brauner.io>; devel(a)driverdev.osuosl.org; >> dri-devel(a)lists.freedesktop.org; linaro-mm-sig(a)lists.linaro.org; >> linux-kernel(a)vger.kernel.org >> Subject: Re: [PATCH] staging: android: ion: refactory ion_alloc for kernel >> driver use >> >> On 3/29/19 11:40 AM, Zeng Tao wrote: >>> There are two reasons for this patch: >>> 1. There are some potential requirements for ion_alloc in kernel >>> space, some media drivers need to allocate media buffers from ion >>> instead of buddy or dma framework, this is more convient and clean >>> very for media drivers. And In that case, ion is the only media buffer >>> provider, it's more easier to maintain. >>> 2. Fd is only needed by user processes, not the kernel space, so >>> dma_buf should be returned instead of fd for kernel space, and >>> dma_buf_fd should be called only for userspace api. >>> >> >> I really want to just NAK this because it doesn't seem like something >> that's necessary. The purpose of Ion is to provide buffers to userspace >> because there's no other way for userspace to get access to the memory. >> The kernel already has other APIs to access the memory. This also >> complicates the re-work that's been happening where the requirement is >> only userspace. >> >> Can you be more detailed about which media drivers you are referring to >> and why they can't just use other APIs? >> > > I think I 've got your point, the ION is designed for usespace, but for kernel > space, we are really lacking of someone which plays the same role,(allocate > media memory, share the memory using dma_buf, provide debug and statistics > for media memory). > > In fact, for kernel space, we have the dma framework, dma-buf, etc.. > And we can work on top of such apis, but some duplicate jobs(everyone has > to maintain its own buffer sharing, debug and statistics). > So we need to have some to do the common things(ION's the best choice now) > Keep in mind that Ion is a thin shell of what it was as most of the debugging and statistics was removed because it was buggy. Most of that should end up going at the dma_buf layer since it's really a dma_buf allocation API. > When the ION was introduced, a lot of media memory frameworks existed, the > dma framework was not so good, so ION heaps, integrated buffer sharing, statistics > and usespace api were the required features, but now dma framework is more powerful, > we don't even need ION heaps now, but the userspace api, buffer sharing, statistics are > still needed, and the buffer sharing, statistics can be re-worked and export to kernel space, > not only used by userspace, , and that is my point. > I see what you are getting at but I don't think the same thing applies to the kernel as it does userspace. We can enforce a single way of using the dma_buf fd in userspace but the kernel has a variety of ways to use dma_buf because each driver and framework has its own needs. I'm still not convinced that adding Ion APIs in the kernel is the right option since as you point out we don't really need the heaps. That mostly leaves Ion as a wrapper to handle doing the export. Maybe we could benefit from that but I think it might require more thought. I'd rather see a proposal in the media API itself showing what you think is necessary but without using Ion. That would be a good start so we could fully review what might make sense to pull out of Ion into something common. Thanks, Laura >> >>> Signed-off-by: Zeng Tao <prime.zeng(a)hisilicon.com> >>> --- >>> drivers/staging/android/ion/ion.c | 32 >> +++++++++++++++++--------------- >>> 1 file changed, 17 insertions(+), 15 deletions(-) >>> >>> diff --git a/drivers/staging/android/ion/ion.c >>> b/drivers/staging/android/ion/ion.c >>> index 92c2914..e93fb49 100644 >>> --- a/drivers/staging/android/ion/ion.c >>> +++ b/drivers/staging/android/ion/ion.c >>> @@ -387,13 +387,13 @@ static const struct dma_buf_ops >> dma_buf_ops = { >>> .unmap = ion_dma_buf_kunmap, >>> }; >>> >>> -static int ion_alloc(size_t len, unsigned int heap_id_mask, unsigned >>> int flags) >>> +struct dma_buf *ion_alloc(size_t len, unsigned int heap_id_mask, >>> + unsigned int flags) >>> { >>> struct ion_device *dev = internal_dev; >>> struct ion_buffer *buffer = NULL; >>> struct ion_heap *heap; >>> DEFINE_DMA_BUF_EXPORT_INFO(exp_info); >>> - int fd; >>> struct dma_buf *dmabuf; >>> >>> pr_debug("%s: len %zu heap_id_mask %u flags %x\n", __func__, >> @@ >>> -407,7 +407,7 @@ static int ion_alloc(size_t len, unsigned int >> heap_id_mask, unsigned int flags) >>> len = PAGE_ALIGN(len); >>> >>> if (!len) >>> - return -EINVAL; >>> + return ERR_PTR(-EINVAL); >>> >>> down_read(&dev->lock); >>> plist_for_each_entry(heap, &dev->heaps, node) { @@ -421,10 >> +421,10 >>> @@ static int ion_alloc(size_t len, unsigned int heap_id_mask, >> unsigned int flags) >>> up_read(&dev->lock); >>> >>> if (!buffer) >>> - return -ENODEV; >>> + return ERR_PTR(-ENODEV); >>> >>> if (IS_ERR(buffer)) >>> - return PTR_ERR(buffer); >>> + return ERR_PTR(PTR_ERR(buffer)); >>> >>> exp_info.ops = &dma_buf_ops; >>> exp_info.size = buffer->size; >>> @@ -432,17 +432,12 @@ static int ion_alloc(size_t len, unsigned int >> heap_id_mask, unsigned int flags) >>> exp_info.priv = buffer; >>> >>> dmabuf = dma_buf_export(&exp_info); >>> - if (IS_ERR(dmabuf)) { >>> + if (IS_ERR(dmabuf)) >>> _ion_buffer_destroy(buffer); >>> - return PTR_ERR(dmabuf); >>> - } >>> >>> - fd = dma_buf_fd(dmabuf, O_CLOEXEC); >>> - if (fd < 0) >>> - dma_buf_put(dmabuf); >>> - >>> - return fd; >>> + return dmabuf; >>> } >>> +EXPORT_SYMBOL(ion_alloc); >>> >>> static int ion_query_heaps(struct ion_heap_query *query) >>> { >>> @@ -539,12 +534,19 @@ static long ion_ioctl(struct file *filp, unsigned >> int cmd, unsigned long arg) >>> case ION_IOC_ALLOC: >>> { >>> int fd; >>> + struct dma_buf *dmabuf; >>> >>> - fd = ion_alloc(data.allocation.len, >>> + dmabuf = ion_alloc(data.allocation.len, >>> data.allocation.heap_id_mask, >>> data.allocation.flags); >>> - if (fd < 0) >>> + if (IS_ERR(dmabuf)) >>> + return PTR_ERR(dmabuf); >>> + >>> + fd = dma_buf_fd(dmabuf, O_CLOEXEC); >>> + if (fd < 0) { >>> + dma_buf_put(dmabuf); >>> return fd; >>> + } >>> >>> data.allocation.fd = fd; >>> >>> >

6 years, 8 months

1
0
0 0

[PATCH] staging: android: ion: fix err_cast.cocci warnings

by kbuild test robot

From: kbuild test robot <lkp(a)intel.com> drivers/staging/android/ion/ion.c:427:9-16: WARNING: ERR_CAST can be used with buffer Use ERR_CAST inlined function instead of ERR_PTR(PTR_ERR(...)) Generated by: scripts/coccinelle/api/err_cast.cocci Fixes: d51f182d188a ("staging: android: ion: refactory ion_alloc for kernel driver use") CC: Zeng Tao <prime.zeng(a)hisilicon.com> Signed-off-by: kbuild test robot <lkp(a)intel.com> --- url: https://github.com/0day-ci/linux/commits/Zeng-Tao/staging-android-ion-refac… ion.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/staging/android/ion/ion.c +++ b/drivers/staging/android/ion/ion.c @@ -424,7 +424,7 @@ struct dma_buf *ion_alloc(size_t len, un return ERR_PTR(-ENODEV); if (IS_ERR(buffer)) - return ERR_PTR(PTR_ERR(buffer)); + return ERR_CAST(buffer); exp_info.ops = &dma_buf_ops; exp_info.size = buffer->size;

6 years, 8 months

1
0
0 0

Re: [Linaro-mm-sig] [PATCH] staging: android: ion: refactory ion_alloc for kernel driver use

by kbuild test robot

Hi Zeng, Thank you for the patch! Perhaps something to improve: [auto build test WARNING on staging/staging-testing] [also build test WARNING on v5.1-rc2 next-20190329] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] url: https://github.com/0day-ci/linux/commits/Zeng-Tao/staging-android-ion-refac… coccinelle warnings: (new ones prefixed by >>) >> drivers/staging/android/ion/ion.c:427:9-16: WARNING: ERR_CAST can be used with buffer Please review and possibly fold the followup patch. --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

6 years, 8 months

1
0
0 0

Re: [Linaro-mm-sig] [PATCH] staging: android: ion: refactory ion_alloc for kernel driver use

by Greg Kroah-Hartman

On Sat, Mar 30, 2019 at 02:32:35AM +0000, Zengtao (B) wrote: > >-----Original Message----- > >From: Greg Kroah-Hartman [mailto:gregkh@linuxfoundation.org] > >Sent: Saturday, March 30, 2019 12:04 AM > >To: Zengtao (B) <prime.zeng(a)hisilicon.com> > >Cc: labbott(a)redhat.com; sumit.semwal(a)linaro.org; > >devel(a)driverdev.osuosl.org; Todd Kjos <tkjos(a)android.com>; > >linux-kernel(a)vger.kernel.org; dri-devel(a)lists.freedesktop.org; > >linaro-mm-sig(a)lists.linaro.org; Arve Hjønnevåg <arve(a)android.com>; > >Joel Fernandes <joel(a)joelfernandes.org>; Martijn Coenen > ><maco(a)android.com>; Christian Brauner <christian(a)brauner.io> > >Subject: Re: [PATCH] staging: android: ion: refactory ion_alloc for kernel > >driver use > > > >On Sat, Mar 30, 2019 at 02:40:16AM +0800, Zeng Tao wrote: > >> There are two reasons for this patch: > >> 1. There are some potential requirements for ion_alloc in kernel > >> space, some media drivers need to allocate media buffers from ion > >> instead of buddy or dma framework, this is more convient and clean > >> very for media drivers. And In that case, ion is the only media buffer > >> provider, it's more easier to maintain. > > > >As this really is just DMA, what is wrong with the existing dma framework > >that makes it hard to use? You have seen all of the changes recently to it, > >right? > > The current dma framework is powerful enough(to me, and more complex ^_^) > , CMA, IOMMU are all integrated, it's good. But buffer sharing, statistics, debug, > are not so friendly for media drivers(each driver has to do all, but duplicate jobs). Then go add statistics and debugging to the dma code so that everyone benefits! thanks, greg k-h

6 years, 8 months

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

Linaro-mm-sig