From patchwork Fri Nov 21 16:26:05 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joerg Roedel X-Patchwork-Id: 10045 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 7E859DDE04 for ; Sat, 22 Nov 2008 03:27:11 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756320AbYKUQ0e (ORCPT ); Fri, 21 Nov 2008 11:26:34 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756258AbYKUQ0c (ORCPT ); Fri, 21 Nov 2008 11:26:32 -0500 Received: from outbound-sin.frontbridge.com ([207.46.51.80]:2944 "EHLO SG2EHSOBE001.bigfish.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755468AbYKUQ0a (ORCPT ); Fri, 21 Nov 2008 11:26:30 -0500 Received: from mail96-sin-R.bigfish.com (10.3.40.3) by SG2EHSOBE001.bigfish.com (10.3.40.21) with Microsoft SMTP Server id 8.1.291.1; Fri, 21 Nov 2008 16:26:28 +0000 Received: from mail96-sin (localhost.localdomain [127.0.0.1]) by mail96-sin-R.bigfish.com (Postfix) with ESMTP id 646A712C85CC; Fri, 21 Nov 2008 16:26:28 +0000 (UTC) X-BigFish: VPS3(zzzzzzz32i43j62h) X-Spam-TCS-SCL: 1:0 Received: by mail96-sin (MessageSwitch) id 1227284785936856_4017; Fri, 21 Nov 2008 16:26:25 +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 mail96-sin.bigfish.com (Postfix) with ESMTP id DAC6A240081; Fri, 21 Nov 2008 16:26:24 +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 mALGQELZ014063; Fri, 21 Nov 2008 08:26:17 -0800 X-WSS-ID: 0KAOYZM-04-Y1H-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 2898C1103C3; 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 SF36EXMB1.amd.com ([172.19.4.24]) 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.77.10]) by SF36EXMB1.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 7FFFF53C44; 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 05/10] x86: add check code for map/unmap_single code Date: Fri, 21 Nov 2008 17:26:05 +0100 Message-ID: <1227284770-19215-6-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.0584 (UTC) FILETIME=[DD221980: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 map/unmap_single usage Signed-off-by: Joerg Roedel --- 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); + + 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); +