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 06C2041E9F for ; Wed, 15 Mar 2023 15:37:35 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0272742D0C; Wed, 15 Mar 2023 15:37:35 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id C2ACA4161A for ; Wed, 15 Mar 2023 15:37:32 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678891052; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PS5+QEEc02MHorwN5+dW7qv/Nim9R5oSzl979vm7E+o=; b=FrCToCmkpEtbrMh5GlJo/uBBAvamwSJG4QycvqKDovgRDfAfxasdh4j4CFvioTwUAe7z+r DFO4YxThY5yBPnoF5fBP5ZFFX6u89640BdCojjxU9QLLMe654lFmWaHGmWxICl9vMV7zUd fI832Y54cURWRay25Qj10DYYAE1/XKk= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-543-kcxdOeQrO4WXm8jidNg-qA-1; Wed, 15 Mar 2023 10:37:30 -0400 X-MC-Unique: kcxdOeQrO4WXm8jidNg-qA-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 083AB85CE6A; Wed, 15 Mar 2023 14:37:30 +0000 (UTC) Received: from rh.Home (unknown [10.39.192.83]) by smtp.corp.redhat.com (Postfix) with ESMTP id 42EC340C6E67; Wed, 15 Mar 2023 14:37:28 +0000 (UTC) From: Kevin Traynor To: Huisong Li Cc: Dongdong Liu , dpdk stable Subject: patch 'net/hns3: separate setting and clearing RSS rule' has been queued to stable release 21.11.4 Date: Wed, 15 Mar 2023 14:36:36 +0000 Message-Id: <20230315143640.677317-43-ktraynor@redhat.com> In-Reply-To: <20230315143640.677317-1-ktraynor@redhat.com> References: <20230315143640.677317-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 Hi, FYI, your patch has been queued to stable release 21.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/20/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/f8bbcce58aaba763517e9f9fd070eb015f88012e Thanks. Kevin --- >From f8bbcce58aaba763517e9f9fd070eb015f88012e Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Fri, 10 Mar 2023 17:35:12 +0800 Subject: [PATCH] net/hns3: separate setting and clearing RSS rule [ upstream commit 1c3aeb2be4b8ef8b18846883ebbb9320f62cf097 ] Separate the setting and clearing of RSS rule. Signed-off-by: Huisong Li Signed-off-by: Dongdong Liu --- drivers/net/hns3/hns3_flow.c | 46 +++++++++++++++++------------------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/drivers/net/hns3/hns3_flow.c b/drivers/net/hns3/hns3_flow.c index 76cfec6b71..617a6e5a71 100644 --- a/drivers/net/hns3/hns3_flow.c +++ b/drivers/net/hns3/hns3_flow.c @@ -1480,6 +1480,20 @@ hns3_update_indir_table(struct hns3_hw *hw, static int -hns3_config_rss_filter(struct hns3_hw *hw, - const struct hns3_rss_conf *conf, bool add) +hns3_reset_rss_filter(struct hns3_hw *hw, const struct hns3_rss_conf *conf) +{ + int ret; + + if (!conf->valid) + return 0; + + ret = hns3_disable_rss(hw); + if (ret) + hns3_err(hw, "RSS disable failed(%d)", ret); + + return ret; +} + +static int +hns3_config_rss_filter(struct hns3_hw *hw, const struct hns3_rss_conf *conf) { uint64_t flow_types; @@ -1498,17 +1512,4 @@ hns3_config_rss_filter(struct hns3_hw *hw, }; - if (!add) { - if (!conf->valid) - return 0; - - ret = hns3_disable_rss(hw); - if (ret) { - hns3_err(hw, "RSS disable failed(%d)", ret); - return ret; - } - - return 0; - } - /* Set rx queues to use */ num = RTE_MIN(hw->data->nb_rx_queues, rss_flow_conf.queue_num); @@ -1551,6 +1552,5 @@ hns3_clear_rss_filter(struct rte_eth_dev *dev) while (rss_filter_ptr) { TAILQ_REMOVE(&hw->flow_rss_list, rss_filter_ptr, entries); - ret = hns3_config_rss_filter(hw, &rss_filter_ptr->filter_info, - false); + ret = hns3_reset_rss_filter(hw, &rss_filter_ptr->filter_info); if (ret) rss_rule_fail_cnt++; @@ -1582,5 +1582,5 @@ hns3_restore_rss_filter(struct hns3_hw *hw) continue; - ret = hns3_config_rss_filter(hw, &filter->filter_info, true); + ret = hns3_config_rss_filter(hw, &filter->filter_info); if (ret != 0) { hns3_err(hw, "restore RSS filter failed, ret=%d", ret); @@ -1626,6 +1626,5 @@ hns3_rss_action_is_dup(struct hns3_hw *hw, static int -hns3_flow_parse_rss(struct rte_eth_dev *dev, - const struct hns3_rss_conf *conf, bool add) +hns3_flow_parse_rss(struct rte_eth_dev *dev, const struct hns3_rss_conf *conf) { struct hns3_adapter *hns = dev->data->dev_private; @@ -1637,5 +1636,5 @@ hns3_flow_parse_rss(struct rte_eth_dev *dev, } - return hns3_config_rss_filter(hw, conf, add); + return hns3_config_rss_filter(hw, conf); } @@ -1724,5 +1723,5 @@ hns3_flow_create_rss_rule(struct rte_eth_dev *dev, } - ret = hns3_flow_parse_rss(dev, new_conf, true); + ret = hns3_flow_parse_rss(dev, new_conf); if (ret != 0) { rte_free(rss_filter_ptr); @@ -1905,6 +1904,5 @@ hns3_flow_destroy(struct rte_eth_dev *dev, struct rte_flow *flow, case RTE_ETH_FILTER_HASH: rss_filter_ptr = (struct hns3_rss_conf_ele *)flow->rule; - ret = hns3_config_rss_filter(hw, &rss_filter_ptr->filter_info, - false); + ret = hns3_reset_rss_filter(hw, &rss_filter_ptr->filter_info); if (ret) return rte_flow_error_set(error, EIO, -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-03-15 14:30:21.630232749 +0000 +++ 0043-net-hns3-separate-setting-and-clearing-RSS-rule.patch 2023-03-15 14:30:20.616123808 +0000 @@ -1 +1 @@ -From 1c3aeb2be4b8ef8b18846883ebbb9320f62cf097 Mon Sep 17 00:00:00 2001 +From f8bbcce58aaba763517e9f9fd070eb015f88012e Mon Sep 17 00:00:00 2001 @@ -6 +6 @@ -Separate the setting and clearing of RSS rule. +[ upstream commit 1c3aeb2be4b8ef8b18846883ebbb9320f62cf097 ] @@ -8 +8 @@ -Cc: stable@dpdk.org +Separate the setting and clearing of RSS rule. @@ -17 +17 @@ -index 21e00e515e..4da98d7adc 100644 +index 76cfec6b71..617a6e5a71 100644 @@ -20 +20 @@ -@@ -1536,6 +1536,20 @@ hns3_update_indir_table(struct hns3_hw *hw, +@@ -1480,6 +1480,20 @@ hns3_update_indir_table(struct hns3_hw *hw, @@ -43 +43 @@ -@@ -1554,17 +1568,4 @@ hns3_config_rss_filter(struct hns3_hw *hw, +@@ -1498,17 +1512,4 @@ hns3_config_rss_filter(struct hns3_hw *hw, @@ -61 +61 @@ -@@ -1607,6 +1608,5 @@ hns3_clear_rss_filter(struct rte_eth_dev *dev) +@@ -1551,6 +1552,5 @@ hns3_clear_rss_filter(struct rte_eth_dev *dev) @@ -69 +69 @@ -@@ -1637,5 +1637,5 @@ hns3_restore_rss_filter(struct hns3_hw *hw) +@@ -1582,5 +1582,5 @@ hns3_restore_rss_filter(struct hns3_hw *hw) @@ -76 +76 @@ -@@ -1681,6 +1681,5 @@ hns3_rss_action_is_dup(struct hns3_hw *hw, +@@ -1626,6 +1626,5 @@ hns3_rss_action_is_dup(struct hns3_hw *hw, @@ -84 +84 @@ -@@ -1692,5 +1691,5 @@ hns3_flow_parse_rss(struct rte_eth_dev *dev, +@@ -1637,5 +1636,5 @@ hns3_flow_parse_rss(struct rte_eth_dev *dev, @@ -91 +91 @@ -@@ -1779,5 +1778,5 @@ hns3_flow_create_rss_rule(struct rte_eth_dev *dev, +@@ -1724,5 +1723,5 @@ hns3_flow_create_rss_rule(struct rte_eth_dev *dev, @@ -98 +98 @@ -@@ -1962,6 +1961,5 @@ hns3_flow_destroy(struct rte_eth_dev *dev, struct rte_flow *flow, +@@ -1905,6 +1904,5 @@ hns3_flow_destroy(struct rte_eth_dev *dev, struct rte_flow *flow,