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 12599A0350 for ; Mon, 21 Feb 2022 16:41:01 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0C2B1410F3; Mon, 21 Feb 2022 16:41:01 +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 1EBEE40E5A for ; Mon, 21 Feb 2022 16:40:59 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645458058; 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=Cz3RL1Cn5llr+YNw/5qF+6cMoNZSSakSXW+DsNm/K1k=; b=Qwc5bGV2oKiWmgWMBYqluOm+KbJeVaxhLRwUQwlc4Rsi3zxOlqqHVZe74eMyiF7G/EKrHz 5IsEpvCMglaZ+Dxs686J0nFASD9g6qz0F0hzWNcxJ7QotaRaW7hQgC+zwt4rvAtcKALmqO 340gymv7+7WB0P9H8TaxJfP/JSsO9Zc= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-662-nvgLlhzqPvaaab8JrajWvg-1; Mon, 21 Feb 2022 10:40:56 -0500 X-MC-Unique: nvgLlhzqPvaaab8JrajWvg-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4E2D78144E2; Mon, 21 Feb 2022 15:40:55 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 731E77E131; Mon, 21 Feb 2022 15:40:54 +0000 (UTC) From: Kevin Traynor To: Lijun Ou Cc: dpdk stable Subject: patch 'net/hns3: fix RSS key with null' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:35:19 +0000 Message-Id: <20220221153625.152324-130-ktraynor@redhat.com> In-Reply-To: <20220221153625.152324-1-ktraynor@redhat.com> References: <20220221153625.152324-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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.1 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/26/22. 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/9b1f69f9069a92f3b307d3a0e3424d9be6a5e813 Thanks. Kevin --- >From 9b1f69f9069a92f3b307d3a0e3424d9be6a5e813 Mon Sep 17 00:00:00 2001 From: Lijun Ou Date: Fri, 28 Jan 2022 10:07:04 +0800 Subject: [PATCH] net/hns3: fix RSS key with null [ upstream commit e995c91dcc426e83d4d0d6681b8d3dc0d313c655 ] Since the patch '1848b117' has initialized the variable 'key' in 'struct rte_flow_action_rss' with 'NULL', the PMD will use the default RSS key when create the first RSS rule with NULL RSS key. Then, if create a repeated RSS rule with the above, it will not identify duplicate rules and return an error message. To solve the preceding problem, determine whether the current RSS keys are the same based on whether the length of key_len of rss is 0. Fixes: 1848b117cca1 ("app/testpmd: fix RSS key for flow API RSS rule") Signed-off-by: Lijun Ou --- drivers/net/hns3/hns3_flow.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/net/hns3/hns3_flow.c b/drivers/net/hns3/hns3_flow.c index b19e5d37a9..5fc80480ba 100644 --- a/drivers/net/hns3/hns3_flow.c +++ b/drivers/net/hns3/hns3_flow.c @@ -1239,4 +1239,5 @@ hns3_action_rss_same(const struct rte_flow_action_rss *comp, const struct rte_flow_action_rss *with) { + bool rss_key_is_same; bool func_is_same; @@ -1255,9 +1256,14 @@ hns3_action_rss_same(const struct rte_flow_action_rss *comp, (comp->func == with->func) : true; - return (func_is_same && + if (with->key_len == 0 || with->key == NULL) + rss_key_is_same = 1; + else + rss_key_is_same = comp->key_len == with->key_len && + !memcmp(comp->key, with->key, with->key_len); + + return (func_is_same && rss_key_is_same && comp->types == (with->types & HNS3_ETH_RSS_SUPPORT) && - comp->level == with->level && comp->key_len == with->key_len && + comp->level == with->level && comp->queue_num == with->queue_num && - !memcmp(comp->key, with->key, with->key_len) && !memcmp(comp->queue, with->queue, sizeof(*with->queue) * with->queue_num)); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:47.412038335 +0000 +++ 0130-net-hns3-fix-RSS-key-with-null.patch 2022-02-21 15:22:44.261704509 +0000 @@ -1 +1 @@ -From e995c91dcc426e83d4d0d6681b8d3dc0d313c655 Mon Sep 17 00:00:00 2001 +From 9b1f69f9069a92f3b307d3a0e3424d9be6a5e813 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e995c91dcc426e83d4d0d6681b8d3dc0d313c655 ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index 56ef6f57b2..aba07aaa6f 100644 +index b19e5d37a9..5fc80480ba 100644 @@ -27 +28 @@ -@@ -1287,4 +1287,5 @@ hns3_action_rss_same(const struct rte_flow_action_rss *comp, +@@ -1239,4 +1239,5 @@ hns3_action_rss_same(const struct rte_flow_action_rss *comp, @@ -33 +34 @@ -@@ -1303,9 +1304,14 @@ hns3_action_rss_same(const struct rte_flow_action_rss *comp, +@@ -1255,9 +1256,14 @@ hns3_action_rss_same(const struct rte_flow_action_rss *comp,