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 A6045A0518 for ; Fri, 24 Jul 2020 14:11:46 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9AF0C1C2A3; Fri, 24 Jul 2020 14:11:46 +0200 (CEST) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id 0D7F81C2A3 for ; Fri, 24 Jul 2020 14:11:45 +0200 (CEST) Received: by mail-wr1-f66.google.com with SMTP id f1so7549938wro.2 for ; Fri, 24 Jul 2020 05:11:45 -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=jLgOosJabfOeOA/s13LgeShS5j1fLa/X1OKWtK3VLEU=; b=oq1LA+4UIyE8cUxHCpjYo1lVPMaB8UCM4Qn+kH74QIBiGPLpUL3tYH+0KOTYXgyq1A 3/gWq1mjDez2ZcInP7C1BhO+Rb1nGDuXdRyJSwBjDVmk0PQZCIinBvs6J18+ZLXEFP2i RXwM9K83kdAlfiZ1TkcoU6O6gyL+69DM+S7ZXNGo9wa+2IyK0wkRzqKHhDaRaK9OlGt+ KtFV6/a2JX1eKEhKeoeIEh4TESfx4/fgT/x7xN7+K1cWgkUhNaiTg41nzDj7rlO9Hgui J8EUG/FVtqfeYgVbgFW7xU6Cy+tZDoT2vgq98IZb4h0X7rU5JGC2AOvvhAsb8sXKeP68 AQFw== 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=jLgOosJabfOeOA/s13LgeShS5j1fLa/X1OKWtK3VLEU=; b=gi08sNDVoUWTS9OjnEVuJjUnK6BWjbohPp3rFZTFObnW0oP2jrRlzi610wJeTCrX8K cKj1hM6BAPxfQSP31/LxJidiMfPrbTJO+yNMq/6U8TqkNUFPVkb56H3RO8p9tPzz1cqQ 8H7SxFEYpd1QD+KmNpGy0JRwMAs4pisN5bP/3+zl9KI7V/SyAE0jHgheoC3NC21O43NC jAnDnUO1fkAsn6nZh57upZx+z4eg6zaJC2PvKym5BPllNb9HxfAqjJZ8BoQ2FA2wDweS 0pVWTGQXItwMh8rK8hrwLO/e5Bk4ALJ+g+hE9j7diAeY2vWREkH4fVgN3rNL1Xw++Yq5 NIHw== X-Gm-Message-State: AOAM532cvTg2ylP7M3DgB/TUccXT6aBgKCP560+R5LC6692af+pcaPiG zgcfIG4kQhUAT38QMn40CYaj3QD8iwif6g== X-Google-Smtp-Source: ABdhPJz9dJsP4JHZxsuvLZ/gqUH2W/psdQ52irvdkJbGU7n8yvtwDksHaO+SPkt2GMJT8fsOgGDosA== X-Received: by 2002:adf:e411:: with SMTP id g17mr3538441wrm.77.1595592704787; Fri, 24 Jul 2020 05:11:44 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id z63sm7625124wmb.2.2020.07.24.05.11.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 05:11:43 -0700 (PDT) From: luca.boccassi@gmail.com To: Dekel Peled Cc: Matan Azrad , dpdk stable Date: Fri, 24 Jul 2020 13:00:11 +0100 Message-Id: <20200724120030.1863487-173-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200724120030.1863487-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx5: fix VLAN pop with decap action validation' has been queued to stable release 19.11.4 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.4 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/26/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. Thanks. Luca Boccassi --- >From 2e5ccbf2ee47f0a9771e7572e76f0f1cbbebdcea Mon Sep 17 00:00:00 2001 From: Dekel Peled Date: Wed, 15 Jul 2020 10:30:33 +0300 Subject: [PATCH] net/mlx5: fix VLAN pop with decap action validation [ upstream commit dd6745da6dea7c3e954ed4e93ba161416ccd3a80 ] The combination of decap action followed by pop VLAN action is not fully validated in existing code. This patch updates the validation function of pop vlan action. Pop VLAN with preceding Decap requires inner header with VLAN. Pop VLAN without preceding Decap requires outer header with VLAN. Fixes: b41e47da2592 ("net/mlx5: support pop flow action on VLAN header") Signed-off-by: Dekel Peled Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_flow_dv.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 930e16026..2407f8723 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -1682,7 +1682,17 @@ flow_dv_validate_action_pop_vlan(struct rte_eth_dev *dev, RTE_FLOW_ERROR_TYPE_ACTION, action, "no support for multiple VLAN " "actions"); - if (!(item_flags & MLX5_FLOW_LAYER_OUTER_VLAN)) + /* Pop VLAN with preceding Decap requires inner header with VLAN. */ + if ((action_flags & MLX5_FLOW_ACTION_DECAP) && + !(item_flags & MLX5_FLOW_LAYER_INNER_VLAN)) + return rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, + NULL, + "cannot pop vlan after decap without " + "match on inner vlan in the flow"); + /* Pop VLAN without preceding Decap requires outer header with VLAN. */ + if (!(action_flags & MLX5_FLOW_ACTION_DECAP) && + !(item_flags & MLX5_FLOW_LAYER_OUTER_VLAN)) return rte_flow_error_set(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-07-24 12:53:55.222927542 +0100 +++ 0173-net-mlx5-fix-VLAN-pop-with-decap-action-validation.patch 2020-07-24 12:53:48.583011974 +0100 @@ -1,8 +1,10 @@ -From dd6745da6dea7c3e954ed4e93ba161416ccd3a80 Mon Sep 17 00:00:00 2001 +From 2e5ccbf2ee47f0a9771e7572e76f0f1cbbebdcea Mon Sep 17 00:00:00 2001 From: Dekel Peled Date: Wed, 15 Jul 2020 10:30:33 +0300 Subject: [PATCH] net/mlx5: fix VLAN pop with decap action validation +[ upstream commit dd6745da6dea7c3e954ed4e93ba161416ccd3a80 ] + The combination of decap action followed by pop VLAN action is not fully validated in existing code. @@ -11,7 +13,6 @@ Pop VLAN without preceding Decap requires outer header with VLAN. Fixes: b41e47da2592 ("net/mlx5: support pop flow action on VLAN header") -Cc: stable@dpdk.org Signed-off-by: Dekel Peled Acked-by: Matan Azrad @@ -20,10 +21,10 @@ 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c -index 778a766cd..5ba788a33 100644 +index 930e16026..2407f8723 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c -@@ -1832,7 +1832,17 @@ flow_dv_validate_action_pop_vlan(struct rte_eth_dev *dev, +@@ -1682,7 +1682,17 @@ flow_dv_validate_action_pop_vlan(struct rte_eth_dev *dev, RTE_FLOW_ERROR_TYPE_ACTION, action, "no support for multiple VLAN " "actions");