From: Oleksandr Natalenko <oleksandr@redhat.com>
To: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Cc: netdev@vger.kernel.org, intel-wired-lan@lists.osuosl.org,
linux-kernel@vger.kernel.org,
Jeff Kirsher <jeffrey.t.kirsher@intel.com>,
Sasha Levin <sashal@kernel.org>, Joseph Yasi <joe.yasi@gmail.com>,
Aaron Brown <aaron.f.brown@intel.com>,
Alexander Duyck <alexander.duyck@gmail.com>,
e1000-devel@lists.sourceforge.net
Subject: Re: [PATCH 1/2] Revert "e1000e: fix cyclic resets at link up with active tx"
Date: Fri, 26 Apr 2019 16:11:26 +0200 [thread overview]
Message-ID: <20190426141126.shpgjeya5lciudiw@butterfly.localdomain> (raw)
In-Reply-To: <155548879651.3454.13167784936351314661.stgit@buzz>
On Wed, Apr 17, 2019 at 11:13:16AM +0300, Konstantin Khlebnikov wrote:
> This reverts commit 0f9e980bf5ee1a97e2e401c846b2af989eb21c61.
>
> That change cased false-positive warning about hardware hang:
>
> e1000e: eth0 NIC Link is Up 1000 Mbps Full Duplex, Flow Control: Rx/Tx
> IPv6: ADDRCONF(NETDEV_CHANGE): eth0: link becomes ready
> e1000e 0000:00:1f.6 eth0: Detected Hardware Unit Hang:
> TDH <0>
> TDT <1>
> next_to_use <1>
> next_to_clean <0>
> buffer_info[next_to_clean]:
> time_stamp <fffba7a7>
> next_to_watch <0>
> jiffies <fffbb140>
> next_to_watch.status <0>
> MAC Status <40080080>
> PHY Status <7949>
> PHY 1000BASE-T Status <0>
> PHY Extended Status <3000>
> PCI Status <10>
> e1000e: eth0 NIC Link is Up 1000 Mbps Full Duplex, Flow Control: Rx/Tx
>
> Besides warning everything works fine.
> Original issue will be fixed property in following patch.
>
> Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
> Reported-by: Joseph Yasi <joe.yasi@gmail.com>
> Link: https://bugzilla.kernel.org/show_bug.cgi?id=203175
> ---
> drivers/net/ethernet/intel/e1000e/netdev.c | 15 +++++++++------
> 1 file changed, 9 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
> index 7acc61e4f645..ba96e52aa8d1 100644
> --- a/drivers/net/ethernet/intel/e1000e/netdev.c
> +++ b/drivers/net/ethernet/intel/e1000e/netdev.c
> @@ -5309,13 +5309,8 @@ static void e1000_watchdog_task(struct work_struct *work)
> /* 8000ES2LAN requires a Rx packet buffer work-around
> * on link down event; reset the controller to flush
> * the Rx packet buffer.
> - *
> - * If the link is lost the controller stops DMA, but
> - * if there is queued Tx work it cannot be done. So
> - * reset the controller to flush the Tx packet buffers.
> */
> - if ((adapter->flags & FLAG_RX_NEEDS_RESTART) ||
> - e1000_desc_unused(tx_ring) + 1 < tx_ring->count)
> + if (adapter->flags & FLAG_RX_NEEDS_RESTART)
> adapter->flags |= FLAG_RESTART_NOW;
> else
> pm_schedule_suspend(netdev->dev.parent,
> @@ -5338,6 +5333,14 @@ static void e1000_watchdog_task(struct work_struct *work)
> adapter->gotc_old = adapter->stats.gotc;
> spin_unlock(&adapter->stats64_lock);
>
> + /* If the link is lost the controller stops DMA, but
> + * if there is queued Tx work it cannot be done. So
> + * reset the controller to flush the Tx packet buffers.
> + */
> + if (!netif_carrier_ok(netdev) &&
> + (e1000_desc_unused(tx_ring) + 1 < tx_ring->count))
> + adapter->flags |= FLAG_RESTART_NOW;
> +
> /* If reset is necessary, do it outside of interrupt context. */
> if (adapter->flags & FLAG_RESTART_NOW) {
> schedule_work(&adapter->reset_task);
>
Tested-by: Oleksandr Natalenko <oleksandr@redhat.com>
--
Best regards,
Oleksandr Natalenko (post-factum)
Senior Software Maintenance Engineer
prev parent reply other threads:[~2019-04-26 14:11 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-17 8:13 [PATCH 1/2] Revert "e1000e: fix cyclic resets at link up with active tx" Konstantin Khlebnikov
2019-04-17 8:13 ` [PATCH 2/2] e1000e: start network tx queue only when link is up Konstantin Khlebnikov
2019-04-23 0:50 ` Joseph Yasi
2019-04-26 0:05 ` Brown, Aaron F
2019-04-26 14:12 ` Oleksandr Natalenko
2019-04-23 0:51 ` [PATCH 1/2] Revert "e1000e: fix cyclic resets at link up with active tx" Joseph Yasi
2019-04-26 0:00 ` Brown, Aaron F
2019-04-26 14:11 ` Oleksandr Natalenko [this message]
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=20190426141126.shpgjeya5lciudiw@butterfly.localdomain \
--to=oleksandr@redhat.com \
--cc=aaron.f.brown@intel.com \
--cc=alexander.duyck@gmail.com \
--cc=e1000-devel@lists.sourceforge.net \
--cc=intel-wired-lan@lists.osuosl.org \
--cc=jeffrey.t.kirsher@intel.com \
--cc=joe.yasi@gmail.com \
--cc=khlebnikov@yandex-team.ru \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sashal@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 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).