From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 128A7A04DD for ; Tue, 17 Nov 2020 12:16:10 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id F17DF5913; Tue, 17 Nov 2020 12:16:08 +0100 (CET) Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by dpdk.org (Postfix) with ESMTP id 1E9A24C90 for ; Tue, 17 Nov 2020 12:16:06 +0100 (CET) Received: by mail-wm1-f46.google.com with SMTP id h2so2870073wmm.0 for ; Tue, 17 Nov 2020 03:16:06 -0800 (PST) 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=Iq9Mg6f4vpsnzeNnqV7+TjAN9XgWL4XdI3JpXHnDIa4=; b=CbS5iZPU/kRr98nq/b3UYggFSIwtpHVFevjO/ae4J7UNZqHi8ebo5iZZRM8hISq8On qUoNJLbbco4KROG6jnnDM1bSVh8RRQvm8cCHL9mBE7u6qMz4f0ejov9mnGpaQDFJ2PhX +O10CDf7d3COKBP5rfvkeut3Ql4AAXuUsL2ROhbGuME5WRVYCZOqf98drIV9Rlm/A6F7 zMt4AgNbvqPFfVDz/gCIbxhsVLSTCFh2XTyrB5BNSw3BxuH+9E2DTE15E8s9Dy6LlWcY O0jetRawtCOUJYF1I2uwsDDVwWVTHv2Sqt9ev2XQh2dusKQU2UkSWO3S17P03oEQkCsN 5etw== 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=Iq9Mg6f4vpsnzeNnqV7+TjAN9XgWL4XdI3JpXHnDIa4=; b=IkbS5Zek/ALySnBmVFAe9n+2WrysdynWAFXrXHx9/1Y0JDNygfft4gDeiw1aeNAS0g rOmFlG+v6/0aOhMB6UDVqzRiQFvucel6Bg/4+szDxYTJnEJuS814vetMQGbznG/XWnc2 oGlNtJWbnMb6Z0SlluzB1kLYLxfq38XpzUS72h3n+KPNFl6L4C4osIwbHyIVgrOZ6GlC PHbQrlKygTHtuBS6rZ4Etkcf2VHBQEE+cJDl1IXFrAg9pcRllpWxSUcjVkX9DiVOL8px YIvb2ROchej3BWAZ2FeY3QiopbVe91p2bCDijZr9YZtvVik5lE+qeNpj48Zjq+6jjxh/ 1Skg== X-Gm-Message-State: AOAM530PkdrGbKek4fkczxJpWHV/kb48ybEc+IF9gyeZ1aLWU8gvz12/ 70QnvZ1vGXqk4dZ/qI9stfM= X-Google-Smtp-Source: ABdhPJzQMe0NMYz2bjI8sDtEgvJLxtI49eSlLUg6mld9yuZi1666CY0nS1wjDiM7nOTWiSX3zsBbPA== X-Received: by 2002:a1c:7e87:: with SMTP id z129mr3753076wmc.176.1605611765917; Tue, 17 Nov 2020 03:16:05 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id z19sm3029138wmk.12.2020.11.17.03.16.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Nov 2020 03:16:05 -0800 (PST) From: luca.boccassi@gmail.com To: Xiaoyu Min Cc: Matan Azrad , dpdk stable Date: Tue, 17 Nov 2020 11:14:07 +0000 Message-Id: <20201117111416.1961049-33-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201117111416.1961049-1-luca.boccassi@gmail.com> References: <20201109185030.3478760-2-luca.boccassi@gmail.com> <20201117111416.1961049-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx5: validate MPLSoGRE with GRE key' has been queued to stable release 19.11.6 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/19/20. 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/d40489b5b9eb5b6e777a38b47ed5e8f55b19a1c3 Thanks. Luca Boccassi --- >From d40489b5b9eb5b6e777a38b47ed5e8f55b19a1c3 Mon Sep 17 00:00:00 2001 From: Xiaoyu Min Date: Tue, 10 Nov 2020 19:59:53 +0800 Subject: [PATCH] net/mlx5: validate MPLSoGRE with GRE key [ upstream commit 6f921f61d481cc83df12e698c37dff8b5d1809da ] Currently PMD only accept flow which item_mpls directly follow item_gre, means to match the GRE header without GRE optional field key in MPLSoGRE encapsulation. However, for the MPLSoGRE, the GRE header could have the optional field (i.e, key) according to the RFC. So PMD need to accept this. Add MLX5_FLOW_LAYER_GRE_KEY into allowed prev_layer to fix Fixes: a7a0365565a4 ("net/mlx5: match GRE key and present bits") Signed-off-by: Xiaoyu Min Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_flow.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 3868b1cf55..b05dbaf9a1 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -2209,7 +2209,8 @@ mlx5_flow_validate_item_mpls(struct rte_eth_dev *dev __rte_unused, /* MPLS over IP, UDP, GRE is allowed */ if (!(prev_layer & (MLX5_FLOW_LAYER_OUTER_L3 | MLX5_FLOW_LAYER_OUTER_L4_UDP | - MLX5_FLOW_LAYER_GRE))) + MLX5_FLOW_LAYER_GRE | + MLX5_FLOW_LAYER_GRE_KEY))) return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ITEM, item, "protocol filtering not compatible" -- 2.27.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-17 11:13:14.378446717 +0000 +++ 0033-net-mlx5-validate-MPLSoGRE-with-GRE-key.patch 2020-11-17 11:13:12.949117172 +0000 @@ -1 +1 @@ -From 6f921f61d481cc83df12e698c37dff8b5d1809da Mon Sep 17 00:00:00 2001 +From d40489b5b9eb5b6e777a38b47ed5e8f55b19a1c3 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 6f921f61d481cc83df12e698c37dff8b5d1809da ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -25 +26 @@ -index 0ee34001a0..53a8a75cc0 100644 +index 3868b1cf55..b05dbaf9a1 100644 @@ -28 +29 @@ -@@ -2746,7 +2746,8 @@ mlx5_flow_validate_item_mpls(struct rte_eth_dev *dev __rte_unused, +@@ -2209,7 +2209,8 @@ mlx5_flow_validate_item_mpls(struct rte_eth_dev *dev __rte_unused,