From: cooldavid@cooldavid.org
To: "David Miller" <davem@davemloft.net>
Cc: Jason Lamb <jason@lambhome.org>,
linux-netdev <netdev@vger.kernel.org>,
Guo-Fu Tseng <cooldavid@cooldavid.org>,
Jason Long <jason@octgsoftware.com>,
Marcus Becker <marcus.disi@gmail.com>,
Aries Lee <arieslee@jmicron.com>,
Devinchiu <devinchiu@jmicron.com>,
Marc Schiffbauer <mschiff@gentoo.org>,
stable@kernel.org
Subject: [PATCH net-2.6] jme: Fix unmap error (Causing system freeze)
Date: Thu, 21 Jul 2011 10:57:36 +0800 [thread overview]
Message-ID: <1311217056-9073-1-git-send-email-cooldavid@cooldavid.org> (raw)
From: Guo-Fu Tseng <cooldavid@cooldavid.org>
This patch add the missing dma_unmap().
Which solved the critical issue of system freeze on heavy load.
Michal Miroslaw's rejected patch:
[PATCH v2 10/46] net: jme: convert to generic DMA API
Pointed out the issue also, thank you Michal.
But the fix was incorrect. It would unmap needed address
when low memory.
Got lots of feedback from End user and Gentoo Bugzilla.
https://bugs.gentoo.org/show_bug.cgi?id=373109
Thank you all. :)
Cc: stable@kernel.org
Signed-off-by: Guo-Fu Tseng <cooldavid@cooldavid.org>
---
drivers/net/jme.c | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/drivers/net/jme.c b/drivers/net/jme.c
index b5b174a..1973814 100644
--- a/drivers/net/jme.c
+++ b/drivers/net/jme.c
@@ -753,20 +753,28 @@ jme_make_new_rx_buf(struct jme_adapter *jme, int i)
struct jme_ring *rxring = &(jme->rxring[0]);
struct jme_buffer_info *rxbi = rxring->bufinf + i;
struct sk_buff *skb;
+ dma_addr_t mapping;
skb = netdev_alloc_skb(jme->dev,
jme->dev->mtu + RX_EXTRA_LEN);
if (unlikely(!skb))
return -ENOMEM;
+ mapping = pci_map_page(jme->pdev, virt_to_page(skb->data),
+ offset_in_page(skb->data), skb_tailroom(skb),
+ PCI_DMA_FROMDEVICE);
+ if (unlikely(pci_dma_mapping_error(jme->pdev, mapping))) {
+ dev_kfree_skb(skb);
+ return -ENOMEM;
+ }
+
+ if (likely(rxbi->mapping))
+ pci_unmap_page(jme->pdev, rxbi->mapping,
+ rxbi->len, PCI_DMA_FROMDEVICE);
+
rxbi->skb = skb;
rxbi->len = skb_tailroom(skb);
- rxbi->mapping = pci_map_page(jme->pdev,
- virt_to_page(skb->data),
- offset_in_page(skb->data),
- rxbi->len,
- PCI_DMA_FROMDEVICE);
-
+ rxbi->mapping = mapping;
return 0;
}
--
1.7.3.4
_______________________________________________
stable mailing list
stable@linux.kernel.org
http://linux.kernel.org/mailman/listinfo/stable
next reply other threads:[~2011-07-21 2:57 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-21 2:57 cooldavid [this message]
2011-07-21 19:30 ` [PATCH net-2.6] jme: Fix unmap error (Causing system freeze) Chris Wright
2011-07-21 22:23 ` David Miller
2011-07-22 7:45 ` Michał Mirosław
2011-07-22 8:49 ` Guo-Fu Tseng
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=1311217056-9073-1-git-send-email-cooldavid@cooldavid.org \
--to=cooldavid@cooldavid.org \
--cc=arieslee@jmicron.com \
--cc=davem@davemloft.net \
--cc=devinchiu@jmicron.com \
--cc=jason@lambhome.org \
--cc=jason@octgsoftware.com \
--cc=marcus.disi@gmail.com \
--cc=mschiff@gentoo.org \
--cc=netdev@vger.kernel.org \
--cc=stable@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).