From patchwork Fri Nov 21 16:26:07 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joerg Roedel X-Patchwork-Id: 10047 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 91913DDE04 for ; Sat, 22 Nov 2008 03:27:13 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756881AbYKUQ07 (ORCPT ); Fri, 21 Nov 2008 11:26:59 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756866AbYKUQ06 (ORCPT ); Fri, 21 Nov 2008 11:26:58 -0500 Received: from outbound-wa4.frontbridge.com ([216.32.181.16]:6049 "EHLO WA4EHSOBE005.bigfish.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756286AbYKUQ0d (ORCPT ); Fri, 21 Nov 2008 11:26:33 -0500 Received: from mail191-wa4-R.bigfish.com (10.8.14.254) by WA4EHSOBE005.bigfish.com (10.8.40.25) with Microsoft SMTP Server id 8.1.291.1; Fri, 21 Nov 2008 16:26:32 +0000 Received: from mail191-wa4 (localhost.localdomain [127.0.0.1]) by mail191-wa4-R.bigfish.com (Postfix) with ESMTP id F32971CF045B; Fri, 21 Nov 2008 16:26:31 +0000 (UTC) X-BigFish: VPS3(zzzzzzz32i43j62h) X-Spam-TCS-SCL: 1:0 X-FB-SS: 5, Received: by mail191-wa4 (MessageSwitch) id 1227284790220115_7102; Fri, 21 Nov 2008 16:26:30 +0000 (UCT) Received: from svlb1extmailp02.amd.com (unknown [139.95.251.11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail191-wa4.bigfish.com (Postfix) with ESMTP id 7E3CD970076; Fri, 21 Nov 2008 16:26:28 +0000 (UTC) Received: from svlb1twp02.amd.com ([139.95.250.35]) by svlb1extmailp02.amd.com (Switch-3.2.7/Switch-3.2.7) with ESMTP id mALGQEcR014062; Fri, 21 Nov 2008 08:26:22 -0800 X-WSS-ID: 0KAOYZN-04-Y1I-01 Received: from SSVLEXBH1.amd.com (ssvlexbh1.amd.com [139.95.53.182]) by svlb1twp02.amd.com (Tumbleweed MailGate 3.5.1) with ESMTP id 2A1C41103C4; Fri, 21 Nov 2008 08:26:10 -0800 (PST) Received: from SSVLEXMB1.amd.com ([139.95.53.181]) by SSVLEXBH1.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 21 Nov 2008 08:26:17 -0800 Received: from SF30EXMB1.amd.com ([172.20.6.49]) by SSVLEXMB1.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 21 Nov 2008 08:26:16 -0800 Received: from lemmy.localdomain ([165.204.85.93]) by SF30EXMB1.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 21 Nov 2008 17:26:10 +0100 Received: by lemmy.localdomain (Postfix, from userid 41430) id 8C8AB53C46; Fri, 21 Nov 2008 17:26:10 +0100 (CET) From: Joerg Roedel To: Ingo Molnar , Thomas Gleixner CC: linux-kernel@vger.kernel.org, netdev@vger.kernel.org, iommu@lists.linux-foundation.org, Joerg Roedel Subject: [PATCH 07/10] x86: add checks for alloc/free_coherent code Date: Fri, 21 Nov 2008 17:26:07 +0100 Message-ID: <1227284770-19215-8-git-send-email-joerg.roedel@amd.com> X-Mailer: git-send-email 1.5.6.4 In-Reply-To: <1227284770-19215-1-git-send-email-joerg.roedel@amd.com> References: <1227284770-19215-1-git-send-email-joerg.roedel@amd.com> X-OriginalArrivalTime: 21 Nov 2008 16:26:10.0625 (UTC) FILETIME=[DD285B10:01C94BF5] MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Impact: detect bugs in alloc/free_coherent usage Signed-off-by: Joerg Roedel --- arch/x86/include/asm/dma-mapping.h | 10 +++++- arch/x86/include/asm/dma_debug.h | 20 +++++++++++++ arch/x86/kernel/pci-dma-debug.c | 56 ++++++++++++++++++++++++++++++++++++ 3 files changed, 84 insertions(+), 2 deletions(-) diff --git a/arch/x86/include/asm/dma-mapping.h b/arch/x86/include/asm/dma-mapping.h index c7bdb75..2893adb 100644 --- a/arch/x86/include/asm/dma-mapping.h +++ b/arch/x86/include/asm/dma-mapping.h @@ -304,8 +304,12 @@ dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, if (!ops->alloc_coherent) return NULL; - return ops->alloc_coherent(dev, size, dma_handle, - dma_alloc_coherent_gfp_flags(dev, gfp)); + memory = ops->alloc_coherent(dev, size, dma_handle, + dma_alloc_coherent_gfp_flags(dev, gfp)); + + debug_alloc_coherent(dev, size, *dma_handle, memory); + + return memory; } static inline void dma_free_coherent(struct device *dev, size_t size, @@ -320,6 +324,8 @@ static inline void dma_free_coherent(struct device *dev, size_t size, if (ops->free_coherent) ops->free_coherent(dev, size, vaddr, bus); + + debug_free_coherent(dev, size, vaddr, bus); } #endif diff --git a/arch/x86/include/asm/dma_debug.h b/arch/x86/include/asm/dma_debug.h index ff06d1c..7245e27 100644 --- a/arch/x86/include/asm/dma_debug.h +++ b/arch/x86/include/asm/dma_debug.h @@ -59,6 +59,14 @@ extern void debug_unmap_sg(struct device *dev, struct scatterlist *sglist, int nelems, int dir); +extern +void debug_alloc_coherent(struct device *dev, size_t size, + dma_addr_t dma_addr, void *virt); + +extern +void debug_free_coherent(struct device *dev, size_t size, + void *virt, dma_addr_t addr); + #else /* CONFIG_DMA_API_DEBUG */ static inline @@ -90,6 +98,18 @@ void debug_unmap_sg(struct device *dev, struct scatterlist *sglist, { } +static inline +void debug_alloc_coherent(struct device *dev, size_t size, + dma_addr_t dma_addr, void *virt) +{ +} + +static inline +void debug_free_coherent(struct device *dev, size_t size, + void *virt, dma_addr_t addr) +{ +} + #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 55ef69a..db5ef9a 100644 --- a/arch/x86/kernel/pci-dma-debug.c +++ b/arch/x86/kernel/pci-dma-debug.c @@ -352,3 +352,59 @@ void debug_unmap_sg(struct device *dev, struct scatterlist *sglist, } EXPORT_SYMBOL(debug_unmap_sg); +void debug_alloc_coherent(struct device *dev, size_t size, + dma_addr_t dma_addr, void *virt) +{ + unsigned long flags; + struct dma_debug_entry *entry; + + if (dma_addr == bad_dma_address) + return; + + entry = dma_entry_alloc(); + if (!entry) + return; + + entry->type = DMA_DEBUG_COHERENT; + entry->dev = dev; + entry->cpu_addr = virt; + entry->size = size; + entry->dev_addr = dma_addr; + entry->direction = DMA_BIDIRECTIONAL; + + spin_lock_irqsave(&dma_lock, flags); + add_dma_entry(entry); + spin_unlock_irqrestore(&dma_lock, flags); +} +EXPORT_SYMBOL(debug_alloc_coherent); + +void debug_free_coherent(struct device *dev, size_t size, + void *virt, dma_addr_t addr) +{ + unsigned long flags; + struct dma_debug_entry ref = { + .type = DMA_DEBUG_COHERENT, + .dev = dev, + .cpu_addr = virt, + .dev_addr = addr, + .size = size, + .direction = DMA_BIDIRECTIONAL, + }; + 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_free_coherent); +