tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UPSTREAM: udmabuf: introduce udmabuf init and deinit helper

Browse Source 
After udmabuf is allocated, its resources need to be initialized,
including various array structures. The current array structure has
already been greatly expanded.

Also, before udmabuf needs to be kfree, the occupied resources need to
be released.

This part is repetitive and maybe overlooked.

This patch give a helper function when init and deinit, by this,
reduce duplicate code.

Change-Id: Ie1d84abf42481869ceaf9efb3ce4dfa8983af884
Signed-off-by: Huan Yang <link@vivo.com>
Acked-by: Vivek Kasireddy <vivek.kasireddy@intel.com>
Signed-off-by: Vivek Kasireddy <vivek.kasireddy@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240918025238.2957823-6-link@vivo.com
(cherry picked from commit 5d8157961fd183ce2a9be1f4fd9c775ae9e94536)
Bug: 389839576
Signed-off-by: T.J. Mercier <tjmercier@google.com>
This commit is contained in:
Huan Yang
2024-09-18 10:52:28 +08:00
committed by Treehugger Robot
parent 5469e4bb81
commit 9d370c245f
1 changed files with 31 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/dma-buf/udmabuf.c
+31 -21
View File
@@ -224,6 +224,28 @@ static int add_to_unpin_list(struct list_head *unpin_list,
return 0;
}
static __always_inline int init_udmabuf(struct udmabuf *ubuf, pgoff_t pgcnt)
{
INIT_LIST_HEAD(&ubuf->unpin_list);
ubuf->folios = kvmalloc_array(pgcnt, sizeof(*ubuf->folios), GFP_KERNEL);
if (!ubuf->folios)
return -ENOMEM;
ubuf->offsets = kvcalloc(pgcnt, sizeof(*ubuf->offsets), GFP_KERNEL);
if (!ubuf->offsets)
return -ENOMEM;
return 0;
}
static __always_inline void deinit_udmabuf(struct udmabuf *ubuf)
{
unpin_all_folios(&ubuf->unpin_list);
kvfree(ubuf->offsets);
kvfree(ubuf->folios);
}
static void release_udmabuf(struct dma_buf *buf)
{
struct udmabuf *ubuf = buf->priv;
@@ -232,9 +254,7 @@ static void release_udmabuf(struct dma_buf *buf)
if (ubuf->sg)
put_sg_table(dev, ubuf->sg, DMA_BIDIRECTIONAL);
unpin_all_folios(&ubuf->unpin_list);
kvfree(ubuf->offsets);
kvfree(ubuf->folios);
deinit_udmabuf(ubuf);
kfree(ubuf);
}
@@ -387,33 +407,24 @@ static long udmabuf_create(struct miscdevice *device,
if (!ubuf)
return -ENOMEM;
INIT_LIST_HEAD(&ubuf->unpin_list);
pglimit = (size_limit_mb * 1024 * 1024) >> PAGE_SHIFT;
for (i = 0; i < head->count; i++) {
if (!PAGE_ALIGNED(list[i].offset))
goto err;
goto err_noinit;
if (!PAGE_ALIGNED(list[i].size))
goto err;
goto err_noinit;
pgcnt += list[i].size >> PAGE_SHIFT;
if (pgcnt > pglimit)
goto err;
goto err_noinit;
}
if (!pgcnt)
goto err;
goto err_noinit;
ubuf->folios = kvmalloc_array(pgcnt, sizeof(*ubuf->folios), GFP_KERNEL);
if (!ubuf->folios) {
ret = -ENOMEM;
ret = init_udmabuf(ubuf, pgcnt);
if (ret)
goto err;
}
ubuf->offsets = kvcalloc(pgcnt, sizeof(*ubuf->offsets), GFP_KERNEL);
if (!ubuf->offsets) {
ret = -ENOMEM;
goto err;
}
for (i = 0; i < head->count; i++) {
struct file *memfd = fget(list[i].memfd);
@@ -460,9 +471,8 @@ out_unlock:
return ret;
err:
unpin_all_folios(&ubuf->unpin_list);
kvfree(ubuf->offsets);
kvfree(ubuf->folios);
deinit_udmabuf(ubuf);
err_noinit:
kfree(ubuf);
return ret;
}