linux-kernel - [PATCH 3.19.y-ckt 095/107] dma-debug: skip debug_dma_assert

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <1438811379-384-96-git-send-email-kamal@canonical.com>
Date:	Wed,  5 Aug 2015 14:49:27 -0700
From:	Kamal Mostafa <kamal@...onical.com>
To:	linux-kernel@...r.kernel.org, stable@...r.kernel.org,
	kernel-team@...ts.ubuntu.com
Cc:	Haggai Eran <haggaie@...lanox.com>,
	Dan Williams <dan.j.williams@...el.com>,
	Joerg Roedel <joro@...tes.org>,
	Vinod Koul <vinod.koul@...el.com>,
	Russell King <rmk+kernel@....linux.org.uk>,
	James Bottomley <JBottomley@...allels.com>,
	Florian Fainelli <f.fainelli@...il.com>,
	Sebastian Ott <sebott@...ux.vnet.ibm.com>,
	Jiri Kosina <jkosina@...e.cz>,
	Horia Geanta <horia.geanta@...escale.com>,
	Andrew Morton <akpm@...ux-foundation.org>,
	Linus Torvalds <torvalds@...ux-foundation.org>,
	Kamal Mostafa <kamal@...onical.com>
Subject: [PATCH 3.19.y-ckt 095/107] dma-debug: skip debug_dma_assert_idle() when disabled

3.19.8-ckt5 -stable review patch.  If anyone has any objections, please let me know.

------------------

From: Haggai Eran <haggaie@...lanox.com>

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.

Signed-off-by: Haggai Eran <haggaie@...lanox.com>
Fixes: 0abdd7a81b7e ("dma-debug: introduce debug_dma_assert_idle()")
Cc: Dan Williams <dan.j.williams@...el.com>
Cc: Joerg Roedel <joro@...tes.org>
Cc: Vinod Koul <vinod.koul@...el.com>
Cc: Russell King <rmk+kernel@....linux.org.uk>
Cc: James Bottomley <JBottomley@...allels.com>
Cc: Florian Fainelli <f.fainelli@...il.com>
Cc: Sebastian Ott <sebott@...ux.vnet.ibm.com>
Cc: Jiri Kosina <jkosina@...e.cz>
Cc: Horia Geanta <horia.geanta@...escale.com>
Signed-off-by: Andrew Morton <akpm@...ux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@...ux-foundation.org>
Signed-off-by: Kamal Mostafa <kamal@...onical.com>
---
 lib/dma-debug.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/dma-debug.c b/lib/dma-debug.c
index 9722bd2..d75c2f4 100644
--- a/lib/dma-debug.c
+++ b/lib/dma-debug.c
@@ -574,6 +574,9 @@ void debug_dma_assert_idle(struct page *page)
 	unsigned long flags;
 	phys_addr_t cln;
 
+	if (dma_debug_disabled())
+		return;
+
 	if (!page)
 		return;
 
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/