patches for DPDK stable branches
 help / color / mirror / Atom feed
From: christian.ehrhardt@canonical.com
To: Chengwen Feng <fengchengwen@huawei.com>
Cc: Dongdong Liu <liudongdong3@huawei.com>, dpdk stable <stable@dpdk.org>
Subject: patch 'net/hns3: fix crash when secondary process access FW' has been queued to stable release 19.11.14
Date: Fri, 11 Nov 2022 12:38:50 +0100	[thread overview]
Message-ID: <20221111113904.1549618-33-christian.ehrhardt@canonical.com> (raw)
In-Reply-To: <20221111113904.1549618-1-christian.ehrhardt@canonical.com>

Hi,

FYI, your patch has been queued to stable release 19.11.14

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

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/10690bdfc448c47b6d739880f98dbda67f6134bc

Thanks.

Christian Ehrhardt <christian.ehrhardt@canonical.com>

---
From 10690bdfc448c47b6d739880f98dbda67f6134bc Mon Sep 17 00:00:00 2001
From: Chengwen Feng <fengchengwen@huawei.com>
Date: Mon, 5 Sep 2022 16:59:36 +0800
Subject: [PATCH] net/hns3: fix crash when secondary process access FW

[ upstream commit a8f1f7cf1b429c3b95fa94f794f697a30f4c482d ]

Currently, to prevent missing reporting of reset interrupts and quickly
identify reset interrupts, the following logic is designed in the
FW (firmware) command interface hns3_cmd_send: if an unprocessed
interrupt exist (by checking reset registers), related reset task is
scheduled.

The secondary process may invoke the hns3_cmd_send interface (e.g. using
proc-info query some stats). Unfortunately, the secondary process
does not support reset processing, and a segment fault may occur if it
schedules reset task.

Fix it by limit the checking and scheduling of reset under only primary
process.

Fixes: 2790c6464725 ("net/hns3: support device reset")

Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
Signed-off-by: Dongdong Liu <liudongdong3@huawei.com>
---
 drivers/net/hns3/hns3_ethdev.c    | 10 +++++++++-
 drivers/net/hns3/hns3_ethdev_vf.c | 11 +++++++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index 1a8d729bc4..4cf3eb1b47 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -4999,7 +4999,15 @@ hns3_is_reset_pending(struct hns3_adapter *hns)
 	struct hns3_hw *hw = &hns->hw;
 	enum hns3_reset_level reset;
 
-	hns3_check_event_cause(hns, NULL);
+	/*
+	 * Check the registers to confirm whether there is reset pending.
+	 * Note: This check may lead to schedule reset task, but only primary
+	 *       process can process the reset event. Therefore, limit the
+	 *       checking under only primary process.
+	 */
+	if (rte_eal_process_type() == RTE_PROC_PRIMARY)
+		hns3_check_event_cause(hns, NULL);
+
 	reset = hns3_get_reset_level(hns, &hw->reset.pending);
 	if (hw->reset.level != HNS3_NONE_RESET && hw->reset.level < reset) {
 		hns3_warn(hw, "High level reset %d is pending", reset);
diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c
index 29a483b2f4..6e1d868a91 100644
--- a/drivers/net/hns3/hns3_ethdev_vf.c
+++ b/drivers/net/hns3/hns3_ethdev_vf.c
@@ -1918,8 +1918,15 @@ hns3vf_is_reset_pending(struct hns3_adapter *hns)
 	if (hw->reset.level == HNS3_VF_FULL_RESET)
 		return false;
 
-	/* Check the registers to confirm whether there is reset pending */
-	hns3vf_check_event_cause(hns, NULL);
+	/*
+	 * Check the registers to confirm whether there is reset pending.
+	 * Note: This check may lead to schedule reset task, but only primary
+	 *       process can process the reset event. Therefore, limit the
+	 *       checking under only primary process.
+	 */
+	if (rte_eal_process_type() == RTE_PROC_PRIMARY)
+		hns3vf_check_event_cause(hns, NULL);
+
 	reset = hns3vf_get_reset_level(hw, &hw->reset.pending);
 	if (hw->reset.level != HNS3_NONE_RESET && hw->reset.level < reset) {
 		hns3_warn(hw, "High level reset %d is pending", reset);
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-11 12:35:05.950534697 +0100
+++ 0033-net-hns3-fix-crash-when-secondary-process-access-FW.patch	2022-11-11 12:35:04.789192151 +0100
@@ -1 +1 @@
-From a8f1f7cf1b429c3b95fa94f794f697a30f4c482d Mon Sep 17 00:00:00 2001
+From 10690bdfc448c47b6d739880f98dbda67f6134bc Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a8f1f7cf1b429c3b95fa94f794f697a30f4c482d ]
+
@@ -21 +22,0 @@
-Cc: stable@dpdk.org
@@ -31 +32 @@
-index 95d3c93c42..3d9f7c6ec7 100644
+index 1a8d729bc4..4cf3eb1b47 100644
@@ -34 +35 @@
-@@ -5602,7 +5602,15 @@ hns3_is_reset_pending(struct hns3_adapter *hns)
+@@ -4999,7 +4999,15 @@ hns3_is_reset_pending(struct hns3_adapter *hns)
@@ -49,2 +50,2 @@
- 	if (reset != HNS3_NONE_RESET && hw->reset.level != HNS3_NONE_RESET &&
- 	    hw->reset.level < reset) {
+ 	if (hw->reset.level != HNS3_NONE_RESET && hw->reset.level < reset) {
+ 		hns3_warn(hw, "High level reset %d is pending", reset);
@@ -52 +53 @@
-index 86f2ba24cc..a72535eb7d 100644
+index 29a483b2f4..6e1d868a91 100644
@@ -55 +56 @@
-@@ -1864,8 +1864,15 @@ hns3vf_is_reset_pending(struct hns3_adapter *hns)
+@@ -1918,8 +1918,15 @@ hns3vf_is_reset_pending(struct hns3_adapter *hns)
@@ -71,2 +72,2 @@
- 	if (hw->reset.level != HNS3_NONE_RESET && reset != HNS3_NONE_RESET &&
- 	    hw->reset.level < reset) {
+ 	if (hw->reset.level != HNS3_NONE_RESET && hw->reset.level < reset) {
+ 		hns3_warn(hw, "High level reset %d is pending", reset);

  parent reply	other threads:[~2022-11-11 11:40 UTC|newest]

Thread overview: 47+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-11-11 11:38 patch 'vhost: fix virtqueue use after free on NUMA reallocation' " christian.ehrhardt
2022-11-11 11:38 ` patch 'net: accept unaligned data in checksum routines' " christian.ehrhardt
2022-11-11 11:38 ` patch 'app/testpmd: restore ixgbe bypass commands' " christian.ehrhardt
2022-11-11 11:38 ` patch 'net/bonding: fix array overflow in Rx burst' " christian.ehrhardt
2022-11-11 11:38 ` patch 'net/bonding: fix double slave link status query' " christian.ehrhardt
2022-11-11 11:38 ` patch 'net/nfp: improve HW info header log readability' " christian.ehrhardt
2022-11-11 11:38 ` patch 'net/mvneta: fix build with GCC 12' " christian.ehrhardt
2022-11-11 11:38 ` patch 'malloc: fix storage size for some allocations' " christian.ehrhardt
2022-11-11 11:38 ` patch 'event/sw: fix device name in dump' " christian.ehrhardt
2022-11-11 11:38 ` patch 'eventdev/eth_tx: add spinlock for adapter start/stop' " christian.ehrhardt
2022-11-11 11:38 ` patch 'eventdev/eth_tx: fix adapter stop' " christian.ehrhardt
2022-11-11 11:38 ` patch 'test/ipsec: skip if no compatible device' " christian.ehrhardt
2022-11-11 11:38 ` patch 'test/crypto: fix debug messages' " christian.ehrhardt
2022-11-11 11:38 ` patch 'test/ipsec: fix build with GCC 12' " christian.ehrhardt
2022-11-11 11:38 ` patch 'ipsec: " christian.ehrhardt
2022-11-11 11:38 ` patch 'crypto/qat: " christian.ehrhardt
2022-11-11 11:38 ` patch 'eventdev: fix name of Rx conf type in documentation' " christian.ehrhardt
2022-11-11 11:38 ` patch 'net/i40e: fix VF representor release' " christian.ehrhardt
2022-11-11 11:38 ` patch 'common/iavf: avoid copy in async mode' " christian.ehrhardt
2022-11-11 11:38 ` patch 'net/ice/base: fix media type of PHY 10G SFI C2C' " christian.ehrhardt
2022-11-11 11:38 ` patch 'net/ice/base: fix array overflow in add switch recipe' " christian.ehrhardt
2022-11-11 11:38 ` patch 'net/virtio: fix crash when configured twice' " christian.ehrhardt
2022-11-11 11:38 ` patch 'net/mlx4: fix Verbs FD leak in secondary process' " christian.ehrhardt
2022-11-11 11:38 ` patch 'net/mlx5: fix meter profile delete after disable' " christian.ehrhardt
2022-11-11 11:38 ` patch 'net/ice: check illegal packet sizes' " christian.ehrhardt
2022-11-11 11:38 ` patch 'common/sfc_efx/base: fix maximum Tx data count' " christian.ehrhardt
2022-11-11 11:38 ` patch 'examples/vm_power_manager: use safe list iterator' " christian.ehrhardt
2022-11-11 11:38 ` patch 'gro: fix chain index for more than 2 packets' " christian.ehrhardt
2022-11-11 11:38 ` patch 'timer: fix stopping all timers' " christian.ehrhardt
2022-11-11 11:38 ` patch 'net/qede/base: fix 32-bit build with GCC 12' " christian.ehrhardt
2022-11-11 11:38 ` patch 'net/tap: fix overflow of network interface index' " christian.ehrhardt
2022-11-11 11:38 ` patch 'net/memif: fix crash with different number of Rx/Tx queues' " christian.ehrhardt
2022-11-11 11:38 ` christian.ehrhardt [this message]
2022-11-11 11:38 ` patch 'net/bonding: fix Tx hash for TCP' " christian.ehrhardt
2022-11-11 11:38 ` patch 'eal: fix data race in multi-process support' " christian.ehrhardt
2022-11-11 11:38 ` patch 'pdump: do not allow enable/disable in primary process' " christian.ehrhardt
2022-11-11 11:38 ` patch 'event/sw: fix flow ID init in self test' " christian.ehrhardt
2022-11-11 11:38 ` patch 'event/sw: fix log " christian.ehrhardt
2022-11-11 11:38 ` patch 'eventdev/eth_tx: fix queue delete' " christian.ehrhardt
2022-11-11 11:38 ` patch 'license: fix paths' " christian.ehrhardt
2022-11-11 11:38 ` patch 'net/bonding: fix descriptor limit reporting' " christian.ehrhardt
2022-11-11 11:38 ` patch 'net/ixgbe: fix broadcast Rx on VF after promisc removal' " christian.ehrhardt
2022-11-11 11:39 ` patch 'net/ixgbe: fix unexpected VLAN Rx in promisc mode on VF' " christian.ehrhardt
2022-11-11 11:39 ` patch 'examples/l2fwd-crypto: fix typo in error message' " christian.ehrhardt
2022-11-11 11:39 ` patch 'test/crypto: fix wireless auth digest segment' " christian.ehrhardt
2022-11-11 11:39 ` patch 'test/crypto: fix PDCP vectors' " christian.ehrhardt
2022-11-11 11:39 ` patch 'crypto/qat: fix null hash algorithm digest size' " christian.ehrhardt

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=20221111113904.1549618-33-christian.ehrhardt@canonical.com \
    --to=christian.ehrhardt@canonical.com \
    --cc=fengchengwen@huawei.com \
    --cc=liudongdong3@huawei.com \
    --cc=stable@dpdk.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).