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 5A214A0093 for ; Wed, 9 Mar 2022 17:32:28 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 545C0410E6; Wed, 9 Mar 2022 17:32:28 +0100 (CET) Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mails.dpdk.org (Postfix) with ESMTP id 5D6EA4013F for ; Wed, 9 Mar 2022 17:32:26 +0100 (CET) Received: by mail-wr1-f51.google.com with SMTP id p9so3889254wra.12 for ; Wed, 09 Mar 2022 08:32:26 -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=JtFbSNDiMOiSyOc6NBAhffHFXQFNaLU0Rx+hnbhMxlg=; b=Ebjzx58st5Qzc780PIf80sI6DadIlgi9CXy+wjzppCE/2qMPY9PCMwfSM4L1HBpnkP WFxRYybB2SoVwmAtQVo6ByX93WepJTxRQTCQDXVwSuKoWfii3WpPeKyXhuZ6JeT/8WiE 8nkYzqdVSrur5j3XnC8Zuyl5c2afhIS9suDkWiSxQ3XMkHntC5O1NXRwWPbRR67f6+sx t9Pa6emuP8SHu+jwxx56HSNvaZ1Sb0d9yatW41GMQRPqEPzcCRdslGotVgD9CM7BC1wq QvVeuMttIxaP3U6bgZz8S8ms5XcnOPMnP0PX/vnqkfZ7xmcRUxezta+sTXK3CieCGJ2h aPeg== 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=JtFbSNDiMOiSyOc6NBAhffHFXQFNaLU0Rx+hnbhMxlg=; b=6mlslmuka5WMUjIRKWiLMDKjh2VfbAjVhW3mmgQjQvzgGqQHxaOpxF7HyofJ0vYZI4 paLhm4rgCk6IBIZQyIH4kjR2lEHBJFc3vMgfEdpEjo6vrCwaOHfKCWyYGnIAJxF1eSaB lQr2TeYFYGU6/Lnhm3Te6KFx0pxDuO/zOG/ASq8Qf4k5gI5GtYTqQwsAggj2Py1/1ESe AeTEaQfJRjsS/FSC3SIM6cf5X8zAfEavjhZarWc1iWURzt8cxG2lKUjO4ogQsl/Y0mnL p5hCvR7h4IKDmHZfSG0P9VR7fVTWdJgCH9C0vYkiUFHcrPxNhRiSxoc3PMsLlTZVp9uf UU9A== X-Gm-Message-State: AOAM531wgk6kFaLdX7X8zOR3ZfqGnVLVra5rqZ0MejoxaigfhGrWt8fJ nOT2qE2xn8kjtrTJHeQ654N2WSlkZ+g= X-Google-Smtp-Source: ABdhPJyw1xLgHeeF8ndGC+EtY/XfvnsUX8RilLJ9fgDn0gUthdeFewtObtmsum6Cy9Ev2bEtUvn1tA== X-Received: by 2002:adf:914f:0:b0:1ed:bb92:d0cc with SMTP id j73-20020adf914f000000b001edbb92d0ccmr336227wrj.297.1646843546102; Wed, 09 Mar 2022 08:32:26 -0800 (PST) Received: from localhost ([2a01:4b00:f41a:3600:360b:9754:2e3a:c344]) by smtp.gmail.com with ESMTPSA id i15-20020a05600011cf00b001edc2966dd4sm2027527wrx.47.2022.03.09.08.32.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Mar 2022 08:32:25 -0800 (PST) From: luca.boccassi@gmail.com To: Gregory Etelson Cc: Matan Azrad , dpdk stable Subject: patch 'net/mlx5: fix next protocol RSS expansion' has been queued to stable release 20.11.5 Date: Wed, 9 Mar 2022 16:30:46 +0000 Message-Id: <20220309163053.245754-30-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220309163053.245754-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-1-luca.boccassi@gmail.com> <20220309163053.245754-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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 03/11/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/34d3fdceae89d42fd910f46eae2ccb94899797d6 Thanks. Luca Boccassi --- >From 34d3fdceae89d42fd910f46eae2ccb94899797d6 Mon Sep 17 00:00:00 2001 From: Gregory Etelson Date: Tue, 1 Mar 2022 17:18:55 +0200 Subject: [PATCH] net/mlx5: fix next protocol RSS expansion MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit 6ae5c238371aeb86359c5a6c1eb1330e1cc25fca ] RSS expansion scheme has 2 operational modes: default and specific. The default mode expands into all valid options for a given network layer. For example, Ethernet expands by default into VLAN, IPv4 and IPv6, L3 expands into TCP and UDP, etc. The specific mode expands according to flow item next protocol configuration provided by the item spec and mask parameters. There are 3 outcomes for the specific expansion: 1. Back to default – that is the case when result of (spec & mask) allows all possibilities. For example: eth type mask 0 type spec 0 2. No results – in that case item configuration has no valid expansion. For example: eth type mask 0xffff type spec 101 3. Direct - In that case flow item mask and spec configuration return valid expansion option. Example: eth type mask 0x0fff type spec 0x0800. Current PMD expands flow items with explicit spec and mask configuration into the Direct(3) or No results (2). Default expansions were handled as No results. Fixes: f3f1f576f438 ("net/mlx5: fix RSS expansion with explicit next protocol") Signed-off-by: Gregory Etelson Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_flow.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 24c2665c53..56db0217b9 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -174,6 +174,9 @@ mlx5_nsh_proto_to_item_type(uint8_t proto_spec, uint8_t proto_mask) enum rte_flow_item_type type; switch (proto_mask & proto_spec) { + case 0: + type = RTE_FLOW_ITEM_TYPE_VOID; + break; case RTE_VXLAN_GPE_TYPE_IPV4: type = RTE_FLOW_ITEM_TYPE_IPV4; break; @@ -195,6 +198,9 @@ mlx5_inet_proto_to_item_type(uint8_t proto_spec, uint8_t proto_mask) enum rte_flow_item_type type; switch (proto_mask & proto_spec) { + case 0: + type = RTE_FLOW_ITEM_TYPE_VOID; + break; case IPPROTO_UDP: type = RTE_FLOW_ITEM_TYPE_UDP; break; @@ -220,6 +226,9 @@ mlx5_ethertype_to_item_type(rte_be16_t type_spec, enum rte_flow_item_type type; switch (rte_be_to_cpu_16(type_spec & type_mask)) { + case 0: + type = RTE_FLOW_ITEM_TYPE_VOID; + break; case RTE_ETHER_TYPE_TEB: type = is_tunnel ? RTE_FLOW_ITEM_TYPE_ETH : RTE_FLOW_ITEM_TYPE_END; -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-09 16:30:09.617167382 +0000 +++ 0030-net-mlx5-fix-next-protocol-RSS-expansion.patch 2022-03-09 16:30:08.575025781 +0000 @@ -1 +1 @@ -From 6ae5c238371aeb86359c5a6c1eb1330e1cc25fca Mon Sep 17 00:00:00 2001 +From 34d3fdceae89d42fd910f46eae2ccb94899797d6 Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit 6ae5c238371aeb86359c5a6c1eb1330e1cc25fca ] + @@ -30 +31,0 @@ -Cc: stable@dpdk.org @@ -39 +40 @@ -index 9bb4ce26f7..efb988a9bb 100644 +index 24c2665c53..56db0217b9 100644 @@ -42 +43 @@ -@@ -175,6 +175,9 @@ mlx5_nsh_proto_to_item_type(uint8_t proto_spec, uint8_t proto_mask) +@@ -174,6 +174,9 @@ mlx5_nsh_proto_to_item_type(uint8_t proto_spec, uint8_t proto_mask) @@ -52 +53 @@ -@@ -196,6 +199,9 @@ mlx5_inet_proto_to_item_type(uint8_t proto_spec, uint8_t proto_mask) +@@ -195,6 +198,9 @@ mlx5_inet_proto_to_item_type(uint8_t proto_spec, uint8_t proto_mask) @@ -62 +63 @@ -@@ -221,6 +227,9 @@ mlx5_ethertype_to_item_type(rte_be16_t type_spec, +@@ -220,6 +226,9 @@ mlx5_ethertype_to_item_type(rte_be16_t type_spec,