Skip to contentSkip to conversation

net driver updates

PATCH In review Jeff Garzik 6 participants 19 messages Feb 11, 2008 – Feb 26, 2008

Subsystems (8)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net driver updates

Mostly fixes, a few cleanups (generally assisting fixes), and an exception for PS3 wireless because it had been posted, reviewed and acked for a while, just not committed.

Please pull from 'upstream-davem' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git upstream-davem

to receive the following updates:

 drivers/net/8139too.c            |    2 +-
 drivers/net/Kconfig              |   18 +
 drivers/net/Makefile             |    3 +-
 drivers/net/cxgb3/l2t.c          |    2 +-
 drivers/net/cxgb3/sge.c          |   35 +-
 drivers/net/dm9000.c             |  654 ++++++----
 drivers/net/e1000/e1000_main.c   |   18 +-
 drivers/net/forcedeth.c          |  132 ++-
 drivers/net/ni52.c               | 1142 ++++++++--------
 drivers/net/ni52.h               |  158 ++--
 drivers/net/pcnet32.c            |   48 +-
 drivers/net/phy/fixed.c          |    4 +-
 drivers/net/ps3_gelic_net.c      | 1215 ++++++++++-------
 drivers/net/ps3_gelic_net.h      |  415 ++++--
 drivers/net/ps3_gelic_wireless.c | 2753 ++++++++++++++++++++++++++++++++++++++
 drivers/net/ps3_gelic_wireless.h |  329 +++++
 drivers/net/r6040.c              |  233 ++--
 drivers/net/sis190.c             |    3 +-
 drivers/s390/net/claw.h          |   19 +-
 drivers/s390/net/lcs.c           |    2 +-
 drivers/s390/net/lcs.h           |   16 +-
 drivers/s390/net/netiucv.c       |   29 +-
 include/linux/dm9000.h           |    2 +
 23 files changed, 5440 insertions(+), 1792 deletions(-)
 create mode 100644 drivers/net/ps3_gelic_wireless.c
 create mode 100644 drivers/net/ps3_gelic_wireless.h

Adrian Bunk (1):
net/phy/fixed.c: fix a use-after-free

Adrian McMenamin (1):
8139too fix for Dreamcast

Alan Cox (1):
ni52: Remove 278 scripts/checkpatch errors

Ayaz Abdulla (2):
forcedeth: tx collision fix
forcedeth: tx pause watermarks

Ben Dooks (24):
DM9000: Fix endian-ness of data accesses.
DM9000: Add platform data to specify external phy DM9000 use dev_xxx() instead of printk for output. DM9000 update debugging macros to use debug level
DM9000: Pass IRQ flags via platform resources
DM9000: Remove old timer based poll routines
DM9000: Add initial ethtool support
DM9000: Do not sleep with spinlock and IRQs held
DM9000: Use msleep() instead of udelay()
DM9000: Remove barely used SROM array read.
DM9000: Add mutex to protect access
DM9000: Add ethtool support for reading and writing EEPROM
DM9000: Add ethtool control of msg_enable value
DM9000: Remove EEPROM initialisation code.
DM9000: Ensure spinlock held whilst accessing EEPROM registers
DM9000: Remove unnecessary changelog in header comment
DM9000: Use netif_msg to enable debugging options
DM9000: Fix delays used by EEPROM read and write
DM9000: Remove cal_CRC() and use ether_crc_le instead
DM9000: Remove redudant use of "& 0xff"
DM9000: Add platform flag for no attached EEPROM
DM9000: Add support for MII ioctl() calls
DM9000: Update retry count whilst identifying chip
DM9000: Show the MAC address source after printing MAC

Benjamin Herrenschmidt (1):
e1000: Fix for 32 bits platforms with 64 bits resources

Cornelia Huck (1):

      netiucv: Remember to set driver->owner.

Don Fry (2):
pcnet32: use NET_IP_ALIGN instead of 2
pcnet32: Use print_mac

Florian Fainelli (4):
r6040: do not use a private stats structure to store statistics
r6040: add helpers to allocate and free the Tx/Rx buffers
r6040: recover from transmit timeout
r6040: cleanups

Krishna Kumar (1):
Optimize cxgb3 xmit path (a bit)

Masakazu Mokuno (7):
PS3: gelic: Fix the wrong dev_id passed
PS3: gelic: Add endianness macros
PS3: gelic: code cleanup
PS3: gelic: remove duplicated ethtool handlers
PS3: gelic: add support for port link status
PS3: gelic: Add support for dual network interface
PS3: gelic: Add wireless support for PS3

Peter Tiedemann (2):
lcs: avoid/reduce unused s390dbf debug areas. claw/lcs/netiucv: check s390dbf level before sprints

Sergio Luis (1):
drivers/net/sis190: fix section mismatch warning in sis190_get_mac_addr

Steve Wise (1):
cxgb3: Handle ARP completions that mark neighbors stale.

Ursula Braun (2):
claw: removal of volatile variables
netiucv: change name of nop function

drivers/net/8139too.c +1 -1
index eef6fec..be6e918 100644
@@ -168,7 +168,7 @@ static int debug = -1;
  * Warning: 64K ring has hardware issues and may lock up.
  */
 #if defined(CONFIG_SH_DREAMCAST)
-#define RX_BUF_IDX	1	/* 16K ring */
+#define RX_BUF_IDX 0	/* 8K ring */
 #else
 #define RX_BUF_IDX	2	/* 32K ring */
 #endif
drivers/net/Kconfig +18 -0
index 50c2b60..f337800 100644
@@ -931,6 +931,14 @@ config ENC28J60_WRITEVERIFY
 	  Enable the verify after the buffer write useful for debugging purpose.
 	  If unsure, say N.
 
+config DM9000_DEBUGLEVEL
+	int "DM9000 maximum debug level"
+	depends on DM9000
+	default 4
+	help
+	  The maximum level of debugging code compiled into the DM9000
+	  driver.
+
 config SMC911X
 	tristate "SMSC LAN911[5678] support"
 	select CRC32
@@ -2352,6 +2360,16 @@ config GELIC_NET
 	  To compile this driver as a module, choose M here: the
 	  module will be called ps3_gelic.
 
+config GELIC_WIRELESS
+       bool "PS3 Wireless support"
+       depends on GELIC_NET
+       help
+        This option adds the support for the wireless feature of PS3.
+        If you have the wireless-less model of PS3 or have no plan to
+        use wireless feature, disabling this option saves memory.  As
+        the driver automatically distinguishes the models, you can
+        safely enable this option even if you have a wireless-less model.
+
 config GIANFAR
 	tristate "Gianfar Ethernet"
 	depends on FSL_SOC
drivers/net/Makefile +2 -1
index 9fc7794..3b1ea32 100644
@@ -70,7 +70,8 @@ obj-$(CONFIG_BNX2X) += bnx2x.o
 spidernet-y += spider_net.o spider_net_ethtool.o
 obj-$(CONFIG_SPIDER_NET) += spidernet.o sungem_phy.o
 obj-$(CONFIG_GELIC_NET) += ps3_gelic.o
-ps3_gelic-objs += ps3_gelic_net.o
+gelic_wireless-$(CONFIG_GELIC_WIRELESS) += ps3_gelic_wireless.o
+ps3_gelic-objs += ps3_gelic_net.o $(gelic_wireless-y)
 obj-$(CONFIG_TC35815) += tc35815.o
 obj-$(CONFIG_SKGE) += skge.o
 obj-$(CONFIG_SKY2) += sky2.o
drivers/net/cxgb3/l2t.c +1 -1
index 17ed4c3..865faee 100644
@@ -404,7 +404,7 @@ found:
 			if (neigh->nud_state & NUD_FAILED) {
 				arpq = e->arpq_head;
 				e->arpq_head = e->arpq_tail = NULL;
-			} else if (neigh_is_connected(neigh))
+			} else if (neigh->nud_state & (NUD_CONNECTED|NUD_STALE))
 				setup_l2e_send_pending(dev, NULL, e);
 		} else {
 			e->state = neigh_is_connected(neigh) ?
drivers/net/cxgb3/sge.c +15 -20
index 9ca8c66..979f3fc 100644
@@ -1059,6 +1059,14 @@ static void write_tx_pkt_wr(struct adapter *adap, struct sk_buff *skb,
 			 htonl(V_WR_TID(q->token)));
 }
 
+static inline void t3_stop_queue(struct net_device *dev, struct sge_qset *qs,
+				 struct sge_txq *q)
+{
+	netif_stop_queue(dev);
+	set_bit(TXQ_ETH, &qs->txq_stopped);
+	q->stops++;
+}
+
 /**
  *	eth_xmit - add a packet to the Ethernet Tx queue
  *	@skb: the packet
@@ -1090,31 +1098,18 @@ int t3_eth_xmit(struct sk_buff *skb, struct net_device *dev)
 	ndesc = calc_tx_descs(skb);
 
 	if (unlikely(credits < ndesc)) {
-		if (!netif_queue_stopped(dev)) {
-			netif_stop_queue(dev);
-			set_bit(TXQ_ETH, &qs->txq_stopped);
-			q->stops++;
-			dev_err(&adap->pdev->dev,
-				"%s: Tx ring %u full while queue awake!\n",
-				dev->name, q->cntxt_id & 7);
-		}
+		t3_stop_queue(dev, qs, q);
+		dev_err(&adap->pdev->dev,
+			"%s: Tx ring %u full while queue awake!\n",
+			dev->name, q->cntxt_id & 7);
 		spin_unlock(&q->lock);
 		return NETDEV_TX_BUSY;
 	}
 
 	q->in_use += ndesc;
-	if (unlikely(credits - ndesc < q->stop_thres)) {
-		q->stops++;
-		netif_stop_queue(dev);
-		set_bit(TXQ_ETH, &qs->txq_stopped);
-#if !USE_GTS
-		if (should_restart_tx(q) &&
-		    test_and_clear_bit(TXQ_ETH, &qs->txq_stopped)) {
-			q->restarts++;
-			netif_wake_queue(dev);
-		}
-#endif
-	}
+	if (unlikely(credits - ndesc < q->stop_thres))
+		if (USE_GTS || !should_restart_tx(q))
+			t3_stop_queue(dev, qs, q);
 
 	gen = q->gen;
 	q->unacked += ndesc;
drivers/net/dm9000.c +425 -229

1,076 lines not on this page · raw message

drivers/net/e1000/e1000_main.c +5 -13
index 7c5b05a..d4ee8ec 100644
@@ -926,8 +926,6 @@ e1000_probe(struct pci_dev *pdev,
 {
 	struct net_device *netdev;
 	struct e1000_adapter *adapter;
-	unsigned long mmio_start, mmio_len;
-	unsigned long flash_start, flash_len;
 
 	static int cards_found = 0;
 	static int global_quad_port_a = 0; /* global ksp3 port a indication */
@@ -970,11 +968,9 @@ e1000_probe(struct pci_dev *pdev,
 	adapter->hw.back = adapter;
 	adapter->msg_enable = (1 << debug) - 1;
 
-	mmio_start = pci_resource_start(pdev, BAR_0);
-	mmio_len = pci_resource_len(pdev, BAR_0);
-
 	err = -EIO;
-	adapter->hw.hw_addr = ioremap(mmio_start, mmio_len);
+	adapter->hw.hw_addr = ioremap(pci_resource_start(pdev, BAR_0),
+				      pci_resource_len(pdev, BAR_0));
 	if (!adapter->hw.hw_addr)
 		goto err_ioremap;
 
@@ -1009,10 +1005,6 @@ e1000_probe(struct pci_dev *pdev,
 #endif
 	strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1);
 
-	netdev->mem_start = mmio_start;
-	netdev->mem_end = mmio_start + mmio_len;
-	netdev->base_addr = adapter->hw.io_base;
-
 	adapter->bd_number = cards_found;
 
 	/* setup the private structure */
@@ -1025,9 +1017,9 @@ e1000_probe(struct pci_dev *pdev,
 	 * because it depends on mac_type */
 	if ((adapter->hw.mac_type == e1000_ich8lan) &&
 	   (pci_resource_flags(pdev, 1) & IORESOURCE_MEM)) {
-		flash_start = pci_resource_start(pdev, 1);
-		flash_len = pci_resource_len(pdev, 1);
-		adapter->hw.flash_address = ioremap(flash_start, flash_len);
+		adapter->hw.flash_address =
+			ioremap(pci_resource_start(pdev, 1),
+				pci_resource_len(pdev, 1));
 		if (!adapter->hw.flash_address)
 			goto err_flashmap;
 	}
drivers/net/forcedeth.c +80 -52

258 lines not on this page · raw message

drivers/net/ni52.c +552 -590

1,516 lines not on this page · raw message

drivers/net/ni52.h +79 -79

158 lines not on this page · raw message

drivers/net/pcnet32.c +26 -22

48 lines not on this page · raw message

drivers/net/phy/fixed.c +2 -2
index 73b6d39..ca9b040 100644

Lines of this file are not shown. View the raw message.

drivers/net/ps3_gelic_net.c +697 -518

1,215 lines not on this page · raw message

drivers/net/ps3_gelic_net.h +270 -145

415 lines not on this page · raw message

drivers/net/ps3_gelic_wireless.c new file +2753 -0

2,753 lines not on this page · raw message

drivers/net/ps3_gelic_wireless.h new file +329 -0

329 lines not on this page · raw message

drivers/net/r6040.c +135 -98

233 lines not on this page · raw message

drivers/net/sis190.c +2 -1
index 2e9e88b..202fdf3 100644

Lines of this file are not shown. View the raw message.

drivers/s390/net/claw.h +13 -6
index 1ee9a6f..1a89d98 100644

Lines of this file are not shown. View the raw message.

drivers/s390/net/lcs.c +1 -1
index 7bfe8d7..f51ed99 100644

Lines of this file are not shown. View the raw message.

drivers/s390/net/lcs.h +12 -4
index 8976fb0..d58fea5 100644

Lines of this file are not shown. View the raw message.

drivers/s390/net/netiucv.c +20 -9
index f3d893c..874a199 100644

Lines of this file are not shown. View the raw message.

include/linux/dm9000.h +2 -0
index 0008e2a..a375046 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Part of the diff is not shown here. View the raw message.

#1 lore raw
Quoted 62 lines · Jeff Garzik

Mostly fixes, a few cleanups (generally assisting fixes), and an exception for PS3 wireless because it had been posted, reviewed and acked for a while, just not committed.

Please pull from 'upstream-davem' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git upstream-davem

to receive the following updates:

 drivers/net/cxgb3/sge.c          |   35 +-
drivers/net/cxgb3/sge.c +12 -16
index 9ca8c66..979f3fc 100644
@@ -1059,6 +1059,14 @@ static void write_tx_pkt_wr(struct adapter *adap, struct sk_buff *skb,
 			 htonl(V_WR_TID(q->token)));
 }
 
+static inline void t3_stop_queue(struct net_device *dev, struct sge_qset *qs,
+				 struct sge_txq *q)
+{
+	netif_stop_queue(dev);
+	set_bit(TXQ_ETH, &qs->txq_stopped);
+	q->stops++;
+}
+
 /**
  *	eth_xmit - add a packet to the Ethernet Tx queue
  *	@skb: the packet
@@ -1090,31 +1098,18 @@ int t3_eth_xmit(struct sk_buff *skb, struct net_device *dev)
 	ndesc = calc_tx_descs(skb);
 
 	if (unlikely(credits < ndesc)) {
-		if (!netif_queue_stopped(dev)) {
-			netif_stop_queue(dev);
-			set_bit(TXQ_ETH, &qs->txq_stopped);
-			q->stops++;
-			dev_err(&adap->pdev->dev,
-				"%s: Tx ring %u full while queue awake!\n",
-				dev->name, q->cntxt_id & 7);
-		}
+		t3_stop_queue(dev, qs, q);
+		dev_err(&adap->pdev->dev,
+			"%s: Tx ring %u full while queue awake!\n",
+			dev->name, q->cntxt_id & 7);
 		spin_unlock(&q->lock);
 		return NETDEV_TX_BUSY;
 	}
 
 	q->in_use += ndesc;
-	if (unlikely(credits - ndesc < q->stop_thres)) {
-		q->stops++;
-		netif_stop_queue(dev);
-		set_bit(TXQ_ETH, &qs->txq_stopped);
-#if !USE_GTS
-		if (should_restart_tx(q) &&
-		    test_and_clear_bit(TXQ_ETH, &qs->txq_stopped)) {
-			q->restarts++;

drivers/net/cxgb3/sge.c int t3_eth_xmit(struct sk_buff *skb, struct net_device *dev) · line 1115

Quoted 10 lines
drivers/net/cxgb3/sge.c +3 -4
-			netif_wake_queue(dev);
-		}
-#endif
-	}
+	if (unlikely(credits - ndesc < q->stop_thres))
+		if (USE_GTS || !should_restart_tx(q))
+			t3_stop_queue(dev, qs, q);
 
 	gen = q->gen;
 	q->unacked += ndesc;

Hi Jeff,

I thought I had NAK'ed the patch modifying sge.c from Krishna Kumar. Looking back at my answer at the time, I was obviously unclear. Can you please revert the drivers/net/cxgb3sge.c change ?

Cheers,
Divy

#2 lore raw
Quoted 72 lines · Divy Le Ray
Quoted 71 lines · Jeff Garzik

Mostly fixes, a few cleanups (generally assisting fixes), and an exception for PS3 wireless because it had been posted, reviewed and acked for a while, just not committed.

Please pull from 'upstream-davem' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git upstream-davem

to receive the following updates:

 drivers/net/cxgb3/sge.c          |   35 +-
drivers/net/cxgb3/sge.c +8 -0
index 9ca8c66..979f3fc 100644
@@ -1059,6 +1059,14 @@ static void write_tx_pkt_wr(struct adapter 
 *adap, struct sk_buff *skb,
              htonl(V_WR_TID(q->token)));
 }
 
+static inline void t3_stop_queue(struct net_device *dev, struct 
 sge_qset *qs,
+                 struct sge_txq *q)
+{
+    netif_stop_queue(dev);
+    set_bit(TXQ_ETH, &qs->txq_stopped);
+    q->stops++;
+}
+
 /**

* eth_xmit - add a packet to the Ethernet Tx queue
* @skb: the packet

drivers/net/cxgb3/sge.c +7 -20
@@ -1090,31 +1098,18 @@ int t3_eth_xmit(struct sk_buff *skb, struct 
 net_device *dev)
     ndesc = calc_tx_descs(skb);
 
     if (unlikely(credits < ndesc)) {
-        if (!netif_queue_stopped(dev)) {
-            netif_stop_queue(dev);
-            set_bit(TXQ_ETH, &qs->txq_stopped);
-            q->stops++;
-            dev_err(&adap->pdev->dev,
-                "%s: Tx ring %u full while queue awake!\n",
-                dev->name, q->cntxt_id & 7);
-        }
+        t3_stop_queue(dev, qs, q);
+        dev_err(&adap->pdev->dev,
+            "%s: Tx ring %u full while queue awake!\n",
+            dev->name, q->cntxt_id & 7);
         spin_unlock(&q->lock);
         return NETDEV_TX_BUSY;
     }
 
     q->in_use += ndesc;
-    if (unlikely(credits - ndesc < q->stop_thres)) {
-        q->stops++;
-        netif_stop_queue(dev);
-        set_bit(TXQ_ETH, &qs->txq_stopped);
-#if !USE_GTS
-        if (should_restart_tx(q) &&
-            test_and_clear_bit(TXQ_ETH, &qs->txq_stopped)) {
-            q->restarts++;
-            netif_wake_queue(dev);
-        }
-#endif
-    }
+    if (unlikely(credits - ndesc < q->stop_thres))
+        if (USE_GTS || !should_restart_tx(q))
+            t3_stop_queue(dev, qs, q);
 
Quoted 8 lines
Quoted 3 lines
drivers/net/cxgb3/sge.c +0 -0
     gen = q->gen;
     q->unacked += ndesc;

Hi Jeff,

I thought I had NAK'ed the patch modifying sge.c from Krishna Kumar. Looking back at my answer at the time, I was obviously unclear. Can you please revert the drivers/net/cxgb3sge.c change ?

Explain why, so I can include it in the changelog please...

Jeff

#3 lore raw
Quoted 77 lines · Jeff Garzik
Quoted 76 lines · Divy Le Ray
Quoted 71 lines · Jeff Garzik

Mostly fixes, a few cleanups (generally assisting fixes), and an exception for PS3 wireless because it had been posted, reviewed and acked for a while, just not committed.

Please pull from 'upstream-davem' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git upstream-davem

to receive the following updates:

 drivers/net/cxgb3/sge.c          |   35 +-

diff --git a/drivers/net/cxgb3/sge.c b/drivers/net/cxgb3/sge.c
index 9ca8c66..979f3fc 100644

drivers/net/cxgb3/sge.c +8 -0
@@ -1059,6 +1059,14 @@ static void write_tx_pkt_wr(struct adapter 
 *adap, struct sk_buff *skb,
              htonl(V_WR_TID(q->token)));
 }
 
+static inline void t3_stop_queue(struct net_device *dev, struct 
 sge_qset *qs,
+                 struct sge_txq *q)
+{
+    netif_stop_queue(dev);
+    set_bit(TXQ_ETH, &qs->txq_stopped);
+    q->stops++;
+}
+
 /**

* eth_xmit - add a packet to the Ethernet Tx queue
* @skb: the packet

drivers/net/cxgb3/sge.c +7 -20
@@ -1090,31 +1098,18 @@ int t3_eth_xmit(struct sk_buff *skb, struct 
 net_device *dev)
     ndesc = calc_tx_descs(skb);
 
     if (unlikely(credits < ndesc)) {
-        if (!netif_queue_stopped(dev)) {
-            netif_stop_queue(dev);
-            set_bit(TXQ_ETH, &qs->txq_stopped);
-            q->stops++;
-            dev_err(&adap->pdev->dev,
-                "%s: Tx ring %u full while queue awake!\n",
-                dev->name, q->cntxt_id & 7);
-        }
+        t3_stop_queue(dev, qs, q);
+        dev_err(&adap->pdev->dev,
+            "%s: Tx ring %u full while queue awake!\n",
+            dev->name, q->cntxt_id & 7);
         spin_unlock(&q->lock);
         return NETDEV_TX_BUSY;
     }
 
     q->in_use += ndesc;
-    if (unlikely(credits - ndesc < q->stop_thres)) {
-        q->stops++;
-        netif_stop_queue(dev);
-        set_bit(TXQ_ETH, &qs->txq_stopped);
-#if !USE_GTS
-        if (should_restart_tx(q) &&
-            test_and_clear_bit(TXQ_ETH, &qs->txq_stopped)) {
-            q->restarts++;
-            netif_wake_queue(dev);
-        }
-#endif
-    }
+    if (unlikely(credits - ndesc < q->stop_thres))
+        if (USE_GTS || !should_restart_tx(q))
+            t3_stop_queue(dev, qs, q);
 
     gen = q->gen;
Quoted 2 lines
     q->unacked += ndesc;

Hi Jeff,

Quoted 5 lines
Quoted 3 lines

I thought I had NAK'ed the patch modifying sge.c from Krishna Kumar. Looking back at my answer at the time, I was obviously unclear. Can you please revert the drivers/net/cxgb3sge.c change ?

Explain why, so I can include it in the changelog please...

Hi Jeff,

The first part of the patch removes the !netif_queue_stopped(dev).
It opens the race discussed a while ago between Stephen hemminger and David Miller:
http://marc.info/?l=linux-netdev&m=113383224512427&w=2

The second part of the patch breaks the current usage of txq_stopped and the logic that stops and restarts the Tx queue.

Cheers,
Divy

#4 lore raw

Hi Divy,

Quoted 8 lines
Quoted 1 line

Explain why, so I can include it in the changelog please...

Hi Jeff,

The first part of the patch removes the !netif_queue_stopped(dev). It opens the race discussed a while ago between Stephen hemminger and David Miller:
http://marc.info/?l=linux-netdev&m=113383224512427&w=2

I feel this race cannot happen anymore. I think the fix for that race was to introduce the
__LINK_STATE_QDISC_RUNNING bit thus eliminating any races between CPU's. If one
CPU has called xmit, the other CPU will enqueue skbs (by holding the queue_lock) and
exit from qdisc_run since it finds the bit set already.

Thanks,

- KK

maintainer
#5 lore raw

From: Krishna Kumar2 <[email protected]>
Date: Thu, 21 Feb 2008 09:13:49 +0530

Quoted 11 lines

Hi Divy,

Quoted 8 lines
Quoted 1 line

Explain why, so I can include it in the changelog please...

Hi Jeff,

The first part of the patch removes the !netif_queue_stopped(dev). It opens the race discussed a while ago between Stephen hemminger and David Miller:
http://marc.info/?l=linux-netdev&m=113383224512427&w=2

Quoted 7 lines

I feel this race cannot happen anymore. I think the fix for that race was to introduce the
__LINK_STATE_QDISC_RUNNING bit thus eliminating any races between CPU's. If one
CPU has called xmit, the other CPU will enqueue skbs (by holding the queue_lock) and
exit from qdisc_run since it finds the bit set already.

And the race is talking about LLTX, which S2IO doesn't use as far as I can tell.

#6 lore raw
Quoted 15 lines

-----Original Message-----
From: David Miller [mailto:[email protected]]
Sent: Wednesday, February 20, 2008 9:47 PM
To: [email protected]
Cc: Divy Le Ray; [email protected]; [email protected]; [email protected]
Subject: Re: [git patches] net driver updates

From: Krishna Kumar2 <[email protected]>
Date: Thu, 21 Feb 2008 09:13:49 +0530

Quoted 2 lines

Hi Divy,

Quoted 11 lines
Quoted 6 lines
Quoted 6 lines
Quoted 1 line

Explain why, so I can include it in the changelog please...

Hi Jeff,

The first part of the patch removes the !netif_queue_stopped(dev). It opens the race discussed a while ago between Stephen hemminger

and

Quoted 4 lines
Quoted 2 lines

David Miller:
http://marc.info/?l=linux-netdev&m=113383224512427&w=2

I feel this race cannot happen anymore. I think the fix for that

race

Quoted 11 lines

was

Quoted 2 lines

to introduce the
__LINK_STATE_QDISC_RUNNING bit thus eliminating any races between

CPU's. If

Quoted 4 lines

one
CPU has called xmit, the other CPU will enqueue skbs (by holding the queue_lock) and
exit from qdisc_run since it finds the bit set already.

And the race is talking about LLTX, which S2IO doesn't use as far as I can tell.

Dave,

The driver is cxgb3 here, it uses LLTX.

Cheers,
Divy

#7 lore raw

Hi Divy,

But the race doesn't exist even for LLTX drivers these days. There is no way two cpu's can execute the xmit handler at the same time.

Thanks,

- KK

Quoted 26 lines
Quoted 7 lines
Quoted 2 lines
Quoted 2 lines

The first part of the patch removes the !netif_queue_stopped(dev). It opens the race discussed a while ago between Stephen hemminger

and

Quoted 4 lines
Quoted 2 lines

David Miller:
http://marc.info/?l=linux-netdev&m=113383224512427&w=2

I feel this race cannot happen anymore. I think the fix for that

race

Quoted 11 lines

was

Quoted 2 lines

to introduce the
__LINK_STATE_QDISC_RUNNING bit thus eliminating any races between

CPU's. If

Quoted 4 lines

one
CPU has called xmit, the other CPU will enqueue skbs (by holding the queue_lock) and
exit from qdisc_run since it finds the bit set already.

And the race is talking about LLTX, which S2IO doesn't use as far as I can tell.

Dave,

The driver is cxgb3 here, it uses LLTX.

Cheers,
Divy

maintainer
#8 lore raw
In reply to Divy Le Ray

From: "Divy Le Ray" <[email protected]>
Date: Wed, 20 Feb 2008 21:57:08 -0800

Quoted 1 line

The driver is cxgb3 here, it uses LLTX.

That's extremely unfortunate, hopefully you can update it to use a model like tg3 and others use. LLTX is a lost cause for hardware device drivers, and in fact we'd like to remove it tree wide eventually.

#9 lore raw
Quoted 9 lines

From: "Divy Le Ray" <[email protected]>
Date: Wed, 20 Feb 2008 21:57:08 -0800

Quoted 1 line

The driver is cxgb3 here, it uses LLTX.

That's extremely unfortunate, hopefully you can update it to use a model like tg3 and others use. LLTX is a lost cause for hardware device drivers, and in fact we'd like to remove it tree wide eventually.

It sounds like I messed up.
cxgb3 does not use LLTX - The Chelsio driver does, thus should be converted.

Divy

#10 lore raw
Quoted 4 lines · Divy Le Ray
Quoted 4 lines

From: "Divy Le Ray" <[email protected]>
Date: Wed, 20 Feb 2008 21:57:08 -0800

Quoted 1 line

The driver is cxgb3 here, it uses LLTX.

Quoted 8 lines
Quoted 4 lines

That's extremely unfortunate, hopefully you can update it to use a model like tg3 and others use. LLTX is a lost cause for hardware device drivers, and in fact we'd like to remove it tree wide eventually.

It sounds like I messed up.
cxgb3 does not use LLTX - The Chelsio driver does, thus should be converted.

So, it sounds like Krishna's patch is ok, because the race does not exist anymore in this driver?

Jeff

#11 lore raw
Quoted 10 lines · you
Quoted 9 lines · Divy Le Ray
Quoted 9 lines

From: "Divy Le Ray" <[email protected]>
Date: Wed, 20 Feb 2008 21:57:08 -0800

Quoted 1 line

The driver is cxgb3 here, it uses LLTX.

That's extremely unfortunate, hopefully you can update it to use a model like tg3 and others use. LLTX is a lost cause for hardware device drivers, and in fact we'd like to remove it tree wide eventually.

Just for info: loopback.c uses it too :-)

Quoted 17 lines
Quoted 4 lines

It sounds like I messed up.
cxgb3 does not use LLTX - The Chelsio driver does, thus should be converted.

So, it sounds like Krishna's patch is ok, because the race does not exist anymore in this driver?

Jeff

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

#12 lore raw
Quoted 5 lines · Marin Mitov
Quoted 4 lines · you
Quoted 3 lines · Divy Le Ray
Quoted 3 lines

From: "Divy Le Ray" <[email protected]>
Date: Wed, 20 Feb 2008 21:57:08 -0800

Quoted 7 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 1 line

The driver is cxgb3 here, it uses LLTX.

That's extremely unfortunate, hopefully you can update it to use a model like tg3 and others use. LLTX is a lost cause for hardware device drivers, and in fact we'd like to remove it tree wide eventually.

Just for info: loopback.c uses it too :-)

Yes, we're all aware of this. Google for "david miller loopback lltx" for a few examples...

Also, please do not strip CC's, that's quite annoying.

Jeff

maintainer
#13 lore raw
In reply to Marin Mitov

From: Marin Mitov <[email protected]>
Date: Tue, 26 Feb 2008 01:34:01 +0200

Quoted 5 lines · you
Quoted 4 lines
Quoted 3 lines · Divy Le Ray
Quoted 3 lines

From: "Divy Le Ray" <[email protected]>
Date: Wed, 20 Feb 2008 21:57:08 -0800

Quoted 8 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 1 line

The driver is cxgb3 here, it uses LLTX.

That's extremely unfortunate, hopefully you can update it to use a model like tg3 and others use. LLTX is a lost cause for hardware device drivers, and in fact we'd like to remove it tree wide eventually.

Just for info: loopback.c uses it too :-)

I know, as I said: "for hardware device drivers" it's a lost cause. Loopback is a software device.

#14 lore raw
In reply to Jeff Garzik
Quoted 3 lines

So, it sounds like Krishna's patch is ok, because the race does not exist anymore in this driver?

The first part is right indeed, but the second part is breaking the current usage of txq_stopped and the logic that stops and restarts the Tx queue.
I can submit a patch fixing it. Plese let me know what's more convenient for you.

Cheers,
Divy

#15 lore raw
Quoted 6 lines · Divy Le Ray
Quoted 3 lines

So, it sounds like Krishna's patch is ok, because the race does not exist anymore in this driver?

The first part is right indeed, but the second part is breaking the current usage of txq_stopped and the logic that stops and restarts the Tx queue.
I can submit a patch fixing it. Plese let me know what's more convenient for you.

At this point, yes a fix (with a good patch description) would be preferred...

Thanks,

Jeff

maintainer
#16 lore raw
In reply to Jeff Garzik

From: Jeff Garzik <[email protected]>
Date: Mon, 11 Feb 2008 12:05:16 -0500

Quoted 8 lines

Mostly fixes, a few cleanups (generally assisting fixes), and an exception for PS3 wireless because it had been posted, reviewed and acked for a while, just not committed.

Please pull from 'upstream-davem' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git upstream-davem

to receive the following updates:

Pulled, thanks a lot Jeff!

#17 lore raw
In reply to Jeff Garzik
Quoted 3 lines · Jeff Garzik

Mostly fixes, a few cleanups (generally assisting fixes), and an exception for PS3 wireless because it had been posted, reviewed and acked for a while, just not committed.

Thanks, good to get the DM9000 changes moving.

Quoted 7 lines

Please pull from 'upstream-davem' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git upstream-davem

Ben Dooks (24):
DM9000: Fix endian-ness of data accesses.
DM9000: Add platform data to specify external phy

These two where meant to be from Laurent Pinchart, they do have the correct signed-off lines in for him and start with "Patch from:". Is there any chance of fixing the authour attribution now?

Signature · 3 lines
Ben ([email protected], http://www.fluff.org/)

  'a smiley only costs 4 bytes'
#18 lore raw
Quoted 3 lines · Ben Dooks

These two where meant to be from Laurent Pinchart, they do have the correct signed-off lines in for him and start with "Patch from:". Is there any chance of fixing the authour attribution now?

The first line of the changeset mentions it. Other than that, nope.

Jeff