From patchwork Tue Aug 31 09:10:52 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Kagstrom X-Patchwork-Id: 63212 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.180.67]) by ozlabs.org (Postfix) with ESMTP id 1E366B713A for ; Tue, 31 Aug 2010 19:21:11 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756317Ab0HaJVE (ORCPT ); Tue, 31 Aug 2010 05:21:04 -0400 Received: from ernst.netinsight.se ([194.16.221.21]:48481 "HELO ernst.netinsight.se" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1753550Ab0HaJVD convert rfc822-to-8bit (ORCPT ); Tue, 31 Aug 2010 05:21:03 -0400 X-Greylist: delayed 602 seconds by postgrey-1.27 at vger.kernel.org; Tue, 31 Aug 2010 05:21:02 EDT Received: from marrow.netinsight.se (unverified [10.100.3.78]) by ernst.netinsight.se (EMWAC SMTPRS 0.83) with SMTP id ; Tue, 31 Aug 2010 11:10:49 +0200 Date: Tue, 31 Aug 2010 11:10:52 +0200 From: Simon Kagstrom To: Dave Jones Cc: netdev@vger.kernel.org Subject: Re: via-velocity dma-debug warnings again. (2.6.35.2) Message-ID: <20100831111052.31f22185@marrow.netinsight.se> In-Reply-To: <20100831011348.GA11993@redhat.com> References: <20100831011348.GA11993@redhat.com> X-Mailer: Claws Mail 3.7.6 (GTK+ 2.20.1; i486-pc-linux-gnu) Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Mon, 30 Aug 2010 21:13:49 -0400 Dave Jones wrote: > I installed the Fedora 14 alpha, which is based on 2.6.35.2, and hit > the following trace.. > > WARNING: at lib/dma-debug.c:811 check_unmap+0x212/0x59b() > Hardware name: > via-velocity 0000:00:0e.0: DMA-API: device driver frees DMA memory with different size [device address=0x00000000194ba27e] [map size=66 bytes] [unmap size=182 bytes] I can't reproduce it here, but does the patch below help for you? // Simon From 81fe86ef9e4be4be43cc75e8320384a0708cef1a Mon Sep 17 00:00:00 2001 From: Simon Kagstrom Date: Tue, 31 Aug 2010 08:41:26 +0200 Subject: [PATCH] via-velocity: Correct packet length on tx free Signed-off-by: Simon Kagstrom --- drivers/net/via-velocity.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c index fd69095..305192e 100644 --- a/drivers/net/via-velocity.c +++ b/drivers/net/via-velocity.c @@ -1721,7 +1721,7 @@ static void velocity_free_tx_buf(struct velocity_info *vptr, /* For scatter-gather */ if (skb_shinfo(skb)->nr_frags > 0) pktlen = max_t(size_t, pktlen, - td->td_buf[i].size & ~TD_QUEUE); + skb_headlen(skb)); pci_unmap_single(vptr->pdev, tdinfo->skb_dma[i], le16_to_cpu(pktlen), PCI_DMA_TODEVICE);