1 files changed, 80 insertions, 8 deletions

diff --git a/lib/dma-debug.c b/lib/dma-debug.c
index fcfa1939ac41..8971370bfb16 100644
--- a/lib/dma-debug.c
+++ b/lib/dma-debug.c
@@ -22,6 +22,7 @@
 #include <linux/stacktrace.h>
 #include <linux/dma-debug.h>
 #include <linux/spinlock.h>
+#include <linux/vmalloc.h>
 #include <linux/debugfs.h>
 #include <linux/uaccess.h>
 #include <linux/export.h>
@@ -43,6 +44,7 @@ enum {
         dma_debug_page,
         dma_debug_sg,
         dma_debug_coherent,
+        dma_debug_resource,
 };
 
 enum map_err_types {
@@ -150,8 +152,9 @@ static const char *const maperr2str[] = {
         [MAP_ERR_CHECKED] = "dma map error checked",
 };
 
-static const char *type2name[4] = { "single", "page",
-                                    "scather-gather", "coherent" };
+static const char *type2name[5] = { "single", "page",
+                                    "scather-gather", "coherent",
+                                    "resource" };
 
 static const char *dir2name[4] = { "DMA_BIDIRECTIONAL", "DMA_TO_DEVICE",
                                    "DMA_FROM_DEVICE", "DMA_NONE" };
@@ -399,6 +402,9 @@ static void hash_bucket_del(struct dma_debug_entry *entry)
 
 static unsigned long long phys_addr(struct dma_debug_entry *entry)
 {
+        if (entry->type == dma_debug_resource)
+                return __pfn_to_phys(entry->pfn) + entry->offset;
+
         return page_to_phys(pfn_to_page(entry->pfn)) + entry->offset;
 }
 
@@ -1164,11 +1170,32 @@ static void check_unmap(struct dma_debug_entry *ref)
         put_hash_bucket(bucket, &flags);
 }
 
-static void check_for_stack(struct device *dev, void *addr)
+static void check_for_stack(struct device *dev,
+                            struct page *page, size_t offset)
 {
-        if (object_is_on_stack(addr))
-                err_printk(dev, NULL, "DMA-API: device driver maps memory from "
-                                "stack [addr=%p]\n", addr);
+        void *addr;
+        struct vm_struct *stack_vm_area = task_stack_vm_area(current);
+
+        if (!stack_vm_area) {
+                /* Stack is direct-mapped. */
+                if (PageHighMem(page))
+                        return;
+                addr = page_address(page) + offset;
+                if (object_is_on_stack(addr))
+                        err_printk(dev, NULL, "DMA-API: device driver maps memory from stack [addr=%p]\n", addr);
+        } else {
+                /* Stack is vmalloced. */
+                int i;
+
+                for (i = 0; i < stack_vm_area->nr_pages; i++) {
+                        if (page != stack_vm_area->pages[i])
+                                continue;
+
+                        addr = (u8 *)current->stack + i * PAGE_SIZE + offset;
+                        err_printk(dev, NULL, "DMA-API: device driver maps memory from stack [probable addr=%p]\n", addr);
+                        break;
+                }
+        }
 }
 
 static inline bool overlap(void *addr, unsigned long len, void *start, void *end)
@@ -1291,10 +1318,11 @@ void debug_dma_map_page(struct device *dev, struct page *page, size_t offset,
         if (map_single)
                 entry->type = dma_debug_single;
 
+        check_for_stack(dev, page, offset);
+
         if (!PageHighMem(page)) {
                 void *addr = page_address(page) + offset;
 
-                check_for_stack(dev, addr);
                 check_for_illegal_area(dev, addr, size);
         }
 
@@ -1386,8 +1414,9 @@ void debug_dma_map_sg(struct device *dev, struct scatterlist *sg,
                 entry->sg_call_ents   = nents;
                 entry->sg_mapped_ents = mapped_ents;
 
+                check_for_stack(dev, sg_page(s), s->offset);
+
                 if (!PageHighMem(sg_page(s))) {
-                        check_for_stack(dev, sg_virt(s));
                         check_for_illegal_area(dev, sg_virt(s), sg_dma_len(s));
                 }
 
@@ -1495,6 +1524,49 @@ void debug_dma_free_coherent(struct device *dev, size_t size,
 }
 EXPORT_SYMBOL(debug_dma_free_coherent);
 
+void debug_dma_map_resource(struct device *dev, phys_addr_t addr, size_t size,
+                            int direction, dma_addr_t dma_addr)
+{
+        struct dma_debug_entry *entry;
+
+        if (unlikely(dma_debug_disabled()))
+                return;
+
+        entry = dma_entry_alloc();
+        if (!entry)
+                return;
+
+        entry->type             = dma_debug_resource;
+        entry->dev              = dev;
+        entry->pfn              = PHYS_PFN(addr);
+        entry->offset           = offset_in_page(addr);
+        entry->size             = size;
+        entry->dev_addr         = dma_addr;
+        entry->direction        = direction;
+        entry->map_err_type     = MAP_ERR_NOT_CHECKED;
+
+        add_dma_entry(entry);
+}
+EXPORT_SYMBOL(debug_dma_map_resource);
+
+void debug_dma_unmap_resource(struct device *dev, dma_addr_t dma_addr,
+                              size_t size, int direction)
+{
+        struct dma_debug_entry ref = {
+                .type           = dma_debug_resource,
+                .dev            = dev,
+                .dev_addr       = dma_addr,
+                .size           = size,
+                .direction      = direction,
+        };
+
+        if (unlikely(dma_debug_disabled()))
+                return;
+
+        check_unmap(&ref);
+}
+EXPORT_SYMBOL(debug_dma_unmap_resource);
+
 void debug_dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle,
                                    size_t size, int direction)
 {