* [PATCH] ixgb: fix TX hangs under heavy load
@ 2007-10-30 18:21 Auke Kok
2007-10-30 18:33 ` Jeff Garzik
2007-10-30 19:28 ` Andy Gospodarek
0 siblings, 2 replies; 3+ messages in thread
From: Auke Kok @ 2007-10-30 18:21 UTC (permalink / raw)
To: jeff; +Cc: netdev, jesse.brandeburg, andy
A merge error occurred where we merged the wrong block here
in version 1.0.120. The right condition for frags is slightly
different then for the skb, so account for the difference properly
and trim the TSO based size right.
Originally part of a fix reported by IBM to fix TSO hangs on
pSeries hardware.
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Cc: Andy Gospodarek <andy@greyhouse.net>
---
drivers/net/ixgb/ixgb_main.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c
index e564335..3021234 100644
--- a/drivers/net/ixgb/ixgb_main.c
+++ b/drivers/net/ixgb/ixgb_main.c
@@ -1321,8 +1321,8 @@ ixgb_tx_map(struct ixgb_adapter *adapter, struct sk_buff *skb,
/* Workaround for premature desc write-backs
* in TSO mode. Append 4-byte sentinel desc */
- if (unlikely(mss && !nr_frags && size == len
- && size > 8))
+ if (unlikely(mss && (f == (nr_frags - 1))
+ && size == len && size > 8))
size -= 4;
buffer_info->length = size;
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] ixgb: fix TX hangs under heavy load
2007-10-30 18:21 [PATCH] ixgb: fix TX hangs under heavy load Auke Kok
@ 2007-10-30 18:33 ` Jeff Garzik
2007-10-30 19:28 ` Andy Gospodarek
1 sibling, 0 replies; 3+ messages in thread
From: Jeff Garzik @ 2007-10-30 18:33 UTC (permalink / raw)
To: Auke Kok; +Cc: netdev, jesse.brandeburg, andy
Auke Kok wrote:
> A merge error occurred where we merged the wrong block here
> in version 1.0.120. The right condition for frags is slightly
> different then for the skb, so account for the difference properly
> and trim the TSO based size right.
>
> Originally part of a fix reported by IBM to fix TSO hangs on
> pSeries hardware.
>
> Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
> Cc: Andy Gospodarek <andy@greyhouse.net>
> ---
>
> drivers/net/ixgb/ixgb_main.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c
applied
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] ixgb: fix TX hangs under heavy load
2007-10-30 18:21 [PATCH] ixgb: fix TX hangs under heavy load Auke Kok
2007-10-30 18:33 ` Jeff Garzik
@ 2007-10-30 19:28 ` Andy Gospodarek
1 sibling, 0 replies; 3+ messages in thread
From: Andy Gospodarek @ 2007-10-30 19:28 UTC (permalink / raw)
To: Auke Kok; +Cc: netdev, jesse.brandeburg
On Tue, Oct 30, 2007 at 11:21:50AM -0700, Auke Kok wrote:
> A merge error occurred where we merged the wrong block here
> in version 1.0.120. The right condition for frags is slightly
> different then for the skb, so account for the difference properly
> and trim the TSO based size right.
>
> Originally part of a fix reported by IBM to fix TSO hangs on
> pSeries hardware.
>
> Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
> Cc: Andy Gospodarek <andy@greyhouse.net>
> ---
>
Thanks, Auke and Jesse!
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2007-10-30 19:28 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-10-30 18:21 [PATCH] ixgb: fix TX hangs under heavy load Auke Kok
2007-10-30 18:33 ` Jeff Garzik
2007-10-30 19:28 ` Andy Gospodarek
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).