Commit 2ce8e7ed authored Dec 10, 2014 by Florian Fainelli Committed by Linus Torvalds Dec 10, 2014

dma-debug: prevent early callers from crashing



dma_debug_init() is called by architecture specific code at different
levels, but typically as a fs_initcall due to the debugfs initialization.
Some platforms may have early callers of the DMA-API, running prior to the
fs_initcall() level, which is not much of an issue unless
CONFIG_DMA_API_DEBUG is set.  When the DMA-API debugging facilities are
turned on a caller will go through:

debug_dma_map_{single,page}
  -> dma_mapping_error (inline function usually)
    -> debug_dma_mapping_error
      -> get_hash_bucket

Calling get_hash_bucket() returns a valid hash value since we hash on high
bits of the dma_addr cookie, but we will grab an unitialized spinlock,
which typically won't crash but produce a warning, the real crash will
however happen during the bucket list traversal because the list has not
been initialized yet.

An obvious solution is of course to move some of the offenders to run
after the fs_initcall level, but since this might not always be an option,
we add a flag "dma_debug_initialized" which is set to false by default,
and set to true once dma_debug_init() has had a chance to run.

The dma_debug_disabled() helper function previously introduced just needs
to check for dma_debug_initialized to allow the caller to proceed or not.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Jiri Kosina <jkosina@suse.cz>
Cc: Horia Geanta <horia.geanta@freescale.com>
Cc: Brian Norris <computersforpeace@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 01ce18b3

lib/dma-debug.c

+10 −2

Original line number	Diff line number	Diff line
		@@ -102,9 +102,12 @@ static DEFINE_SPINLOCK(free_entries_lock);
		/* Global disable flag - will be set in case of an error */
		static u32 global_disable __read_mostly;

		/* Early initialization disable flag, set at the end of dma_debug_init */
		static bool dma_debug_initialized __read_mostly;

		static inline bool dma_debug_disabled(void)
		{
		return global_disable;
		return global_disable \|\| !dma_debug_initialized;
		}

		/* Global error count */
		@@ -999,7 +1002,10 @@ void dma_debug_init(u32 num_entries)
		{
		int i;

		if (dma_debug_disabled())
		/* Do not use dma_debug_initialized here, since we really want to be
		* called to set dma_debug_initialized
		*/
		if (global_disable)
		return;

		for (i = 0; i < HASH_SIZE; ++i) {
		@@ -1026,6 +1032,8 @@ void dma_debug_init(u32 num_entries)

		nr_total_entries = num_free_entries;

		dma_debug_initialized = true;

		pr_info("DMA-API: debugging enabled by kernel config\n");
		}

Admin message