From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 98B3FA0093 for ; Tue, 19 May 2020 15:09:42 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8F8451D6C7; Tue, 19 May 2020 15:09:42 +0200 (CEST) Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by dpdk.org (Postfix) with ESMTP id 3CE771D6A4 for ; Tue, 19 May 2020 15:09:41 +0200 (CEST) Received: by mail-wm1-f66.google.com with SMTP id u1so2219403wmn.3 for ; Tue, 19 May 2020 06:09:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XWELuJdA95wDlD8MOxyPZhSdaDqBAlqIO4r4Qxx3Zqk=; b=jqQboyOa0qLQ4zWZoUyCfCpQDvQIc8KUPLSLpCeQrzXLlNxMRrLwjH9UeHCTjNDSIH 5zF4+yhXRbQaa/4e5v3MPPoGedCXR1lj6KlxxuKT5My5KN74gouGOQ2mHvLHFdOjelQa qGbK8UWsb9TqjJHKLmsgJ/EPE/Tikx2Bry1hau3BTKyNAUI/k+MFq0jrWbfkWi3Wzrkl NvZinW5Ulfq6Vwh0enQEtpGUAOc9UX++YFvZ1BqVWu47qx/2JUEc8oExc4hvgB7ZBemR cdjo3Gr/ZuIL7V3kB0ra3+4xsy1l4YP+krgCHMJrHqZUPR15KLkx8DJvWTbfOciURLOU XEsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XWELuJdA95wDlD8MOxyPZhSdaDqBAlqIO4r4Qxx3Zqk=; b=VVI8IYz8R3xmbPFedpxYY3YO/+YxSuL9LaSxBvYqojVMT6SpOnJ4kDu2ZJPQ1YLcQt vn6aGfO2Q54VFkXWYe7iFdxDiM6ysaaO7eXYEE4q/9KfQtraTx2ChR72MNZ4qP7HmrEa JkN9Ojg6aPzHgyUlAeYpBlKcdXUCmmhU5cHpYrYRjvMSetkmWtiZ4CP9uZUbexDe9eI6 WKTpyJOV2xa5z69XvoAqtDqEsZHW9TI49IfZAmOqS4DxVNFJ5z4MPJtCwIJVW/Lkmo+o R1Nd7W9MHO57UrI8fkizdykqyHbuvXvwzhId8haWxGrvIbmejlI+Dm1b6JhCbqHZXXKn SB/A== X-Gm-Message-State: AOAM532xEC1i8s+XZWj2XX6ANNh46XbFAu+pY2tVNnSDm98/5RCxa79k 4XhMrI5ciFfCIhnwI1YI2fo= X-Google-Smtp-Source: ABdhPJyBStc1KegDWszVzbqd4ZnLepjdsoEPmHrMFqYulfc7LoxXojuLbv1WvyINB7EAYPrSbH2wJQ== X-Received: by 2002:a1c:b60b:: with SMTP id g11mr5512530wmf.49.1589893780963; Tue, 19 May 2020 06:09:40 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id x10sm2297859wrn.54.2020.05.19.06.09.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:09:40 -0700 (PDT) From: luca.boccassi@gmail.com To: Chengwen Feng Cc: Wei Hu , dpdk stable Date: Tue, 19 May 2020 14:03:29 +0100 Message-Id: <20200519130549.112823-74-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519130549.112823-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> <20200519130549.112823-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/hns3: clear residual flow rules on init' has been queued to stable release 19.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/21/20. 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. Thanks. Luca Boccassi --- >From 50daf2acc9b7057ba21ac1d21a49c71f2e8cb36e Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Fri, 10 Apr 2020 19:09:26 +0800 Subject: [PATCH] net/hns3: clear residual flow rules on init [ upstream commit 31cdde02f0be730fc1b9b12a8b53f8a04fa423fc ] This patch fixes that the flow director rules are not cleared during initialization, which lead to remaining flow director rules after upper application (such as testpmd) restarted. Fixes: fcba820d9b9e ("net/hns3: support flow director") Signed-off-by: Chengwen Feng Signed-off-by: Wei Hu (Xavier) --- drivers/net/hns3/hns3_fdir.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/drivers/net/hns3/hns3_fdir.c b/drivers/net/hns3/hns3_fdir.c index ca3c78e1ce..53c6448cdd 100644 --- a/drivers/net/hns3/hns3_fdir.c +++ b/drivers/net/hns3/hns3_fdir.c @@ -772,6 +772,20 @@ static int hns3_config_action(struct hns3_hw *hw, struct hns3_fdir_rule *rule) return hns3_fd_ad_config(hw, ad_data.ad_id, &ad_data); } +static int hns3_fd_clear_all_rules(struct hns3_hw *hw, uint32_t rule_num) +{ + uint32_t i; + int ret; + + for (i = 0; i < rule_num; i++) { + ret = hns3_fd_tcam_config(hw, true, i, NULL, false); + if (ret) + return ret; + } + + return 0; +} + int hns3_fdir_filter_init(struct hns3_adapter *hns) { struct hns3_pf *pf = &hns->pf; @@ -785,6 +799,13 @@ int hns3_fdir_filter_init(struct hns3_adapter *hns) .hash_func = rte_hash_crc, .hash_func_init_val = 0, }; + int ret; + + ret = hns3_fd_clear_all_rules(&hns->hw, rule_num); + if (ret) { + PMD_INIT_LOG(ERR, "Clear all fd rules fail! ret = %d", ret); + return ret; + } fdir_hash_params.socket_id = rte_socket_id(); TAILQ_INIT(&fdir_info->fdir_list); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 14:04:47.482647590 +0100 +++ 0074-net-hns3-clear-residual-flow-rules-on-init.patch 2020-05-19 14:04:44.236648735 +0100 @@ -1,14 +1,15 @@ -From 31cdde02f0be730fc1b9b12a8b53f8a04fa423fc Mon Sep 17 00:00:00 2001 +From 50daf2acc9b7057ba21ac1d21a49c71f2e8cb36e Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Fri, 10 Apr 2020 19:09:26 +0800 Subject: [PATCH] net/hns3: clear residual flow rules on init +[ upstream commit 31cdde02f0be730fc1b9b12a8b53f8a04fa423fc ] + This patch fixes that the flow director rules are not cleared during initialization, which lead to remaining flow director rules after upper application (such as testpmd) restarted. Fixes: fcba820d9b9e ("net/hns3: support flow director") -Cc: stable@dpdk.org Signed-off-by: Chengwen Feng Signed-off-by: Wei Hu (Xavier) @@ -17,7 +18,7 @@ 1 file changed, 21 insertions(+) diff --git a/drivers/net/hns3/hns3_fdir.c b/drivers/net/hns3/hns3_fdir.c -index a395eb1f83..26c3117580 100644 +index ca3c78e1ce..53c6448cdd 100644 --- a/drivers/net/hns3/hns3_fdir.c +++ b/drivers/net/hns3/hns3_fdir.c @@ -772,6 +772,20 @@ static int hns3_config_action(struct hns3_hw *hw, struct hns3_fdir_rule *rule)