From: Eric Dumazet <eric.dumazet@gmail.com>
To: Thomas Meyer <thomas@m3y3r.de>, David Miller <davem@davemloft.net>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
"jcliburn@gmail.com" <jcliburn@gmail.com>,
"chris.snook@gmail.com" <chris.snook@gmail.com>,
netdev <netdev@vger.kernel.org>, Josh Boyer <jwboyer@gmail.com>
Subject: [PATCH] atl1c: dont use highprio tx queue
Date: Thu, 16 Feb 2012 07:43:11 +0100 [thread overview]
Message-ID: <1329374591.5646.23.camel@edumazet-laptop> (raw)
In-Reply-To: <21390AB8-BD9B-44D7-B2CE-B20AF7605CE7@m3y3r.de>
This driver attempts to use two TX rings but lacks proper support :
1) IRQ handler only takes care of TX completion on first TX ring
2) the stop/start logic uses the legacy functions (for non multiqueue
drivers)
This means all packets witk skb mark set to 1 are sent through high
queue but are never cleaned and queue eventualy fills and block the
device, triggering the infamous "NETDEV WATCHDOG" message.
Lets use a single TX ring to fix the problem, this driver is not a real
multiqueue one yet.
Minimal fix for stable kernels.
Reported-by: Thomas Meyer <thomas@m3y3r.de>
Tested-by: Thomas Meyer <thomas@m3y3r.de>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Cc: Jay Cliburn <jcliburn@gmail.com>
Cc: Chris Snook <chris.snook@gmail.com>
---
drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
index b859124..1ff3c6d 100644
--- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
+++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
@@ -2244,10 +2244,6 @@ static netdev_tx_t atl1c_xmit_frame(struct sk_buff *skb,
dev_info(&adapter->pdev->dev, "tx locked\n");
return NETDEV_TX_LOCKED;
}
- if (skb->mark == 0x01)
- type = atl1c_trans_high;
- else
- type = atl1c_trans_normal;
if (atl1c_tpd_avail(adapter, type) < tpd_req) {
/* no enough descriptor, just stop queue */
next prev parent reply other threads:[~2012-02-16 6:43 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-12 16:16 NETDEV WATCHDOG: eth0 (atl1c): transmit queue 0 timed out Thomas Meyer
2012-02-13 21:00 ` Josh Boyer
2012-02-14 7:36 ` Eric Dumazet
2012-02-16 4:34 ` Eric Dumazet
2012-02-16 6:13 ` Thomas Meyer
2012-02-16 6:18 ` Eric Dumazet
2012-02-16 6:23 ` Thomas Meyer
2012-02-16 6:43 ` Eric Dumazet [this message]
2012-02-16 12:36 ` [PATCH] atl1c: dont use highprio tx queue Josh Boyer
2012-02-16 13:12 ` Eric Dumazet
2012-02-19 23:59 ` David Miller
2012-02-16 7:09 ` NETDEV WATCHDOG: eth0 (atl1c): transmit queue 0 timed out Huang, Xiong
2012-02-21 17:56 ` Thomas Meyer
2012-02-21 18:14 ` Eric Dumazet
2012-02-24 19:20 ` Eric Dumazet
2012-02-25 9:52 ` Thomas Meyer
2012-06-06 0:38 ` Jonathan Nieder
2012-06-07 12:37 ` Thomas Meyer
2012-06-07 12:52 ` Eric Dumazet
2012-06-07 21:30 ` Huang, Xiong
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=1329374591.5646.23.camel@edumazet-laptop \
--to=eric.dumazet@gmail.com \
--cc=chris.snook@gmail.com \
--cc=davem@davemloft.net \
--cc=jcliburn@gmail.com \
--cc=jwboyer@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=thomas@m3y3r.de \
/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