Skip to contentSkip to conversation

dmapool-dont-memset-on-free-twice.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Feb 26, 2023

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: dmapool: don't memset on free twice
has been removed from the -mm tree. Its filename was
dmapool-dont-memset-on-free-twice.patch

This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Keith Busch <[email protected]>
Subject: dmapool: don't memset on free twice
Date: Thu, 26 Jan 2023 13:51:23 -0800

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

---

mm/dmapool.c renamed from mm/dmapool.c~dmapool-dont-memset-on-free-twice +2 -2
@@ -160,6 +160,8 @@ static void pool_check_block(struct dma_
 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
 		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;

_

Patches currently in -mm which might be from [email protected] are