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 F20EBA0C4F for ; Mon, 12 Jul 2021 15:15:14 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E775E4119D; Mon, 12 Jul 2021 15:15:14 +0200 (CEST) Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mails.dpdk.org (Postfix) with ESMTP id EEE8C41177 for ; Mon, 12 Jul 2021 15:15:13 +0200 (CEST) Received: by mail-wr1-f52.google.com with SMTP id a13so25547196wrf.10 for ; Mon, 12 Jul 2021 06:15:13 -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=6J56rVHsYTDRV9mpf/DzDaUsCibESrIigu5K+jUsF7k=; b=B++PPqGDX5Rla+nYK7akKL7FDJdBtStOiJ9H47r9og2cgJYzCtIWm2lx7La8wie6H5 /M9WIZOlBO3cUz1n9XhayxqdwYOTpj+jCipO9oJXfwQIrqIn6GwqnSrjdDU5nBgy816/ u5hzJhTimt7ltT8CHFo0uZkhwOIPgKDf/WE8VKNzF2JY7YMoApqimoRQkPyQLf5Wlpi6 q+af4mF02O/CEhng0HSyXa8M2+0UTUdExw+Vhwq7aN+3P5R0uf7NhWXhaCZ3z6/XaYks 38065Jj8TwO7cjpsCcK2RJevwewXbIwwnXAslEYzSxmu+xoXCXR5AywH2tfgs3NNUCDe MKcw== 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=6J56rVHsYTDRV9mpf/DzDaUsCibESrIigu5K+jUsF7k=; b=oJ2ZM9xqfb2ezCyT4JdqkOEjitXQg3m78iui45vt/tNM7BVt+5OBm5JWSEwwVU2L0S /A5uAAJtUARqsXoTCh+uaf5CeoNMzo3Fp4qkmEuAvGV1ysQsqNCNNLl7+OognJrXmNTB 10EJf0yhaFxtEAV7VI0pbeNOycpCJgi8wP0zKrKX1sXh7c2A8gIllzl4fbIeb5eUZROR yRZ7s45m/ksJgTLefQVkjmN0pCEKDWK2xl3uQ+zbGV1e9rZozU2ej95DkXkMVU0mLLR3 4AqoZCe4jAEbvXoUWHLCJwhlJmrFJFGqkVngtqYsuIFTl5yqpBL9j9onQM7ZB6l/Xq+0 h2Cw== X-Gm-Message-State: AOAM532SKWb1mV93H2obCBGWVjjGCL8ea+WSGmR5Q4xZ7YIHip2mmP/P k1tRHye5Oikc08CS/Rqy0H4= X-Google-Smtp-Source: ABdhPJxE+kjwx512e0gDGS6RGdZyUnDEay/voG6f75WqDF3V4qnf1fRuRFXX97fggmUWpMPVrhLyww== X-Received: by 2002:adf:fac7:: with SMTP id a7mr58571486wrs.384.1626095713762; Mon, 12 Jul 2021 06:15:13 -0700 (PDT) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id g3sm10874781wru.95.2021.07.12.06.15.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 06:15:13 -0700 (PDT) From: luca.boccassi@gmail.com To: Xiaoyu Min Cc: Matan Azrad , dpdk stable Date: Mon, 12 Jul 2021 14:05:33 +0100 Message-Id: <20210712130551.2462159-98-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 match MPLS over GRE with key' 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/9cce845acb4c0cf39a4e467109cf437ef5ecc76c Thanks. Luca Boccassi --- >From 9cce845acb4c0cf39a4e467109cf437ef5ecc76c Mon Sep 17 00:00:00 2001 From: Xiaoyu Min Date: Thu, 1 Jul 2021 13:54:56 +0800 Subject: [PATCH] net/mlx5: fix match MPLS over GRE with key [ upstream commit 4b1cb50a86b73dceade317be4541f2c176c7ca5b ] Currently PMD needs previous layer information in order to set corresponding match field for MPLSoGRE or MPLSoUDP. GRE_KEY item is missing as supported previous layer when translate item MPLS, which causes flow[1] cannot match MPLS over GRE traffic. According to RFC4023, MPLS over GRE tunnel with optional key field needs to be supported too. By adding missing GRE_KEY as supported previous layer fix problem. [1]: flow create 0 ingress pattern eth / ipv6 / gre k_bit is 1 / gre_key / mpls label is 966138 / end actions queue index 1 / mark id 0xa / end Fixes: a7a0365565a4 ("net/mlx5: match GRE key and present bits") Signed-off-by: Xiaoyu Min Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_flow_dv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index f5ceb7a2d5..3dd9c0d52b 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -7342,6 +7342,8 @@ flow_dv_translate_item_mpls(void *matcher, void *key, MLX5_UDP_PORT_MPLS); break; case MLX5_FLOW_LAYER_GRE: + /* Fall-through. */ + case MLX5_FLOW_LAYER_GRE_KEY: MLX5_SET(fte_match_set_misc, misc_m, gre_protocol, 0xffff); MLX5_SET(fte_match_set_misc, misc_v, gre_protocol, RTE_ETHER_TYPE_MPLS); -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-07-12 13:41:41.627370873 +0100 +++ 0098-net-mlx5-fix-match-MPLS-over-GRE-with-key.patch 2021-07-12 13:41:36.822129527 +0100 @@ -1 +1 @@ -From 4b1cb50a86b73dceade317be4541f2c176c7ca5b Mon Sep 17 00:00:00 2001 +From 9cce845acb4c0cf39a4e467109cf437ef5ecc76c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 4b1cb50a86b73dceade317be4541f2c176c7ca5b ] + @@ -22 +23,0 @@ -Cc: stable@dpdk.org @@ -31 +32 @@ -index 4758b9f2cb..0209a3e8e6 100644 +index f5ceb7a2d5..3dd9c0d52b 100644 @@ -34 +35 @@ -@@ -9064,6 +9064,8 @@ flow_dv_translate_item_mpls(void *matcher, void *key, +@@ -7342,6 +7342,8 @@ flow_dv_translate_item_mpls(void *matcher, void *key,