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 0C7ED41D52 for ; Thu, 23 Feb 2023 16:08:06 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 222AA4328F; Thu, 23 Feb 2023 16:08:05 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 5D15F4327B for ; Thu, 23 Feb 2023 16:08:03 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677164882; 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=APXeVAQwPA4UXp0FV0Ank6OBfTANSFT1n9JAqsg6srE=; b=jKjCUGg3SsLvwnUC1Ea1HhFtfkRKBdqpQfMDMBsds6RTohBlBo6wHvt7pMexYLG/EUz7ka UYmdsyOx4ee2QtGgjU/QxOBx1OEBUFFLBQtwt3jVM7O5d/GstBRh98GEsThBl0KGfzZdyz OOcF1ijAngPLNvJZRUn6q+1m83mCvxA= 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-182-Jn8sGJM1MFuvES_b2stwng-1; Thu, 23 Feb 2023 10:08:01 -0500 X-MC-Unique: Jn8sGJM1MFuvES_b2stwng-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 E67F7100F933; Thu, 23 Feb 2023 15:07:59 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id D931F2166B29; Thu, 23 Feb 2023 15:07:58 +0000 (UTC) From: Kevin Traynor To: Huisong Li Cc: Dongdong Liu , dpdk stable Subject: patch 'net/hns3: fix clearing RSS configuration' has been queued to stable release 21.11.4 Date: Thu, 23 Feb 2023 15:05:50 +0000 Message-Id: <20230223150631.723699-59-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/eee8b3cd45b38cedb736984245f5085f307ad2a7 Thanks. Kevin --- >From eee8b3cd45b38cedb736984245f5085f307ad2a7 Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Tue, 31 Jan 2023 21:02:55 +0800 Subject: [PATCH] net/hns3: fix clearing RSS configuration [ upstream commit 1aa5222454725001939ff571e685225f6cf85653 ] When a RSS rule has an unsupported action, the RSS configuration is cleared by mistake. Remove clearing RSS configuration in this case. Fixes: c37ca66f2b27 ("net/hns3: support RSS") Signed-off-by: Huisong Li Signed-off-by: Dongdong Liu --- drivers/net/hns3/hns3_flow.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/net/hns3/hns3_flow.c b/drivers/net/hns3/hns3_flow.c index d2eab7e289..78d0bd7e5e 100644 --- a/drivers/net/hns3/hns3_flow.c +++ b/drivers/net/hns3/hns3_flow.c @@ -1375,10 +1375,8 @@ hns3_parse_rss_filter(struct rte_eth_dev *dev, /* Check if the next not void action is END */ NEXT_ITEM_OF_ACTION(act, actions, act_index); - if (act->type != RTE_FLOW_ACTION_TYPE_END) { - memset(rss_conf, 0, sizeof(struct hns3_rss_conf)); + if (act->type != RTE_FLOW_ACTION_TYPE_END) return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, act, "Not supported action."); - } return 0; -- 2.39.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-23 14:46:25.240986233 +0000 +++ 0059-net-hns3-fix-clearing-RSS-configuration.patch 2023-02-23 14:46:23.806236091 +0000 @@ -1 +1 @@ -From 1aa5222454725001939ff571e685225f6cf85653 Mon Sep 17 00:00:00 2001 +From eee8b3cd45b38cedb736984245f5085f307ad2a7 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 1aa5222454725001939ff571e685225f6cf85653 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index de38a42048..5711757684 100644 +index d2eab7e289..78d0bd7e5e 100644 @@ -24 +25 @@ -@@ -1422,10 +1422,8 @@ hns3_parse_rss_filter(struct rte_eth_dev *dev, +@@ -1375,10 +1375,8 @@ hns3_parse_rss_filter(struct rte_eth_dev *dev,