[dpdk-stable] patch 'net/hns3: clear hash map on flow director clear' has been queued to stable release 19.11.9

[Christian Ehrhardt]

Hi,

FYI, your patch has been queued to stable release 19.11.9

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

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From 50160966a51f13bec546e3ea640cb9c465c89e01 Mon Sep 17 00:00:00 2001
From: Chengwen Feng <fengchengwen at huawei.com>
Date: Fri, 7 May 2021 17:08:16 +0800
Subject: [PATCH] net/hns3: clear hash map on flow director clear

[ upstream commit 7d01f89fa6a149157f77ef11a2b5ebec890d7db8 ]

The fdir hash map hold the pointers of fdir rule elements, it needs to
be set to NULL when clear all fdir rules.

Fixes: fcba820d9b9e ("net/hns3: support flow director")

Signed-off-by: Chengwen Feng <fengchengwen at huawei.com>
Signed-off-by: Min Hu (Connor) <humin29 at huawei.com>
---
 drivers/net/hns3/hns3_fdir.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/net/hns3/hns3_fdir.c b/drivers/net/hns3/hns3_fdir.c
index a55ce0bf42..49df88662b 100644
--- a/drivers/net/hns3/hns3_fdir.c
+++ b/drivers/net/hns3/hns3_fdir.c
@@ -1012,6 +1012,10 @@ int hns3_clear_all_fdir_filter(struct hns3_adapter *hns)
 	rte_hash_reset(fdir_info->hash_handle);
 	rte_spinlock_unlock(&fdir_info->flows_lock);
 
+	memset(fdir_info->hash_map, 0,
+	       sizeof(struct hns3_fdir_rule_ele *) *
+	       fdir_info->fd_cfg.rule_num[HNS3_FD_STAGE_1]);
+
 	fdir_filter = TAILQ_FIRST(&fdir_info->fdir_list);
 	while (fdir_filter) {
 		TAILQ_REMOVE(&fdir_info->fdir_list, fdir_filter, entries);
-- 
2.31.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-06-10 14:04:58.877787651 +0200
+++ 0017-net-hns3-clear-hash-map-on-flow-director-clear.patch	2021-06-10 14:04:58.038024435 +0200
@@ -1 +1 @@
-From 7d01f89fa6a149157f77ef11a2b5ebec890d7db8 Mon Sep 17 00:00:00 2001
+From 50160966a51f13bec546e3ea640cb9c465c89e01 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 7d01f89fa6a149157f77ef11a2b5ebec890d7db8 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index e116d872fb..d043f5786d 100644
+index a55ce0bf42..49df88662b 100644
@@ -22,2 +23 @@
-@@ -1033,6 +1033,10 @@ int hns3_clear_all_fdir_filter(struct hns3_adapter *hns)
- 	/* flush flow director */
+@@ -1012,6 +1012,10 @@ int hns3_clear_all_fdir_filter(struct hns3_adapter *hns)
@@ -24,0 +25 @@
+ 	rte_spinlock_unlock(&fdir_info->flows_lock);