Re: [GIT]: Networking

Eric Dumazet
2009-07-02T10:51:43Z

Ingo Molnar a écrit :
>> The following changes since commit 52989765629e7d182b4f146050ebba0abf2cb0b7:
>> Linus Torvalds (1):
>> Merge git://git.kernel.org/.../davem/net-2.6
>>
>> are available in the git repository at:
>>
>> master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git master
>
> Hm, something in this lot quickly wrecked networking here - see the
> tx timeout dump below. It starts with:
>
> [ 351.004596] WARNING: at net/sched/sch_generic.c:246 dev_watchdog+0x10b/0x19c()
> [ 351.011815] Hardware name: System Product Name
> [ 351.016220] NETDEV WATCHDOG: eth0 (forcedeth): transmit queue 0 timed out
>
> Config attached. Unfortunately i've got no time to do bisection
> today.

forcedeth might have a problem, in its netif_wake_queue() logic, but
I could not see why a recent patch could make this problem visible now.

CPU0/1: AMD Athlon(tm) 64 X2 Dual Core Processor 3800+ stepping 02
is not a new cpu either :)

forcedeth uses an internal tx_stop without appropriate barrier.

Could you try following patch ?

(random guess as I dont have much time right now)

Thank you

diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index 1094d29..dc6bbde 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -2165,7 +2165,7 @@ static int nv_start_xmit(struct sk_buff *skb, struct net_device *dev)
empty_slots = nv_get_empty_tx_slots(np);
if (unlikely(empty_slots <= entries)) {
netif_stop_queue(dev);
- np->tx_stop = 1;
+ set_mb(np->tx_stop, 1);
spin_unlock_irqrestore(&np->lock, flags);
return NETDEV_TX_BUSY;
}
@@ -2286,7 +2286,7 @@ static int nv_start_xmit_optimized(struct sk_buff *skb, struct net_device *dev)
empty_slots = nv_get_empty_tx_slots(np);
if (unlikely(empty_slots <= entries)) {
netif_stop_queue(dev);
- np->tx_stop = 1;
+ set_mb(np->tx_stop, 1);
spin_unlock_irqrestore(&np->lock, flags);
return NETDEV_TX_BUSY;
}
@@ -2564,7 +2564,7 @@ static void nv_tx_timeout(struct net_device *dev)
else
status = readl(base + NvRegIrqStatus) & NVREG_IRQSTAT_MASK;

- printk(KERN_INFO "%s: Got tx_timeout. irq: %08x\n", dev->name, status);
+ printk(KERN_INFO "%s: Got tx_timeout. irq: %08x tx_stop=%d\n", dev->name, status, np->tx_stop);

{
int i;