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 4C85241D52 for ; Thu, 23 Feb 2023 16:08:09 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A929743299; Thu, 23 Feb 2023 16:08:06 +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 87A7A4327B for ; Thu, 23 Feb 2023 16:08:05 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677164885; 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=ht4RaLihcWBv4/1nMWL7HzJGb8W/ACCjGLRGE0+FaYs=; b=VkIadbThMdaNEO3Qm609Gs4rDt0eEkqTBfD7xFhYpX5NccxPLQLO+/YHdF2O55cGDsn9y0 AMDQdPRNjU8pNqkLIvq2agui+z3bn33c3vqYIa4tNkvlE7Wxq3h809zeorQjwGe0KWuIr5 oBIzBtH1MMBubSh+PqJCOA3bsDY6KPk= 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-29--4tYf0t0O7OjSumJ9s1FBQ-1; Thu, 23 Feb 2023 10:08:03 -0500 X-MC-Unique: -4tYf0t0O7OjSumJ9s1FBQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E1A64100F934; Thu, 23 Feb 2023 15:08:02 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3BD162166B29; Thu, 23 Feb 2023 15:08:02 +0000 (UTC) From: Kevin Traynor To: Huisong Li Cc: Dongdong Liu , dpdk stable Subject: patch 'net/hns3: fix warning on flush or destroy rule' has been queued to stable release 21.11.4 Date: Thu, 23 Feb 2023 15:05:53 +0000 Message-Id: <20230223150631.723699-62-ktraynor@redhat.com> In-Reply-To: <20230223150631.723699-1-ktraynor@redhat.com> References: <20230223150631.723699-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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 02/28/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/c7c798a8f63d321ce23669fd9fe5fd9b6cf5dec2 Thanks. Kevin --- >From c7c798a8f63d321ce23669fd9fe5fd9b6cf5dec2 Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Tue, 31 Jan 2023 21:02:58 +0800 Subject: [PATCH] net/hns3: fix warning on flush or destroy rule [ upstream commit a7bf2789168c8d49ca4dec5bb7bb0b3f765fc1bd ] Although flow rules will no longer be used when user flush all rules or destroy a rule a warning is generated like: "modified RSS types based on hardware support, requested:0x137f83fffc configured:0x3ffc". Prevent warning for flush or destroy rule case. Fixes: ec674cb742e5 ("net/hns3: fix flushing RSS rule") Signed-off-by: Huisong Li Signed-off-by: Dongdong Liu --- drivers/net/hns3/hns3_flow.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/net/hns3/hns3_flow.c b/drivers/net/hns3/hns3_flow.c index 5803406ef7..cc1a7f5eaa 100644 --- a/drivers/net/hns3/hns3_flow.c +++ b/drivers/net/hns3/hns3_flow.c @@ -1493,15 +1493,4 @@ hns3_config_rss_filter(struct hns3_hw *hw, }; - /* Filter the unsupported flow types */ - flow_types = conf->conf.types ? - rss_flow_conf.types & HNS3_ETH_RSS_SUPPORT : - hw->rss_info.conf.types; - if (flow_types != rss_flow_conf.types) - hns3_warn(hw, "modified RSS types based on hardware support, " - "requested:0x%" PRIx64 " configured:0x%" PRIx64, - rss_flow_conf.types, flow_types); - /* Update the useful flow types */ - rss_flow_conf.types = flow_types; - if (!add) { if (!conf->valid) @@ -1529,4 +1518,15 @@ hns3_config_rss_filter(struct hns3_hw *hw, } + /* Filter the unsupported flow types */ + flow_types = conf->conf.types ? + rss_flow_conf.types & HNS3_ETH_RSS_SUPPORT : + hw->rss_info.conf.types; + if (flow_types != rss_flow_conf.types) + hns3_warn(hw, "modified RSS types based on hardware support," + " requested:0x%" PRIx64 " configured:0x%" PRIx64, + rss_flow_conf.types, flow_types); + /* Update the useful flow types */ + rss_flow_conf.types = flow_types; + /* Set hash algorithm and flow types by the user's config */ return hns3_hw_rss_hash_set(hw, &rss_flow_conf); -- 2.39.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-23 14:46:25.309717819 +0000 +++ 0062-net-hns3-fix-warning-on-flush-or-destroy-rule.patch 2023-02-23 14:46:23.811236109 +0000 @@ -1 +1 @@ -From a7bf2789168c8d49ca4dec5bb7bb0b3f765fc1bd Mon Sep 17 00:00:00 2001 +From c7c798a8f63d321ce23669fd9fe5fd9b6cf5dec2 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit a7bf2789168c8d49ca4dec5bb7bb0b3f765fc1bd ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 3809fcc2d7..632247b846 100644 +index 5803406ef7..cc1a7f5eaa 100644 @@ -26 +27 @@ -@@ -1538,15 +1538,4 @@ hns3_config_rss_filter(struct hns3_hw *hw, +@@ -1493,15 +1493,4 @@ hns3_config_rss_filter(struct hns3_hw *hw, @@ -42 +43 @@ -@@ -1574,4 +1563,15 @@ hns3_config_rss_filter(struct hns3_hw *hw, +@@ -1529,4 +1518,15 @@ hns3_config_rss_filter(struct hns3_hw *hw,