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 62033A0C4C for ; Mon, 12 Jul 2021 15:15:29 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5C3E040685; Mon, 12 Jul 2021 15:15:29 +0200 (CEST) Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by mails.dpdk.org (Postfix) with ESMTP id 0808940685 for ; Mon, 12 Jul 2021 15:15:28 +0200 (CEST) Received: by mail-wm1-f42.google.com with SMTP id y21-20020a7bc1950000b02902161fccabf1so11224214wmi.2 for ; Mon, 12 Jul 2021 06:15:28 -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=uCg6N3eyJOhke/WRjLTbbUKyj30AE6qpH0ytgN+aKJQ=; b=YfaU9JO2xvzD/mJoeExNcyUm9tJS/KJQjjZie5w8uZ3Pt43FK7xUyLaCusjmTciAaU CGOkZdu1/NUsrm0RQZi6bjCL/cpAjLPSq+IrJ/RIgxhgFIXZWuAq0fOcJtRwRnIBz+WX Gy0MFrb/23OtMOtNj2QZEgt2uros7oFIYBVfAmwT4UsEDLkJ5YzTPixXW3ehX1erPpIh 3tzlCh78qk3awSKLIGjXwjNAx9FA7Qco37yuLue+ZrSS0PjQ2srSPG6ReTtVNIBRDH6L 3idusK3063kUAMno4nyOD8EiLXxaoOl1BtioDo6LJELe/RdFmUQLUislkKlA4nygLlDe uQdw== 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=uCg6N3eyJOhke/WRjLTbbUKyj30AE6qpH0ytgN+aKJQ=; b=J3D6d3uAG+K/yr0tYXi757kEmEY4wpWeWzJMPxr6Zfgwx7tAww0cAIOX3DuehoegoR 2KblvdiWP+x+UOR6YuL8c7btN2m62kksLmXJYpEZHaO75YQ/4Wyh7Ni0Fuq+LPYKGR1X xGp1nFKHw7p4UEWLtEG+A8XS1lgTZgsisBf1BJqt/pIF+kLmjvGGiPbGQfsyoqAf1k7U RyX20kAcKJX8lltQukJqbtHUJ6BD6s4f6eTtgnjKmW0ysZtTrCAgfPFoZrnz2OtPiPev qmDiFEy6Ho29rod0/2ILQCjwuR/ipGMaJ5x8NZZE/GKSH4udtFoIKrlgo+mTYJE+D5eT NPnQ== X-Gm-Message-State: AOAM5304jMr5QFPdjKzkndzVz3baT6r0XkSEZJKdwfo7tscJAqqCT+lf 70SxoSzPJM/zv02OzFUnOGE= X-Google-Smtp-Source: ABdhPJxz4+DOfJc3p1ErY1VRl5nU0Y0HsLLuVVsSEEYpSs5vvpFRfu9mO3EVvOU8JrFbHVp/Lr9XtQ== X-Received: by 2002:a1c:ed14:: with SMTP id l20mr14103228wmh.20.1626095727845; Mon, 12 Jul 2021 06:15:27 -0700 (PDT) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id m18sm12082210wmq.45.2021.07.12.06.15.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 06:15:27 -0700 (PDT) From: luca.boccassi@gmail.com To: Xiaoyu Min Cc: Matan Azrad , dpdk stable Date: Mon, 12 Jul 2021 14:05:36 +0100 Message-Id: <20210712130551.2462159-101-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210712130551.2462159-1-luca.boccassi@gmail.com> References: <20210712130551.2462159-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx5: fix MPLS RSS expansion' 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/14/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/66d53636e902dc2474206225565daed4729ac6b2 Thanks. Luca Boccassi --- >From 66d53636e902dc2474206225565daed4729ac6b2 Mon Sep 17 00:00:00 2001 From: Xiaoyu Min Date: Fri, 2 Jul 2021 16:34:47 +0800 Subject: [PATCH] net/mlx5: fix MPLS RSS expansion [ upstream commit 84f4764c22a32b319cb6fa7c8935b0d7977298cc ] MPLSoUDP and MPLSoGRE are supported by PMD from rte flow point of view. RSS expansion doesn't support above but, instead, supports normal MPLS over L2, which actually will be rejected by PMD. This patch removes RSS expansion support of the MPLS over L2 and adds support of MPLSoUDP and MPLSoGRE. In addition to above, support for eth over MPLS expansion is added too. Fixes: a4a5cd21d20a ("net/mlx5: add flow MPLS item") Signed-off-by: Xiaoyu Min Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_flow.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index e11652a467..35a1d04a2e 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -131,6 +131,7 @@ mlx5_flow_is_rss_expandable_item(const struct rte_flow_item *item) case RTE_FLOW_ITEM_TYPE_NVGRE: case RTE_FLOW_ITEM_TYPE_GRE: case RTE_FLOW_ITEM_TYPE_GENEVE: + case RTE_FLOW_ITEM_TYPE_MPLS: return true; default: break; @@ -477,8 +478,7 @@ static const struct mlx5_flow_expand_node mlx5_support_expansion[] = { }, [MLX5_EXPANSION_OUTER_ETH] = { .next = MLX5_FLOW_EXPAND_RSS_NEXT(MLX5_EXPANSION_OUTER_IPV4, - MLX5_EXPANSION_OUTER_IPV6, - MLX5_EXPANSION_MPLS), + MLX5_EXPANSION_OUTER_IPV6), .type = RTE_FLOW_ITEM_TYPE_ETH, .rss_types = 0, }, @@ -506,7 +506,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_VXLAN_GPE, + MLX5_EXPANSION_MPLS), .type = RTE_FLOW_ITEM_TYPE_UDP, .rss_types = ETH_RSS_NONFRAG_IPV4_UDP, }, @@ -528,7 +529,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_VXLAN_GPE, + MLX5_EXPANSION_MPLS), .type = RTE_FLOW_ITEM_TYPE_UDP, .rss_types = ETH_RSS_NONFRAG_IPV6_UDP, }, @@ -551,12 +553,14 @@ static const struct mlx5_flow_expand_node mlx5_support_expansion[] = { [MLX5_EXPANSION_GRE] = { .next = MLX5_FLOW_EXPAND_RSS_NEXT(MLX5_EXPANSION_IPV4, MLX5_EXPANSION_IPV6, - MLX5_EXPANSION_GRE_KEY), + MLX5_EXPANSION_GRE_KEY, + MLX5_EXPANSION_MPLS), .type = RTE_FLOW_ITEM_TYPE_GRE, }, [MLX5_EXPANSION_GRE_KEY] = { .next = MLX5_FLOW_EXPAND_RSS_NEXT(MLX5_EXPANSION_IPV4, - MLX5_EXPANSION_IPV6), + MLX5_EXPANSION_IPV6, + MLX5_EXPANSION_MPLS), .type = RTE_FLOW_ITEM_TYPE_GRE_KEY, .optional = 1, }, @@ -566,7 +570,8 @@ static const struct mlx5_flow_expand_node mlx5_support_expansion[] = { }, [MLX5_EXPANSION_MPLS] = { .next = MLX5_FLOW_EXPAND_RSS_NEXT(MLX5_EXPANSION_IPV4, - MLX5_EXPANSION_IPV6), + MLX5_EXPANSION_IPV6, + MLX5_EXPANSION_ETH), .type = RTE_FLOW_ITEM_TYPE_MPLS, }, [MLX5_EXPANSION_ETH] = { -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-07-12 13:41:41.823857818 +0100 +++ 0101-net-mlx5-fix-MPLS-RSS-expansion.patch 2021-07-12 13:41:36.866130443 +0100 @@ -1 +1 @@ -From 84f4764c22a32b319cb6fa7c8935b0d7977298cc Mon Sep 17 00:00:00 2001 +From 66d53636e902dc2474206225565daed4729ac6b2 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 84f4764c22a32b319cb6fa7c8935b0d7977298cc ] + @@ -19 +20,0 @@ -Cc: stable@dpdk.org @@ -28 +29 @@ -index dc41e8b1b7..00fc37ed55 100644 +index e11652a467..35a1d04a2e 100644