From: Anton Blanchard <anton@samba•org>
To: Santiago Leon <santil@linux•vnet.ibm.com>,
brking@linux•vnet.ibm.com, rcj@linux•vnet.ibm.com
Cc: netdev@vger•kernel.org
Subject: [PATCH 1/4] ibmveth: Fix DMA unmap error
Date: Thu, 08 Sep 2011 10:41:03 +1000 [thread overview]
Message-ID: <20110908004121.570234962@samba.org> (raw)
In-Reply-To: 20110908004102.355674129@samba.org
[-- Attachment #1: ibmveth_1.patch --]
[-- Type: text/plain, Size: 1208 bytes --]
From: Brian King <brking@linux•vnet.ibm.com>
Commit 6e8ab30ec677 (ibmveth: Add scatter-gather support) introduced a
DMA mapping API inconsistency resulting in dma_unmap_page getting
called on memory mapped via dma_map_single. This was seen when
CONFIG_DMA_API_DEBUG was enabled. Fix up this API usage inconsistency.
Signed-off-by: Brian King <brking@linux•vnet.ibm.com>
Acked-by: Anton Blanchard <anton@samba•org>
Cc: <stable@kernel•org> # v2.6.37+
---
Index: linux-build/drivers/net/ibmveth.c
===================================================================
--- linux-build.orig/drivers/net/ibmveth.c 2011-09-08 08:00:16.842856634 +1000
+++ linux-build/drivers/net/ibmveth.c 2011-09-08 09:45:43.163851274 +1000
@@ -1026,7 +1026,12 @@ retry_bounce:
netdev->stats.tx_bytes += skb->len;
}
- for (i = 0; i < skb_shinfo(skb)->nr_frags + 1; i++)
+ dma_unmap_single(&adapter->vdev->dev,
+ descs[0].fields.address,
+ descs[0].fields.flags_len & IBMVETH_BUF_LEN_MASK,
+ DMA_TO_DEVICE);
+
+ for (i = 1; i < skb_shinfo(skb)->nr_frags + 1; i++)
dma_unmap_page(&adapter->vdev->dev, descs[i].fields.address,
descs[i].fields.flags_len & IBMVETH_BUF_LEN_MASK,
DMA_TO_DEVICE);
next prev parent reply other threads:[~2011-09-08 0:45 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-08 0:41 [PATCH 0/4] ibmveth fixes Anton Blanchard
2011-09-08 0:41 ` Anton Blanchard [this message]
2011-09-08 0:41 ` [PATCH 2/4] ibmveth: Fix issue with DMA mapping failure Anton Blanchard
2011-09-08 0:41 ` [PATCH 3/4] ibmveth: Checksum offload is always disabled Anton Blanchard
2011-09-08 0:41 ` [PATCH 4/4] ibmveth: Fix checksum offload failure handling Anton Blanchard
2011-09-16 19:28 ` [PATCH 0/4] ibmveth fixes David Miller
2011-09-16 20:51 ` Anton Blanchard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110908004121.570234962@samba.org \
--to=anton@samba$(echo .)org \
--cc=brking@linux$(echo .)vnet.ibm.com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=rcj@linux$(echo .)vnet.ibm.com \
--cc=santil@linux$(echo .)vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox