[PATCHv3,08/12] dmapool: consolidate page initialization

Commit Message

Keith Busch Jan. 3, 2023, 7:15 p.m. UTC

From: Keith Busch <[e-mail]>

Various fields of the dma pool are set in different places. Move it all
to one function.

Signed-off-by: Keith Busch <[e-mail]>
---
 mm/dmapool.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Comments

Christoph Hellwig Jan. 8, 2023, 5:07 p.m. UTC | #1

On Tue, Jan 03, 2023 at 11:15:47AM -0800, Keith Busch wrote:
> From: Keith Busch <[e-mail]>
> 
> Various fields of the dma pool are set in different places. Move it all
> to one function.
> 
> Signed-off-by: Keith Busch <[e-mail]>

Looks good:

Reviewed-by: Christoph Hellwig <[e-mail]>

Patch

diff --git a/mm/dmapool.c b/mm/dmapool.c
index 0a443c8120f62..6862b4e763891 100644
--- a/mm/dmapool.c
+++ b/mm/dmapool.c
@@ -202,6 +202,11 @@  static void pool_initialise_page(struct dma_pool *pool, struct dma_page *page)
 	unsigned int offset = 0;
 	unsigned int next_boundary = pool->boundary;
 
+#ifdef	DMAPOOL_DEBUG
+	memset(page->vaddr, POOL_POISON_FREED, pool->allocation);
+#endif
+	page->in_use = 0;
+	page->offset = 0;
 	do {
 		unsigned int next = offset + pool->size;
 		if (unlikely((next + pool->size) >= next_boundary)) {
@@ -226,12 +231,7 @@  static struct dma_page *pool_alloc_page(struct dma_pool *pool, gfp_t mem_flags)
 		kfree(page);
 		return NULL;
 	}
-#ifdef	DMAPOOL_DEBUG
-	memset(page->vaddr, POOL_POISON_FREED, pool->allocation);
-#endif
 	pool_initialise_page(pool, page);
-	page->in_use = 0;
-	page->offset = 0;
 
 	return page;
 }