From: christian.ehrhardt@canonical.com
To: Yiding Zhou <yidingx.zhou@intel.com>
Cc: Ke Xu <ke1.xu@intel.com>, dpdk stable <stable@dpdk.org>
Subject: patch 'net/ice/base: fix duplicate flow rules' has been queued to stable release 19.11.14
Date: Wed, 16 Nov 2022 11:40:04 +0100 [thread overview]
Message-ID: <20221116104012.2975036-9-christian.ehrhardt@canonical.com> (raw)
In-Reply-To: <20221116104012.2975036-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/23/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/abb751ede53458d3693527a3bd33397d9b544bdd
Thanks.
Christian Ehrhardt <christian.ehrhardt@canonical.com>
---
From abb751ede53458d3693527a3bd33397d9b544bdd Mon Sep 17 00:00:00 2001
From: Yiding Zhou <yidingx.zhou@intel.com>
Date: Thu, 13 Oct 2022 14:21:13 +0800
Subject: [PATCH] net/ice/base: fix duplicate flow rules
[ upstream commit 43d30256b215937d9d8b554d39ac91f1866b0e5a ]
When a vsi that already exists in the created vsi_list subscribes to the
same filter again, the return value ICE_SUCCESS results in duplicate flow
rules to be stored, which will cause 'flush' and 'destroy' errors.
Fixes: fed0c5ca5f19 ("net/ice/base: support programming a new switch recipe")
Signed-off-by: Yiding Zhou <yidingx.zhou@intel.com>
Tested-by: Ke Xu <ke1.xu@intel.com>
---
drivers/net/ice/base/ice_switch.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ice/base/ice_switch.c b/drivers/net/ice/base/ice_switch.c
index 5fe6e9ea69..5daf29dbd0 100644
--- a/drivers/net/ice/base/ice_switch.c
+++ b/drivers/net/ice/base/ice_switch.c
@@ -6023,7 +6023,7 @@ ice_adv_add_update_vsi_list(struct ice_hw *hw,
/* A rule already exists with the new VSI being added */
if (ice_is_bit_set(m_entry->vsi_list_info->vsi_map, vsi_handle))
- return ICE_SUCCESS;
+ return ICE_ERR_ALREADY_EXISTS;
/* Update the previously created VSI list set with
* the new VSI ID passed in
--
2.38.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2022-11-16 11:36:50.757679285 +0100
+++ 0009-net-ice-base-fix-duplicate-flow-rules.patch 2022-11-16 11:36:50.420775502 +0100
@@ -1 +1 @@
-From 43d30256b215937d9d8b554d39ac91f1866b0e5a Mon Sep 17 00:00:00 2001
+From abb751ede53458d3693527a3bd33397d9b544bdd Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 43d30256b215937d9d8b554d39ac91f1866b0e5a ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index 4b115ce660..a2581f404d 100644
+index 5fe6e9ea69..5daf29dbd0 100644
@@ -23 +24 @@
-@@ -8786,7 +8786,7 @@ ice_adv_add_update_vsi_list(struct ice_hw *hw,
+@@ -6023,7 +6023,7 @@ ice_adv_add_update_vsi_list(struct ice_hw *hw,
next prev parent reply other threads:[~2022-11-16 10:40 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-16 10:39 patch 'net/bonding: set initial value of descriptor count alignment' " christian.ehrhardt
2022-11-16 10:39 ` patch 'net/bonding: fix dropping valid MAC packets' " christian.ehrhardt
2022-11-16 10:39 ` patch 'app/testpmd: make quit flag volatile' " christian.ehrhardt
2022-11-16 10:39 ` patch 'net/bonding: fix mbuf fast free handling' " christian.ehrhardt
2022-11-16 10:40 ` patch 'eal: fix doxygen comments for UUID' " christian.ehrhardt
2022-11-16 10:40 ` patch 'power: fix some doxygen comments' " christian.ehrhardt
2022-11-16 10:40 ` patch 'test/hash: remove dead code in extendable bucket test' " christian.ehrhardt
2022-11-16 10:40 ` patch 'net/mlx5: fix hairpin split with set VLAN VID action' " christian.ehrhardt
2022-11-16 10:40 ` christian.ehrhardt [this message]
2022-11-16 10:40 ` patch 'net/ice: fix scalar Rx path segment' " christian.ehrhardt
2022-11-16 10:40 ` patch 'net/ice: fix scalar Tx " christian.ehrhardt
2022-11-16 10:40 ` patch 'examples/fips_validation: fix typo in error log' " christian.ehrhardt
2022-11-16 10:40 ` patch 'test/crypto: fix bitwise operator in a SNOW3G case' " christian.ehrhardt
2022-11-16 10:40 ` patch 'doc: fix typo depreciated instead of deprecated' " christian.ehrhardt
2022-11-16 10:40 ` patch 'drivers: fix typos found by Lintian' " christian.ehrhardt
2022-11-16 10:40 ` patch 'doc: fix net drivers ordering' " christian.ehrhardt
2022-11-16 10:40 ` patch 'ring: remove leftover comment about watermark' " 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=20221116104012.2975036-9-christian.ehrhardt@canonical.com \
--to=christian.ehrhardt@canonical.com \
--cc=ke1.xu@intel.com \
--cc=stable@dpdk.org \
--cc=yidingx.zhou@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).