[kernel] r14888 - in dists/lenny/linux-2.6/debian: . patches/bugfix/all patches/series
Ben Hutchings
benh at alioth.debian.org
Tue Jan 5 02:02:53 UTC 2010
Author: benh
Date: Tue Jan 5 02:02:46 2010
New Revision: 14888
Log:
via-velocity: Give RX descriptors to the NIC later on open or MTU change (Closes: #508527)
Added:
dists/lenny/linux-2.6/debian/patches/bugfix/all/via-velocity-give-rx-descriptors-later.patch
dists/lenny/linux-2.6/debian/patches/bugfix/all/via-velocity-move-residual-free-rx-descriptors-count.patch
dists/lenny/linux-2.6/debian/patches/series/22
Modified:
dists/lenny/linux-2.6/debian/changelog
Modified: dists/lenny/linux-2.6/debian/changelog
==============================================================================
--- dists/lenny/linux-2.6/debian/changelog Mon Jan 4 15:04:04 2010 (r14887)
+++ dists/lenny/linux-2.6/debian/changelog Tue Jan 5 02:02:46 2010 (r14888)
@@ -1,8 +1,13 @@
linux-2.6 (2.6.26-22) UNRELEASED; urgency=high
+ [ maximilian attems ]
* [openvz] 1f7db8e checkpointing shared memory fails. (closes: #562891)
* [openvz] 1a6d795 Fix cfq related oops. (closes: #562892)
* [openvz] ddbec37 inotify: unblock umounting. (closes: #513537)
+
+ [ Ben Hutchings ]
+ * via-velocity: Give RX descriptors to the NIC later on open or MTU change
+ (Closes: #508527)
-- maximilian attems <maks at debian.org> Mon, 28 Dec 2009 23:44:19 +0100
Added: dists/lenny/linux-2.6/debian/patches/bugfix/all/via-velocity-give-rx-descriptors-later.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/lenny/linux-2.6/debian/patches/bugfix/all/via-velocity-give-rx-descriptors-later.patch Tue Jan 5 02:02:46 2010 (r14888)
@@ -0,0 +1,35 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Subject: [PATCH] via-velocity: Give RX descriptors to the NIC later on open or MTU change
+
+velocity_open() calls velocity_give_many_rx_descs(), which gives RX
+descriptors to the NIC, before installing an interrupt handler or
+calling velocity_init_registers(). I think this is very unsafe and it
+appears to explain the bug report <http://bugs.debian.org/508527>.
+
+On MTU change, velocity_give_many_rx_descs() is again called before
+velocity_init_registers(). I'm not sure whether this is unsafe but
+it does look wrong.
+
+Therefore, move the calls to velocity_give_many_rx_descs() after
+request_irq() and velocity_init_registers().
+
+--- a/drivers/net/via-velocity.c
++++ b/drivers/net/via-velocity.c
+@@ -2237,8 +2237,6 @@ static int velocity_open(struct net_device *dev)
+ /* Ensure chip is running */
+ pci_set_power_state(vptr->pdev, PCI_D0);
+
+- velocity_give_many_rx_descs(vptr);
+-
+ velocity_init_registers(vptr, VELOCITY_INIT_COLD);
+
+ ret = request_irq(vptr->pdev->irq, velocity_intr, IRQF_SHARED,
+@@ -2250,6 +2248,8 @@ static int velocity_open(struct net_device *dev)
+ goto out;
+ }
+
++ velocity_give_many_rx_descs(vptr);
++
+ mac_enable_int(vptr->mac_regs);
+ netif_start_queue(dev);
+ napi_enable(&vptr->napi);
Added: dists/lenny/linux-2.6/debian/patches/bugfix/all/via-velocity-move-residual-free-rx-descriptors-count.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/lenny/linux-2.6/debian/patches/bugfix/all/via-velocity-move-residual-free-rx-descriptors-count.patch Tue Jan 5 02:02:46 2010 (r14888)
@@ -0,0 +1,128 @@
+From 28133176082d9bcafb5958b8fac80943e51d5eda Mon Sep 17 00:00:00 2001
+From: Francois Romieu <romieu at fr.zoreil.com>
+Date: Fri, 11 Jul 2008 00:05:17 +0200
+Subject: [PATCH] via-velocity: move residual free rx descriptors count register update
+
+Updates of the RBRDU have two different meanings depending on their
+context:
+1. the receiving process has not started - the value which is written
+ into the RBRDU register is supposed to be the free rx descriptors
+ count (rounded to a multiple of 4)
+2. the receiving process is running - the value increments the count
+ above (sic)
+
+The update is currently issued deep inside the rx replenish chain (see
+velocity_give_many_rx_descs).
+
+Let's propagate enough information to the caller so that the rx
+replenish functions do not depend on hardware any more.
+
+It is needed to perform the Rx/Tx buffers housekeeping when MTU changes.
+
+Signed-off-by: Francois Romieu <romieu at fr.zoreil.com>
+Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
+---
+ drivers/net/via-velocity.c | 28 ++++++++++++++--------------
+ 1 files changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c
+index 86b256c..086d69c 100644
+--- a/drivers/net/via-velocity.c
++++ b/drivers/net/via-velocity.c
+@@ -1155,7 +1155,7 @@ static void velocity_free_rings(struct velocity_info *vptr)
+ pci_free_consistent(vptr->pdev, size, vptr->rd_ring, vptr->rd_pool_dma);
+ }
+
+-static inline void velocity_give_many_rx_descs(struct velocity_info *vptr)
++static void velocity_give_many_rx_descs(struct velocity_info *vptr)
+ {
+ struct mac_regs __iomem *regs = vptr->mac_regs;
+ int avail, dirty, unusable;
+@@ -1182,7 +1182,7 @@ static inline void velocity_give_many_rx_descs(struct velocity_info *vptr)
+
+ static int velocity_rx_refill(struct velocity_info *vptr)
+ {
+- int dirty = vptr->rd_dirty, done = 0, ret = 0;
++ int dirty = vptr->rd_dirty, done = 0;
+
+ do {
+ struct rx_desc *rd = vptr->rd_ring + dirty;
+@@ -1192,8 +1192,7 @@ static int velocity_rx_refill(struct velocity_info *vptr)
+ break;
+
+ if (!vptr->rd_info[dirty].skb) {
+- ret = velocity_alloc_rx_buf(vptr, dirty);
+- if (ret < 0)
++ if (velocity_alloc_rx_buf(vptr, dirty) < 0)
+ break;
+ }
+ done++;
+@@ -1203,10 +1202,9 @@ static int velocity_rx_refill(struct velocity_info *vptr)
+ if (done) {
+ vptr->rd_dirty = dirty;
+ vptr->rd_filled += done;
+- velocity_give_many_rx_descs(vptr);
+ }
+
+- return ret;
++ return done;
+ }
+
+ /**
+@@ -1219,25 +1217,27 @@ static int velocity_rx_refill(struct velocity_info *vptr)
+
+ static int velocity_init_rd_ring(struct velocity_info *vptr)
+ {
+- int ret;
+ int mtu = vptr->dev->mtu;
++ int ret = -ENOMEM;
+
+ vptr->rx_buf_sz = (mtu <= ETH_DATA_LEN) ? PKT_BUF_SZ : mtu + 32;
+
+ vptr->rd_info = kcalloc(vptr->options.numrx,
+ sizeof(struct velocity_rd_info), GFP_KERNEL);
+ if (!vptr->rd_info)
+- return -ENOMEM;
++ goto out;
+
+ vptr->rd_filled = vptr->rd_dirty = vptr->rd_curr = 0;
+
+- ret = velocity_rx_refill(vptr);
+- if (ret < 0) {
++ if (velocity_rx_refill(vptr) != vptr->options.numrx) {
+ VELOCITY_PRT(MSG_LEVEL_ERR, KERN_ERR
+ "%s: failed to allocate RX buffer.\n", vptr->dev->name);
+ velocity_free_rd_ring(vptr);
++ goto out;
+ }
+
++ ret = 0;
++out:
+ return ret;
+ }
+
+@@ -1412,10 +1412,8 @@ static int velocity_rx_srv(struct velocity_info *vptr, int status)
+
+ vptr->rd_curr = rd_curr;
+
+- if (works > 0 && velocity_rx_refill(vptr) < 0) {
+- VELOCITY_PRT(MSG_LEVEL_ERR, KERN_ERR
+- "%s: rx buf allocation failure\n", vptr->dev->name);
+- }
++ if ((works > 0) && (velocity_rx_refill(vptr) > 0))
++ velocity_give_many_rx_descs(vptr);
+
+ VAR_USED(stats);
+ return works;
+@@ -1877,6 +1875,8 @@ static int velocity_open(struct net_device *dev)
+ /* Ensure chip is running */
+ pci_set_power_state(vptr->pdev, PCI_D0);
+
++ velocity_give_many_rx_descs(vptr);
++
+ velocity_init_registers(vptr, VELOCITY_INIT_COLD);
+
+ ret = request_irq(vptr->pdev->irq, &velocity_intr, IRQF_SHARED,
+--
+1.6.5.4
+
Added: dists/lenny/linux-2.6/debian/patches/series/22
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/lenny/linux-2.6/debian/patches/series/22 Tue Jan 5 02:02:46 2010 (r14888)
@@ -0,0 +1,2 @@
++ bugfix/all/via-velocity-move-residual-free-rx-descriptors-count.patch
++ bugfix/all/via-velocity-give-rx-descriptors-later.patch
More information about the Kernel-svn-changes
mailing list