From: Tony Battersby <tonyb@cybernetics.com>
Date: Thu, 26 Jan 2023 21:51:18 +0000 (-0800)
Subject: dmapool: speedup DMAPOOL_DEBUG with init_on_alloc
X-Git-Tag: v6.6.7~2875^2~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=290911c56f98ac7af9354108f3d16da5d6c5189c;p=platform%2Fkernel%2Flinux-starfive.git

dmapool: speedup DMAPOOL_DEBUG with init_on_alloc

Avoid double-memset of the same allocated memory in dma_pool_alloc() when
both DMAPOOL_DEBUG is enabled and init_on_alloc=1.

Link: https://lkml.kernel.org/r/20230126215125.4069751-6-kbusch@meta.com
Fixes: 2d55c16c0c54 ("dmapool: create/destroy cleanup")
Signed-off-by: Tony Battersby <tonyb@cybernetics.com>
Signed-off-by: Keith Busch <kbusch@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Cc: Matthew Wilcox <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

diff --git a/mm/dmapool.c b/mm/dmapool.c
index ee993bb..eaed3ff 100644
--- a/mm/dmapool.c
+++ b/mm/dmapool.c
@@ -356,7 +356,7 @@ void *dma_pool_alloc(struct dma_pool *pool, gfp_t mem_flags,
 			break;
 		}
 	}
-	if (!(mem_flags & __GFP_ZERO))
+	if (!want_init_on_alloc(mem_flags))
 		memset(retval, POOL_POISON_ALLOCATED, pool->size);
 #endif
 	spin_unlock_irqrestore(&pool->lock, flags);