patches for DPDK stable branches
 help / color / mirror / Atom feed
From: Kevin Traynor <ktraynor@redhat.com>
To: Guinan Sun <guinanx.sun@intel.com>
Cc: Robert Konklewski <robertx.konklewski@intel.com>,
	Wei Zhao <wei.zhao1@intel.com>, dpdk stable <stable@dpdk.org>
Subject: [dpdk-stable] patch 'net/ixgbe/base: fix infinite recursion on PCIe link down' has been queued to LTS release 18.11.10
Date: Thu, 20 Aug 2020 16:33:34 +0100
Message-ID: <20200820153341.171927-29-ktraynor@redhat.com> (raw)
In-Reply-To: <20200820153341.171927-1-ktraynor@redhat.com>

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/25/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.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/223b828be2e333cd6ada65d79855b060c5b4a927

Thanks.

Kevin.

---
From 223b828be2e333cd6ada65d79855b060c5b4a927 Mon Sep 17 00:00:00 2001
From: Guinan Sun <guinanx.sun@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@intel.com>
Signed-off-by: Guinan Sun <guinanx.sun@intel.com>
Reviewed-by: Wei Zhao <wei.zhao1@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 5889410f98..9e7182eb33 100644
--- a/drivers/net/ixgbe/base/ixgbe_common.c
+++ b/drivers/net/ixgbe/base/ixgbe_common.c
@@ -3778,9 +3778,9 @@ s32 ixgbe_clear_vmdq_generic(struct ixgbe_hw *hw, u32 rar, u32 vmdq)
 		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) {
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-20 16:26:16.862152879 +0100
+++ 0029-net-ixgbe-base-fix-infinite-recursion-on-PCIe-link-d.patch	2020-08-20 16:26:15.822324306 +0100
@@ -1 +1 @@
-From 2d04b9e856125197ec8e967471426d56ab7efcf0 Mon Sep 17 00:00:00 2001
+From 223b828be2e333cd6ada65d79855b060c5b4a927 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 2d04b9e856125197ec8e967471426d56ab7efcf0 ]
+
@@ -33 +34,0 @@
-Cc: stable@dpdk.org
@@ -43 +44 @@
-index fec6241f5b..2d848a02b3 100644
+index 5889410f98..9e7182eb33 100644


  parent reply	other threads:[~2020-08-20 15:34 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-20 15:33 [dpdk-stable] patch 'test: fix rpath for drivers with meson' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'rawdev: allow getting info for unknown device' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'rawdev: fill NUMA socket ID in info' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'rawdev: export dump function in map file' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'cfgfile: fix stack buffer underflow' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'drivers/crypto: add missing OOP feature flag' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'test/crypto: fix asymmetric session mempool creation' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'common/cpt: fix encryption offset' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'crypto/dpaax_sec: fix inline query for descriptors' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'service: fix core mapping reset' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'net/ixgbe: report 10Mbps link speed for x553' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'net/iavf: fix uninitialized variable' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'net/ixgbe/base: remove dead code' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'net/i40e: fix getting EEPROM information' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'app/testpmd: use clock time in throughput calculation' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'app/testpmd: fix burst percentage " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'ethdev: fix log type for some error messages' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'service: fix C++ linkage' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'net: fix unneeded replacement of TCP checksum 0' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'net: fix checksum on big endian CPUs' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'eal: fix parentheses in alignment macros' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'vhost: fix virtio ready flag check' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'bus/fslmc: fix getting FD error' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'net/dpaa: fix FD offset data type' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'net/bonding: fix socket ID check' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'net/netvsc: fix underflow when Rx external mbuf' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'net/ixgbe/base: fix host interface shadow RAM read' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'net/ixgbe/base: fix x550em 10G NIC link status' " Kevin Traynor
2020-08-20 15:33 ` Kevin Traynor [this message]
2020-08-20 15:33 ` [dpdk-stable] patch 'ethdev: fix data room size verification in Rx queue setup' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'net/nfp: fix RSS hash configuration reporting' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'drivers/net: fix exposing internal headers' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'net/bonding: fix LACP negotiation' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'net/bnxt: remove unused enum declaration' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'examples/fips_validation: fix parsing of TDES vectors' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'examples/fips_validation: fix count overwrite for TDES' " Kevin Traynor

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=20200820153341.171927-29-ktraynor@redhat.com \
    --to=ktraynor@redhat.com \
    --cc=guinanx.sun@intel.com \
    --cc=robertx.konklewski@intel.com \
    --cc=stable@dpdk.org \
    --cc=wei.zhao1@intel.com \
    /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

patches for DPDK stable branches

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://inbox.dpdk.org/stable/0 stable/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 stable stable/ https://inbox.dpdk.org/stable \
		stable@dpdk.org
	public-inbox-index stable

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.stable


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git