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 8F2D1A0093 for ; Thu, 10 Mar 2022 13:12:09 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8A39E4113E; Thu, 10 Mar 2022 13:12:09 +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 432454113E for ; Thu, 10 Mar 2022 13:12:08 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646914327; 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=e7NH7sqr3TnMRnqGO67ttN+8aCfh96mp6U0fHgqLH1Q=; b=IoxCCuGDWDe7L6gm0ukR0YReWN7c4MT2Q34hT+2jRXWCNq5Mok8ur6hNgUGKdITr2S0t2p XW97+0LvByhzNQq3ObGtYFruA2wSVYQQNuANYrQXQ/PVtX6ZsdW+YEftmFdqZE3BgpmeXT OoqFX/O1EJhuYuiNprlRAWAGX3v4Etg= 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-116-GUZArPfVP4Oi9XafqVmQdg-1; Thu, 10 Mar 2022 07:12:04 -0500 X-MC-Unique: GUZArPfVP4Oi9XafqVmQdg-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A8FAF1800D50; Thu, 10 Mar 2022 12:12:03 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.75]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9B21883079; Thu, 10 Mar 2022 12:12:02 +0000 (UTC) From: Kevin Traynor To: Gregory Etelson Cc: Matan Azrad , dpdk stable Subject: patch 'net/mlx5: fix next protocol RSS expansion' has been queued to stable release 21.11.1 Date: Thu, 10 Mar 2022 12:11:13 +0000 Message-Id: <20220310121127.1324802-7-ktraynor@redhat.com> In-Reply-To: <20220310121127.1324802-1-ktraynor@redhat.com> References: <20220310121127.1324802-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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-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 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 03/14/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/5d3ade99bd40fcc4cc0b495bf00c11fe65ae4bac Thanks. Kevin --- >From 5d3ade99bd40fcc4cc0b495bf00c11fe65ae4bac 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 7b53b8413d..cee8f00413 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -175,4 +175,7 @@ mlx5_nsh_proto_to_item_type(uint8_t proto_spec, uint8_t proto_mask) 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; @@ -196,4 +199,7 @@ mlx5_inet_proto_to_item_type(uint8_t proto_spec, uint8_t proto_mask) switch (proto_mask & proto_spec) { + case 0: + type = RTE_FLOW_ITEM_TYPE_VOID; + break; case IPPROTO_UDP: type = RTE_FLOW_ITEM_TYPE_UDP; @@ -221,4 +227,7 @@ mlx5_ethertype_to_item_type(rte_be16_t type_spec, 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 ? -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-10 12:05:31.655817491 +0000 +++ 0014-net-mlx5-fix-next-protocol-RSS-expansion.patch 2022-03-10 12:05:31.264630765 +0000 @@ -1 +1 @@ -From 6ae5c238371aeb86359c5a6c1eb1330e1cc25fca Mon Sep 17 00:00:00 2001 +From 5d3ade99bd40fcc4cc0b495bf00c11fe65ae4bac 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 7b53b8413d..cee8f00413 100644 @@ -42 +43 @@ -@@ -176,4 +176,7 @@ mlx5_nsh_proto_to_item_type(uint8_t proto_spec, uint8_t proto_mask) +@@ -175,4 +175,7 @@ mlx5_nsh_proto_to_item_type(uint8_t proto_spec, uint8_t proto_mask) @@ -50 +51 @@ -@@ -197,4 +200,7 @@ mlx5_inet_proto_to_item_type(uint8_t proto_spec, uint8_t proto_mask) +@@ -196,4 +199,7 @@ mlx5_inet_proto_to_item_type(uint8_t proto_spec, uint8_t proto_mask) @@ -58 +59 @@ -@@ -222,4 +228,7 @@ mlx5_ethertype_to_item_type(rte_be16_t type_spec, +@@ -221,4 +227,7 @@ mlx5_ethertype_to_item_type(rte_be16_t type_spec,