Commit 36d1a289 authored Jan 26, 2023 by Keith Busch Committed by Andrew Morton Apr 05, 2023

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


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>

parent 52e7d565

mm/dmapool.c

+9 −7

Original line number	Diff line number	Diff line
		@@ -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) {
		if (!page->vaddr) {
		kfree(page);
		return NULL;
		}

		pool_init_page(pool, page);
		pool_initialise_page(pool, page);
		page->in_use = 0;
		page->offset = 0;
		} else {
		kfree(page);
		page = NULL;
		}

		return page;
		}