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 C5E1FA034C for ; Fri, 25 Feb 2022 18:17:44 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BFEC74114D; Fri, 25 Feb 2022 18:17:44 +0100 (CET) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by mails.dpdk.org (Postfix) with ESMTP id 3C1A6410FD for ; Fri, 25 Feb 2022 18:17:43 +0100 (CET) Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 1EAD53FCA6 for ; Fri, 25 Feb 2022 17:17:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1645809463; bh=ZF+CNAlLA9dat4iN583RYY31BmIYSB00uCHbPuQmJtw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=oRKhhDovrC3FY7mc267FzqpzKzfVlsbQyA7ujVAXj0JC7qFzD1En7jQbsKBhRCsIn ZEUHc8gssZAtBkfCE0/M8Fcx8OCZJ+zlyNuTxBZiK2vB7+O8pRtGz9E+xUp2MrjeeU BWdej6jRsFCHO0M8PIzk19fwBKDfvO/qMSsevwaTSBnR3Y5Zmn+v4m8ODSD4LAjy8D Bliz3vJ2i2KEMBKqVOjdlfCRi1VLH548UqAi0yqTvr4byLzs+UgmKqlrUzlU7UTSht io9kmx8ogyrpzhs1gI0aZmUJ6e2conURJ9OyMGMt+ca6/a2uficpWUO+yX35WDoTq6 qJpRxEZ9KpNdw== Received: by mail-wr1-f70.google.com with SMTP id q12-20020adfbb8c000000b001ea938f79e9so1075852wrg.23 for ; Fri, 25 Feb 2022 09:17:43 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZF+CNAlLA9dat4iN583RYY31BmIYSB00uCHbPuQmJtw=; b=KiJ/b+Ylw/FpPqOhZiSB7VAjJKdZppJDvP2hiuLYMdTMyRGAqv0oCKy47JdTl+Iqvk ctbG9F48niVxE72L5+8P70OdGP1eLedBIG3bK0EazvFn5suWZHSOWhQIb8MJmwBRtIG7 RAd70hlMnrSce1LStHiEC5EfQH1XbPtWUD0QucFejmPiSgEh5hC/6K/LzQCiIdS+d+85 zW28Ryz8PiajPsBmpPZgOYhH7Mde5mCym7Rq99lej98ltarozeyBlShbDf9OSfjozbOz iMGAy8JcI5XglVEWz8j/6JESqgv5g3qG9xoo/f4RJcUAHMaoApeBw3AWYfofOEBgcYz/ EKuQ== X-Gm-Message-State: AOAM531WVamm05/+f+h6Bx+L1eQApjqaecOKpcZnb3vd7ZiYiQYDen3J 0WjgXh4WHWV1ZrEOPehWYCHmSnbIY30+WpMgzzPJ+73rJblzS3+BxmOcBIZF9fQ2wLfPT3HcJca IUn0Ad2ASyvlh7PIXmkVCtfiK X-Received: by 2002:a7b:cb44:0:b0:37b:c569:5924 with SMTP id v4-20020a7bcb44000000b0037bc5695924mr3520764wmj.83.1645809462379; Fri, 25 Feb 2022 09:17:42 -0800 (PST) X-Google-Smtp-Source: ABdhPJzrqPl24JU9KC3cJXnNL4aQnYyxuEbOjwuRUsaUFdxAA/mNnAsOxJ5Wh6ozRwohpcKWh8/RZw== X-Received: by 2002:a7b:cb44:0:b0:37b:c569:5924 with SMTP id v4-20020a7bcb44000000b0037bc5695924mr3520755wmj.83.1645809462176; Fri, 25 Feb 2022 09:17:42 -0800 (PST) Received: from Keschdeichel.fritz.box (068-133-067-156.ip-addr.inexio.net. [156.67.133.68]) by smtp.gmail.com with ESMTPSA id a3-20020adfe5c3000000b001e68a5e1c20sm2830030wrn.4.2022.02.25.09.17.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Feb 2022 09:17:41 -0800 (PST) From: christian.ehrhardt@canonical.com To: Lijun Ou Cc: dpdk stable Subject: patch 'net/hns3: fix RSS key with null' has been queued to stable release 19.11.12 Date: Fri, 25 Feb 2022 18:15:32 +0100 Message-Id: <20220225171550.3499040-39-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.35.0 In-Reply-To: <20220225171550.3499040-1-christian.ehrhardt@canonical.com> References: <20220225171550.3499040-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 19.11.12 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/27/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/04768eab277ce59288344e14a963793d4a9ea451 Thanks. Christian Ehrhardt --- >From 04768eab277ce59288344e14a963793d4a9ea451 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 ce6f37880a..a3bc037062 100644 --- a/drivers/net/hns3/hns3_flow.c +++ b/drivers/net/hns3/hns3_flow.c @@ -1189,6 +1189,7 @@ static bool 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; /* @@ -1205,11 +1206,16 @@ hns3_action_rss_same(const struct rte_flow_action_rss *comp, func_is_same = (with->func != RTE_ETH_HASH_FUNCTION_DEFAULT) ? (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.35.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-25 16:58:45.738230299 +0100 +++ 0039-net-hns3-fix-RSS-key-with-null.patch 2022-02-25 16:58:44.256990428 +0100 @@ -1 +1 @@ -From e995c91dcc426e83d4d0d6681b8d3dc0d313c655 Mon Sep 17 00:00:00 2001 +From 04768eab277ce59288344e14a963793d4a9ea451 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 ce6f37880a..a3bc037062 100644 @@ -27 +28 @@ -@@ -1286,6 +1286,7 @@ static bool +@@ -1189,6 +1189,7 @@ static bool @@ -35 +36 @@ -@@ -1302,11 +1303,16 @@ hns3_action_rss_same(const struct rte_flow_action_rss *comp, +@@ -1205,11 +1206,16 @@ hns3_action_rss_same(const struct rte_flow_action_rss *comp,