From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:43816 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1946207AbbHGVOb (ORCPT ); Fri, 7 Aug 2015 17:14:31 -0400 Subject: Patch "dma-debug: skip debug_dma_assert_idle() when disabled" has been added to the 3.14-stable tree To: haggaie@mellanox.com, JBottomley@Parallels.com, akpm@linux-foundation.org, dan.j.williams@intel.com, f.fainelli@gmail.com, gregkh@linuxfoundation.org, horia.geanta@freescale.com, jkosina@suse.cz, joro@8bytes.org, rmk+kernel@arm.linux.org.uk, sebott@linux.vnet.ibm.com, torvalds@linux-foundation.org, vinod.koul@intel.com Cc: , From: Date: Fri, 07 Aug 2015 14:14:29 -0700 Message-ID: <1438982069248113@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: 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 3.14-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-3.14 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From c9d120b0b2b5069cb2ae62f8eac0cef31c8544be Mon Sep 17 00:00:00 2001 From: Haggai Eran Date: Fri, 17 Jul 2015 16:24:06 -0700 Subject: dma-debug: skip debug_dma_assert_idle() when disabled From: Haggai Eran 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 Fixes: 0abdd7a81b7e ("dma-debug: introduce debug_dma_assert_idle()") Cc: Dan Williams Cc: Joerg Roedel Cc: Vinod Koul Cc: Russell King Cc: James Bottomley Cc: Florian Fainelli Cc: Sebastian Ott Cc: Jiri Kosina Cc: Horia Geanta Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- lib/dma-debug.c | 3 +++ 1 file changed, 3 insertions(+) --- a/lib/dma-debug.c +++ b/lib/dma-debug.c @@ -566,6 +566,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 haggaie@mellanox.com are queue-3.14/dma-debug-skip-debug_dma_assert_idle-when-disabled.patch