From patchwork Fri Nov 21 16:26:09 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joerg Roedel X-Patchwork-Id: 10043 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 C73CADDE08 for ; Sat, 22 Nov 2008 03:26:46 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755437AbYKUQ0l (ORCPT ); Fri, 21 Nov 2008 11:26:41 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756522AbYKUQ0k (ORCPT ); Fri, 21 Nov 2008 11:26:40 -0500 Received: from outbound-va3.frontbridge.com ([216.32.180.16]:3152 "EHLO VA3EHSOBE002.bigfish.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755271AbYKUQ03 (ORCPT ); Fri, 21 Nov 2008 11:26:29 -0500 Received: from mail16-va3-R.bigfish.com (10.7.14.251) by VA3EHSOBE002.bigfish.com (10.7.40.22) with Microsoft SMTP Server id 8.1.291.1; Fri, 21 Nov 2008 16:26:26 +0000 Received: from mail16-va3 (localhost.localdomain [127.0.0.1]) by mail16-va3-R.bigfish.com (Postfix) with ESMTP id 7DB2E9701E7; Fri, 21 Nov 2008 16:26:25 +0000 (UTC) X-BigFish: VPS3(zzzzzzz32i43j66h) X-Spam-TCS-SCL: 5:0 Received: by mail16-va3 (MessageSwitch) id 1227284782571242_10506; Fri, 21 Nov 2008 16:26:22 +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 mail16-va3.bigfish.com (Postfix) with ESMTP id 569E1670055; Fri, 21 Nov 2008 16:26:22 +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 mALGQDTb014059; Fri, 21 Nov 2008 08:26:16 -0800 X-WSS-ID: 0KAOYZO-03-S7Y-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 203FB884941; Fri, 21 Nov 2008 08:26:12 -0800 (PST) Received: from ssvlexmb2.amd.com ([139.95.53.7]) by SSVLEXBH2.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 21 Nov 2008 08:26:18 -0800 Received: from SF30EXMB1.amd.com ([172.20.6.49]) by ssvlexmb2.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 21 Nov 2008 08:26:17 -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 9397F53C45; 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 09/10] x86: add checks for sync_single_range* code Date: Fri, 21 Nov 2008 17:26:09 +0100 Message-ID: <1227284770-19215-10-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.0656 (UTC) FILETIME=[DD2D1600: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 sync_single_range* usage Signed-off-by: Joerg Roedel --- arch/x86/include/asm/dma-mapping.h | 4 ++++ arch/x86/include/asm/dma_debug.h | 26 ++++++++++++++++++++++++++ arch/x86/kernel/pci-dma-debug.c | 17 +++++++++++++++++ 3 files changed, 47 insertions(+), 0 deletions(-) diff --git a/arch/x86/include/asm/dma-mapping.h b/arch/x86/include/asm/dma-mapping.h index 63bed40..2b6399d 100644 --- a/arch/x86/include/asm/dma-mapping.h +++ b/arch/x86/include/asm/dma-mapping.h @@ -185,6 +185,8 @@ dma_sync_single_range_for_cpu(struct device *hwdev, dma_addr_t dma_handle, if (ops->sync_single_range_for_cpu) ops->sync_single_range_for_cpu(hwdev, dma_handle, offset, size, direction); + debug_sync_single_range_for_cpu(hwdev, dma_handle, offset, + size, direction); flush_write_buffers(); } @@ -199,6 +201,8 @@ dma_sync_single_range_for_device(struct device *hwdev, dma_addr_t dma_handle, if (ops->sync_single_range_for_device) ops->sync_single_range_for_device(hwdev, dma_handle, offset, size, direction); + debug_sync_single_range_for_device(hwdev, dma_handle, offset, + size, direction); flush_write_buffers(); } diff --git a/arch/x86/include/asm/dma_debug.h b/arch/x86/include/asm/dma_debug.h index 8262cd1..bc4a841 100644 --- a/arch/x86/include/asm/dma_debug.h +++ b/arch/x86/include/asm/dma_debug.h @@ -75,6 +75,17 @@ extern void debug_sync_single_for_device(struct device *dev, dma_addr_t dma_handle, size_t size, int direction); +extern +void debug_sync_single_range_for_cpu(struct device *dev, dma_addr_t dma_handle, + unsigned long offset, size_t size, + int direction); + +extern +void debug_sync_single_range_for_device(struct device *dev, + dma_addr_t dma_handle, + unsigned long offset, + size_t size, int direction); + #else /* CONFIG_DMA_API_DEBUG */ static inline @@ -130,6 +141,21 @@ void debug_sync_single_for_device(struct device *dev, dma_addr_t dma_handle, { } +static inline +void debug_sync_single_range_for_cpu(struct device *dev, dma_addr_t dma_handle, + unsigned long offset, size_t size, + int direction) +{ +} + +static inline +void debug_sync_single_range_for_device(struct device *dev, + dma_addr_t dma_handle, + unsigned long offset, + 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 1dfcd33..92b9491 100644 --- a/arch/x86/kernel/pci-dma-debug.c +++ b/arch/x86/kernel/pci-dma-debug.c @@ -422,3 +422,20 @@ void debug_sync_single_for_device(struct device *dev, dma_addr_t dma_handle, } EXPORT_SYMBOL(debug_sync_single_for_device); +void debug_sync_single_range_for_cpu(struct device *dev, dma_addr_t dma_handle, + unsigned long offset, size_t size, + int direction) +{ + check_sync(dev, dma_handle, size, offset, direction, true); +} +EXPORT_SYMBOL(debug_sync_single_range_for_cpu); + +void debug_sync_single_range_for_device(struct device *dev, + dma_addr_t dma_handle, + unsigned long offset, + size_t size, int direction) +{ + check_sync(dev, dma_handle, size, offset, direction, false); +} +EXPORT_SYMBOL(debug_sync_single_range_for_device); +