From patchwork Fri Jan 9 16:19:23 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joerg Roedel X-Patchwork-Id: 17536 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 A97AE475CE for ; Sat, 10 Jan 2009 03:21:18 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753022AbZAIQUj (ORCPT ); Fri, 9 Jan 2009 11:20:39 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753262AbZAIQUh (ORCPT ); Fri, 9 Jan 2009 11:20:37 -0500 Received: from outbound-sin.frontbridge.com ([207.46.51.80]:45975 "EHLO SG2EHSOBE004.bigfish.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752439AbZAIQTs (ORCPT ); Fri, 9 Jan 2009 11:19:48 -0500 Received: from mail25-sin-R.bigfish.com (10.3.40.3) by SG2EHSOBE004.bigfish.com (10.3.40.24) with Microsoft SMTP Server id 8.1.291.1; Fri, 9 Jan 2009 16:19:44 +0000 Received: from mail25-sin (localhost.localdomain [127.0.0.1]) by mail25-sin-R.bigfish.com (Postfix) with ESMTP id 5B0D06B01DD; Fri, 9 Jan 2009 16:19:44 +0000 (UTC) X-BigFish: VPS3(zzzzzzz32i43j62h) X-Spam-TCS-SCL: 1:0 Received: by mail25-sin (MessageSwitch) id 1231517983177143_5867; Fri, 9 Jan 2009 16:19:43 +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 mail25-sin.bigfish.com (Postfix) with ESMTP id 8DA385005C; Fri, 9 Jan 2009 16:19:42 +0000 (UTC) Received: from svlb1twp01.amd.com ([139.95.250.34]) by svlb1extmailp02.amd.com (Switch-3.2.7/Switch-3.2.7) with ESMTP id n09GJTVp004096; Fri, 9 Jan 2009 08:19:33 -0800 X-WSS-ID: 0KD7PCI-03-IX1-01 Received: from SSVLEXBH2.amd.com (ssvlexbh2.amd.com [139.95.53.183]) by svlb1twp01.amd.com (Tumbleweed MailGate 3.5.1) with ESMTP id 2851988494A; Fri, 9 Jan 2009 08:19:29 -0800 (PST) Received: from ssvlexmb2.amd.com ([139.95.53.7]) by SSVLEXBH2.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 9 Jan 2009 08:19:35 -0800 Received: from SF30EXMB1.amd.com ([172.20.6.49]) by ssvlexmb2.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 9 Jan 2009 08:19:35 -0800 Received: from lemmy.localdomain ([165.204.85.93]) by SF30EXMB1.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 9 Jan 2009 17:19:30 +0100 Received: by lemmy.localdomain (Postfix, from userid 41430) id B24D853C69; Fri, 9 Jan 2009 17:19:30 +0100 (CET) From: Joerg Roedel To: linux-kernel@vger.kernel.org CC: mingo@redhat.com, dwmw2@infradead.org, fujita.tomonori@lab.ntt.co.jp, netdev@vger.kernel.org, iommu@lists.linux-foundation.org, Joerg Roedel Subject: [PATCH 09/16] dma-debug: add checking for map/unmap_single Date: Fri, 9 Jan 2009 17:19:23 +0100 Message-ID: <1231517970-20288-10-git-send-email-joerg.roedel@amd.com> X-Mailer: git-send-email 1.5.6.4 In-Reply-To: <1231517970-20288-1-git-send-email-joerg.roedel@amd.com> References: <1231517970-20288-1-git-send-email-joerg.roedel@amd.com> X-OriginalArrivalTime: 09 Jan 2009 16:19:30.0795 (UTC) FILETIME=[0D14E3B0:01C97276] MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Impact: add debug callbacks for dma_{un}map_single Signed-off-by: Joerg Roedel --- include/linux/dma-debug.h | 19 +++++++++++++++++++ lib/dma-debug.c | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 0 deletions(-) diff --git a/include/linux/dma-debug.h b/include/linux/dma-debug.h index 345d538..82ae9ca 100644 --- a/include/linux/dma-debug.h +++ b/include/linux/dma-debug.h @@ -28,12 +28,31 @@ struct device; extern void dma_debug_init(u32 num_entries); +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 void dma_debug_init(u32 num_entries) { } +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 /* __DMA_DEBUG_H */ diff --git a/lib/dma-debug.c b/lib/dma-debug.c index 9f730a4..d4d14e5 100644 --- a/lib/dma-debug.c +++ b/lib/dma-debug.c @@ -510,3 +510,44 @@ out: } +void debug_map_single(struct device *dev, void *ptr, size_t size, + int direction, dma_addr_t dma_addr) +{ + struct dma_debug_entry *entry; + + if (global_disable) + 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; + + add_dma_entry(entry); +} +EXPORT_SYMBOL(debug_map_single); + +void debug_unmap_single(struct device *dev, dma_addr_t addr, + size_t size, int direction) +{ + struct dma_debug_entry ref = { + .type = dma_debug_single, + .dev = dev, + .dev_addr = addr, + .size = size, + .direction = direction, + }; + + if (global_disable) + return; + + check_unmap(&ref); +} +EXPORT_SYMBOL(debug_unmap_single); +