lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.16 0826/1039] dma-buf: cma_heap: Fix mutex locking section
    Date
    From: Weizhao Ouyang <o451686892@gmail.com>

    [ Upstream commit 54329e6f7beea6af56c1230da293acc97d6a6ee7 ]

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

    Fixes: a5d2d29e24be ("dma-buf: heaps: Move heap-helper logic into the cma_heap implementation")
    Signed-off-by: Weizhao Ouyang <o451686892@gmail.com>
    Acked-by: John Stultz <john.stultz@linaro.org>
    Signed-off-by: Sumit Semwal <sumit.semwal@linaro.org>
    Link: https://patchwork.freedesktop.org/patch/msgid/20220104073545.124244-1-o451686892@gmail.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/dma-buf/heaps/cma_heap.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    diff --git a/drivers/dma-buf/heaps/cma_heap.c b/drivers/dma-buf/heaps/cma_heap.c
    index 0c05b79870f96..83f02bd51dda6 100644
    --- a/drivers/dma-buf/heaps/cma_heap.c
    +++ b/drivers/dma-buf/heaps/cma_heap.c
    @@ -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 dma_heap_attachment *a;

    + mutex_lock(&buffer->lock);
    +
    if (buffer->vmap_cnt)
    invalidate_kernel_vmap_range(buffer->vaddr, buffer->len);

    - mutex_lock(&buffer->lock);
    list_for_each_entry(a, &buffer->attachments, list) {
    if (!a->mapped)
    continue;
    @@ -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 dma_heap_attachment *a;

    + mutex_lock(&buffer->lock);
    +
    if (buffer->vmap_cnt)
    flush_kernel_vmap_range(buffer->vaddr, buffer->len);

    - mutex_lock(&buffer->lock);
    list_for_each_entry(a, &buffer->attachments, list) {
    if (!a->mapped)
    continue;
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-09-17 16:14    [W:4.970 / U:0.532 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site