From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id C0B55A0C45 for ; Thu, 10 Jun 2021 14:07:23 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BADB24003C; Thu, 10 Jun 2021 14:07:23 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 029A54003C for ; Thu, 10 Jun 2021 14:07:22 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lrJSz-00005v-Qk; Thu, 10 Jun 2021 12:07:21 +0000 From: Christian Ehrhardt To: Chengwen Feng Cc: Min Hu , dpdk stable Date: Thu, 10 Jun 2021 14:06:05 +0200 Message-Id: <20210610120641.885862-17-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210610120641.885862-1-christian.ehrhardt@canonical.com> References: <20210610120641.885862-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/hns3: clear hash map on flow director clear' has been queued to stable release 19.11.9 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" 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 --- >From 50160966a51f13bec546e3ea640cb9c465c89e01 Mon Sep 17 00:00:00 2001 From: Chengwen Feng 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 Signed-off-by: Min Hu (Connor) --- 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@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);