| Message ID | 1227284770-19215-6-git-send-email-joerg.roedel@amd.com |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | David Miller |
| Headers | show |
On Fri, 21 Nov 2008 17:26:05 +0100 Joerg Roedel <joerg.roedel@amd.com> wrote: > Impact: detect bugs in map/unmap_single usage > > Signed-off-by: Joerg Roedel <joerg.roedel@amd.com> > --- > arch/x86/include/asm/dma-mapping.h | 9 +++++- > arch/x86/include/asm/dma_debug.h | 20 +++++++++++++ > arch/x86/kernel/pci-dma-debug.c | 55 ++++++++++++++++++++++++++++++++++++ > 3 files changed, 83 insertions(+), 1 deletions(-) > > diff --git a/arch/x86/include/asm/dma-mapping.h b/arch/x86/include/asm/dma-mapping.h > index 83d7b7d..c9bead2 100644 > --- a/arch/x86/include/asm/dma-mapping.h > +++ b/arch/x86/include/asm/dma-mapping.h > @@ -98,9 +98,14 @@ dma_map_single(struct device *hwdev, void *ptr, size_t size, > int direction) > { > struct dma_mapping_ops *ops = get_dma_ops(hwdev); > + dma_addr_t addr; > > BUG_ON(!valid_dma_direction(direction)); > - return ops->map_single(hwdev, virt_to_phys(ptr), size, direction); > + addr = ops->map_single(hwdev, virt_to_phys(ptr), size, direction); > + > + debug_map_single(hwdev, ptr, size, direction, addr); debug_map_single could fail due to OOM. Then debug_unmap_single in dma_unmap_single gives a false warning because it can't find the dma_debug_entry? -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Sat, Nov 22, 2008 at 12:27:41PM +0900, FUJITA Tomonori wrote: > On Fri, 21 Nov 2008 17:26:05 +0100 > Joerg Roedel <joerg.roedel@amd.com> wrote: > > > Impact: detect bugs in map/unmap_single usage > > > > Signed-off-by: Joerg Roedel <joerg.roedel@amd.com> > > --- > > arch/x86/include/asm/dma-mapping.h | 9 +++++- > > arch/x86/include/asm/dma_debug.h | 20 +++++++++++++ > > arch/x86/kernel/pci-dma-debug.c | 55 ++++++++++++++++++++++++++++++++++++ > > 3 files changed, 83 insertions(+), 1 deletions(-) > > > > diff --git a/arch/x86/include/asm/dma-mapping.h b/arch/x86/include/asm/dma-mapping.h > > index 83d7b7d..c9bead2 100644 > > --- a/arch/x86/include/asm/dma-mapping.h > > +++ b/arch/x86/include/asm/dma-mapping.h > > @@ -98,9 +98,14 @@ dma_map_single(struct device *hwdev, void *ptr, size_t size, > > int direction) > > { > > struct dma_mapping_ops *ops = get_dma_ops(hwdev); > > + dma_addr_t addr; > > > > BUG_ON(!valid_dma_direction(direction)); > > - return ops->map_single(hwdev, virt_to_phys(ptr), size, direction); > > + addr = ops->map_single(hwdev, virt_to_phys(ptr), size, direction); > > + > > + debug_map_single(hwdev, ptr, size, direction, addr); > > debug_map_single could fail due to OOM. Then debug_unmap_single in > dma_unmap_single gives a false warning because it can't find the > dma_debug_entry? True. I will add a check to disable checking when a map operation has failed. Joerg -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/x86/include/asm/dma-mapping.h b/arch/x86/include/asm/dma-mapping.h index 83d7b7d..c9bead2 100644 --- a/arch/x86/include/asm/dma-mapping.h +++ b/arch/x86/include/asm/dma-mapping.h @@ -98,9 +98,14 @@ dma_map_single(struct device *hwdev, void *ptr, size_t size, int direction) { struct dma_mapping_ops *ops = get_dma_ops(hwdev); + dma_addr_t addr; BUG_ON(!valid_dma_direction(direction)); - return ops->map_single(hwdev, virt_to_phys(ptr), size, direction); + addr = ops->map_single(hwdev, virt_to_phys(ptr), size, direction); + + debug_map_single(hwdev, ptr, size, direction, addr); + + return addr; } static inline void @@ -112,6 +117,8 @@ dma_unmap_single(struct device *dev, dma_addr_t addr, size_t size, BUG_ON(!valid_dma_direction(direction)); if (ops->unmap_single) ops->unmap_single(dev, addr, size, direction); + + debug_unmap_single(dev, addr, size, direction); } static inline int diff --git a/arch/x86/include/asm/dma_debug.h b/arch/x86/include/asm/dma_debug.h index f2c3d53..ba4d9b7 100644 --- a/arch/x86/include/asm/dma_debug.h +++ b/arch/x86/include/asm/dma_debug.h @@ -43,6 +43,14 @@ struct dma_debug_entry { extern void dma_debug_init(void); +extern +void debug_map_single(struct device *dev, void *ptr, size_t size, + int direction, dma_addr_t dma_addr); + +extern +void debug_unmap_single(struct device *dev, dma_addr_t addr, + size_t size, int direction); + #else /* CONFIG_DMA_API_DEBUG */ static inline @@ -50,6 +58,18 @@ void dma_debug_init(void) { } +static inline +void debug_map_single(struct device *dev, void *ptr, size_t size, + int direction, dma_addr_t dma_addr) +{ +} + +static inline +void debug_unmap_single(struct device *dev, dma_addr_t addr, + size_t size, int direction) +{ +} + #endif /* CONFIG_DMA_API_DEBUG */ #endif /* __ASM_X86_DMA_DEBUG */ diff --git a/arch/x86/kernel/pci-dma-debug.c b/arch/x86/kernel/pci-dma-debug.c index fc95631..9afb6c8 100644 --- a/arch/x86/kernel/pci-dma-debug.c +++ b/arch/x86/kernel/pci-dma-debug.c @@ -234,3 +234,58 @@ void dma_debug_init(void) printk(KERN_INFO "PCI-DMA: DMA API debugging enabled by kernel config\n"); } +void debug_map_single(struct device *dev, void *ptr, size_t size, + int direction, dma_addr_t dma_addr) +{ + unsigned long flags; + struct dma_debug_entry *entry; + + if (dma_addr == bad_dma_address) + return; + + entry = dma_entry_alloc(); + if (!entry) + return; + + entry->dev = dev; + entry->type = DMA_DEBUG_SINGLE; + entry->cpu_addr = ptr; + entry->dev_addr = dma_addr; + entry->size = size; + entry->direction = direction; + + spin_lock_irqsave(&dma_lock, flags); + add_dma_entry(entry); + spin_unlock_irqrestore(&dma_lock, flags); +} +EXPORT_SYMBOL(debug_map_single); + +void debug_unmap_single(struct device *dev, dma_addr_t addr, + size_t size, int direction) +{ + unsigned long flags; + struct dma_debug_entry ref = { + .type = DMA_DEBUG_SINGLE, + .dev = dev, + .dev_addr = addr, + .size = size, + .direction = direction, + }; + struct dma_debug_entry *entry; + + if (addr == bad_dma_address) + return; + + spin_lock_irqsave(&dma_lock, flags); + + entry = find_dma_entry(&ref); + + if (check_unmap(&ref, entry)) { + remove_dma_entry(entry); + dma_entry_free(entry); + } + + spin_unlock_irqrestore(&dma_lock, flags); +} +EXPORT_SYMBOL(debug_unmap_single); +
Impact: detect bugs in map/unmap_single usage Signed-off-by: Joerg Roedel <joerg.roedel@amd.com> --- arch/x86/include/asm/dma-mapping.h | 9 +++++- arch/x86/include/asm/dma_debug.h | 20 +++++++++++++ arch/x86/kernel/pci-dma-debug.c | 55 ++++++++++++++++++++++++++++++++++++ 3 files changed, 83 insertions(+), 1 deletions(-)