* Re: Raise initial congestion window size / speedup slow start?
From: H.K. Jerry Chu @ 2010-07-16 0:23 UTC (permalink / raw)
To: Stephen Hemminger
Cc: Rick Jones, Bill Fink, Hagen Paul Pfeifer, David Miller, lists,
davidsen, linux-kernel, netdev
In-Reply-To: <20100715134857.38d519c5@nehalam>
I don't even consider a modest IW increase to 10 is aggressive. The scaling
of IW is only adequate IMO given the huge b/w growth in the past
decade. Remember there could be plenty of flows sending large cwnd
bursts at
twice the bottleneck link rate at any point of time in the network anyway so
the "fairness" question may already be ill-defined. In any case we're
trying to conduct some experiment in a private testbed to hopefully
get some insights
with real data.
Jerry
On Thu, Jul 15, 2010 at 1:48 PM, Stephen Hemminger
<shemminger@vyatta.com> wrote:
> On Thu, 15 Jul 2010 12:51:22 -0700
> Rick Jones <rick.jones2@hp.com> wrote:
>
>> I have to wonder if the only heuristic one could employ for divining the initial
>> congestion window is to be either pessimistic/conservative or
>> optimistic/liberal. Or for that matter the only one one really needs here?
>>
>> That's what it comes down to doesn't it? At any one point in time, we don't
>> *really* know the state of the network and whether it can handle the load we
>> might wish to put upon it. We are always reacting to it. Up until now, it has
>> been felt necessary to be pessimistic/conservative at time of connection
>> establishment and not rely as much on the robustness of the "control" part of
>> avoidance and control.
>>
>> Now, the folks at Google have lots of data to suggest we don't need to be so
>> pessimistic/conservative and so we have to decide if we are willing to be more
>> optimistic/liberal. Broadly handwaving, the "netdev we" seems to be willing to
>> be more optimistic/liberal in at least a few cases, and the question comes down
>> to whether or not the "IETF we" will be similarly willing.
>
> I am not convinced that a host being aggressive with initial cwnd (Linux) would
> not end up unfairly monopolizing available bandwidth compared to older more conservative
> implementations (Windows). Whether fairness is important or not is another debate.
>
>
^ permalink raw reply
* Re: [PATCH 05/11] tulip: formatting of pointers in printk()
From: Kyle McMartin @ 2010-07-16 0:46 UTC (permalink / raw)
To: David Miller
Cc: segooon, kernel-janitors, grundler, kyle, joe, jpirko, ben,
grant.likely, netdev, linux-kernel, devicetree-discuss
In-Reply-To: <20100714.150739.193711125.davem@davemloft.net>
On Wed, Jul 14, 2010 at 03:07:39PM -0700, David Miller wrote:
> Since patch #5 and #6 are doing the same change to different
> files in the same driver, I combined them into one commit.
>
Thanks, Dave!
--Kyle
^ permalink raw reply
* Re: [PATCH] Drivers: net: 8139cp: Fixed 28 style errors, and 119 warnings.
From: Jeff Garzik @ 2010-07-16 0:57 UTC (permalink / raw)
To: Joseph Kogut; +Cc: davem, netdev, linux-kernel
In-Reply-To: <AANLkTikspw9LxFFsXJgWn30k2qCVu5zkOAq2FhWTpQvW@mail.gmail.com>
> -/* The following settings are log_2(bytes)-4: 0 == 16 bytes .. 6==1024, 7==end of packet. */
> -#define RX_FIFO_THRESH 5 /* Rx buffer level before first PCI xfer. */
> +/* The following settings are log_2(bytes)-4: 0 == 16 bytes .. 6 == 1024, 7 == end of packet. */
> +#define RX_FIFO_THRESH 5 /* Rx buffer level before first PCI xfer. */
useless noise
> - unsigned wol_enabled : 1; /* Is Wake-on-LAN enabled? */
> + unsigned wol_enabled:1; /* Is Wake-on-LAN enabled? */
not an improvement
> - if (wol->wolopts & WAKE_PHY) options |= LinkUp;
> - if (wol->wolopts & WAKE_MAGIC) options |= MagicPacket;
> + if (wol->wolopts & WAKE_PHY)
> + options |= LinkUp;
> + if (wol->wolopts & WAKE_MAGIC)
> + options |= MagicPacket;
ditto
> - if (wol->wolopts & WAKE_UCAST) options |= UWF;
> - if (wol->wolopts & WAKE_BCAST) options |= BWF;
> - if (wol->wolopts & WAKE_MCAST) options |= MWF;
> + if (wol->wolopts & WAKE_UCAST)
> + options |= UWF;
> + if (wol->wolopts & WAKE_BCAST)
> + options |= BWF;
> + if (wol->wolopts & WAKE_MCAST)
> + options |= MWF;
ditto
>
> - if (options & UWF) wol->wolopts |= WAKE_UCAST;
> - if (options & BWF) wol->wolopts |= WAKE_BCAST;
> - if (options & MWF) wol->wolopts |= WAKE_MCAST;
> + options = cpr8(Config5);
> + if (options & UWF)
> + wol->wolopts |= WAKE_UCAST;
> + if (options & BWF)
> + wol->wolopts |= WAKE_BCAST;
> + if (options & MWF)
> + wol->wolopts |= WAKE_MCAST;
ditto
^ permalink raw reply
* Re: [PATCH 2.6.35-rc1] net-next: vmxnet3 fixes [1/5] Spare skb to avoid starvation
From: Shreyas Bhatewara @ 2010-07-16 1:19 UTC (permalink / raw)
To: netdev; +Cc: pv-drivers, linux-kernel, sbhatewara
In-Reply-To: <alpine.LRH.2.00.1007131743520.32055@localhost.localdomain>
Reposting this patch with struct vmxnet3_cmd_ring *ring made const
according to Stephen's feedback.
---
skb_alloc() failure can cause the ring to loose all packet reception. Avoid
this by introducing a spare buffer. The spare skb is only used when the ring
is "empty" and an skb allocation failure would cause the ring to starve. It is
never handed up to netif_rx(), and instead, when the rx_interrupt occurs, the
skb is shuffled back to reuse. Further use the incoming receive packet
interrupts as events to poll for skb allocation.
Signed-off-by: Michael Stolarchuk <stolarchuk@vmware.com>
Signed-off-by: Shreyas Bhatewara <sbhatewara@vmware.com>
---
drivers/net/vmxnet3/vmxnet3_drv.c | 61 +++++++++++++++++++++++++++++++++++--
drivers/net/vmxnet3/vmxnet3_int.h | 12 ++++++-
2 files changed, 68 insertions(+), 5 deletions(-)
diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
index 989b742..5a50d10 100644
--- a/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
@@ -541,7 +541,12 @@ vmxnet3_rq_alloc_rx_buf(struct vmxnet3_rx_queue *rq, u32 ring_idx,
NET_IP_ALIGN);
if (unlikely(rbi->skb == NULL)) {
rq->stats.rx_buf_alloc_failure++;
- break;
+ /* starvation prevention */
+ if (vmxnet3_cmd_ring_desc_empty(
+ rq->rx_ring + ring_idx))
+ rbi->skb = rq->spare_skb;
+ else
+ break;
}
rbi->skb->dev = adapter->netdev;
@@ -611,6 +616,29 @@ vmxnet3_append_frag(struct sk_buff *skb, struct Vmxnet3_RxCompDesc *rcd,
}
+/*
+ * Free any pages which were attached to the frags of the spare skb. This can
+ * happen when the spare skb is attached to the rx ring to prevent starvation,
+ * but there was no issue with page allocation.
+ */
+
+static void
+vmxnet3_rx_spare_skb_free_frags(struct vmxnet3_adapter *adapter)
+{
+ struct sk_buff *skb = adapter->rx_queue.spare_skb;
+ int i;
+ for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
+ struct skb_frag_struct *frag = &skb_shinfo(skb)->frags[i];
+ BUG_ON(frag->page != 0);
+ put_page(frag->page);
+ frag->page = 0;
+ frag->size = 0;
+ }
+ skb_shinfo(skb)->nr_frags = 0;
+ skb->data_len = 0;
+}
+
+
static void
vmxnet3_map_pkt(struct sk_buff *skb, struct vmxnet3_tx_ctx *ctx,
struct vmxnet3_tx_queue *tq, struct pci_dev *pdev,
@@ -1060,8 +1088,12 @@ vmxnet3_rx_error(struct vmxnet3_rx_queue *rq, struct Vmxnet3_RxCompDesc *rcd,
* ctx->skb may be NULL if this is the first and the only one
* desc for the pkt
*/
- if (ctx->skb)
- dev_kfree_skb_irq(ctx->skb);
+ if (ctx->skb) {
+ if (ctx->skb == rq->spare_skb)
+ vmxnet3_rx_spare_skb_free_frags(adapter);
+ else
+ dev_kfree_skb_irq(ctx->skb);
+ }
ctx->skb = NULL;
}
@@ -1159,6 +1191,12 @@ vmxnet3_rq_rx_complete(struct vmxnet3_rx_queue *rq,
skb = ctx->skb;
if (rcd->eop) {
+ if (skb == rq->spare_skb) {
+ rq->stats.drop_total++;
+ vmxnet3_rx_spare_skb_free_frags(adapter);
+ ctx->skb = NULL;
+ goto rcd_done;
+ }
skb->len += skb->data_len;
skb->truesize += skb->data_len;
@@ -1244,6 +1282,14 @@ vmxnet3_rq_cleanup(struct vmxnet3_rx_queue *rq,
rq->uncommitted[ring_idx] = 0;
}
+ /* free starvation prevention skb if allocated */
+ if (rq->spare_skb) {
+ vmxnet3_rx_spare_skb_free_frags(adapter);
+ dev_kfree_skb(rq->spare_skb);
+ rq->spare_skb = NULL;
+ }
+
+
rq->comp_ring.gen = VMXNET3_INIT_GEN;
rq->comp_ring.next2proc = 0;
}
@@ -1325,6 +1371,15 @@ vmxnet3_rq_init(struct vmxnet3_rx_queue *rq,
}
vmxnet3_rq_alloc_rx_buf(rq, 1, rq->rx_ring[1].size - 1, adapter);
+ /* allocate ring starvation protection */
+ rq->spare_skb = dev_alloc_skb(PAGE_SIZE);
+ if (rq->spare_skb == NULL) {
+ vmxnet3_rq_cleanup(rq, adapter);
+ return -ENOMEM;
+ }
+
+
+
/* reset the comp ring */
rq->comp_ring.next2proc = 0;
memset(rq->comp_ring.base, 0, rq->comp_ring.size *
diff --git a/drivers/net/vmxnet3/vmxnet3_int.h b/drivers/net/vmxnet3/vmxnet3_int.h
index 34f392f..9c2fe9a 100644
--- a/drivers/net/vmxnet3/vmxnet3_int.h
+++ b/drivers/net/vmxnet3/vmxnet3_int.h
@@ -149,6 +149,13 @@ vmxnet3_cmd_ring_desc_avail(struct vmxnet3_cmd_ring *ring)
ring->next2comp - ring->next2fill - 1;
}
+static inline bool
+vmxnet3_cmd_ring_desc_empty(const struct vmxnet3_cmd_ring *ring)
+{
+ return (ring->next2comp == ring->next2fill);
+}
+
+
struct vmxnet3_comp_ring {
union Vmxnet3_GenericDesc *base;
u32 size;
@@ -266,9 +273,10 @@ struct vmxnet3_rx_queue {
u32 qid2; /* rqID in RCD for buffer from 2nd ring */
u32 uncommitted[2]; /* # of buffers allocated since last RXPROD
* update */
- struct vmxnet3_rx_buf_info *buf_info[2];
- struct Vmxnet3_RxQueueCtrl *shared;
+ struct vmxnet3_rx_buf_info *buf_info[2];
+ struct Vmxnet3_RxQueueCtrl *shared;
struct vmxnet3_rq_driver_stats stats;
+ struct sk_buff *spare_skb; /* starvation skb */
} __attribute__((__aligned__(SMP_CACHE_BYTES)));
#define VMXNET3_LINUX_MAX_MSIX_VECT 1
^ permalink raw reply related
* Re: [PATCH 2.6.35-rc1] net-next: vmxnet3 fixes [2/5] Interrupt control bitmap
From: Shreyas Bhatewara @ 2010-07-16 1:20 UTC (permalink / raw)
To: David Miller
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
pv-drivers@vmware.com, Ronghua Zhang
In-Reply-To: <20100714.140433.59678649.davem@davemloft.net>
On Wed, 14 Jul 2010, David Miller wrote:
> From: Shreyas Bhatewara <sbhatewara@vmware.com>
> Date: Tue, 13 Jul 2010 17:48:04 -0700 (PDT)
>
> > - __le32 reserved[3];
> > + __le32 intrCtrl;
> > + __le32 reserved[2];
> > };
> >
> ...
> > + adapter->shared->devRead.intrConf.intrCtrl &= ~VMXNET3_IC_DISABLE_ALL;
> ...
> > + adapter->shared->devRead.intrConf.intrCtrl |= VMXNET3_IC_DISABLE_ALL;
> ...
> > + devRead->intrConf.intrCtrl |= VMXNET3_IC_DISABLE_ALL;
>
> You need to use cpu_to_le32() and similar when accessing this value.
>
> If you run "sparse" with endianness checking enabled you'll see
> warnings showing alerting you to this issue...
>
Reposting the patch with the endianness fix.
---
A new bit map 'intrCtrl' is introduced in the DriverShared area. The
driver Ashould update VMXNET3_IC_DISABLE_ALL bit before writing IMR.
Signed-off-by: Ronghua Zang <ronghua@vmware.com>
Signed-off-by: Shreyas Bhatewara <sbhatewara@vmware.com>
---
drivers/net/vmxnet3/vmxnet3_defs.h | 6 +++++-
drivers/net/vmxnet3/vmxnet3_drv.c | 5 +++++
2 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/drivers/net/vmxnet3/vmxnet3_defs.h b/drivers/net/vmxnet3/vmxnet3_defs.h
index b4889e6..ca7727b 100644
--- a/drivers/net/vmxnet3/vmxnet3_defs.h
+++ b/drivers/net/vmxnet3/vmxnet3_defs.h
@@ -464,6 +464,9 @@ enum vmxnet3_intr_type {
/* addition 1 for events */
#define VMXNET3_MAX_INTRS 25
+/* value of intrCtrl */
+#define VMXNET3_IC_DISABLE_ALL 0x1 /* bit 0 */
+
struct Vmxnet3_IntrConf {
bool autoMask;
@@ -471,7 +474,8 @@ struct Vmxnet3_IntrConf {
u8 eventIntrIdx;
u8 modLevels[VMXNET3_MAX_INTRS]; /* moderation level for
* each intr */
- __le32 reserved[3];
+ __le32 intrCtrl;
+ __le32 reserved[2];
};
/* one bit per VLAN ID, the size is in the units of u32 */
diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
index 5a50d10..df3d2ac 100644
--- a/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
@@ -72,6 +72,8 @@ vmxnet3_enable_all_intrs(struct vmxnet3_adapter *adapter)
for (i = 0; i < adapter->intr.num_intrs; i++)
vmxnet3_enable_intr(adapter, i);
+ adapter->shared->devRead.intrConf.intrCtrl &=
+ cpu_to_le32(~VMXNET3_IC_DISABLE_ALL);
}
@@ -80,6 +82,8 @@ vmxnet3_disable_all_intrs(struct vmxnet3_adapter *adapter)
{
int i;
+ adapter->shared->devRead.intrConf.intrCtrl |=
+ cpu_to_le32(VMXNET3_IC_DISABLE_ALL);
for (i = 0; i < adapter->intr.num_intrs; i++)
vmxnet3_disable_intr(adapter, i);
}
@@ -1880,6 +1884,7 @@ vmxnet3_setup_driver_shared(struct vmxnet3_adapter *adapter)
devRead->intrConf.modLevels[i] = adapter->intr.mod_levels[i];
devRead->intrConf.eventIntrIdx = adapter->intr.event_intr_idx;
+ devRead->intrConf.intrCtrl |= cpu_to_le32(VMXNET3_IC_DISABLE_ALL);
/* rx filter settings */
devRead->rxFilterConf.rxMode = 0;
^ permalink raw reply related
* Re: [PATCH 2.6.35-rc1] net-next: vmxnet3 fixes [3/5] Initialize link state at probe time
From: Shreyas Bhatewara @ 2010-07-16 1:20 UTC (permalink / raw)
To: David Miller
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
pv-drivers@vmware.com
In-Reply-To: <20100714.141054.48510602.davem@davemloft.net>
On Wed, 14 Jul 2010, David Miller wrote:
> From: Shreyas Bhatewara <sbhatewara@vmware.com>
> Date: Tue, 13 Jul 2010 17:48:55 -0700 (PDT)
>
> >
> > Initialize vmxnet3 link state at probe time
> >
> > This change initializes the state of link at the time when driver is
> > loaded. The ethtool output for 'link detected' and 'link speed'
> > is thus valid even before the interface is brought up.
> >
> > Signed-off-by: Shreyas Bhatewara <sbhatewara@vmware.com>
>
> You should never, ever, call netif_start_queue() on a device which has
> not been brought up.
>
> But that is what this patch is doing.
>
I do not understand why you say so. vmxnet3_check_link() is called in
probe() with affectTxQueue as false. Hence netif_start_queue() will not be
called before device is brought up.
vmxnet3_check_link() is again called with affectTxQueue as true in
vmxnet3_activate_dev() after device was activated.
^ permalink raw reply
* Re: [PATCH 2.6.35-rc1] net-next: vmxnet3 fixes [4/5] Do not reset when the device is not opened
From: Shreyas Bhatewara @ 2010-07-16 1:20 UTC (permalink / raw)
To: David Miller
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
pv-drivers@vmware.com, Ronghua Zhang, Matthieu Bucchianeri
In-Reply-To: <20100714.140718.115934967.davem@davemloft.net>
On Wed, 14 Jul 2010, David Miller wrote:
> From: Shreyas Bhatewara <sbhatewara@vmware.com>
> Date: Tue, 13 Jul 2010 17:49:52 -0700 (PDT)
>
> >
> > Do not reset when the device is not opened
> >
> > If a reset is scheduled, and the device goes thru close and open, it
> > may happen that reset and open may run in parallel.
> > The reset code now bails out if the device is not opened.
> >
> > Signed-off-by: Ronghua Zang <ronghua@vmware.com>
> > Signed-off-by: Matthieu Bucchianeri <matthieu@vmware.com>
> > Signed-off-by: Shreyas Bhatewara <sbhatewara@vmware.com>
>
> Testing IFF_UP is just making your race hole a little smaller but
> it isn't fixing the problem.
>
> In fact, there really isn't any legitimate reason for a driver
> to test the IFF_UP state bit. netif_running() is the correct
> test, and asynchronous work queue things like resets should
> synchronize with open/close using the RTNL lock so that your
> test of netif_running() is a stable one.
>
Is this what you suggest :
---
Hold rtnl_lock to get the right link state.
While asynchronously resetting the device, hold rtnl_lock to get the
right value from netif_running. If a reset is scheduled, and the device
goes thru close and open, it may happen that reset and open may run in
parallel. Holding rtnl_lock will avoid this.
---
drivers/net/vmxnet3/vmxnet3_drv.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
index 1b0ce8c..c4d7e42 100644
--- a/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
@@ -2420,6 +2420,7 @@ vmxnet3_reset_work(struct work_struct *data)
return;
/* if the device is closed, we must leave it alone */
+ rtnl_lock();
if (netif_running(adapter->netdev)) {
printk(KERN_INFO "%s: resetting\n", adapter->netdev->name);
vmxnet3_quiesce_dev(adapter);
@@ -2428,6 +2429,7 @@ vmxnet3_reset_work(struct work_struct *data)
} else {
printk(KERN_INFO "%s: already closed\n", adapter->netdev->name);
}
+ rtnl_unlock();
clear_bit(VMXNET3_STATE_BIT_RESETTING, &adapter->state);
}
^ permalink raw reply related
* Re: [PATCH 2.6.35-rc1] net-next: vmxnet3 fixes [5/5] Respect the interrupt type in VM configuration
From: Shreyas Bhatewara @ 2010-07-16 1:21 UTC (permalink / raw)
To: David Miller
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
pv-drivers@vmware.com
In-Reply-To: <20100714.141118.260092331.davem@davemloft.net>
On Wed, 14 Jul 2010, David Miller wrote:
> From: Shreyas Bhatewara <sbhatewara@vmware.com>
> Date: Tue, 13 Jul 2010 17:51:39 -0700 (PDT)
>
> >
> > Do not ignore interrupt type in VM configuration
> >
> > When interrupt type is not auto, do not ignore the interrupt type set from
> > VM configuration.
> > Driver may not always respect the interrupt type in configuration but it
> > will certainly try to. Eg: if MSIx is configured and enabling MSIx fails
> > in driver, it fall back on MSI and then on INTx.
> >
> > Signed-off-by: Shreyas Bhatewara <sbhatewara@vmware.com>
> ...
> > @@ -291,7 +291,7 @@ vmxnet3_set_flags(struct net_device *netdev, u32 data)
> >
> > /* update harware LRO capability accordingly */
> > if (lro_requested)
> > - adapter->shared->devRead.misc.uptFeatures &= UPT1_F_LRO;
> > + adapter->shared->devRead.misc.uptFeatures |= UPT1_F_LRO;
> > else
>
> This change has nothing to do with respecting the VM interrupt setting.
>
> Do not stuff unrelated changes into a commit.
> ...
Sorry about that. This is a fix I wanted to add and I did not operate stg
correctly. Reposting the patch w/o the feature update bits.
---
Respect the interrupt type set in VM configuration.
When interrupt type is not auto, do not ignore the interrupt type set from
VM configuration.
Signed-off-by: Shreyas Bhatewara <sbhatewara@vmware.com>
---
drivers/net/vmxnet3/vmxnet3_drv.c | 13 ++++++++++---
drivers/net/vmxnet3/vmxnet3_int.h | 4 ++--
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
index c4d7e42..9282635 100644
--- a/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
@@ -2357,9 +2357,13 @@ vmxnet3_alloc_intr_resources(struct vmxnet3_adapter *adapter)
adapter->intr.mask_mode = (cfg >> 2) & 0x3;
if (adapter->intr.type == VMXNET3_IT_AUTO) {
- int err;
+ adapter->intr.type = VMXNET3_IT_MSIX;
+ }
#ifdef CONFIG_PCI_MSI
+ if (adapter->intr.type == VMXNET3_IT_MSIX) {
+ int err;
+
adapter->intr.msix_entries[0].entry = 0;
err = pci_enable_msix(adapter->pdev, adapter->intr.msix_entries,
VMXNET3_LINUX_MAX_MSIX_VECT);
@@ -2368,15 +2372,18 @@ vmxnet3_alloc_intr_resources(struct vmxnet3_adapter *adapter)
adapter->intr.type = VMXNET3_IT_MSIX;
return;
}
-#endif
+ adapter->intr.type = VMXNET3_IT_MSI;
+ }
+ if (adapter->intr.type == VMXNET3_IT_MSI) {
+ int err;
err = pci_enable_msi(adapter->pdev);
if (!err) {
adapter->intr.num_intrs = 1;
- adapter->intr.type = VMXNET3_IT_MSI;
return;
}
}
+#endif /* CONFIG_PCI_MSI */
adapter->intr.type = VMXNET3_IT_INTX;
diff --git a/drivers/net/vmxnet3/vmxnet3_int.h b/drivers/net/vmxnet3/vmxnet3_int.h
index 9c2fe9a..d17fae6 100644
--- a/drivers/net/vmxnet3/vmxnet3_int.h
+++ b/drivers/net/vmxnet3/vmxnet3_int.h
@@ -68,10 +68,10 @@
/*
* Version numbers
*/
-#define VMXNET3_DRIVER_VERSION_STRING "1.0.5.0-k"
+#define VMXNET3_DRIVER_VERSION_STRING "1.0.13.0-k"
/* a 32-bit int, each byte encode a verion number in VMXNET3_DRIVER_VERSION */
-#define VMXNET3_DRIVER_VERSION_NUM 0x01000500
+#define VMXNET3_DRIVER_VERSION_NUM 0x01000B00
/*
^ permalink raw reply related
* [PATCH 2.6.35-rc1] net-next: fix LRO feature update in vmxnet3
From: Shreyas Bhatewara @ 2010-07-16 1:28 UTC (permalink / raw)
To: David Miller
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
pv-drivers@vmware.com
In-Reply-To: <alpine.LRH.2.00.1007151458580.10176@localhost.localdomain>
From: Shreyas Bhatewara <sbhatewara@vmware.com>
Fix LRO feature update.
Signed-off-by: Shreyas Bhatewara <sbhatewara@vmware.com>
---
drivers/net/vmxnet3/vmxnet3_ethtool.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/net/vmxnet3/vmxnet3_ethtool.c b/drivers/net/vmxnet3/vmxnet3_ethtool.c
index de1ba14..7e4b5a8 100644
--- a/drivers/net/vmxnet3/vmxnet3_ethtool.c
+++ b/drivers/net/vmxnet3/vmxnet3_ethtool.c
@@ -291,10 +291,11 @@ vmxnet3_set_flags(struct net_device *netdev, u32 data)
/* update harware LRO capability accordingly */
if (lro_requested)
- adapter->shared->devRead.misc.uptFeatures &= UPT1_F_LRO;
+ adapter->shared->devRead.misc.uptFeatures |=
+ cpu_to_le64(UPT1_F_LRO);
else
adapter->shared->devRead.misc.uptFeatures &=
- ~UPT1_F_LRO;
+ cpu_to_le64(~UPT1_F_LRO);
VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
VMXNET3_CMD_UPDATE_FEATURE);
}
^ permalink raw reply related
* Re: [PATCH] Drivers: net: 8139cp: Fixed 28 style errors, and 119 warnings.
From: David Miller @ 2010-07-16 1:30 UTC (permalink / raw)
To: joseph.kogut; +Cc: netdev, linux-kernel
In-Reply-To: <AANLkTikspw9LxFFsXJgWn30k2qCVu5zkOAq2FhWTpQvW@mail.gmail.com>
Besides the feedback given by Jeff Garzik, I would like to ask that
you please post your patches in a format other than as a binary
attachment. Plain text attachments are fine, for example.
That way your patch will be properly logged and tracked in
patchwork, and be easier for people to reply to and comment
upon.
Thank you.
^ permalink raw reply
* Re: [PATCH 2.6.35-rc1] net-next: vmxnet3 fixes [4/5] Do not reset when the device is not opened
From: David Miller @ 2010-07-16 1:32 UTC (permalink / raw)
To: sbhatewara; +Cc: netdev, linux-kernel, pv-drivers, ronghua, matthieu
In-Reply-To: <alpine.LRH.2.00.1007151448260.25472@localhost.localdomain>
From: Shreyas Bhatewara <sbhatewara@vmware.com>
Date: Thu, 15 Jul 2010 18:20:52 -0700 (PDT)
> Is this what you suggest :
>
> ---
>
> Hold rtnl_lock to get the right link state.
It ought to work, but make sure that it is legal to take the
RTNL semaphore in all contexts in which this code block
might be called.
^ permalink raw reply
* Re: [PATCH 2.6.35-rc1] net-next: vmxnet3 fixes [1/5] Spare skb to avoid starvation
From: David Miller @ 2010-07-16 1:39 UTC (permalink / raw)
To: sbhatewara; +Cc: netdev, pv-drivers, linux-kernel
In-Reply-To: <alpine.LRH.2.00.1007151656140.10176@localhost.localdomain>
From: Shreyas Bhatewara <sbhatewara@vmware.com>
Date: Thu, 15 Jul 2010 18:19:39 -0700 (PDT)
>
> Reposting this patch with struct vmxnet3_cmd_ring *ring made const
> according to Stephen's feedback.
Please address my feedback, which is that this is not the way to
handle this problem.
You can prevent all forms of starvation, without hacky spare-skbs or
things like that, by trying to allocate the replacement SKB _before_
sending the packet up to the stack.
If the replacement SKB allocation fails, you do not give the packet to
the network stack. Instead, you give it back to the card's RX ring.
See drivers/net/tg3.c, drivers/net/niu.c, etc. for examples of this.
^ permalink raw reply
* Re: [PATCH 05/25] atm: Convert pci_table entries to PCI_VDEVICE (if PCI_ANY_ID is used)
From: David Miller @ 2010-07-16 2:06 UTC (permalink / raw)
To: PeterHuewe
Cc: kernel-janitors, chas, eric.dumazet, tj, linux-atm-general,
netdev, linux-kernel
In-Reply-To: <201007152041.08976.PeterHuewe@gmx.de>
From: Peter Huewe <PeterHuewe@gmx.de>
Date: Thu, 15 Jul 2010 20:41:08 +0200
> From: Peter Huewe <peterhuewe@gmx.de>
>
> This patch converts pci_table entries, where .subvendor=PCI_ANY_ID and
> .subdevice=PCI_ANY_ID, .class=0 and .class_mask=0, to use the
> PCI_VDEVICE macro, and thus improves readability.
>
> Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Applied.
^ permalink raw reply
* Re: [PATCH 03/25] atm: Convert pci_table entries to PCI_VDEVICE (if PCI_ANY_ID is used)
From: David Miller @ 2010-07-16 2:06 UTC (permalink / raw)
To: PeterHuewe
Cc: kernel-janitors, chas, ben, tj, linux-atm-general, netdev,
linux-kernel
In-Reply-To: <201007152038.21535.PeterHuewe@gmx.de>
From: Peter Huewe <PeterHuewe@gmx.de>
Date: Thu, 15 Jul 2010 20:38:20 +0200
> From: Peter Huewe <peterhuewe@gmx.de>
>
> This patch converts pci_table entries, where .subvendor=PCI_ANY_ID and
> .subdevice=PCI_ANY_ID, .class=0 and .class_mask=0, to use the
> PCI_VDEVICE macro, and thus improves readability.
>
> Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Applied.
^ permalink raw reply
* Re: [PATCH 06/25] atm: Convert pci_table entries to PCI_VDEVICE (if PCI_ANY_ID is used)
From: David Miller @ 2010-07-16 2:06 UTC (permalink / raw)
To: PeterHuewe
Cc: kernel-janitors, chas, tj, linux-atm-general, netdev,
linux-kernel
In-Reply-To: <201007152042.13091.PeterHuewe@gmx.de>
From: Peter Huewe <PeterHuewe@gmx.de>
Date: Thu, 15 Jul 2010 20:42:12 +0200
> From: Peter Huewe <peterhuewe@gmx.de>
>
> This patch converts pci_table entries, where .subvendor=PCI_ANY_ID and
> .subdevice=PCI_ANY_ID, .class=0 and .class_mask=0, to use the
> PCI_VDEVICE macro, and thus improves readability.
>
> Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Applied.
^ permalink raw reply
* Re: [PATCH 07/25] atm: Convert pci_table entries to PCI_VDEVICE (if PCI_ANY_ID is used)
From: David Miller @ 2010-07-16 2:06 UTC (permalink / raw)
To: PeterHuewe
Cc: kernel-janitors, chas, roel.kluin, eric.dumazet, tj,
linux-atm-general, netdev, linux-kernel
In-Reply-To: <201007152044.12653.PeterHuewe@gmx.de>
From: Peter Huewe <PeterHuewe@gmx.de>
Date: Thu, 15 Jul 2010 20:44:11 +0200
> From: Peter Huewe <peterhuewe@gmx.de>
>
> This patch converts pci_table entries, where .subvendor=PCI_ANY_ID and
> .subdevice=PCI_ANY_ID, .class=0 and .class_mask=0, to use the
> PCI_VDEVICE macro, and thus improves readability.
>
> Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Applied.
^ permalink raw reply
* Re: [PATCH 10/25] atm: Convert pci_table entries to PCI_VDEVICE (if PCI_ANY_ID is used)
From: David Miller @ 2010-07-16 2:06 UTC (permalink / raw)
To: PeterHuewe
Cc: kernel-janitors, chas, tj, linux-atm-general, netdev,
linux-kernel
In-Reply-To: <201007152049.33395.PeterHuewe@gmx.de>
From: Peter Huewe <PeterHuewe@gmx.de>
Date: Thu, 15 Jul 2010 20:49:32 +0200
> From: Peter Huewe <peterhuewe@gmx.de>
>
> This patch converts pci_table entries, where .subvendor=PCI_ANY_ID and
> .subdevice=PCI_ANY_ID, .class=0 and .class_mask=0, to use the
> PCI_VDEVICE macro, and thus improves readability.
>
> Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Applied.
^ permalink raw reply
* Re: [PATCH 08/25] atm: Convert pci_table entries to PCI_VDEVICE (if PCI_ANY_ID is used)
From: David Miller @ 2010-07-16 2:06 UTC (permalink / raw)
To: PeterHuewe
Cc: kernel-janitors, chas, hsweeten, tj, linux-atm-general, netdev,
linux-kernel
In-Reply-To: <201007152045.33543.PeterHuewe@gmx.de>
From: Peter Huewe <PeterHuewe@gmx.de>
Date: Thu, 15 Jul 2010 20:45:32 +0200
> From: Peter Huewe <peterhuewe@gmx.de>
>
> This patch converts pci_table entries, where .subvendor=PCI_ANY_ID and
> .subdevice=PCI_ANY_ID, .class=0 and .class_mask=0, to use the
> PCI_VDEVICE macro, and thus improves readability.
>
> Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Applied.
^ permalink raw reply
* Re: [PATCH 09/25] atm: Convert pci_table entries to PCI_VDEVICE (if PCI_ANY_ID is used)
From: David Miller @ 2010-07-16 2:06 UTC (permalink / raw)
To: PeterHuewe
Cc: kernel-janitors, chas, hsweeten, tj, linux-atm-general, netdev,
linux-kernel
In-Reply-To: <201007152048.27535.PeterHuewe@gmx.de>
From: Peter Huewe <PeterHuewe@gmx.de>
Date: Thu, 15 Jul 2010 20:48:26 +0200
> From: Peter Huewe <peterhuewe@gmx.de>
>
> This patch converts pci_table entries, where .subvendor=PCI_ANY_ID and
> .subdevice=PCI_ANY_ID, .class=0 and .class_mask=0, to use the
> PCI_VDEVICE macro, and thus improves readability.
>
> Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Applied.
^ permalink raw reply
* Re: [PATCH 19/25] isdn/hardware/mISDN: Convert pci_table entries to PCI_VDEVICE (if PCI_ANY_ID is used)
From: David Miller @ 2010-07-16 2:06 UTC (permalink / raw)
To: PeterHuewe
Cc: kernel-janitors, isdn, u.kleine-koenig, tj, jkosina, netdev,
linux-kernel
In-Reply-To: <201007152102.38008.PeterHuewe@gmx.de>
From: Peter Huewe <PeterHuewe@gmx.de>
Date: Thu, 15 Jul 2010 21:02:36 +0200
> From: Peter Huewe <peterhuewe@gmx.de>
>
> This patch converts pci_table entries, where .subvendor=PCI_ANY_ID and
> .subdevice=PCI_ANY_ID, .class=0 and .class_mask=0, to use the
> PCI_VDEVICE macro, and thus improves readability.
>
> Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Applied.
^ permalink raw reply
* Re: [PATCH 21/25] isdn/hardware/eicon: Convert pci_table entries to PCI_VDEVICE (if PCI_ANY_ID is used)
From: David Miller @ 2010-07-16 2:07 UTC (permalink / raw)
To: PeterHuewe; +Cc: kernel-janitors, mac, isdn, arnd, netdev, linux-kernel
In-Reply-To: <201007152104.45958.PeterHuewe@gmx.de>
From: Peter Huewe <PeterHuewe@gmx.de>
Date: Thu, 15 Jul 2010 21:04:45 +0200
> From: Peter Huewe <peterhuewe@gmx.de>
>
> This patch converts pci_table entries, where .subvendor=PCI_ANY_ID and
> .subdevice=PCI_ANY_ID, .class=0 and .class_mask=0, to use the
> PCI_VDEVICE macro, and thus improves readability.
>
> Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Applied.
^ permalink raw reply
* Re: [PATCH 20/25] mISDN: Convert pci_table entries to PCI_VDEVICE (if PCI_ANY_ID is used)
From: David Miller @ 2010-07-16 2:07 UTC (permalink / raw)
To: PeterHuewe
Cc: kernel-janitors, isdn, akpm, u.kleine-koenig, tj, netdev,
linux-kernel
In-Reply-To: <201007152104.08458.PeterHuewe@gmx.de>
From: Peter Hüwe <PeterHuewe@gmx.de>
Date: Thu, 15 Jul 2010 21:04:07 +0200
> From: Peter Huewe <peterhuewe@gmx.de>
>
> This patch converts pci_table entries, where .subvendor=PCI_ANY_ID and
> .subdevice=PCI_ANY_ID, .class=0 and .class_mask=0, to use the
> PCI_VDEVICE macro, and thus improves readability.
>
> Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Applied.
^ permalink raw reply
* Re: [PATCH 22/25] mISDN: Convert pci_table entries to PCI_VDEVICE (if PCI_ANY_ID is used)
From: David Miller @ 2010-07-16 2:07 UTC (permalink / raw)
To: PeterHuewe
Cc: kernel-janitors, isdn, akpm, jkosina, roel.kluin, netdev,
linux-kernel
In-Reply-To: <201007152105.39404.PeterHuewe@gmx.de>
From: Peter Huewe <PeterHuewe@gmx.de>
Date: Thu, 15 Jul 2010 21:05:38 +0200
> From: Peter Huewe <peterhuewe@gmx.de>
>
> This patch converts pci_table entries, where .subvendor=PCI_ANY_ID and
> .subdevice=PCI_ANY_ID, .class=0 and .class_mask=0, to use the
> PCI_VDEVICE macro, and thus improves readability.
>
> Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Applied.
^ permalink raw reply
* Re: [PATCH 23/25] isdn/hisax: Convert pci_table entries to PCI_VDEVICE (if PCI_ANY_ID is used)
From: David Miller @ 2010-07-16 2:07 UTC (permalink / raw)
To: PeterHuewe; +Cc: kernel-janitors, isdn, tj, netdev, linux-kernel
In-Reply-To: <201007152107.31524.PeterHuewe@gmx.de>
From: Peter Huewe <PeterHuewe@gmx.de>
Date: Thu, 15 Jul 2010 21:07:30 +0200
> From: Peter Huewe <peterhuewe@gmx.de>
>
> This patch converts pci_table entries, where .subvendor=PCI_ANY_ID and
> .subdevice=PCI_ANY_ID, .class=0 and .class_mask=0, to use the
> PCI_VDEVICE macro, and thus improves readability.
>
> Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Applied.
^ permalink raw reply
* Re: [PATCH net-next] drivers/net/mlx4: Use %pV, pr_<level>, printk_once
From: David Miller @ 2010-07-16 2:07 UTC (permalink / raw)
To: joe; +Cc: rolandd, yevgenyp, jackm, netdev, linux-kernel
In-Reply-To: <baf5f3949ffd5a48a6f5667b6d6394e6d48c91ca.1278696312.git.joe@perches.com>
From: Joe Perches <joe@perches.com>
Date: Sat, 10 Jul 2010 10:22:46 -0700
> Remove near duplication of format string constants by using the newly
> introduced vsprintf extention %pV to reduce text by 20k or so.
>
> $ size drivers/net/mlx4/built-in.o*
> text data bss dec hex filename
> 161367 1866 48784 212017 33c31 drivers/net/mlx4/built-in.o
> 142621 1866 46248 190735 2e90f drivers/net/mlx4/built-in.o.new
>
> Use printk_once as appropriate.
> Convert printks to pr_<level>, some bare printks now use pr_cont.
> Remove now unused #define PFX.
>
> Signed-off-by: Joe Perches <joe@perches.com>
Applied, thanks Joe.
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox