Patchwork e1000: prevent oops when adapter is being closed and reset simultaneously

login
register
mail settings
Submitter yanjun.zhu
Date Nov. 25, 2013, 2:49 a.m.
Message ID <1385347767-5950-1-git-send-email-yanjun.zhu@windriver.com>
Download mbox | patch
Permalink /patch/62269/
State New
Headers show

Comments

yanjun.zhu - Nov. 25, 2013, 2:49 a.m.
This change is based on a similar change made to e1000e support in
commit bb9e44d0d0f4 ("e1000e: prevent oops when adapter is being closed
and reset simultaneously").  The same issue has also been observed
on the older e1000 cards.

Here, we have increased the RESET_COUNT value to 50 because there are too
many accesses to e1000 nic on stress tests to e1000 nic, it is not enough
to set RESET_COUT 25. Experimentation has shown that it is enough to set
RESET_COUNT 50.
---
 drivers/net/ethernet/intel/e1000/e1000.h      |    5 +++++
 drivers/net/ethernet/intel/e1000/e1000_main.c |    7 +++++++
 2 files changed, 12 insertions(+)
Bruce Ashfield - Nov. 25, 2013, 3:47 a.m.
On Sun, Nov 24, 2013 at 9:49 PM, yzhu1 <yanjun.zhu@windriver.com> wrote:
> This change is based on a similar change made to e1000e support in
> commit bb9e44d0d0f4 ("e1000e: prevent oops when adapter is being closed
> and reset simultaneously").  The same issue has also been observed
> on the older e1000 cards.

I assume you are sending this for inclusion in the linux-yocto trees ?
If so, use
the linux-yocto@yoctoproject.org list (subscriber only) for the patch.

Also, make sure to note the impacted kernel versions.

Bruce

>
> Here, we have increased the RESET_COUNT value to 50 because there are too
> many accesses to e1000 nic on stress tests to e1000 nic, it is not enough
> to set RESET_COUT 25. Experimentation has shown that it is enough to set
> RESET_COUNT 50.
> ---
>  drivers/net/ethernet/intel/e1000/e1000.h      |    5 +++++
>  drivers/net/ethernet/intel/e1000/e1000_main.c |    7 +++++++
>  2 files changed, 12 insertions(+)
>
> diff --git a/drivers/net/ethernet/intel/e1000/e1000.h b/drivers/net/ethernet/intel/e1000/e1000.h
> index 26d9cd5..5c2a1b1 100644
> --- a/drivers/net/ethernet/intel/e1000/e1000.h
> +++ b/drivers/net/ethernet/intel/e1000/e1000.h
> @@ -83,6 +83,11 @@ struct e1000_adapter;
>
>  #define E1000_MAX_INTR                 10
>
> +/*
> + * Count for polling __E1000_RESET condition every 10-20msec.
> + */
> +#define E1000_CHECK_RESET_COUNT         50
> +
>  /* TX/RX descriptor defines */
>  #define E1000_DEFAULT_TXD              256
>  #define E1000_MAX_TXD                  256
> diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c
> index 59ad007..69c55ed 100644
> --- a/drivers/net/ethernet/intel/e1000/e1000_main.c
> +++ b/drivers/net/ethernet/intel/e1000/e1000_main.c
> @@ -1445,7 +1445,10 @@ static int e1000_close(struct net_device *netdev)
>  {
>         struct e1000_adapter *adapter = netdev_priv(netdev);
>         struct e1000_hw *hw = &adapter->hw;
> +       int count = E1000_CHECK_RESET_COUNT;
>
> +       while (test_bit(__E1000_RESETTING, &adapter->flags) && count--)
> +               usleep_range(10000, 20000);
>         WARN_ON(test_bit(__E1000_RESETTING, &adapter->flags));
>         e1000_down(adapter);
>         e1000_power_down_phy(adapter);
> @@ -4969,6 +4972,10 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool *enable_wake)
>         netif_device_detach(netdev);
>
>         if (netif_running(netdev)) {
> +               int count = E1000_CHECK_RESET_COUNT;
> +               while (test_bit(__E1000_RESETTING, &adapter->flags) && count--)
> +                       usleep_range(10000, 20000);
> +
>                 WARN_ON(test_bit(__E1000_RESETTING, &adapter->flags));
>                 e1000_down(adapter);
>         }
> --
> 1.7.9.5
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

Patch

diff --git a/drivers/net/ethernet/intel/e1000/e1000.h b/drivers/net/ethernet/intel/e1000/e1000.h
index 26d9cd5..5c2a1b1 100644
--- a/drivers/net/ethernet/intel/e1000/e1000.h
+++ b/drivers/net/ethernet/intel/e1000/e1000.h
@@ -83,6 +83,11 @@  struct e1000_adapter;
 
 #define E1000_MAX_INTR			10
 
+/*
+ * Count for polling __E1000_RESET condition every 10-20msec.
+ */
+#define E1000_CHECK_RESET_COUNT         50
+
 /* TX/RX descriptor defines */
 #define E1000_DEFAULT_TXD		256
 #define E1000_MAX_TXD			256
diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c
index 59ad007..69c55ed 100644
--- a/drivers/net/ethernet/intel/e1000/e1000_main.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_main.c
@@ -1445,7 +1445,10 @@  static int e1000_close(struct net_device *netdev)
 {
 	struct e1000_adapter *adapter = netdev_priv(netdev);
 	struct e1000_hw *hw = &adapter->hw;
+	int count = E1000_CHECK_RESET_COUNT;
 
+	while (test_bit(__E1000_RESETTING, &adapter->flags) && count--)
+		usleep_range(10000, 20000);
 	WARN_ON(test_bit(__E1000_RESETTING, &adapter->flags));
 	e1000_down(adapter);
 	e1000_power_down_phy(adapter);
@@ -4969,6 +4972,10 @@  static int __e1000_shutdown(struct pci_dev *pdev, bool *enable_wake)
 	netif_device_detach(netdev);
 
 	if (netif_running(netdev)) {
+		int count = E1000_CHECK_RESET_COUNT;
+		while (test_bit(__E1000_RESETTING, &adapter->flags) && count--)
+			usleep_range(10000, 20000);
+
 		WARN_ON(test_bit(__E1000_RESETTING, &adapter->flags));
 		e1000_down(adapter);
 	}