Commit 9d062a8a authored by Keith Busch's avatar Keith Busch Committed by Andrew Morton
Browse files

dmapool: don't memset on free twice 

If debug is enabled, dmapool will poison the range, so no need to clear it
to 0 immediately before writing over it.

Link: https://lkml.kernel.org/r/20230126215125.4069751-11-kbusch@meta.com


Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Tony Battersby <tonyb@cybernetics.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 887aef61

mm/dmapool.c

+2 −2
Original line number Diff line number Diff line
@@ -160,6 +160,8 @@ static void pool_check_block(struct dma_pool *pool, void *retval, 
static bool pool_page_err(struct dma_pool *pool, struct dma_page *page,

			  void *vaddr, dma_addr_t dma)

{

	if (want_init_on_free())

		memset(vaddr, 0, pool->size);

	return false;

}
@@ -441,8 +443,6 @@ void dma_pool_free(struct dma_pool *pool, void *vaddr, dma_addr_t dma) 
		return;

	}



	if (want_init_on_free())

		memset(vaddr, 0, pool->size);

	if (pool_page_err(pool, page, vaddr, dma)) {

		spin_unlock_irqrestore(&pool->lock, flags);

		return;