summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Busch <kbusch@kernel.org>2023-01-27 00:51:20 +0300
committerAndrew Morton <akpm@linux-foundation.org>2023-05-06 20:33:37 +0300
commit5407df10e5754b80d43697a75484bacda048fef8 (patch)
tree29bff767dbf954761916f87e0188edfd80f6ccdf
parentd93e08b7556fcd393b7fd1eb421cb44e5fae314c (diff)
downloadlinux-5407df10e5754b80d43697a75484bacda048fef8.tar.xz
dmapool: rearrange page alloc failure handling
Handle the error in a condition so the good path can be in the normal flow. Link: https://lkml.kernel.org/r/20230126215125.4069751-8-kbusch@meta.com Fixes: 2d55c16c0c54 ("dmapool: create/destroy cleanup") Signed-off-by: Keith Busch <kbusch@kernel.org> Reviewed-by: Christoph Hellwig <hch@lst.de> Cc: Matthew Wilcox <willy@infradead.org> Cc: Tony Battersby <tonyb@cybernetics.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-rw-r--r--mm/dmapool.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/mm/dmapool.c b/mm/dmapool.c
index 30b069e99996..900f2afa363a 100644
--- a/mm/dmapool.c
+++ b/mm/dmapool.c
@@ -292,17 +292,19 @@ static struct dma_page *pool_alloc_page(struct dma_pool *pool, gfp_t mem_flags)
page = kmalloc(sizeof(*page), mem_flags);
if (!page)
return NULL;
+
page->vaddr = dma_alloc_coherent(pool->dev, pool->allocation,
&page->dma, mem_flags);
- if (page->vaddr) {
- pool_init_page(pool, page);
- pool_initialise_page(pool, page);
- page->in_use = 0;
- page->offset = 0;
- } else {
+ if (!page->vaddr) {
kfree(page);
- page = NULL;
+ return NULL;
}
+
+ pool_init_page(pool, page);
+ pool_initialise_page(pool, page);
+ page->in_use = 0;
+ page->offset = 0;
+
return page;
}