patches for DPDK stable branches
 help / color / mirror / Atom feed
From: Kevin Traynor <ktraynor@redhat.com>
To: Zhichao Zeng <zhichaox.zeng@intel.com>
Cc: Bartosz Staszewski <bartoszx.staszewski@intel.com>,
	Qi Zhang <qi.z.zhang@intel.com>, dpdk stable <stable@dpdk.org>
Subject: patch 'net/iavf: fix stop ordering' has been queued to stable release 21.11.5
Date: Fri, 21 Jul 2023 14:34:58 +0100	[thread overview]
Message-ID: <20230721133509.348959-3-ktraynor@redhat.com> (raw)
In-Reply-To: <20230721133509.348959-1-ktraynor@redhat.com>

Hi,

FYI, your patch has been queued to stable release 21.11.5

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/25/23. 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

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/5a0e07583487a16021f43a1a740b26a925e5c656

Thanks.

Kevin

---
From 5a0e07583487a16021f43a1a740b26a925e5c656 Mon Sep 17 00:00:00 2001
From: Zhichao Zeng <zhichaox.zeng@intel.com>
Date: Wed, 12 Jul 2023 13:35:37 +0800
Subject: [PATCH] net/iavf: fix stop ordering

[ upstream commit 87b2afdea3aae6095aa80956ae2e15f602594185 ]

The current implementation stops queue before disabling the Rx interrupt,
and when there are still unprocessed packets remaining in the queue,
this may cause the Rx ring to timeout, leading to IOMMU fault.

This patch disables the Rx interrupt before stopping the queue, ensuring
that no packets received when disabling the queues.

Fixes: 02d212ca3125 ("net/iavf: rename remaining avf strings")

Signed-off-by: Bartosz Staszewski <bartoszx.staszewski@intel.com>
Signed-off-by: Zhichao Zeng <zhichaox.zeng@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
---
 .mailmap                       | 1 +
 drivers/net/iavf/iavf_ethdev.c | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.mailmap b/.mailmap
index 2b254e64ef..495f89e75d 100644
--- a/.mailmap
+++ b/.mailmap
@@ -145,4 +145,5 @@ Bao-Long Tran <longtb5@viettel.com.vn>
 Barak Enat <barak@saguna.net>
 Barry Cao <barry.cao@nxp.com>
+Bartosz Staszewski <bartoszx.staszewski@intel.com>
 Baruch Siach <baruch@tkos.co.il>
 Bassam Zaid AlKilani <bzalkilani@nvidia.com>
diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c
index 1afbc22d54..e40af1316d 100644
--- a/drivers/net/iavf/iavf_ethdev.c
+++ b/drivers/net/iavf/iavf_ethdev.c
@@ -1048,6 +1048,4 @@ iavf_dev_stop(struct rte_eth_dev *dev)
 		return 0;
 
-	iavf_stop_queues(dev);
-
 	/* Disable the interrupt for Rx */
 	rte_intr_efd_disable(intr_handle);
@@ -1062,4 +1060,6 @@ iavf_dev_stop(struct rte_eth_dev *dev)
 				  false);
 
+	iavf_stop_queues(dev);
+
 	adapter->stopped = 1;
 	dev->data->dev_started = 0;
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-07-21 14:33:59.093677247 +0100
+++ 0003-net-iavf-fix-stop-ordering.patch	2023-07-21 14:33:59.001253204 +0100
@@ -1 +1 @@
-From 87b2afdea3aae6095aa80956ae2e15f602594185 Mon Sep 17 00:00:00 2001
+From 5a0e07583487a16021f43a1a740b26a925e5c656 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 87b2afdea3aae6095aa80956ae2e15f602594185 ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -25 +26 @@
-index 670d312f84..9ce554451b 100644
+index 2b254e64ef..495f89e75d 100644
@@ -28 +29 @@
-@@ -152,4 +152,5 @@ Bar Neuman <bneuman@nvidia.com>
+@@ -145,4 +145,5 @@ Bao-Long Tran <longtb5@viettel.com.vn>
@@ -35 +36 @@
-index ac7154d720..f2fc5a5621 100644
+index 1afbc22d54..e40af1316d 100644
@@ -38 +39 @@
-@@ -1088,6 +1088,4 @@ iavf_dev_stop(struct rte_eth_dev *dev)
+@@ -1048,6 +1048,4 @@ iavf_dev_stop(struct rte_eth_dev *dev)
@@ -45 +46 @@
-@@ -1102,4 +1100,6 @@ iavf_dev_stop(struct rte_eth_dev *dev)
+@@ -1062,4 +1060,6 @@ iavf_dev_stop(struct rte_eth_dev *dev)


  parent reply	other threads:[~2023-07-21 13:35 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-07-21 13:34 patch 'doc: fix typos and wording in flow API guide' " Kevin Traynor
2023-07-21 13:34 ` patch 'net/i40e: fix comments' " Kevin Traynor
2023-07-21 13:34 ` Kevin Traynor [this message]
2023-07-21 13:34 ` patch 'common/iavf: fix MAC type for 710 NIC' " Kevin Traynor
2023-07-21 13:35 ` patch 'net/ixgbe: fix Rx and Tx queue status' " Kevin Traynor
2023-07-21 13:35 ` patch 'net/igc: " Kevin Traynor
2023-07-21 13:35 ` patch 'net/e1000: " Kevin Traynor
2023-07-21 13:35 ` patch 'net/mlx5: fix drop action memory leak' " Kevin Traynor
2023-07-21 13:35 ` patch 'net/mlx5: fix LRO TCP checksum' " Kevin Traynor
2023-07-21 13:35 ` patch 'net/mlx5: fix validation for conntrack indirect action' " Kevin Traynor
2023-07-21 13:35 ` patch 'doc: update BIOS settings and supported HW for NTB' " 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=20230721133509.348959-3-ktraynor@redhat.com \
    --to=ktraynor@redhat.com \
    --cc=bartoszx.staszewski@intel.com \
    --cc=qi.z.zhang@intel.com \
    --cc=stable@dpdk.org \
    --cc=zhichaox.zeng@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
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).