* [stable-2.6.32 PATCH] ixgbe: backport bug fix for tx panic
@ 2010-05-11 0:46 Jeff Kirsher
2010-05-25 7:15 ` Jeff Kirsher
0 siblings, 1 reply; 7+ messages in thread
From: Jeff Kirsher @ 2010-05-11 0:46 UTC (permalink / raw)
To: stable, greg; +Cc: netdev, linux-kernel, davem, Brandon, Jesse Brandeburg
From: Jesse Brandeburg <jesse.brandeburg@intel.com>
backporting this commit:
commit fdd3d631cddad20ad9d3e1eb7dbf26825a8a121f
Author: Krishna Kumar <krkumar2@in.ibm.com>
Date: Wed Feb 3 13:13:10 2010 +0000
ixgbe: Fix return of invalid txq
a developer had complained of getting lots of warnings:
"eth16 selects TX queue 98, but real number of TX queues is 64"
http://www.mail-archive.com/e1000-devel@lists.sourceforge.net/msg02200.html
As there was no follow up on that bug, I am submitting this
patch assuming that the other return points will not return
invalid txq's, and also that this fixes the bug (not tested).
Signed-off-by: Krishna Kumar <krkumar2@in.ibm.com>
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Acked-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
CC: Brandon <brandon@ifup.org>
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
---
drivers/net/ixgbe/ixgbe_main.c | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 6339d65..a873c5d 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -5241,9 +5241,13 @@ static int ixgbe_maybe_stop_tx(struct net_device *netdev,
static u16 ixgbe_select_queue(struct net_device *dev, struct sk_buff *skb)
{
struct ixgbe_adapter *adapter = netdev_priv(dev);
+ int txq = smp_processor_id();
- if (adapter->flags & IXGBE_FLAG_FDIR_HASH_CAPABLE)
- return smp_processor_id();
+ if (adapter->flags & IXGBE_FLAG_FDIR_HASH_CAPABLE) {
+ while (unlikely(txq >= dev->real_num_tx_queues))
+ txq -= dev->real_num_tx_queues;
+ return txq;
+ }
if (adapter->flags & IXGBE_FLAG_DCB_ENABLED)
return (skb->vlan_tci & IXGBE_TX_FLAGS_VLAN_PRIO_MASK) >> 13;
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [stable-2.6.32 PATCH] ixgbe: backport bug fix for tx panic
2010-05-11 0:46 [stable-2.6.32 PATCH] ixgbe: backport bug fix for tx panic Jeff Kirsher
@ 2010-05-25 7:15 ` Jeff Kirsher
2010-05-25 16:27 ` Brandeburg, Jesse
2010-05-25 18:19 ` Greg KH
0 siblings, 2 replies; 7+ messages in thread
From: Jeff Kirsher @ 2010-05-25 7:15 UTC (permalink / raw)
To: stable, greg; +Cc: netdev, linux-kernel, davem, Brandon, Jesse Brandeburg
On Mon, May 10, 2010 at 17:46, Jeff Kirsher <jeffrey.t.kirsher@intel.com> wrote:
> From: Jesse Brandeburg <jesse.brandeburg@intel.com>
>
> backporting this commit:
>
> commit fdd3d631cddad20ad9d3e1eb7dbf26825a8a121f
> Author: Krishna Kumar <krkumar2@in.ibm.com>
> Date: Wed Feb 3 13:13:10 2010 +0000
>
> ixgbe: Fix return of invalid txq
>
> a developer had complained of getting lots of warnings:
>
> "eth16 selects TX queue 98, but real number of TX queues is 64"
>
> http://www.mail-archive.com/e1000-devel@lists.sourceforge.net/msg02200.html
>
> As there was no follow up on that bug, I am submitting this
> patch assuming that the other return points will not return
> invalid txq's, and also that this fixes the bug (not tested).
>
> Signed-off-by: Krishna Kumar <krkumar2@in.ibm.com>
> Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
> Acked-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Signed-off-by: David S. Miller <davem@davemloft.net>
>
> CC: Brandon <brandon@ifup.org>
> Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
> ---
>
> drivers/net/ixgbe/ixgbe_main.c | 8 ++++++--
> 1 files changed, 6 insertions(+), 2 deletions(-)
>
Greg - status? Did you queue this patch for the stable release and I missed it?
--
Cheers,
Jeff
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [stable-2.6.32 PATCH] ixgbe: backport bug fix for tx panic
2010-05-25 7:15 ` Jeff Kirsher
@ 2010-05-25 16:27 ` Brandeburg, Jesse
2010-05-25 20:18 ` [stable] " Greg KH
2010-05-25 18:19 ` Greg KH
1 sibling, 1 reply; 7+ messages in thread
From: Brandeburg, Jesse @ 2010-05-25 16:27 UTC (permalink / raw)
To: Jeff Kirsher; +Cc: stable, greg, netdev, linux-kernel, davem, Brandon
On Tue, 25 May 2010, Jeff Kirsher wrote:
> On Mon, May 10, 2010 at 17:46, Jeff Kirsher <jeffrey.t.kirsher@intel.com> wrote:
> > From: Jesse Brandeburg <jesse.brandeburg@intel.com>
> >
> > backporting this commit:
> >
> > commit fdd3d631cddad20ad9d3e1eb7dbf26825a8a121f
> > Author: Krishna Kumar <krkumar2@in.ibm.com>
> > Date: Wed Feb 3 13:13:10 2010 +0000
> >
> > ixgbe: Fix return of invalid txq
> >
> > a developer had complained of getting lots of warnings:
> >
> > "eth16 selects TX queue 98, but real number of TX queues is 64"
> >
> > http://www.mail-archive.com/e1000-devel@lists.sourceforge.net/msg02200.html
> >
> > As there was no follow up on that bug, I am submitting this
> > patch assuming that the other return points will not return
> > invalid txq's, and also that this fixes the bug (not tested).
> >
> > Signed-off-by: Krishna Kumar <krkumar2@in.ibm.com>
> > Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
> > Acked-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Signed-off-by: David S. Miller <davem@davemloft.net>
> >
> > CC: Brandon <brandon@ifup.org>
> > Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
> > ---
> >
> > drivers/net/ixgbe/ixgbe_main.c | 8 ++++++--
> > 1 files changed, 6 insertions(+), 2 deletions(-)
> >
>
> Greg - status? Did you queue this patch for the stable release and I missed it?
Maybe we didn't say (and we should have) that this fixes a panic on
machines with > 64 cores. Please apply to -stable 32.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [stable] [stable-2.6.32 PATCH] ixgbe: backport bug fix for tx panic
2010-05-25 7:15 ` Jeff Kirsher
2010-05-25 16:27 ` Brandeburg, Jesse
@ 2010-05-25 18:19 ` Greg KH
1 sibling, 0 replies; 7+ messages in thread
From: Greg KH @ 2010-05-25 18:19 UTC (permalink / raw)
To: Jeff Kirsher
Cc: stable, Jesse Brandeburg, netdev, linux-kernel, Brandon, davem
On Tue, May 25, 2010 at 12:15:12AM -0700, Jeff Kirsher wrote:
> On Mon, May 10, 2010 at 17:46, Jeff Kirsher <jeffrey.t.kirsher@intel.com> wrote:
> > From: Jesse Brandeburg <jesse.brandeburg@intel.com>
> >
> > backporting this commit:
> >
> > commit fdd3d631cddad20ad9d3e1eb7dbf26825a8a121f
> > Author: Krishna Kumar <krkumar2@in.ibm.com>
> > Date: Wed Feb 3 13:13:10 2010 +0000
> >
> > ixgbe: Fix return of invalid txq
> >
> > a developer had complained of getting lots of warnings:
> >
> > "eth16 selects TX queue 98, but real number of TX queues is 64"
> >
> > http://www.mail-archive.com/e1000-devel@lists.sourceforge.net/msg02200.html
> >
> > As there was no follow up on that bug, I am submitting this
> > patch assuming that the other return points will not return
> > invalid txq's, and also that this fixes the bug (not tested).
> >
> > Signed-off-by: Krishna Kumar <krkumar2@in.ibm.com>
> > Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
> > Acked-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Signed-off-by: David S. Miller <davem@davemloft.net>
> >
> > CC: Brandon <brandon@ifup.org>
> > Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
> > ---
> >
> > drivers/net/ixgbe/ixgbe_main.c | 8 ++++++--
> > 1 files changed, 6 insertions(+), 2 deletions(-)
> >
>
> Greg - status? Did you queue this patch for the stable release and I missed it?
Nope, I missed it, sorry.
I'll make sure to get it for the next .32 round.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [stable] [stable-2.6.32 PATCH] ixgbe: backport bug fix for tx panic
2010-05-25 16:27 ` Brandeburg, Jesse
@ 2010-05-25 20:18 ` Greg KH
2010-07-02 21:37 ` Jeff Kirsher
0 siblings, 1 reply; 7+ messages in thread
From: Greg KH @ 2010-05-25 20:18 UTC (permalink / raw)
To: Brandeburg, Jesse
Cc: Jeff Kirsher, linux-kernel, stable, Brandon, netdev, davem
On Tue, May 25, 2010 at 09:27:25AM -0700, Brandeburg, Jesse wrote:
>
>
> On Tue, 25 May 2010, Jeff Kirsher wrote:
>
> > On Mon, May 10, 2010 at 17:46, Jeff Kirsher <jeffrey.t.kirsher@intel.com> wrote:
> > > From: Jesse Brandeburg <jesse.brandeburg@intel.com>
> > >
> > > backporting this commit:
> > >
> > > commit fdd3d631cddad20ad9d3e1eb7dbf26825a8a121f
> > > Author: Krishna Kumar <krkumar2@in.ibm.com>
> > > Date: Wed Feb 3 13:13:10 2010 +0000
> > >
> > > ixgbe: Fix return of invalid txq
> > >
> > > a developer had complained of getting lots of warnings:
> > >
> > > "eth16 selects TX queue 98, but real number of TX queues is 64"
> > >
> > > http://www.mail-archive.com/e1000-devel@lists.sourceforge.net/msg02200.html
> > >
> > > As there was no follow up on that bug, I am submitting this
> > > patch assuming that the other return points will not return
> > > invalid txq's, and also that this fixes the bug (not tested).
> > >
> > > Signed-off-by: Krishna Kumar <krkumar2@in.ibm.com>
> > > Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
> > > Acked-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
> > > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > > Signed-off-by: David S. Miller <davem@davemloft.net>
> > >
> > > CC: Brandon <brandon@ifup.org>
> > > Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
> > > ---
> > >
> > > drivers/net/ixgbe/ixgbe_main.c | 8 ++++++--
> > > 1 files changed, 6 insertions(+), 2 deletions(-)
> > >
> >
> > Greg - status? Did you queue this patch for the stable release and I missed it?
>
> Maybe we didn't say (and we should have) that this fixes a panic on
> machines with > 64 cores. Please apply to -stable 32.
I'll get to it for the next release after this one, if that's ok.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [stable] [stable-2.6.32 PATCH] ixgbe: backport bug fix for tx panic
2010-05-25 20:18 ` [stable] " Greg KH
@ 2010-07-02 21:37 ` Jeff Kirsher
2010-07-03 2:28 ` Greg KH
0 siblings, 1 reply; 7+ messages in thread
From: Jeff Kirsher @ 2010-07-02 21:37 UTC (permalink / raw)
To: Greg KH; +Cc: Brandeburg, Jesse, linux-kernel, stable, Brandon, netdev, davem
On Tue, May 25, 2010 at 13:18, Greg KH <greg@kroah.com> wrote:
> On Tue, May 25, 2010 at 09:27:25AM -0700, Brandeburg, Jesse wrote:
>>
>>
>> On Tue, 25 May 2010, Jeff Kirsher wrote:
>>
>> > On Mon, May 10, 2010 at 17:46, Jeff Kirsher <jeffrey.t.kirsher@intel.com> wrote:
>> > > From: Jesse Brandeburg <jesse.brandeburg@intel.com>
>> > >
>> > > backporting this commit:
>> > >
>> > > commit fdd3d631cddad20ad9d3e1eb7dbf26825a8a121f
>> > > Author: Krishna Kumar <krkumar2@in.ibm.com>
>> > > Date: Wed Feb 3 13:13:10 2010 +0000
>> > >
>> > > ixgbe: Fix return of invalid txq
>> > >
>> > > a developer had complained of getting lots of warnings:
>> > >
>> > > "eth16 selects TX queue 98, but real number of TX queues is 64"
>> > >
>> > > http://www.mail-archive.com/e1000-devel@lists.sourceforge.net/msg02200.html
>> > >
>> > > As there was no follow up on that bug, I am submitting this
>> > > patch assuming that the other return points will not return
>> > > invalid txq's, and also that this fixes the bug (not tested).
>> > >
>> > > Signed-off-by: Krishna Kumar <krkumar2@in.ibm.com>
>> > > Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
>> > > Acked-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
>> > > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>> > > Signed-off-by: David S. Miller <davem@davemloft.net>
>> > >
>> > > CC: Brandon <brandon@ifup.org>
>> > > Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
>> > > ---
>> > >
>> > > drivers/net/ixgbe/ixgbe_main.c | 8 ++++++--
>> > > 1 files changed, 6 insertions(+), 2 deletions(-)
>> > >
>> >
>> > Greg - status? Did you queue this patch for the stable release and I missed it?
>>
>> Maybe we didn't say (and we should have) that this fixes a panic on
>> machines with > 64 cores. Please apply to -stable 32.
>
> I'll get to it for the next release after this one, if that's ok.
>
> thanks,
>
> greg k-h
> --
I did not see this patch in the list of patches for the next release
of the stable kernel. Just want to make sure this patch makes it this
time... :)
--
Cheers,
Jeff
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [stable] [stable-2.6.32 PATCH] ixgbe: backport bug fix for tx panic
2010-07-02 21:37 ` Jeff Kirsher
@ 2010-07-03 2:28 ` Greg KH
0 siblings, 0 replies; 7+ messages in thread
From: Greg KH @ 2010-07-03 2:28 UTC (permalink / raw)
To: Jeff Kirsher
Cc: Brandeburg, Jesse, linux-kernel, stable, Brandon, netdev, davem
On Fri, Jul 02, 2010 at 02:37:13PM -0700, Jeff Kirsher wrote:
> On Tue, May 25, 2010 at 13:18, Greg KH <greg@kroah.com> wrote:
> > On Tue, May 25, 2010 at 09:27:25AM -0700, Brandeburg, Jesse wrote:
> >>
> >>
> >> On Tue, 25 May 2010, Jeff Kirsher wrote:
> >>
> >> > On Mon, May 10, 2010 at 17:46, Jeff Kirsher <jeffrey.t.kirsher@intel.com> wrote:
> >> > > From: Jesse Brandeburg <jesse.brandeburg@intel.com>
> >> > >
> >> > > backporting this commit:
> >> > >
> >> > > commit fdd3d631cddad20ad9d3e1eb7dbf26825a8a121f
> >> > > Author: Krishna Kumar <krkumar2@in.ibm.com>
> >> > > Date: Wed Feb 3 13:13:10 2010 +0000
> >> > >
> >> > > ixgbe: Fix return of invalid txq
> >> > >
> >> > > a developer had complained of getting lots of warnings:
> >> > >
> >> > > "eth16 selects TX queue 98, but real number of TX queues is 64"
> >> > >
> >> > > http://www.mail-archive.com/e1000-devel@lists.sourceforge.net/msg02200.html
> >> > >
> >> > > As there was no follow up on that bug, I am submitting this
> >> > > patch assuming that the other return points will not return
> >> > > invalid txq's, and also that this fixes the bug (not tested).
> >> > >
> >> > > Signed-off-by: Krishna Kumar <krkumar2@in.ibm.com>
> >> > > Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
> >> > > Acked-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
> >> > > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >> > > Signed-off-by: David S. Miller <davem@davemloft.net>
> >> > >
> >> > > CC: Brandon <brandon@ifup.org>
> >> > > Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
> >> > > ---
> >> > >
> >> > > drivers/net/ixgbe/ixgbe_main.c | 8 ++++++--
> >> > > 1 files changed, 6 insertions(+), 2 deletions(-)
> >> > >
> >> >
> >> > Greg - status? Did you queue this patch for the stable release and I missed it?
> >>
> >> Maybe we didn't say (and we should have) that this fixes a panic on
> >> machines with > 64 cores. Please apply to -stable 32.
> >
> > I'll get to it for the next release after this one, if that's ok.
> >
> > thanks,
> >
> > greg k-h
> > --
>
> I did not see this patch in the list of patches for the next release
> of the stable kernel. Just want to make sure this patch makes it this
> time... :)
Ick, I missed it, let me go queue it up right now, sorry about that.
greg k-h
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2010-07-03 2:28 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-05-11 0:46 [stable-2.6.32 PATCH] ixgbe: backport bug fix for tx panic Jeff Kirsher
2010-05-25 7:15 ` Jeff Kirsher
2010-05-25 16:27 ` Brandeburg, Jesse
2010-05-25 20:18 ` [stable] " Greg KH
2010-07-02 21:37 ` Jeff Kirsher
2010-07-03 2:28 ` Greg KH
2010-05-25 18:19 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).