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 32F29A0032 for ; Fri, 18 Feb 2022 13:43:54 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2DF0740395; Fri, 18 Feb 2022 13:43:54 +0100 (CET) Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mails.dpdk.org (Postfix) with ESMTP id 6348540141 for ; Fri, 18 Feb 2022 13:43:52 +0100 (CET) Received: by mail-wr1-f46.google.com with SMTP id x5so9538515wrg.13 for ; Fri, 18 Feb 2022 04:43:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aUDMkvaSFewJ+p7vsyJ6AymIgJJ/XunvgUDOL90ZfCs=; b=b6PNa+Aeje+olNKvNjbQI00DkXJz43efv0gi2VWwMzH8xgls+AFCMMCd0trKxtZ5sa aMUWWwSEgQPI3U/I+IdNBeaN6B815Q0SADbzjxTwR6vmpa/Hjhpoj//fbLrYd/+bshEr IQbCt1DthN7vCdjCSgvuzvqQYkO09byld0FTlqkATWA0gOXXVgkRjzOsYQPfhTpUEt0Y 6kcLYC4wRIY8fjNdPAtwDHgDF7/B28KQf0nm9+olV4oPN6MITW1Oufgx7mklDCbJkJF/ E/ndHvjucOd5QX8/uWFABPJ3A9Cdw/HzyXgtZwQP2fspFvjsMI5hU0yh/n0rHfJdqOn3 8Pwg== 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=aUDMkvaSFewJ+p7vsyJ6AymIgJJ/XunvgUDOL90ZfCs=; b=e/ItBj4JuBLuOiI8yFmQrUvGkcJpqLtUOo6yfqNrfEhuVbYSF9n8rWOcdaTJ6TwQGm 8mFnq9K9yu3qM++9DMfu7ZPI7FRQRsBHto3te7nfnNrnMKZlfrOYNwtAmxlCbv3T7A2S 6+26llgZw5jY/76Njwb4acY1g+/OfnnDZ8ZkhkSWKffYSb+N8ZG/e8YUbwBfDWI/x08h KDBTsdyBkh6vsV1DnZfkPWzaGMPnOrZil/cRKSbVTZ8Iak4Xsr/JIpJYxGWwe9WCzIh6 vCkNoW6TA2cW4GVxq1suNBUPhZQQBlMF/QjITTnLboDMTMmMFzVl5bj3NkRZxn3IAfxR kpEQ== X-Gm-Message-State: AOAM533MEQwd3sst3rNg/7FuSiiBNZmOqkEJE9kQ+qTxJ9vc5cgVp/MO 9kchnviCI0bqzdOVNr6F8xPoQq+rgAJoHDSH X-Google-Smtp-Source: ABdhPJz/ZUT9zuw1kcsruEdgof0sqD/bBdUtPHEQXtIxM17Usfov74PY7nW3r1Lohsk3DHIhaCzUCg== X-Received: by 2002:a05:6000:1ace:b0:1e8:cbe4:9920 with SMTP id i14-20020a0560001ace00b001e8cbe49920mr5639117wry.121.1645188232143; Fri, 18 Feb 2022 04:43:52 -0800 (PST) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id m22sm4625821wmq.35.2022.02.18.04.43.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Feb 2022 04:43:51 -0800 (PST) From: luca.boccassi@gmail.com To: Lijun Ou Cc: dpdk stable Subject: patch 'net/hns3: fix RSS key with null' has been queued to stable release 20.11.5 Date: Fri, 18 Feb 2022 12:38:53 +0000 Message-Id: <20220218123931.1749595-84-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220218123931.1749595-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-1-luca.boccassi@gmail.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 20.11.5 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/20/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/73d429724480502174f68200a152a54bc9baf9fb Thanks. Luca Boccassi --- >From 73d429724480502174f68200a152a54bc9baf9fb 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 6c09172343..8d9c2ef530 100644 --- a/drivers/net/hns3/hns3_flow.c +++ b/drivers/net/hns3/hns3_flow.c @@ -1264,6 +1264,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; /* @@ -1280,11 +1281,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.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-18 12:37:41.117607526 +0000 +++ 0084-net-hns3-fix-RSS-key-with-null.patch 2022-02-18 12:37:37.770793707 +0000 @@ -1 +1 @@ -From e995c91dcc426e83d4d0d6681b8d3dc0d313c655 Mon Sep 17 00:00:00 2001 +From 73d429724480502174f68200a152a54bc9baf9fb 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 6c09172343..8d9c2ef530 100644 @@ -27 +28 @@ -@@ -1286,6 +1286,7 @@ static bool +@@ -1264,6 +1264,7 @@ static bool @@ -35 +36 @@ -@@ -1302,11 +1303,16 @@ hns3_action_rss_same(const struct rte_flow_action_rss *comp, +@@ -1280,11 +1281,16 @@ hns3_action_rss_same(const struct rte_flow_action_rss *comp,