Skip to content

Commit cc66995

Browse files
keithbuschakpm00
authored andcommitted
dmapool: simplify freeing
The actions for busy and not busy are mostly the same, so combine these and remove the unnecessary function. Also, the pool is about to be freed so there's no need to poison the page data since we only check for poison on alloc, which can't be done on a freed pool. Link: https://lkml.kernel.org/r/20230126215125.4069751-10-kbusch@meta.com Fixes: 2d55c16 ("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>
1 parent f0bccea commit cc66995

File tree

1 file changed

+6
-16
lines changed

1 file changed

+6
-16
lines changed

mm/dmapool.c

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -312,16 +312,6 @@ static inline bool is_page_busy(struct dma_page *page)
312312
return page->in_use != 0;
313313
}
314314

315-
static void pool_free_page(struct dma_pool *pool, struct dma_page *page)
316-
{
317-
dma_addr_t dma = page->dma;
318-
319-
pool_init_page(pool, page);
320-
dma_free_coherent(pool->dev, pool->allocation, page->vaddr, dma);
321-
list_del(&page->page_list);
322-
kfree(page);
323-
}
324-
325315
/**
326316
* dma_pool_destroy - destroys a pool of dma memory blocks.
327317
* @pool: dma pool that will be destroyed
@@ -349,14 +339,14 @@ void dma_pool_destroy(struct dma_pool *pool)
349339
mutex_unlock(&pools_reg_lock);
350340

351341
list_for_each_entry_safe(page, tmp, &pool->page_list, page_list) {
352-
if (is_page_busy(page)) {
342+
if (!is_page_busy(page))
343+
dma_free_coherent(pool->dev, pool->allocation,
344+
page->vaddr, page->dma);
345+
else
353346
dev_err(pool->dev, "%s %s, %p busy\n", __func__,
354347
pool->name, page->vaddr);
355-
/* leak the still-in-use consistent memory */
356-
list_del(&page->page_list);
357-
kfree(page);
358-
} else
359-
pool_free_page(pool, page);
348+
list_del(&page->page_list);
349+
kfree(page);
360350
}
361351

362352
kfree(pool);

0 commit comments

Comments
 (0)