dma-buf: system_heap: Make sure to return an error if we abort
RFC PATCH 1/3 dma-buf: system_heap: Make sure to return an error if we abort
If we abort from the allocation due to a fatal_signal_pending(), be sure we report an error so any return code paths don't trip over the fact that the allocation didn't succeed.
--- drivers/dma-buf/heaps/system_heap.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/dma-buf/heaps/system_heap.c +3 -1
@@ -363,8 +363,10 @@ static int system_heap_allocate(struct dma_heap *heap,* Avoid trying to allocate memory if the process * has been killed by SIGKILL */ -if (fatal_signal_pending (current)) +if (fatal_signal_pending (current)) { + ret = -EINTR ; goto free_buffer; + } page =alloc_largest_available (size_remaining, max_order);if (!page)
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
RFC PATCH 2/3 dma-buf: heaps: Add a WARN_ON should the vmap_cnt go negative
We shouldn't vunmap more then we vmap, but if we do, make sure we complain loudly.
--- drivers/dma-buf/heaps/cma_heap.c | 1 + drivers/dma-buf/heaps/system_heap.c | 1 + 2 files changed, 2 insertions(+)
drivers/dma-buf/heaps/cma_heap.c +1 -0
@@ -231,6 +231,7 @@ static void cma_heap_vunmap(struct dma_buf *dmabuf, struct dma_buf_map *map)struct cma_heap_buffer *buffer = dmabuf->priv;mutex_lock (&buffer->lock); +WARN_ON (buffer->vmap_cnt ==0 );if (!--buffer->vmap_cnt) {vunmap (buffer->vaddr); buffer->vaddr =NULL ;
drivers/dma-buf/heaps/system_heap.c +1 -0
@@ -273,6 +273,7 @@ static void system_heap_vunmap(struct dma_buf *dmabuf, struct dma_buf_map *map)struct system_heap_buffer *buffer = dmabuf->priv;mutex_lock (&buffer->lock); +WARN_ON (buffer->vmap_cnt ==0 );if (!--buffer->vmap_cnt) {vunmap (buffer->vaddr); buffer->vaddr =NULL ;
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
RFC PATCH 3/3 dma-buf: heaps: Rework heep allocation hooks to return struct dma_buf instead of fd
In reply to John StultzEvery heap needs to create a dmabuf and then export it to a fd via dma_buf_fd(), so to consolidate things a bit, have the heaps just return a struct dmabuf * and let the top level dma_heap_buffer_alloc() call handle creating the fd via dma_buf_fd().
--- drivers/dma-buf/dma-heap.c | 14 +++++++++++++- drivers/dma-buf/heaps/cma_heap.c | 22 +++++++--------------- drivers/dma-buf/heaps/system_heap.c | 21 +++++++-------------- include/linux/dma-heap.h | 12 ++++++------ 4 files changed, 33 insertions(+), 36 deletions(-)
drivers/dma-buf/dma-heap.c +13 -1
@@ -52,6 +52,9 @@ static int dma_heap_buffer_alloc(struct dma_heap *heap, size_t len,unsigned int fd_flags, unsigned int heap_flags) { + struct dma_buf *dmabuf; +int fd; +/* * Allocations from all heaps have to begin * and end on page boundaries.
@@ -60,7 +63,16 @@ static int dma_heap_buffer_alloc(struct dma_heap *heap, size_t len,if (!len)return -EINVAL ; -return heap->ops->allocate (heap, len, fd_flags, heap_flags); + dmabuf = heap->ops->allocate (heap, len, fd_flags, heap_flags); +if (IS_ERR (dmabuf)) +return PTR_ERR (dmabuf); + + fd =dma_buf_fd (dmabuf, fd_flags); +if (fd <0 ) { +dma_buf_put (dmabuf); +/* just return, as put will call release and that will free */ + } +return fd; }static int dma_heap_open (struct inode *inode,struct file *file)
drivers/dma-buf/heaps/cma_heap.c +7 -15
@@ -268,10 +268,10 @@ static const struct dma_buf_ops cma_heap_buf_ops = { .release = cma_heap_dma_buf_release, }; -static int cma_heap_allocate (struct dma_heap *heap, -unsigned long len, -unsigned long fd_flags, -unsigned long heap_flags) +static struct dma_buf *cma_heap_allocate (struct dma_heap *heap, +unsigned long len, +unsigned long fd_flags, +unsigned long heap_flags) {struct cma_heap *cma_heap =dma_heap_get_drvdata (heap);struct cma_heap_buffer *buffer;
@@ -286,7 +286,7 @@ static int cma_heap_allocate(struct dma_heap *heap, buffer =kzalloc (sizeof (*buffer),GFP_KERNEL );if (!buffer) -return -ENOMEM ; +return ERR_PTR (-ENOMEM );INIT_LIST_HEAD (&buffer->attachments);mutex_init (&buffer->lock);
@@ -345,15 +345,7 @@ static int cma_heap_allocate(struct dma_heap *heap, ret =PTR_ERR (dmabuf); goto free_pages; } - - ret =dma_buf_fd (dmabuf, fd_flags); -if (ret <0 ) { -dma_buf_put (dmabuf); -/* just return, as put will call release and that will free */ -return ret; - } - -return ret; +return dmabuf; free_pages:kfree (buffer->pages);
@@ -362,7 +354,7 @@ static int cma_heap_allocate(struct dma_heap *heap, free_buffer:kfree (buffer); -return ret; +return ERR_PTR (ret); }static const struct dma_heap_ops cma_heap_ops = {
drivers/dma-buf/heaps/system_heap.c +7 -14
@@ -332,10 +332,10 @@ static struct page *alloc_largest_available(unsigned long size,return NULL ; } -static int system_heap_allocate (struct dma_heap *heap, -unsigned long len, -unsigned long fd_flags, -unsigned long heap_flags) +static struct dma_buf *system_heap_allocate (struct dma_heap *heap, +unsigned long len, +unsigned long fd_flags, +unsigned long heap_flags) {struct system_heap_buffer *buffer;DEFINE_DMA_BUF_EXPORT_INFO (exp_info);
@@ -350,7 +350,7 @@ static int system_heap_allocate(struct dma_heap *heap, buffer =kzalloc (sizeof (*buffer),GFP_KERNEL );if (!buffer) -return -ENOMEM ; +return ERR_PTR (-ENOMEM );INIT_LIST_HEAD (&buffer->attachments);mutex_init (&buffer->lock);
@@ -400,14 +400,7 @@ static int system_heap_allocate(struct dma_heap *heap, ret =PTR_ERR (dmabuf); goto free_pages; } - - ret =dma_buf_fd (dmabuf, fd_flags); -if (ret <0 ) { -dma_buf_put (dmabuf); -/* just return, as put will call release and that will free */ -return ret; - } -return ret; +return dmabuf; free_pages:for_each_sgtable_sg (table, sg, i) {
@@ -421,7 +414,7 @@ static int system_heap_allocate(struct dma_heap *heap,__free_pages (page,compound_order (page));kfree (buffer); -return ret; +return ERR_PTR (ret); }static const struct dma_heap_ops system_heap_ops = {
include/linux/dma-heap.h +6 -6
@@ -16,15 +16,15 @@ struct dma_heap;/** * struct dma_heap_ops - ops to operate on a given heap -* @allocate: allocate dmabuf and return fd +* @allocate: allocate dmabuf and return struct dma_buf ptr * -* allocate returns dmabuf fd on success, -errno on error. +* allocate returns dmabuf on success, ERR_PTR(-errno) on error. */ struct dma_heap_ops { -int (*allocate)(struct dma_heap *heap, -unsigned long len, -unsigned long fd_flags, -unsigned long heap_flags); +struct dma_buf *(*allocate)(struct dma_heap *heap, +unsigned long len, +unsigned long fd_flags, +unsigned long heap_flags); };/**
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel