From: "Steven J. Hill" <sjhill@realitydiluted.com>
To: netdev@vger.kernel.org
Subject: [PATCH] Merge GT/MV642xx Support into MV643xx Driver [8/8]
Date: Thu, 19 Jul 2007 00:02:04 -0500 [thread overview]
Message-ID: <469EF04C.1020505@realitydiluted.com> (raw)
[-- Attachment #1.1: Type: text/plain, Size: 134 bytes --]
Fix long standing panic with regards to descriptors and locking.
Signed-off-by: Steven J. Hill <sjhill1@rockwellcollins.com>
---
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 08-mv643xx-panic-lock-fix.patch --]
[-- Type: text/x-patch; name="08-mv643xx-panic-lock-fix.patch", Size: 1717 bytes --]
diff -ur linux-2.6.22.1/drivers/net/mv643xx_eth.c linux-2.6.22.1-rci/drivers/net/mv643xx_eth.c
--- linux-2.6.22.1/drivers/net/mv643xx_eth.c 2007-07-18 22:55:11.000000000 -0500
+++ linux-2.6.22.1-rci/drivers/net/mv643xx_eth.c 2007-07-18 22:39:37.000000000 -0500
@@ -350,13 +350,6 @@
while (mp->tx_desc_count > 0) {
spin_lock_irqsave(&mp->lock, flags);
-
- /* tx_desc_count might have changed before acquiring the lock */
- if (mp->tx_desc_count <= 0) {
- spin_unlock_irqrestore(&mp->lock, flags);
- return released;
- }
-
tx_index = mp->tx_used_desc_q;
desc = &mp->p_tx_desc_area[tx_index];
#ifdef CONFIG_GT64260
@@ -367,7 +360,7 @@
if (!force && (cmd_sts & ETH_BUFFER_OWNED_BY_DMA)) {
spin_unlock_irqrestore(&mp->lock, flags);
- return released;
+ continue;
}
mp->tx_used_desc_q = (tx_index + 1) % mp->tx_ring_size;
@@ -1488,7 +1481,19 @@
BUG_ON(netif_queue_stopped(dev));
BUG_ON(skb == NULL);
- if (mp->tx_ring_size - mp->tx_desc_count < MAX_DESCS_PER_SKB) {
+ if (mp->tx_ring_size - mp->tx_desc_count <= MAX_DESCS_PER_SKB) {
+ /*
+ * We are completely out of TX descriptors, however,
+ * if 'tx_used_desc_q' is zero, most likely the port
+ * has been configured and is up, but there is no link.
+ * We attempt to free a single descriptor to keep the
+ * 'sendto' call and rest of the stack happy. If this
+ * check is taken out, expect an error and kernel panic
+ * from 'kernel/softirq.c:141' inside 'local_bh_enable'.
+ */
+ if (mp->tx_used_desc_q == 0)
+ mv643xx_eth_free_all_tx_descs(dev);
+
printk(KERN_ERR "%s: transmit with queue full\n", dev->name);
netif_stop_queue(dev);
return 1;
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 254 bytes --]
next reply other threads:[~2007-07-19 5:02 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-07-19 5:02 Steven J. Hill [this message]
2007-07-19 14:45 ` [PATCH] Merge GT/MV642xx Support into MV643xx Driver [8/8] Dale Farnsworth
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=469EF04C.1020505@realitydiluted.com \
--to=sjhill@realitydiluted.com \
--cc=netdev@vger.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).