[dpdk-stable] patch 'net/ixgbe/base: fix infinite recursion on PCIe link down' has been queued to stable release 19.11.4

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.4

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 07/26/20. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Thanks.

Luca Boccassi

---
>From fc6dfa05e7df26dd246597fc8ab3a0f6c7d88f54 Mon Sep 17 00:00:00 2001
From: Guinan Sun <guinanx.sun at intel.com>
Date: Thu, 9 Jul 2020 08:00:31 +0000
Subject: [PATCH] net/ixgbe/base: fix infinite recursion on PCIe link down

[ upstream commit 2d04b9e856125197ec8e967471426d56ab7efcf0 ]

In some corner cases the functions ixgbe_clear_rar_generic and
ixgbe_clear_vmdq_generic may call one another leading to infinite
recursion.

When ixgbe_clear_vmdq_generic is called with IXGBE_CLEAR_VMDQ_ALL
flag, it's going to clear MPSAR registers, and proceed to call
ixgbe_clear_rar_generic, which in turn will clear the RAR registers,
and recursively call back ixgbe_clear_vmdq_generic. Normally, the
latter would detect that MPSAR registers have already been cleared
and terminate the recursion.

However, when PCIe link is down, and before the driver has had the
opportunity to shut itself down, all register reads return 0xFFFFFFFF,
and all register writes fail silently. In such case, because
ixgbe_clear_vmdq_generic blindly assumes that clearing MPSAR registers
succeeded, it's going to always call ixgbe_clear_rar_generic, which
in turn will always call back ixgbe_clear_vmdq_generic, creating
infinite recursion.

This patch re-reads MPSAR register values after they had been cleared.
In case of PCIe link failure, the values read will be non-zero, which
will terminate the recursion. On the other hand, under normal
circumstances the value read from MPSAR registers is going to be equal
to the value previously written, so this patch is expected not to cause
any regressions.

Fixes: af75078fece3 ("first public release")

Signed-off-by: Robert Konklewski <robertx.konklewski at intel.com>
Signed-off-by: Guinan Sun <guinanx.sun at intel.com>
Reviewed-by: Wei Zhao <wei.zhao1 at intel.com>
---
 drivers/net/ixgbe/base/ixgbe_common.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ixgbe/base/ixgbe_common.c b/drivers/net/ixgbe/base/ixgbe_common.c
index 5889410f9..9e7182eb3 100644
--- a/drivers/net/ixgbe/base/ixgbe_common.c
+++ b/drivers/net/ixgbe/base/ixgbe_common.c
@@ -3777,11 +3777,11 @@ s32 ixgbe_clear_vmdq_generic(struct ixgbe_hw *hw, u32 rar, u32 vmdq)
 	if (vmdq == IXGBE_CLEAR_VMDQ_ALL) {
 		if (mpsar_lo) {
 			IXGBE_WRITE_REG(hw, IXGBE_MPSAR_LO(rar), 0);
-			mpsar_lo = 0;
+			mpsar_lo = IXGBE_READ_REG(hw, IXGBE_MPSAR_LO(rar));
 		}
 		if (mpsar_hi) {
 			IXGBE_WRITE_REG(hw, IXGBE_MPSAR_HI(rar), 0);
-			mpsar_hi = 0;
+			mpsar_hi = IXGBE_READ_REG(hw, IXGBE_MPSAR_HI(rar));
 		}
 	} else if (vmdq < 32) {
 		mpsar_lo &= ~(1 << vmdq);
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-07-24 12:53:53.781962217 +0100
+++ 0136-net-ixgbe-base-fix-infinite-recursion-on-PCIe-link-d.patch	2020-07-24 12:53:48.439009292 +0100
@@ -1,8 +1,10 @@
-From 2d04b9e856125197ec8e967471426d56ab7efcf0 Mon Sep 17 00:00:00 2001
+From fc6dfa05e7df26dd246597fc8ab3a0f6c7d88f54 Mon Sep 17 00:00:00 2001
 From: Guinan Sun <guinanx.sun at intel.com>
 Date: Thu, 9 Jul 2020 08:00:31 +0000
 Subject: [PATCH] net/ixgbe/base: fix infinite recursion on PCIe link down
 
+[ upstream commit 2d04b9e856125197ec8e967471426d56ab7efcf0 ]
+
 In some corner cases the functions ixgbe_clear_rar_generic and
 ixgbe_clear_vmdq_generic may call one another leading to infinite
 recursion.
@@ -30,7 +32,6 @@
 any regressions.
 
 Fixes: af75078fece3 ("first public release")
-Cc: stable at dpdk.org
 
 Signed-off-by: Robert Konklewski <robertx.konklewski at intel.com>
 Signed-off-by: Guinan Sun <guinanx.sun at intel.com>
@@ -40,7 +41,7 @@
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/net/ixgbe/base/ixgbe_common.c b/drivers/net/ixgbe/base/ixgbe_common.c
-index fec6241f5..2d848a02b 100644
+index 5889410f9..9e7182eb3 100644
 --- a/drivers/net/ixgbe/base/ixgbe_common.c
 +++ b/drivers/net/ixgbe/base/ixgbe_common.c
 @@ -3777,11 +3777,11 @@ s32 ixgbe_clear_vmdq_generic(struct ixgbe_hw *hw, u32 rar, u32 vmdq)