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 3C6DFA0C4C for ; Mon, 12 Jul 2021 15:15:18 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 35BDA40685; Mon, 12 Jul 2021 15:15:18 +0200 (CEST) Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by mails.dpdk.org (Postfix) with ESMTP id 09F4B406B4 for ; Mon, 12 Jul 2021 15:15:17 +0200 (CEST) Received: by mail-wr1-f54.google.com with SMTP id l7so24645106wrv.7 for ; Mon, 12 Jul 2021 06:15:17 -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=psiEdPh/d4L1OflSBdZU/YnFRdhxKeT+Yi3LCGw4KGQ=; b=QJ0PxSGDP9LzNHi75tMlZgsa6kifq4+86qvQyDTvf3eFqUK8C7hUaWCpf6k19kSeBv bzcJzKrUdHAZrsH7Jv0uJy+rMlKL4wWkWxsB6uirCW4hnXGJef6U5nnpccC7fiVNCx0D aVza3uZ1FfX6ydf/KWnMYE0Vu6sIpACpKO3YfPIe48iTXVinMJLNcCFoZ8si11J1oMxq KXBzaDppRFyb9bTY0En+MMp8dIR83quVr5IfeavmHVrPU9NdktSrOGRhdi9l18uQaem4 t1A4XT3WhSSTYUM2hknZGE/s9BVASsAMfFKtYr5MtWi+OaBFjpqPOh/mteKkAXPov12A Aasg== 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=psiEdPh/d4L1OflSBdZU/YnFRdhxKeT+Yi3LCGw4KGQ=; b=B1Eq+2Da59At89xLAEo0PMohVqv4XkDBIs4kdXwgBbgEeCEKPpvC0CMBGxDSh8yV2d 1ySYeCy8HX/oP5NPxzbSNB/knTw13xulM3xRicFwuLeIqkDVdwR1hl5cyKKOEIgWsM2A JoKyvwA/yvVIf/n2UiJ2fWSZi0ZsiHxjrnipV99xVtkKg5ml32D6GiFoqzjtvLhpFJEn HU/+tg4tPfnM3P3zU/W4Ps65WlJRso/fL5ZWu9atF2Eyu9njMjmkewJ9+K6cZ0aX4hSZ eGXDnkW0iRPlXu41W+gzmh33d25cH14YxUlQjKboryJONlI/b/uo7CmmReC1zoDuvAVI BgOg== X-Gm-Message-State: AOAM530LeJyjRcijni8wH2wkualYAGMbz97zvZPLbvod9zpMOKZIC5Nr m9oO7plzkaa3f/VFZgHf0BM= X-Google-Smtp-Source: ABdhPJyTuXBH1a/OPSGoi35NymD3G/KcObQEVY9jl7uhAu9GMSkbDl+ZKEvKqshzI7ScIVeek3ys7w== X-Received: by 2002:adf:f70a:: with SMTP id r10mr41526807wrp.401.1626095716855; Mon, 12 Jul 2021 06:15:16 -0700 (PDT) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id i15sm15339887wro.3.2021.07.12.06.15.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 06:15:15 -0700 (PDT) From: luca.boccassi@gmail.com To: Xiaoyu Min Cc: Matan Azrad , dpdk stable Date: Mon, 12 Jul 2021 14:05:35 +0100 Message-Id: <20210712130551.2462159-100-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: remove unsupported flow item MPLS over IP' 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/c66f74e42606307ac3303bfea3cb0f69cc794ddf Thanks. Luca Boccassi --- >From c66f74e42606307ac3303bfea3cb0f69cc794ddf Mon Sep 17 00:00:00 2001 From: Xiaoyu Min Date: Fri, 2 Jul 2021 16:34:46 +0800 Subject: [PATCH] net/mlx5: remove unsupported flow item MPLS over IP [ upstream commit 14ad99d78a466bd5fb796cb9c147d2a315cbe318 ] HW doesn't support match MPLS over IP traffic. Remove related code. Fixes: d1abe664ddde ("net/mlx5: add MPLS to Direct Verbs flow engine") Signed-off-by: Xiaoyu Min Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_flow.c | 5 ++--- drivers/net/mlx5/mlx5_flow_dv.c | 3 --- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 5e64a674d3..e11652a467 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -2700,9 +2700,8 @@ mlx5_flow_validate_item_mpls(struct rte_eth_dev *dev __rte_unused, "MPLS not supported or" " disabled in firmware" " configuration."); - /* MPLS over IP, UDP, GRE is allowed */ - if (!(prev_layer & (MLX5_FLOW_LAYER_OUTER_L3 | - MLX5_FLOW_LAYER_OUTER_L4_UDP | + /* MPLS over UDP, GRE is allowed */ + if (!(prev_layer & (MLX5_FLOW_LAYER_OUTER_L4_UDP | MLX5_FLOW_LAYER_GRE | MLX5_FLOW_LAYER_GRE_KEY))) return rte_flow_error_set(error, EINVAL, diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 3dd9c0d52b..0ffbdb4ab7 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -7349,9 +7349,6 @@ flow_dv_translate_item_mpls(void *matcher, void *key, RTE_ETHER_TYPE_MPLS); break; default: - MLX5_SET(fte_match_set_lyr_2_4, headers_m, ip_protocol, 0xff); - MLX5_SET(fte_match_set_lyr_2_4, headers_v, ip_protocol, - IPPROTO_MPLS); break; } if (!in_mpls_v) -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-07-12 13:41:41.748695542 +0100 +++ 0100-net-mlx5-remove-unsupported-flow-item-MPLS-over-IP.patch 2021-07-12 13:41:36.854130193 +0100 @@ -1 +1 @@ -From 14ad99d78a466bd5fb796cb9c147d2a315cbe318 Mon Sep 17 00:00:00 2001 +From c66f74e42606307ac3303bfea3cb0f69cc794ddf Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 14ad99d78a466bd5fb796cb9c147d2a315cbe318 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 667ae3fd97..dc41e8b1b7 100644 +index 5e64a674d3..e11652a467 100644 @@ -24 +25 @@ -@@ -2923,9 +2923,8 @@ mlx5_flow_validate_item_mpls(struct rte_eth_dev *dev __rte_unused, +@@ -2700,9 +2700,8 @@ mlx5_flow_validate_item_mpls(struct rte_eth_dev *dev __rte_unused, @@ -37 +38 @@ -index 6ffdaf188c..6c8adb3481 100644 +index 3dd9c0d52b..0ffbdb4ab7 100644 @@ -40 +41 @@ -@@ -9076,9 +9076,6 @@ flow_dv_translate_item_mpls(void *matcher, void *key, +@@ -7349,9 +7349,6 @@ flow_dv_translate_item_mpls(void *matcher, void *key,