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 A3AD7A0C47 for ; Mon, 26 Jul 2021 15:55:10 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9D93F40DDA; Mon, 26 Jul 2021 15:55:10 +0200 (CEST) Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mails.dpdk.org (Postfix) with ESMTP id EEA5640DDA for ; Mon, 26 Jul 2021 15:55:08 +0200 (CEST) Received: by mail-wr1-f44.google.com with SMTP id g15so11222924wrd.3 for ; Mon, 26 Jul 2021 06:55:08 -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=snbmgl4D4iTrX8UtaiqBn5cggILDH/fyPO5a7Ya1BIw=; b=etGEsUig/s2zo5rFlIaNjixcuQmYW8B/h39dloJGTd7rF1fX5aE8iv+BgBdkBaLyWN fVEdeSG3mpEC/+R/TD0FIhIKjn7ARd462mPdh+cgrhTqpys968YJSgUpOhKp9phXuVR3 Hke4JlaJstOVhNmAfeIZJYe+rSPoCS2au3fAbmJuGlUxqAkOauFbQaJcSbva1cRD0D9S a2bghEttJhML7afWuEp3EZ5aEG9mLlfmEM4tTJbZZ1y2KVS+foi9mAZkHXdJmp/iWEXI BLQ1XlAjwVpfkzMyHOJtZKlZOWoycb4a7bx5Cg6RkeLlbIXVQ5IwT0i8ZNXUxoDpnAgX OrYw== 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=snbmgl4D4iTrX8UtaiqBn5cggILDH/fyPO5a7Ya1BIw=; b=dZjp3dziWOiG/GoMoVZkytbXWeHl8b+uasqlxBA4lL8AiZV57O71ZvY3/jLxzM9503 1giyBmOjd9SbZEeC0rXtVjFeWOQD2kY3oUkb0ihhWjUvWR6EW6CF1Yg1KmZ6btbVvd+H 9vsAQ9NoMg446gQEpWJ6TENfmdahvqMNd3tmQVXw6wXjf4cD0MTYLD7KhcZtz/zEvRCV YGykAtAtiTCAwOOJBGSoLxQNbtAtgoz3ozPA+wvvh++Ynn/PvElSqq0QA/WK1Raf+CeC G3yBamVcM1h3CdVqh3rcrnVC4amlvN3T7Ar7T1xCNsvFscX/PEP+of4A9obCW/bnlYjp JDMQ== X-Gm-Message-State: AOAM533OTIfF4fTNU/WgwBJhDomBWehB2dqmAOQQW5/e5wgAxt7rum1d 59WiyFYqCKeiiBKUcWtpoT8= X-Google-Smtp-Source: ABdhPJyPCH3Vzb8o7MqWhnOCooIVRjZNs72NWVlPQVwBpQBX/Werw95UtgVYJW50//IKClgClRpk/A== X-Received: by 2002:a5d:680b:: with SMTP id w11mr19319061wru.69.1627307708742; Mon, 26 Jul 2021 06:55:08 -0700 (PDT) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id w185sm13471682wmb.11.2021.07.26.06.55.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jul 2021 06:55:08 -0700 (PDT) From: luca.boccassi@gmail.com To: Lior Margalit Cc: Matan Azrad , dpdk stable Date: Mon, 26 Jul 2021 14:52:57 +0100 Message-Id: <20210726135322.149850-34-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210726135322.149850-1-luca.boccassi@gmail.com> References: <20210712130551.2462159-1-luca.boccassi@gmail.com> <20210726135322.149850-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx5: reject inner ethernet matching in GTP' 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/28/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/d0213e26bbb0d02d4c811527e8c3a7b014aca3c4 Thanks. Luca Boccassi --- >From d0213e26bbb0d02d4c811527e8c3a7b014aca3c4 Mon Sep 17 00:00:00 2001 From: Lior Margalit Date: Tue, 20 Jul 2021 18:17:18 +0300 Subject: [PATCH] net/mlx5: reject inner ethernet matching in GTP [ upstream commit 4e5ba38d56e3a037271547c90fbfc25c81938a4f ] The user is able to create a flow rule pattern with ETH after GTP although it is not supported by the flex-parser configuration. Failed the rule validation in such case with proper error message. Fixes: 23c1d42c7138 ("net/mlx5: split flow validation to dedicated function") Signed-off-by: Lior Margalit Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_flow.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index f067619001..75d172e06b 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -1914,6 +1914,10 @@ mlx5_flow_validate_item_eth(const struct rte_flow_item *item, return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ITEM, item, "L2 layer should not follow VLAN"); + if (item_flags & MLX5_FLOW_LAYER_GTP) + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ITEM, item, + "L2 layer should not follow GTP"); if (!mask) mask = &rte_flow_item_eth_mask; ret = mlx5_flow_item_acceptable(item, (const uint8_t *)mask, -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-07-26 13:53:17.656093082 +0100 +++ 0034-net-mlx5-reject-inner-ethernet-matching-in-GTP.patch 2021-07-26 13:53:15.885293379 +0100 @@ -1 +1 @@ -From 4e5ba38d56e3a037271547c90fbfc25c81938a4f Mon Sep 17 00:00:00 2001 +From d0213e26bbb0d02d4c811527e8c3a7b014aca3c4 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 4e5ba38d56e3a037271547c90fbfc25c81938a4f ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 2059f29b23..a3fdce685e 100644 +index f067619001..75d172e06b 100644 @@ -24 +25 @@ -@@ -1999,6 +1999,10 @@ mlx5_flow_validate_item_eth(const struct rte_flow_item *item, +@@ -1914,6 +1914,10 @@ mlx5_flow_validate_item_eth(const struct rte_flow_item *item,