torvalds/linux
torvalds/linux
2
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-04 20:19:47 +08:00
Code

page_pool: Set dma_sync to false for devmem memory provider

Browse Source 
Move the `dma_map` and `dma_sync` checks to `page_pool_init` to make
them generic. Set dma_sync to false for devmem memory provider because
the dma_sync APIs should not be used for dma_buf backed devmem memory
provider.

Cc: Jason Gunthorpe <jgg@ziepe.ca>
Signed-off-by: Samiullah Khawaja <skhawaja@google.com>
Signed-off-by: Mina Almasry <almasrymina@google.com>
Link: https://patch.msgid.link/20241211212033.1684197-4-almasrymina@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Samiullah Khawaja 2024-12-11 21:20:30 +00:00 committed by Jakub Kicinski
parent 8156c31049
commit b400f4b874
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
net/core/devmem.c
View File

@ -331,11 +331,10 @@ int mp_dmabuf_devmem_init(struct page_pool *pool)
if (!binding) if (!binding)
return -EINVAL; return -EINVAL;
if (!pool->dma_map) /* dma-buf dma addresses do not need and should not be used with
return -EOPNOTSUPP; * dma_sync_for_cpu/device. Force disable dma_sync.
*/
if (pool->dma_sync) pool->dma_sync = false;
return -EOPNOTSUPP;
if (pool->p.order != 0) if (pool->p.order != 0)
return -E2BIG; return -E2BIG;

3
net/core/page_pool.c
View File

@ -287,6 +287,9 @@ static int page_pool_init(struct page_pool *pool,
} }
if (pool->mp_priv) { if (pool->mp_priv) {
if (!pool->dma_map || !pool->dma_sync)
return -EOPNOTSUPP;
err = mp_dmabuf_devmem_init(pool); err = mp_dmabuf_devmem_init(pool);
if (err) { if (err) {
pr_warn("%s() mem-provider init failed %d\n", __func__, pr_warn("%s() mem-provider init failed %d\n", __func__,