Skip to contentSkip to conversation

Patch "dma-debug: skip debug_dma_assert_idle() when disabled" has been added to the 4.1-stable tree

PATCH [email protected] 1 participant 1 message Aug 7, 2015

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

dma-debug: skip debug_dma_assert_idle() when disabled

to the 4.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
dma-debug-skip-debug_dma_assert_idle-when-disabled.patch
and it can be found in the queue-4.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From c9d120b0b2b5069cb2ae62f8eac0cef31c8544be Mon Sep 17 00:00:00 2001

From: Haggai Eran <[email protected]>
Date: Fri, 17 Jul 2015 16:24:06 -0700
Subject: dma-debug: skip debug_dma_assert_idle() when disabled

From: Haggai Eran <[email protected]>

commit c9d120b0b2b5069cb2ae62f8eac0cef31c8544be upstream.

If dma-debug is disabled due to a memory error, DMA unmaps do not affect the dma_active_cacheline radix tree anymore, and debug_dma_assert_idle() can print false warnings.

Disable debug_dma_assert_idle() when dma_debug_disabled() is true.

Fixes 0abdd7a81b7e ("dma-debug: introduce debug_dma_assert_idle()")
Cc Dan Williams <[email protected]>
Cc Joerg Roedel <[email protected]>
Cc Vinod Koul <[email protected]>
Cc Russell King <[email protected]>
Cc James Bottomley <[email protected]>
Cc Florian Fainelli <[email protected]>
Cc Sebastian Ott <[email protected]>
Cc Jiri Kosina <[email protected]>
Cc Horia Geanta <[email protected]>
---
 lib/dma-debug.c |    3 +++
 1 file changed, 3 insertions(+)
lib/dma-debug.c +3 -0
@@ -574,6 +574,9 @@ void debug_dma_assert_idle(struct page *
 	unsigned long flags;
 	phys_addr_t cln;
 
+	if (dma_debug_disabled())
+		return;
+
 	if (!page)
 		return;
 

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

queue-4.1/dma-debug-skip-debug_dma_assert_idle-when-disabled.patch