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 47448A0C47 for ; Tue, 10 Aug 2021 17:43:15 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3F791411CA; Tue, 10 Aug 2021 17:43:15 +0200 (CEST) Received: from smtp-relay-canonical-1.canonical.com (smtp-relay-canonical-1.canonical.com [185.125.188.121]) by mails.dpdk.org (Postfix) with ESMTP id 25BDD411C8 for ; Tue, 10 Aug 2021 17:43:14 +0200 (CEST) Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPS id 0DE123F357 for ; Tue, 10 Aug 2021 15:43:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1628610194; bh=cWpIHmhNOgF1MD8HoFbWPtPD0t7Q1ELTOCH6P+FR4W0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=cpGWrN041sAuA8Ie6WGXvPkb7g4E724D3xOvb8FYxODDd73VgzddV7YAr4LKe8e6k h5LQ3VdW48CuV0xuUBDmU+j4yH/+XlBuB6x2PLaNkaSyzQnjArUPzvSAVgqLNVTKM7 3mnHrqxNAFLfwyjpqthd9vrMhuqkx9Pvmc9/BQFFZDLTYdfcFfOMTz8F7+9An3PH6f aq+W8O/T/DSNOSAMZfLytt9i/6+hISpM9LJVP9ihHeziiOcm1mS03A+lYkeuNBPlaU 1A27ThgpTRAyxQM3AqZ844cXePvcbHXsrjaaqjo1mKmZs84HuWCzsq7owVgrgqWJWQ AdslqLAVKASbg== Received: by mail-ej1-f70.google.com with SMTP id ja25-20020a1709079899b02905b2a2bf1a62so1712688ejc.4 for ; Tue, 10 Aug 2021 08:43:14 -0700 (PDT) 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=cWpIHmhNOgF1MD8HoFbWPtPD0t7Q1ELTOCH6P+FR4W0=; b=EhJ+6l6Fy6qmQwrofJUK7NXIYUErD5gPWYSiK2EtwlZhAVU5htdFsq7QCSN5QeOn1l z4/jHBmiGs1UIx1zE57BdjKJ6EJ8Do39xOzoA8fRqafAtA6WQft1BGgE9xM707pd+Tpw /f5YqgHDSagpAMMbfr78jBVAskfQfD38zRYB8r/jkoKjsgnklfYy+Kt+cp/SFhlsHdKC 1LIYtMASEUfao4qmkfoq+IhWBV2pb3KN7mj35IfphUI1aEQ+3FRblHAfoFcBsNJqZvqP gFq4NQmKJ7Yz92ZPub9I6Z/2MhSyNzJWqd1ZHJKMkc+EiCeQ4qqMhhLOkPMLeKXrKEKs OwfQ== X-Gm-Message-State: AOAM530K2YotE/wRCuItDPVN8CJa47/6KvlApW+FiE9OEXc1VPQY43X/ /ltZZye/O0ftaG4CEND7RR+auur1OnN8BamWv1E2mGY2HAFHoHjZ9FF0ZMo4fTKExFrJs6O9U3q UVBVV6ya0/ZUWYLaShSDKxUXJ X-Received: by 2002:a17:906:345b:: with SMTP id d27mr1673512ejb.429.1628610193738; Tue, 10 Aug 2021 08:43:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzVsM7poQhtruQYQTP3jXx03ZDzfU1A3PYWKF2b5MkZXW4ttLL3Cn/MySBWlkr+jZZikVZVAw== X-Received: by 2002:a17:906:345b:: with SMTP id d27mr1673500ejb.429.1628610193566; Tue, 10 Aug 2021 08:43:13 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id lk14sm7034740ejb.9.2021.08.10.08.43.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Aug 2021 08:43:13 -0700 (PDT) From: christian.ehrhardt@canonical.com To: Xiaoyu Min Cc: Matan Azrad , dpdk stable Date: Tue, 10 Aug 2021 17:39:35 +0200 Message-Id: <20210810154022.749358-55-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210810154022.749358-1-christian.ehrhardt@canonical.com> References: <20210810154022.749358-1-christian.ehrhardt@canonical.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 19.11.10 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 19.11.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/12/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/55b8b2f9e12ec0ddab7b9a4945bea0ea01c252f3 Thanks. Christian Ehrhardt --- >From 55b8b2f9e12ec0ddab7b9a4945bea0ea01c252f3 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 7bc0cc2662..65064ffb07 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -2224,9 +2224,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 5f0d720d69..a021ac9d20 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -6228,9 +6228,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.32.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-08-10 15:11:15.160524337 +0200 +++ 0055-net-mlx5-remove-unsupported-flow-item-MPLS-over-IP.patch 2021-08-10 15:11:13.046638301 +0200 @@ -1 +1 @@ -From 14ad99d78a466bd5fb796cb9c147d2a315cbe318 Mon Sep 17 00:00:00 2001 +From 55b8b2f9e12ec0ddab7b9a4945bea0ea01c252f3 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 7bc0cc2662..65064ffb07 100644 @@ -24 +25 @@ -@@ -2923,9 +2923,8 @@ mlx5_flow_validate_item_mpls(struct rte_eth_dev *dev __rte_unused, +@@ -2224,9 +2224,8 @@ mlx5_flow_validate_item_mpls(struct rte_eth_dev *dev __rte_unused, @@ -37 +38 @@ -index 6ffdaf188c..6c8adb3481 100644 +index 5f0d720d69..a021ac9d20 100644 @@ -40 +41 @@ -@@ -9076,9 +9076,6 @@ flow_dv_translate_item_mpls(void *matcher, void *key, +@@ -6228,9 +6228,6 @@ flow_dv_translate_item_mpls(void *matcher, void *key,