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 85AE4A0C47 for ; Mon, 26 Jul 2021 15:55:08 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7DFAD410EF; Mon, 26 Jul 2021 15:55:08 +0200 (CEST) Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mails.dpdk.org (Postfix) with ESMTP id 01515410E6 for ; Mon, 26 Jul 2021 15:55:08 +0200 (CEST) Received: by mail-wr1-f50.google.com with SMTP id j2so11157777wrx.9 for ; Mon, 26 Jul 2021 06:55:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Tm3jEnm8zkWg3NmLaAhBoeAiiEYB6UfVRSHPiQpyQss=; b=RKRKxrL2q3TIMfER1iQXmcPm1Oe5Uf2oUnlVWxDlPk7Yuh9EFQdTetlxAmhA2UBd15 jQgyKuH9CV4BiDkywxU/Btinc+3+EnFyKib61e3na0fgrsTN75U4BvfaN80G3F2plsqV DFkF+iE6dmp+yD2hDx2bcH3F2not+JMH0yAzZ4/mWDP3Msw1+swy+vnqFzu+h0icX72P /Ne+sgQJIl0dZY5GHSG5fAVRkZdspF5G9ddFY5kMEfxFwDRR2UQLbz3g6CEiJkjQs7Ox Jq4T9S1/+VpjwKViTcbM5OEB4fMmLlTU7OCX05i3wz+V96JFG4dLScU84878YdVqrrek lZ4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Tm3jEnm8zkWg3NmLaAhBoeAiiEYB6UfVRSHPiQpyQss=; b=ONLKhQqmKogG94P7CSDWVLCYPBKjn7CyHQdGLZQjlV63Kh6G1Fuok61ft0qkVLbOGB QTkWZbB3oNMGzjaHcjP+B/tBvnkdSXTYWfzCIQzxrOSLrZnw+mMOsY8vJtK1WaOWvR8U 9AxwOJcsEBN1ES9dA8/ShE822K6px9PADMKV10mj5Lkcx9Ew4MpXDy3u4tvgCvJueVj6 mC/JV6qAVGGeZSFmNb8H9r6KgSqp9QDZId4BarZuhmCITUsMdTJcoV5yZOp/p3syiriB 4Hl3rGdousLP6boynXFPEOf7FYjVK0wAwrSGLhP5lfMMUQGmuyHgaEiYjLJlgzE00JZt 79JA== X-Gm-Message-State: AOAM5328TZ5rZetFmmeh/cDqfK006x1Y8cKqsFdhfdXr03l1rR/LjJMO nHHrKG1XjuqpwheElqy9tv4= X-Google-Smtp-Source: ABdhPJxGIDtXdY33AMgbLoM014W7pDSfWriQ8YXRHMHFPQ6HzaV3fLbF5ZuYXXF9rpZwbeJ8px+Yyw== X-Received: by 2002:a5d:5048:: with SMTP id h8mr19722720wrt.292.1627307707748; Mon, 26 Jul 2021 06:55:07 -0700 (PDT) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id v15sm14305484wmj.39.2021.07.26.06.55.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jul 2021 06:55:07 -0700 (PDT) From: luca.boccassi@gmail.com To: Lior Margalit Cc: Matan Azrad , dpdk stable Date: Mon, 26 Jul 2021 14:52:56 +0100 Message-Id: <20210726135322.149850-33-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210726135322.149850-1-luca.boccassi@gmail.com> References: <20210712130551.2462159-1-luca.boccassi@gmail.com> <20210726135322.149850-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx5: fix RSS expansion for GTP' has been queued to stable release 20.11.3 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/28/21. 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/cf3ae2009ce9e46c81fd030dc27bd70d4caffe16 Thanks. Luca Boccassi --- >From cf3ae2009ce9e46c81fd030dc27bd70d4caffe16 Mon Sep 17 00:00:00 2001 From: Lior Margalit Date: Sun, 18 Jul 2021 14:15:04 +0300 Subject: [PATCH] net/mlx5: fix RSS expansion for GTP [ upstream commit 3e455a97dcb23b6e3684aa48a0302cf0429f4286 ] The flow did not expand correctly when it included a GTP item. Added GTP node to the expansion graph as possible next node after IPv4/IPv6 UDP node. Fixes: 592f05b29a25 ("net/mlx5: add RSS flow action") Signed-off-by: Lior Margalit Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_flow.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 4f5a0cf95c..f067619001 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -135,6 +135,7 @@ mlx5_flow_is_rss_expandable_item(const struct rte_flow_item *item) case RTE_FLOW_ITEM_TYPE_VXLAN_GPE: case RTE_FLOW_ITEM_TYPE_GRE_KEY: case RTE_FLOW_ITEM_TYPE_IPV6_FRAG_EXT: + case RTE_FLOW_ITEM_TYPE_GTP: return true; default: break; @@ -455,6 +456,7 @@ enum mlx5_expansion { MLX5_EXPANSION_IPV6_UDP, MLX5_EXPANSION_IPV6_TCP, MLX5_EXPANSION_IPV6_FRAG_EXT, + MLX5_EXPANSION_GTP }; /** Supported expansion of items. */ @@ -511,7 +513,8 @@ static const struct mlx5_flow_expand_node mlx5_support_expansion[] = { [MLX5_EXPANSION_OUTER_IPV4_UDP] = { .next = MLX5_FLOW_EXPAND_RSS_NEXT(MLX5_EXPANSION_VXLAN, MLX5_EXPANSION_VXLAN_GPE, - MLX5_EXPANSION_MPLS), + MLX5_EXPANSION_MPLS, + MLX5_EXPANSION_GTP), .type = RTE_FLOW_ITEM_TYPE_UDP, .rss_types = ETH_RSS_NONFRAG_IPV4_UDP, }, @@ -534,7 +537,8 @@ static const struct mlx5_flow_expand_node mlx5_support_expansion[] = { [MLX5_EXPANSION_OUTER_IPV6_UDP] = { .next = MLX5_FLOW_EXPAND_RSS_NEXT(MLX5_EXPANSION_VXLAN, MLX5_EXPANSION_VXLAN_GPE, - MLX5_EXPANSION_MPLS), + MLX5_EXPANSION_MPLS, + MLX5_EXPANSION_GTP), .type = RTE_FLOW_ITEM_TYPE_UDP, .rss_types = ETH_RSS_NONFRAG_IPV6_UDP, }, @@ -626,6 +630,11 @@ static const struct mlx5_flow_expand_node mlx5_support_expansion[] = { [MLX5_EXPANSION_IPV6_FRAG_EXT] = { .type = RTE_FLOW_ITEM_TYPE_IPV6_FRAG_EXT, }, + [MLX5_EXPANSION_GTP] = { + .next = MLX5_FLOW_EXPAND_RSS_NEXT(MLX5_EXPANSION_IPV4, + MLX5_EXPANSION_IPV6), + .type = RTE_FLOW_ITEM_TYPE_GTP + } }; static struct rte_flow_shared_action * -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-07-26 13:53:17.593507971 +0100 +++ 0033-net-mlx5-fix-RSS-expansion-for-GTP.patch 2021-07-26 13:53:15.873293127 +0100 @@ -1 +1 @@ -From 3e455a97dcb23b6e3684aa48a0302cf0429f4286 Mon Sep 17 00:00:00 2001 +From cf3ae2009ce9e46c81fd030dc27bd70d4caffe16 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 3e455a97dcb23b6e3684aa48a0302cf0429f4286 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 2dba207d27..2059f29b23 100644 +index 4f5a0cf95c..f067619001 100644 @@ -71 +72 @@ - static struct rte_flow_action_handle * + static struct rte_flow_shared_action *