diff options
| author | Keith Busch <kbusch@kernel.org> | 2023-01-26 22:51:23 +0100 |
|---|---|---|
| committer | Andrew Morton <akpm@linux-foundation.org> | 2023-05-06 19:33:38 +0200 |
| commit | 8ecc369554219060367fc589661d2b7ab201e923 (patch) | |
| tree | 2b70e87246181b2212e8691bfd57ac078b2a38a7 /mm/dmapool.c | |
| parent | dmapool: simplify freeing (diff) | |
| download | linux-8ecc369554219060367fc589661d2b7ab201e923.tar.xz linux-8ecc369554219060367fc589661d2b7ab201e923.zip | |
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
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>
Diffstat (limited to '')
| -rw-r--r-- | mm/dmapool.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/dmapool.c b/mm/dmapool.c index 4dea2a0dbd33..21e6d362c726 100644 --- a/mm/dmapool.c +++ b/mm/dmapool.c @@ -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; |