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 AA50EA0C47 for ; Tue, 10 Aug 2021 17:44:28 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A531A4114F; Tue, 10 Aug 2021 17:44:28 +0200 (CEST) Received: from smtp-relay-canonical-0.canonical.com (smtp-relay-canonical-0.canonical.com [185.125.188.120]) by mails.dpdk.org (Postfix) with ESMTP id 4BD7E4014F for ; Tue, 10 Aug 2021 17:44:27 +0200 (CEST) Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (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-0.canonical.com (Postfix) with ESMTPS id BFFA140330 for ; Tue, 10 Aug 2021 15:44:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1628610266; bh=61gVDMbJn31jjvQcgq4GO+Sb7RQfa2kCkuwPx9zmGFE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=G/t8lck3G+T3dqNYs4PBUXK/N1o4oM+NxpwwmKaV84hUGynFRIl9QBfwjHXfqM0lf ZiG/2qfoJz06pYFVTG+W3NDYOUEclIg1bqfcX9NDNeCkJL6+H7EvT3yXOgBjRZy2fq azclIFwsP4cMgGJurUN572nniHYHJvXW8ftYz0B8SGLIsPq0zOP+56CgdLAryiaI1B y5qYu5lVWP85kjBk5q8qCW1dJYR7MG+H6E5ka1xgybXhj/j8TI479ovcJP817Yg8sF sN5DgxJKMpBo+mFjfyB3FqRexuEkSWhZfg8xp4TZyHq9GFBQLgzxHzRqlyAZw7G1n1 wDOORzi+ecUnw== Received: by mail-ed1-f69.google.com with SMTP id v20-20020aa7d9d40000b02903be68450bf3so3157010eds.23 for ; Tue, 10 Aug 2021 08:44:26 -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=61gVDMbJn31jjvQcgq4GO+Sb7RQfa2kCkuwPx9zmGFE=; b=f8GrmQmpVz7aAqSeXvu4m9F3Jl101lp26eP34z+fqfxUXmn84kbiuahIaKSSZFHGJd EOfu0CjAbz+dD8BJ5l+ifw+bAYW5CZjUVfnJzH7UW5P2nKszfRvSBBlMWzrS9j5iJH3X foe96S4OT96ox+7J2kB9YsFqR0dNlTntqX/QF9ycgS+X3CNqCSxffjb5cElyMpqba4Ez E2IPeSdgTmZDDj42N0nZH6M50Sbp9DYSmKeAVhyqmnS2BZj0Vfuv+ER1IuZClXHy9D1y Pqw29BV1QKiNGrEvLxnvw5uA/X7MhqXhizibCB1ObSguOgWM8hdd7H7rCNY3GimvaaMy tHcg== X-Gm-Message-State: AOAM533CgnPiZnyfI0EvO+mfQzUkMUYvimIqEP6dQJ6TN3bpBZxmw+YU M3mWdqkDLToUEmju/y/7Yx47Qw7csYk8PpDnIsqzK9oqZ9+XjMguvNEPTJlC40ekVoNGNvkMfeT YITTyRFZeNU54qcwtwobezZv1 X-Received: by 2002:a05:6402:358d:: with SMTP id y13mr5717882edc.300.1628610266500; Tue, 10 Aug 2021 08:44:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyAH0z3YlsdmI57UgzfddQ0lSXdaMZFX76Qarz8VGnQzrbXOLQmRoOIQ9+DSQ9Y4nk9EwxBEQ== X-Received: by 2002:a05:6402:358d:: with SMTP id y13mr5717868edc.300.1628610266325; Tue, 10 Aug 2021 08:44:26 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id t9sm9371640edd.33.2021.08.10.08.44.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Aug 2021 08:44:25 -0700 (PDT) From: christian.ehrhardt@canonical.com To: Lior Margalit Cc: Matan Azrad , dpdk stable Date: Tue, 10 Aug 2021 17:39:57 +0200 Message-Id: <20210810154022.749358-77-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: reject inner ethernet matching in GTP' 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/72c1cc5d90154b1f8a8fc0b94f097c41cdb27b24 Thanks. Christian Ehrhardt --- >From 72c1cc5d90154b1f8a8fc0b94f097c41cdb27b24 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 65064ffb07..cb08e5ec35 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -1441,6 +1441,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.32.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-08-10 15:11:15.983836535 +0200 +++ 0077-net-mlx5-reject-inner-ethernet-matching-in-GTP.patch 2021-08-10 15:11:13.090638619 +0200 @@ -1 +1 @@ -From 4e5ba38d56e3a037271547c90fbfc25c81938a4f Mon Sep 17 00:00:00 2001 +From 72c1cc5d90154b1f8a8fc0b94f097c41cdb27b24 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 65064ffb07..cb08e5ec35 100644 @@ -24 +25 @@ -@@ -1999,6 +1999,10 @@ mlx5_flow_validate_item_eth(const struct rte_flow_item *item, +@@ -1441,6 +1441,10 @@ mlx5_flow_validate_item_eth(const struct rte_flow_item *item,