From: David Miller Subject: Re: 8139cp dma-debug warning. Date: Wed, 12 Aug 2009 22:20:46 -0700 (PDT) Message-ID: <20090812.222046.60033759.davem@davemloft.net> References: <20090806215702.GA17555@redhat.com> <20090812171333.GD3116@redhat.com> Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: netdev@vger.kernel.org To: davej@redhat.com Return-path: Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:40591 "EHLO sunset.davemloft.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751216AbZHMFUg (ORCPT ); Thu, 13 Aug 2009 01:20:36 -0400 In-Reply-To: <20090812171333.GD3116@redhat.com> Sender: netdev-owner@vger.kernel.org List-ID: From: Dave Jones Date: Wed, 12 Aug 2009 13:13:33 -0400 > There's another instance of the same further in the file. > > Does this look right? Dave, Francois posted the following fix to lkml (he forgot to CC: netdev and the people reporting this bug, oh well) Did you see it? It should fix the bug. 8139cp: balance dma_map_single vs dma_unmap_single pair The driver always: 1. allocate cp->rx_buf_sz + NET_IP_ALIGN 2. map cp->rx_buf_sz Signed-off-by: Francois Romieu Signed-off-by: David S. Miller --- drivers/net/8139cp.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c index 50efde1..d0dbbf3 100644 --- a/drivers/net/8139cp.c +++ b/drivers/net/8139cp.c @@ -515,7 +515,7 @@ rx_status_loop: dma_addr_t mapping; struct sk_buff *skb, *new_skb; struct cp_desc *desc; - unsigned buflen; + const unsigned buflen = cp->rx_buf_sz; skb = cp->rx_skb[rx_tail]; BUG_ON(!skb); @@ -549,8 +549,7 @@ rx_status_loop: pr_debug("%s: rx slot %d status 0x%x len %d\n", dev->name, rx_tail, status, len); - buflen = cp->rx_buf_sz + NET_IP_ALIGN; - new_skb = netdev_alloc_skb(dev, buflen); + new_skb = netdev_alloc_skb(dev, buflen + NET_IP_ALIGN); if (!new_skb) { dev->stats.rx_dropped++; goto rx_next; -- 1.6.3.4