From patchwork Fri Jan 9 16:19:24 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joerg Roedel X-Patchwork-Id: 17529 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 0F9A847506 for ; Sat, 10 Jan 2009 03:20:18 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753231AbZAIQUP (ORCPT ); Fri, 9 Jan 2009 11:20:15 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752533AbZAIQUM (ORCPT ); Fri, 9 Jan 2009 11:20:12 -0500 Received: from outbound-sin.frontbridge.com ([207.46.51.80]:47695 "EHLO SG2EHSOBE004.bigfish.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752976AbZAIQUJ (ORCPT ); Fri, 9 Jan 2009 11:20:09 -0500 Received: from mail168-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:20:07 +0000 Received: from mail168-sin (localhost.localdomain [127.0.0.1]) by mail168-sin-R.bigfish.com (Postfix) with ESMTP id 4F95B510158; Fri, 9 Jan 2009 16:20:07 +0000 (UTC) X-BigFish: VPS0(zz18c1Kzzzzz32i43j62h) X-Spam-TCS-SCL: 1:0 Received: by mail168-sin (MessageSwitch) id 1231518005502392_24790; Fri, 9 Jan 2009 16:20:05 +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 mail168-sin.bigfish.com (Postfix) with ESMTP id 6EC9CF28098; Fri, 9 Jan 2009 16:19:54 +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 n09GJhBQ004316; Fri, 9 Jan 2009 08:19:46 -0800 X-WSS-ID: 0KD7PCJ-03-IX4-01 Received: from SSVLEXBH1.amd.com (ssvlexbh1.amd.com [139.95.53.182]) by svlb1twp01.amd.com (Tumbleweed MailGate 3.5.1) with ESMTP id 24E4E884959; Fri, 9 Jan 2009 08:19:30 -0800 (PST) Received: from SSVLEXMB1.amd.com ([139.95.53.181]) by SSVLEXBH1.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 9 Jan 2009 08:19:36 -0800 Received: from SF30EXMB1.amd.com ([172.20.6.49]) by SSVLEXMB1.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 9 Jan 2009 08:19:36 -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 B776653C44; 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 10/16] dma-debug: add add checking for map/unmap_sg Date: Fri, 9 Jan 2009 17:19:24 +0100 Message-ID: <1231517970-20288-11-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.0810 (UTC) FILETIME=[0D172DA0: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_sg Signed-off-by: Joerg Roedel --- include/linux/dma-debug.h | 15 ++++++++++++ lib/dma-debug.c | 53 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 0 deletions(-) diff --git a/include/linux/dma-debug.h b/include/linux/dma-debug.h index 82ae9ca..b2131f4 100644 --- a/include/linux/dma-debug.h +++ b/include/linux/dma-debug.h @@ -34,6 +34,11 @@ extern void debug_map_single(struct device *dev, void *ptr, size_t size, extern void debug_unmap_single(struct device *dev, dma_addr_t addr, size_t size, int direction); +extern void debug_map_sg(struct device *dev, struct scatterlist *sg, + int nents, int direction); + +extern void debug_unmap_sg(struct device *dev, struct scatterlist *sglist, + int nelems, int dir); #else /* CONFIG_DMA_API_DEBUG */ @@ -52,6 +57,16 @@ static inline void debug_unmap_single(struct device *dev, dma_addr_t addr, { } +static inline void debug_map_sg(struct device *dev, struct scatterlist *sg, + int nents, int direction) +{ +} + +static inline void debug_unmap_sg(struct device *dev, + struct scatterlist *sglist, + int nelems, int dir) +{ +} #endif /* CONFIG_DMA_API_DEBUG */ diff --git a/lib/dma-debug.c b/lib/dma-debug.c index d4d14e5..e6d45f9 100644 --- a/lib/dma-debug.c +++ b/lib/dma-debug.c @@ -17,6 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include #include #include #include @@ -551,3 +552,55 @@ void debug_unmap_single(struct device *dev, dma_addr_t addr, } EXPORT_SYMBOL(debug_unmap_single); +void debug_map_sg(struct device *dev, struct scatterlist *sg, + int nents, int direction) +{ + struct dma_debug_entry *entry; + struct scatterlist *s; + int i; + + if (global_disable) + return; + + for_each_sg(sg, s, nents, i) { + entry = dma_entry_alloc(); + if (!entry) + return; + + entry->type = dma_debug_sg; + entry->dev = dev; + entry->cpu_addr = sg_virt(s); + entry->size = s->length; + entry->dev_addr = s->dma_address; + entry->direction = direction; + + add_dma_entry(entry); + } +} +EXPORT_SYMBOL(debug_map_sg); + +void debug_unmap_sg(struct device *dev, struct scatterlist *sglist, + int nelems, int dir) +{ + struct scatterlist *s; + int i; + + if (global_disable) + return; + + for_each_sg(sglist, s, nelems, i) { + + struct dma_debug_entry ref = { + .type = dma_debug_sg, + .dev = dev, + .cpu_addr = sg_virt(s), + .dev_addr = s->dma_address, + .size = s->length, + .direction = dir, + }; + + check_unmap(&ref); + } +} +EXPORT_SYMBOL(debug_unmap_sg); +