From: Thomas Jarosch <thomas.jarosch@intra2net.com>
To: Eric Dumazet <eric.dumazet@gmail.com>
Cc: e1000-devel <e1000-devel@lists.sourceforge.net>,
'Linux Netdev List' <netdev@vger.kernel.org>,
Eric Dumazet <edumazet@google.com>
Subject: Re: [bisected regression] e1000e: "Detected Hardware Unit Hang"
Date: Thu, 15 Jan 2015 18:37:10 +0100 [thread overview]
Message-ID: <1951915.1kCMSXLj6g@storm> (raw)
In-Reply-To: <1421342437.11734.79.camel@edumazet-glaptop2.roam.corp.google.com>
On Thursday, 15. January 2015 09:20:37 Eric Dumazet wrote:
> > for the sake of completeness:
> > 1: hang
>
> This is weird : This should have same effect then GRO off (at most one
> segment per packet)
I thought so, too. OTOH the code path was changed from
"goto merge" to "return -E2BIG". I didn't look at the code
what happens at the "merge" label.
> Could you try the following ?
>
> diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c
> b/drivers/net/ethernet/intel/e1000e/netdev.c index
> 38cb586b1bf42fa7a50e19f3e650e8c139788820..6d93facddab78f8db7000fddaa24322
> 651a0eae9 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c
> +++ b/drivers/net/ethernet/intel/e1000e/netdev.c
> @@ -1264,7 +1264,7 @@ static bool e1000_clean_tx_irq(struct e1000_ring
> *tx_ring)
>
> netdev_completed_queue(netdev, pkts_compl, bytes_compl);
>
> -#define TX_WAKE_THRESHOLD 32
> +#define TX_WAKE_THRESHOLD (MAX_SKB_FRAGS * 3 + 2)
> if (count && netif_carrier_ok(netdev) &&
> e1000_desc_unused(tx_ring) >= TX_WAKE_THRESHOLD) {
> /* Make sure that anybody stopping the queue after this
> @@ -5650,10 +5650,7 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff
> *skb, netdev_sent_queue(netdev, skb->len);
> e1000_tx_queue(tx_ring, tx_flags, count);
> /* Make sure there is space in the ring for the next send. */
> - e1000_maybe_stop_tx(tx_ring,
> - (MAX_SKB_FRAGS *
> - DIV_ROUND_UP(PAGE_SIZE,
> - adapter->tx_fifo_limit) + 2));
> + e1000_maybe_stop_tx(tx_ring, 3 * MAX_SKB_FRAGS + 2);
> } else {
> dev_kfree_skb_any(skb);
> tx_ring->buffer_info[first].time_stamp = 0;
I was just about to leave the office... and switched the test box back on.
Also reverted to vanilla 3.19-rc4+ and applied the above patch instead.
Still hangs. Grrr. More testing tomorrow.
------------------------------------------------------------------------------
New Year. New Location. New Benefits. New Data Center in Ashburn, VA.
GigeNET is offering a free month of service with a new server in Ashburn.
Choose from 2 high performing configs, both with 100TB of bandwidth.
Higher redundancy.Lower latency.Increased capacity.Completely compliant.
http://p.sf.net/sfu/gigenet
_______________________________________________
E1000-devel mailing list
E1000-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/e1000-devel
To learn more about Intel® Ethernet, visit http://communities.intel.com/community/wired
next prev parent reply other threads:[~2015-01-15 17:37 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-14 15:32 [bisected regression] e1000e: "Detected Hardware Unit Hang" Thomas Jarosch
2015-01-14 17:20 ` Eric Dumazet
2015-01-15 10:11 ` Thomas Jarosch
2015-01-15 14:43 ` Eric Dumazet
2015-01-15 14:58 ` Thomas Jarosch
2015-01-15 15:25 ` Eric Dumazet
2015-01-15 15:48 ` Thomas Jarosch
2015-01-15 16:00 ` Eric Dumazet
2015-01-15 17:04 ` Thomas Jarosch
2015-01-15 17:20 ` Eric Dumazet
2015-01-15 17:37 ` Thomas Jarosch [this message]
2015-01-15 18:24 ` Eric Dumazet
2015-01-19 16:49 ` Thomas Jarosch
2015-01-15 14:59 ` Jeff Kirsher
2015-02-11 11:23 ` Thomas Jarosch
2015-02-11 11:34 ` Jeff Kirsher
2015-02-12 23:28 ` Brown, Aaron F
2015-02-13 16:14 ` Thomas Jarosch
2015-02-21 1:59 ` Brown, Aaron F
2015-03-23 13:58 ` Thomas Jarosch
2015-03-23 22:37 ` Brown, Aaron F
2015-05-27 16:00 ` Thomas Jarosch
2015-05-30 1:18 ` Brown, Aaron F
2015-07-29 8:51 ` Thomas Jarosch
2019-05-02 12:58 ` Juliana Rodrigueiro
2015-02-12 1:18 ` nick
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1951915.1kCMSXLj6g@storm \
--to=thomas.jarosch@intra2net.com \
--cc=e1000-devel@lists.sourceforge.net \
--cc=edumazet@google.com \
--cc=eric.dumazet@gmail.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.