From 20dedb2b6f684bb4beec2702bed33dae36d5c3bc Mon Sep 17 00:00:00 2001 From: Shuah Khan Date: Tue, 17 Dec 2013 10:44:50 +1100 Subject: [PATCH] dma-debug: enhance dma_debug_device_change() to check for mapping errors dma-debug checks to verify if driver validated the address returned by dma mapping routines when driver does unmap. If a driver doesn't call unmap, failure to check mapping errors isn't detected and reported. Enhance the existing bus notifier_call dma_debug_device_change() to check for mapping errors at the same time it detects leaked dma buffers for BUS_NOTIFY_UNBOUND_DRIVER event. It scans for mapping errors and if any found, prints one warning message that includes mapping error count. Signed-off-by: Shuah Khan Cc: Alexander Duyck Cc: Joerg Roedel Signed-off-by: Andrew Morton --- lib/dma-debug.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/dma-debug.c b/lib/dma-debug.c index d87a17a819d0..e34865ef27e3 100644 --- a/lib/dma-debug.c +++ b/lib/dma-debug.c @@ -717,6 +717,7 @@ static int device_dma_allocations(struct device *dev, struct dma_debug_entry **o struct dma_debug_entry *entry; unsigned long flags; int count = 0, i; + int map_err_cnt = 0; local_irq_save(flags); @@ -724,6 +725,8 @@ static int device_dma_allocations(struct device *dev, struct dma_debug_entry **o spin_lock(&dma_entry_hash[i].lock); list_for_each_entry(entry, &dma_entry_hash[i].list, list) { if (entry->dev == dev) { + if (entry->map_err_type == MAP_ERR_NOT_CHECKED) + map_err_cnt += 1; count += 1; *out_entry = entry; } @@ -733,6 +736,10 @@ static int device_dma_allocations(struct device *dev, struct dma_debug_entry **o local_irq_restore(flags); + if (map_err_cnt) + dev_warn(entry->dev, + "DMA-API: device driver failed to check map errors: " + "[count] = %d\n", map_err_cnt); return count; } -- 2.39.5