Re: [git patches] net driver updates
Divy Le Ray wrote: 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 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [git patches] net driver updates
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 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [git patches] net driver updates
Marin Mitov wrote: On Tuesday 26 February 2008 12:59:04 am you wrote: Divy Le Ray wrote: From: "Divy Le Ray" <[EMAIL PROTECTED]> Date: Wed, 20 Feb 2008 21:57:08 -0800 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 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [git patches] net driver updates
Divy Le Ray wrote: From: "Divy Le Ray" <[EMAIL PROTECTED]> Date: Wed, 20 Feb 2008 21:57:08 -0800 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. 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 netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
RE: [git patches] net driver updates
> From: "Divy Le Ray" <[EMAIL PROTECTED]> > Date: Wed, 20 Feb 2008 21:57:08 -0800 > > > 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 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [git patches] net driver updates
From: "Divy Le Ray" <[EMAIL PROTECTED]> Date: Wed, 20 Feb 2008 21:57:08 -0800 > 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. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
RE: [git patches] net driver updates
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 > > > > 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. > > > > 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 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
RE: [git patches] net driver updates
> -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]; > netdev@vger.kernel.org > Subject: Re: [git patches] net driver updates > > From: Krishna Kumar2 <[EMAIL PROTECTED]> > Date: Thu, 21 Feb 2008 09:13:49 +0530 > > > Hi Divy, > > > > > > 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. > > 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 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [git patches] net driver updates
From: Krishna Kumar2 <[EMAIL PROTECTED]> Date: Thu, 21 Feb 2008 09:13:49 +0530 > Hi Divy, > > > > 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. And the race is talking about LLTX, which S2IO doesn't use as far as I can tell. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [git patches] net driver updates
Hi Divy, > > 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 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [git patches] net driver updates
Jeff Garzik wrote:
Divy Le Ray wrote:
Jeff Garzik wrote:
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
--- a/drivers/net/cxgb3/sge.c
+++ b/drivers/net/cxgb3/sge.c
@@ -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;
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...
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
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [git patches] net driver updates
Divy Le Ray wrote:
Jeff Garzik wrote:
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
--- a/drivers/net/cxgb3/sge.c
+++ b/drivers/net/cxgb3/sge.c
@@ -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;
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
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [git patches] net driver updates
Ben Dooks wrote: 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 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [git patches] net driver updates
On Mon, Feb 11, 2008 at 12:05:16PM -0500, Jeff Garzik wrote: > 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. > 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? -- Ben ([EMAIL PROTECTED], http://www.fluff.org/) 'a smiley only costs 4 bytes' -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [git patches] net driver updates
From: Jeff Garzik <[EMAIL PROTECTED]> Date: Mon, 11 Feb 2008 12:05:16 -0500 > 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! -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [git patches] net driver updates
Jeff Garzik wrote:
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
--- a/drivers/net/cxgb3/sge.c
+++ b/drivers/net/cxgb3/sge.c
@@ -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;
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
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [git patches] net driver updates
From: Jeff Garzik <[EMAIL PROTECTED]> Date: Wed, 6 Feb 2008 06:49:50 -0500 > 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 Jeff. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [git patches] net driver updates #2
From: David Miller <[EMAIL PROTECTED]>
Date: Fri, 01 Feb 2008 21:52:10 -0800 (PST)
> From: Jeff Garzik <[EMAIL PROTECTED]>
> Date: Fri, 1 Feb 2008 16:03:38 -0500
>
> > Please pull from 'upstream2-davem' branch of
>
> This is now pulled and pushed back out to net-2.6
The first S2io patch breaks the build so I'm removing it from the
net-2.6 tree. I suspect you rejected an earlier patch that added the
tx_lock member to the S2IO device private.
If you do that Jeff, please at least do a quick sanity check of the
build.
If, instead, I messed things up somehow, my apologies in advance.
drivers/net/s2io.c: In function 's2io_vlan_rx_kill_vid':
drivers/net/s2io.c:395: error: 'struct s2io_nic' has no member named 'tx_lock'
drivers/net/s2io.c:399: error: 'struct s2io_nic' has no member named 'tx_lock'
S2io: Support for vlan_rx_kill_vid entry point
- Added s2io_vlan_rx_kill_vid entry point function for unregistering vlan.
- Fix to aggregate vlan packets. IP offset is incremented by
4 bytes if the packet contains vlan header.
Signed-off-by: Surjit Reang <[EMAIL PROTECTED]>
Signed-off-by: Ramkrishna Vepa <[EMAIL PROTECTED]>
Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]>
---
drivers/net/s2io.c | 108 +---
drivers/net/s2io.h |7 ++-
2 files changed, 65 insertions(+), 50 deletions(-)
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 5fab7d7..dcad502 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -386,6 +386,19 @@ static void s2io_vlan_rx_register(struct net_device *dev,
/* A flag indicating whether 'RX_PA_CFG_STRIP_VLAN_TAG' bit is set or not */
static int vlan_strip_flag;
+/* Unregister the vlan */
+static void s2io_vlan_rx_kill_vid(struct net_device *dev, unsigned long vid)
+{
+ unsigned long flags;
+ struct s2io_nic *nic = dev->priv;
+
+ spin_lock_irqsave(&nic->tx_lock, flags);
+ if (nic->vlgrp)
+ vlan_group_set_device(nic->vlgrp, vid, NULL);
+
+ spin_unlock_irqrestore(&nic->tx_lock, flags);
+}
+
/*
* Constants to be programmed into the Xena's registers, to configure
* the XAUI.
@@ -2948,7 +2961,7 @@ static void rx_intr_handler(struct ring_info *ring_data)
struct lro *lro = &nic->lro0_n[i];
if (lro->in_use) {
update_L3L4_header(nic, lro);
- queue_rx_frame(lro->parent);
+ queue_rx_frame(lro->parent, lro->vlan_tag);
clear_lro_session(lro);
}
}
@@ -7371,7 +7384,8 @@ static int rx_osm_handler(struct ring_info *ring_data,
struct RxD_t * rxdp)
{
lro_append_pkt(sp, lro,
skb, tcp_len);
- queue_rx_frame(lro->parent);
+ queue_rx_frame(lro->parent,
+ lro->vlan_tag);
clear_lro_session(lro);
sp->mac_control.stats_info->
sw_stat.flush_max_pkts++;
@@ -7382,7 +7396,8 @@ static int rx_osm_handler(struct ring_info *ring_data,
struct RxD_t * rxdp)
lro->frags_len;
sp->mac_control.stats_info->
sw_stat.sending_both++;
- queue_rx_frame(lro->parent);
+ queue_rx_frame(lro->parent,
+ lro->vlan_tag);
clear_lro_session(lro);
goto send_up;
case 0: /* sessions exceeded */
@@ -7408,31 +7423,12 @@ static int rx_osm_handler(struct ring_info *ring_data,
struct RxD_t * rxdp)
*/
skb->ip_summed = CHECKSUM_NONE;
}
- } else {
+ } else
skb->ip_summed = CHECKSUM_NONE;
- }
+
sp->mac_control.stats_info->sw_stat.mem_freed += skb->truesize;
- if (!sp->lro) {
- skb->protocol = eth_type_trans(skb, dev);
- if ((sp->vlgrp && RXD_GET_VLAN_TAG(rxdp->Control_2) &&
- vlan_strip_flag)) {
- /* Queueing the vlan frame to the upper layer */
- if (napi)
- vlan_hwaccel_receive_skb(skb, sp->vlgrp,
- RXD_GET_VLAN_TAG(rxdp->Control_2));
- else
- vlan
Re: [git patches] net driver updates #2
From: Jeff Garzik <[EMAIL PROTECTED]> Date: Fri, 1 Feb 2008 16:03:38 -0500 > Please pull from 'upstream2-davem' branch of This is now pulled and pushed back out to net-2.6 Thanks! -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [git patches] net driver updates #2
From: Jeff Garzik <[EMAIL PROTECTED]> Date: Fri, 1 Feb 2008 16:03:38 -0500 > This submit is based on top of Linus's tree, since I'm not sure what's > going on with net-2.6.git and my previous (lost?) submission. > > These changes do /not/ include anything from the previous submission, > which was on top of net-2.6 -- but then you rebased, which probably made > everything more difficult. :) Can you respin the tree with that previus submission init? The best I'll be able to do is clone that entire tree in order to pick the patches out, and from here in Australia with a dodgy link I might not even finish before I have to get on a plane back home on Monday :-) I'll pull in this second set later tonight. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [git patches] net driver updates
From: Jeff Garzik <[EMAIL PROTECTED]> Date: Tue, 22 Jan 2008 06:02:31 -0500 > NOTE: This is the igb as Auke submitted it. It still needs a review > against ultra-recent Intel driver work. > > Please pull from 'upstream-davem' branch of > master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git > upstream-davem Pulled and pushed out, I'll try to take a stare at IGB after getting some sleep. Thanks! -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [git patches] net driver updates for 2.6.25
From: Jeff Garzik <[EMAIL PROTECTED]> Date: Fri, 18 Jan 2008 15:17:21 -0500 > > Please pull from the 'upstream' branch of > git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git upstream > > to receive my 2.6.25 net driver queue into davem/net-2.6.25.git: Pulled and pushed back out, thanks Jeff. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [git patches] net driver updates
From: Jeff Garzik <[EMAIL PROTECTED]> Date: Tue, 9 Oct 2007 21:03:26 -0400 > > Please pull from the 'upstream-davem' branch of > master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git > upstream-davem > > to receive these changes: Pulled and pushed back out, thanks Jeff! - To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [git patches] net driver updates
From: Jeff Garzik <[EMAIL PROTECTED]> Date: Fri, 5 Oct 2007 14:20:08 -0400 > Please pull from 'upstream-davem' branch of > master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git > upstream-davem > Pulled, and pushed back out to net-2.6.24, thanks Jeff. - To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [git patches] net driver updates
From: Jeff Garzik <[EMAIL PROTECTED]> Date: Wed, 3 Oct 2007 14:39:16 -0400 > > Normally I wait a day or two between pushes, to queue up patches and > also to avoid annoying my upstream :) But this includes a couple fixes > I felt should be upstreamed sooner rather than later. > > Please pull from 'upstream' branch of > master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git upstream Pulled, thanks Jeff! - To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [git patches] net driver updates
From: Jeff Garzik <[EMAIL PROTECTED]> Date: Tue, 2 Oct 2007 13:41:50 -0400 > Please pull from the 'upstream' branch of > master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git upstream Pulled and pushed back out to net-2.6.24, thanks Jeff! - To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [git patches] net driver updates
From: Jeff Garzik <[EMAIL PROTECTED]> Date: Thu, 20 Sep 2007 03:26:10 -0400 > Please pull from the 'upstream' branch of > master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git upstream > > to receive the following changes: Pulled into net-2.6.24 and pushed out, thanks Jeff! - To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [git patches] net driver updates
On Mon, Jul 16, 2007 at 06:57:21PM -0400, Jeff Garzik wrote: > Minor fixes and cleanups, and a wireless pull from Linville. > > Please pull from 'upstream-linus' branch of > master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git > upstream-linus > did you get the dgrs removal patch? mail didn't hit netdev due to beeing too large, but you were on cc. shall i rebase? -- maks - To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [git patches] net driver updates
On Wed, 11 Jul 2007, Jiri Kosina wrote: On Tue, 10 Jul 2007, Jeff Garzik wrote: Various minor updates. The only thing of note is sk98lin driver removal. Please pull from 'upstream-linus' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git upstream-linus This is probably going to cause a new entry in regressions list, as at least Chris Stromsoe has reported bonding-related problems with skge that don't happen with sklin - http://www.uwsg.indiana.edu/hypermail/linux/kernel/0707.1/1158.html It's worse than just bonding related. This also causes a reliable hard lockup with skge: fresno:~# modprobe skge fresno:~# ip li set eth2 up fresno:~# ip li set eth2 down fresno:~# ip li set eth3 up The server locks up there. Nothing is printed to console and it takes a power cycle to fix the problem. eth2 and eth3 are both ports on an SK-9844 dual-port card. The test above is with 2.6.22. I've also had it fail with .21.*, .20.*, and several other kernels. fresno:~# uname -a Linux fresno 2.6.22 #4 SMP Tue Jul 10 11:38:19 PDT 2007 i686 GNU/Linux fresno:~# dmesg | grep skge skge 1.11 addr 0xfebfc000 irq 22 chip Genesis rev 0 skge eth2: addr 00:00:5a:98:ac:8c skge eth3: addr 00:00:5a:98:ac:8d fresno:~# lspci -v -s 02:01 02:01.0 Ethernet controller: SysKonnect SK-9872 Gigabit Ethernet Server Adapter (SK-NET GE-ZX dual link) (rev 11) Subsystem: SysKonnect SK-9844 Gigabit Ethernet Server Adapter (SK-NET GE-SX dual link) Flags: bus master, 66MHz, medium devsel, latency 64, IRQ 22 Memory at febfc000 (32-bit, non-prefetchable) [size=16K] I/O ports at e800 [size=256] Expansion ROM at febc [disabled] [size=128K] Capabilities: [48] Power Management version 1 Capabilities: [50] Vital Product Data -Chris - To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [git patches] net driver updates
On Tue, 10 Jul 2007, Jeff Garzik wrote: > Various minor updates. The only thing of note is sk98lin driver removal. > Please pull from 'upstream-linus' branch of > master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git > upstream-linus This is probably going to cause a new entry in regressions list, as at least Chris Stromsoe has reported bonding-related problems with skge that don't happen with sklin - http://www.uwsg.indiana.edu/hypermail/linux/kernel/0707.1/1158.html -- Jiri Kosina - To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [git patches] net driver updates
On Friday 18 May 2007, Andrew Morton wrote: >On Fri, 18 May 2007 23:46:21 +0200 > >Mariusz Koz__owski <[EMAIL PROTECTED]> wrote: >> Hello, >> >> > diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h >> > index 7053026..111f23d 100644 >> > --- a/drivers/net/smc91x.h >> > +++ b/drivers/net/smc91x.h >> > @@ -279,6 +279,40 @@ SMC_outw(u16 val, void __iomem *ioaddr, int reg) >> >> ... >> >> > +#define SMC_outb(v, a, r) __ __ >> > __outw(((inw((a)+((r)&~1))*(0xff<<8*(r%2 | ((v)<<(8*(r&2, (a) + >> > ((r)&~1)) >> >> This one has unbalanced parenthesis. > >I dunno how you can tell - I can't count that high. > Try removing the one in front of the comma, it makes the count -1. And I wrote, probably a good 20 years ago, a gizmo I called cntx that found that stuff for you. I occasionally use it to run over a section of the kernel tree, but it rarely finds anything to fuss about. And I really do need to make it handle shell expansions so you don't have write a quick script to have it scan everything in a directory. However I suspect that most of you already have such a tool in your bag of tricks. >Can this be programmed in C, rather than in cpp? >- >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/ -- Cheers, Gene "There are four boxes to be used in defense of liberty: soap, ballot, jury, and ammo. Please use in that order." -Ed Howdershelt (Author) I'm definitely not in Omaha! - To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [git patches] net driver updates
> > > diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h > > > index 7053026..111f23d 100644 > > > --- a/drivers/net/smc91x.h > > > +++ b/drivers/net/smc91x.h > > > @@ -279,6 +279,40 @@ SMC_outw(u16 val, void __iomem *ioaddr, int reg) > > > > ... > > > > > +#define SMC_outb(v, a, r) __ __ > > > __outw(((inw((a)+((r)&~1))*(0xff<<8*(r%2 | ((v)<<(8*(r&2, (a) + > > > ((r)&~1)) > > > > This one has unbalanced parenthesis. > > > > I dunno how you can tell - I can't count that high. Me neither. Simple script does that for me ;) Not sure where exactly the parenthesis is missing so I leave it up to someone (the author?) who knows better. Regards, Mariusz - To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [git patches] net driver updates
On Fri, 18 May 2007 23:46:21 +0200 Mariusz Koz__owski <[EMAIL PROTECTED]> wrote: > Hello, > > > diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h > > index 7053026..111f23d 100644 > > --- a/drivers/net/smc91x.h > > +++ b/drivers/net/smc91x.h > > @@ -279,6 +279,40 @@ SMC_outw(u16 val, void __iomem *ioaddr, int reg) > > ... > > > +#define SMC_outb(v, a, r) __ __ > > __outw(((inw((a)+((r)&~1))*(0xff<<8*(r%2 | ((v)<<(8*(r&2, (a) + > > ((r)&~1)) > > This one has unbalanced parenthesis. > I dunno how you can tell - I can't count that high. Can this be programmed in C, rather than in cpp? - To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [git patches] net driver updates
Hello, > diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h > index 7053026..111f23d 100644 > --- a/drivers/net/smc91x.h > +++ b/drivers/net/smc91x.h > @@ -279,6 +279,40 @@ SMC_outw(u16 val, void __iomem *ioaddr, int reg) ... > +#define SMC_outb(v, a, r) outw(((inw((a)+((r)&~1))*(0xff<<8*(r%2 | > ((v)<<(8*(r&2, (a) + ((r)&~1)) This one has unbalanced parenthesis. Regards, Mariusz - To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [git patches] net driver updates
On Sun, Apr 29, 2007 at 12:19:01PM -0400, Jeff Garzik wrote: > > (just sent this upstream to Linus and Andrew) > > The only really notable thing is the merging of the wireless driver for > the OLPC, libertas. I don't think it's quite ready yet, at least I've got no feedback about completion of the todo list of obvious items I sent out a while ago. Nor has an updated patchset been posted to lkml. - To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [git patches] net driver updates
On Wed, 2007-02-21 at 08:27 -0500, John W. Linville wrote: > On Wed, Feb 21, 2007 at 12:46:46PM +0100, Roger While wrote: > > > > > > > >Dan Williams (1): > > > prism54: correct assignment of DOT1XENABLE in WE-19 codepaths > > > > Where did this spring from ? > > I see no posting of this patch let alone > > an ACK. > > The patch is also doing rather more than the description - > > It is inserting extra breaks into a switch statement with > > no comment as to why. > > Dan posted it to [EMAIL PROTECTED] on 13 Feb 2007. > The description in the body is quoted below: It was also posted to [EMAIL PROTECTED] and accepted for 2.6.19 and 2.6.20. Dan > Correct assignment of DOT1XENABLE in WE-19 codepaths. > RX_UNENCRYPTED_EAPOL = 1 really means setting DOT1XENABLE _off_, and > vice versa. The original WE-19 patch erroneously reversed that. This > patch fixes association with unencrypted and WEP networks when using > wpa_supplicant. > > It also adds two missing break statements that, left out, could result > in incorrect card configuration. > > Please commit to both development and stable branches. > > Hth... > > John - To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [git patches] net driver updates
On Wed, Feb 21, 2007 at 12:46:46PM +0100, Roger While wrote: > > > > >Dan Williams (1): > > prism54: correct assignment of DOT1XENABLE in WE-19 codepaths > > Where did this spring from ? > I see no posting of this patch let alone > an ACK. > The patch is also doing rather more than the description - > It is inserting extra breaks into a switch statement with > no comment as to why. Dan posted it to [EMAIL PROTECTED] on 13 Feb 2007. The description in the body is quoted below: Correct assignment of DOT1XENABLE in WE-19 codepaths. RX_UNENCRYPTED_EAPOL = 1 really means setting DOT1XENABLE _off_, and vice versa. The original WE-19 patch erroneously reversed that. This patch fixes association with unencrypted and WEP networks when using wpa_supplicant. It also adds two missing break statements that, left out, could result in incorrect card configuration. Please commit to both development and stable branches. Hth... John -- John W. Linville [EMAIL PROTECTED] - To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [git patches] net driver updates
On Wed, 2007-02-21 at 12:46 +0100, Roger While wrote: > > > >Dan Williams (1): > > prism54: correct assignment of DOT1XENABLE in WE-19 codepaths > > Where did this spring from ? wireless > I see no posting of this patch let alone > an ACK. > The patch is also doing rather more than the description - > It is inserting extra breaks into a switch statement with > no comment as to why. The patch description clearly indicates those break statements, and they're also clearly necessary. http://kernel.org/git/?p=linux/kernel/git/linville/wireless-2.6.git;a=commit;h=b5c41651645f7604dda7abc3445e1622f9b1b9ab johannes signature.asc Description: This is a digitally signed message part
Re: [git patches] net driver updates
> I don't have any good ideas, please try to figure out what's wrong. Is > there a debug switch for the network layer that forces the network layer > to verify the CHECKSUM_UNNECESSARY blocks? > Good news. The latest -git driver seems to fix the problem. So maybe something got broken with the double request_irq. -Andi - To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [git patches] net driver updates
Andreas Kleen wrote: No idea, but unlikely. The fix removes a duplicate request_irq call. Is it possible that the both instances run concurrently? The system has two Forcedeth ports, but only one has a cable connected. I don't think there is any parallelism. Just one connection with a lot of data. It didn't happen with 2.6.16. You misunderstood me: Due to a broken patch, the driver did request_irq(irqnum, handler,...) twice. Thus the irq handler was registered twice. The rx synchronization assumes that the irq handler doesn't run concurrently. I'm not sure what happens if the irq handler is registered twice: is it possible that it runs twice at the same time, i.e. is the synchronization in the irq subsystem irq number or registration call based? If you don't have any other good ideas I will try to track it down. I don't have any good ideas, please try to figure out what's wrong. Is there a debug switch for the network layer that forces the network layer to verify the CHECKSUM_UNNECESSARY blocks? -- Manfred - To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [git patches] net driver updates
> No idea, but unlikely. The fix removes a duplicate request_irq call. > Is > it possible that the both instances run concurrently? The system has two Forcedeth ports, but only one has a cable connected. I don't think there is any parallelism. Just one connection with a lot of data. It didn't happen with 2.6.16. If you don't have any other good ideas I will try to track it down. -Andi - To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [git patches] net driver updates
Andi Kleen wrote: My NF4Pro machine now reliably does Disconnecting: Bad packet length 3742984839. when I display a lot of data through ssh. Apparently it generates some corruption that's not caught by the TCP checksum. The nic does hw checksumming - thus the tcp checksum won't catch driver bugs. Would that be fixed by this change too? No idea, but unlikely. The fix removes a duplicate request_irq call. Is it possible that the both instances run concurrently? -- Manfred - To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [git patches] net driver updates
On Saturday 20 May 2006 19:55, Andrew Morton wrote: > Linus Torvalds <[EMAIL PROTECTED]> wrote: > > > > > > > > On Sat, 20 May 2006, Andrew Morton wrote: > > > Jeff Garzik <[EMAIL PROTECTED]> wrote: > > > > > > > > Andrew Morton: > > > >revert "forcedeth: fix multi irq issues" > > > > > > Manfred just found the fix for this, so we should no longer need to > > > revert. > > > > Hmm. I already pulled. I guess we can revert the revert and apply > > Manfreds fix. Jeff? > > > > I can cook up the necessary pieces. My NF4Pro machine now reliably does Disconnecting: Bad packet length 3742984839. when I display a lot of data through ssh. Apparently it generates some corruption that's not caught by the TCP checksum. Would that be fixed by this change too? -Andi - To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [git patches] net driver updates
Linus Torvalds <[EMAIL PROTECTED]> wrote: > > > > On Sat, 20 May 2006, Andrew Morton wrote: > > Jeff Garzik <[EMAIL PROTECTED]> wrote: > > > > > > Andrew Morton: > > >revert "forcedeth: fix multi irq issues" > > > > Manfred just found the fix for this, so we should no longer need to revert. > > Hmm. I already pulled. I guess we can revert the revert and apply > Manfreds fix. Jeff? > I can cook up the necessary pieces. - To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [git patches] net driver updates
On Sat, 20 May 2006, Andrew Morton wrote: > Jeff Garzik <[EMAIL PROTECTED]> wrote: > > > > Andrew Morton: > >revert "forcedeth: fix multi irq issues" > > Manfred just found the fix for this, so we should no longer need to revert. Hmm. I already pulled. I guess we can revert the revert and apply Manfreds fix. Jeff? Linus - To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [git patches] net driver updates
Jeff Garzik <[EMAIL PROTECTED]> wrote: > > Andrew Morton: >revert "forcedeth: fix multi irq issues" Manfred just found the fix for this, so we should no longer need to revert. - To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
