Commit 54329e6f authored by Weizhao Ouyang's avatar Weizhao Ouyang Committed by Sumit Semwal

dma-buf: cma_heap: Fix mutex locking section

Fix cma_heap_buffer mutex locking critical section to protect vmap_cnt
and vaddr.

Fixes: a5d2d29e ("dma-buf: heaps: Move heap-helper logic into the cma_heap implementation")
Signed-off-by: default avatarWeizhao Ouyang <o451686892@gmail.com>
Acked-by: default avatarJohn Stultz <john.stultz@linaro.org>
Signed-off-by: default avatarSumit Semwal <sumit.semwal@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20220104073545.124244-1-o451686892@gmail.com
parent 0499f419
...@@ -124,10 +124,11 @@ static int cma_heap_dma_buf_begin_cpu_access(struct dma_buf *dmabuf, ...@@ -124,10 +124,11 @@ static int cma_heap_dma_buf_begin_cpu_access(struct dma_buf *dmabuf,
struct cma_heap_buffer *buffer = dmabuf->priv; struct cma_heap_buffer *buffer = dmabuf->priv;
struct dma_heap_attachment *a; struct dma_heap_attachment *a;
mutex_lock(&buffer->lock);
if (buffer->vmap_cnt) if (buffer->vmap_cnt)
invalidate_kernel_vmap_range(buffer->vaddr, buffer->len); invalidate_kernel_vmap_range(buffer->vaddr, buffer->len);
mutex_lock(&buffer->lock);
list_for_each_entry(a, &buffer->attachments, list) { list_for_each_entry(a, &buffer->attachments, list) {
if (!a->mapped) if (!a->mapped)
continue; continue;
...@@ -144,10 +145,11 @@ static int cma_heap_dma_buf_end_cpu_access(struct dma_buf *dmabuf, ...@@ -144,10 +145,11 @@ static int cma_heap_dma_buf_end_cpu_access(struct dma_buf *dmabuf,
struct cma_heap_buffer *buffer = dmabuf->priv; struct cma_heap_buffer *buffer = dmabuf->priv;
struct dma_heap_attachment *a; struct dma_heap_attachment *a;
mutex_lock(&buffer->lock);
if (buffer->vmap_cnt) if (buffer->vmap_cnt)
flush_kernel_vmap_range(buffer->vaddr, buffer->len); flush_kernel_vmap_range(buffer->vaddr, buffer->len);
mutex_lock(&buffer->lock);
list_for_each_entry(a, &buffer->attachments, list) { list_for_each_entry(a, &buffer->attachments, list) {
if (!a->mapped) if (!a->mapped)
continue; continue;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment