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 C0163A051C for ; Tue, 11 Feb 2020 12:40:38 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id AC2021BFCD; Tue, 11 Feb 2020 12:40:38 +0100 (CET) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by dpdk.org (Postfix) with ESMTP id B38911BFA7 for ; Tue, 11 Feb 2020 12:40:37 +0100 (CET) Received: by mail-wm1-f52.google.com with SMTP id a6so3137861wme.2 for ; Tue, 11 Feb 2020 03:40:37 -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=9I0cuNXhaLb/gqTtuOoox3byiZS7NR+uuLiFz0oGdSA=; b=AhAGXBraQ4l9xv9gHRdNBuXhHTh+MgxPAux87H0Z0+m0xRg5Zcx9LNEY5e/91l4xev FEPY9JOV4Y3Ck0bdBaWChk5J/OPIuv+HU0fh45U9bIoMk3hfBPUEWzQi04ZBJPQ9iUvK e26nYV6/O2jSgBRDXYw/72ldO+VmF7bduF6Qb8gjayqek0HiJTzp60Vg0AndxiwbZp0N ZOXMAlOxVkA/E0MVzH/g41VFxmIHPBXHbJ4+M90mg2G8M4mf4RgrGllSU0HqZR0Zxo5L ht8DR4LnQ84/SJcxJHrjH6GxwN20M4Iv3i4NGizgfnJ59RvjDI71Qf9MogoqY4gBT6oz FmFg== 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=9I0cuNXhaLb/gqTtuOoox3byiZS7NR+uuLiFz0oGdSA=; b=pkdnSjPsnaoRfkeSlyer7Ii4GaNFrt2LnOLQ9vuEEJPqFSwiVTjiiSrpz9J64/AucP ZWqjFGEn2gd5LPsAx3CuiFf4jwLRgg1gQHMli1uP0TCxwGaumVDG5HBuUWmAcUyynVfU S5jbWzFo56zB5a8G5kQ6c7MsDo2HU88PUX7fmlrWUzv3Q8fxlavJBptpwVcGlBPnIyU1 6ihKsHFpiO2FEQsWyEy1PW/dK2hCyNZ9O0Uyjtwve6x2Oln9H+WUILNgDL0tBEJzVc94 YvHMK2y48rbY/63wvAvprZr/WtQQNHc7+665GRtMT/ZbWGiXccPdgfkl6rO7wM/g6co6 YP9w== X-Gm-Message-State: APjAAAWRK0j4QSjt8SuqYQS2XXKI/m/v0BMLkatH1VSmlD7xUi5DiDHP fNcmjaoQbVbzdQzl3IyZYyTs4yjvEwQ= X-Google-Smtp-Source: APXvYqweSUwA7HSA/cOc7MFPURz7lKOteFJiKxhd5CyiIjAuXvBX5tfRmXbyVZoEq4RNSCzZIl+kPQ== X-Received: by 2002:a7b:c934:: with SMTP id h20mr5162526wml.103.1581421237394; Tue, 11 Feb 2020 03:40:37 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id a6sm5036271wrm.69.2020.02.11.03.40.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2020 03:40:36 -0800 (PST) From: luca.boccassi@gmail.com To: Dekel Peled Cc: Ori Kam , Viacheslav Ovsiienko , dpdk stable Date: Tue, 11 Feb 2020 11:21:31 +0000 Message-Id: <20200211112216.3929-145-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200211112216.3929-1-luca.boccassi@gmail.com> References: <20200211112216.3929-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx5: fix check for VLAN actions' has been queued to stable release 19.11.1 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.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/13/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 e6797a244f6c5796f8e1f6ddd2843cd8ea08449b Mon Sep 17 00:00:00 2001 From: Dekel Peled Date: Wed, 22 Jan 2020 16:27:14 +0200 Subject: [PATCH] net/mlx5: fix check for VLAN actions [ upstream commit a2268a4cfb08e70e3f0f0a082033ad5a24a2a07d ] Flow validation function includes, after all items and actions are validated discretely, a check for VLAN and VXLAN actions. This check is incorrect and redundant. This patch removes the invalid check from validation function. Check is incorrect, action_flags bit map is checked against items mask MLX5_FLOW_LAYER_TUNNEL. Check is also redundant, because VLAN push/pop actions can be used together with packet reformat actions. Fixes: b41e47da2592 ("net/mlx5: support pop flow action on VLAN header") Signed-off-by: Dekel Peled Acked-by: Ori Kam Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow_dv.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 74d1a68e4a..8a5aea0603 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -4830,13 +4830,6 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, "action not supported"); } } - if ((action_flags & MLX5_FLOW_LAYER_TUNNEL) && - (action_flags & MLX5_FLOW_VLAN_ACTIONS)) - return rte_flow_error_set(error, ENOTSUP, - RTE_FLOW_ERROR_TYPE_ACTION, - actions, - "can't have vxlan and vlan" - " actions in the same rule"); /* Eswitch has few restrictions on using items and actions */ if (attr->transfer) { if (!mlx5_flow_ext_mreg_supported(dev) && -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-02-11 11:17:43.675021628 +0000 +++ 0145-net-mlx5-fix-check-for-VLAN-actions.patch 2020-02-11 11:17:38.664006283 +0000 @@ -1,8 +1,10 @@ -From a2268a4cfb08e70e3f0f0a082033ad5a24a2a07d Mon Sep 17 00:00:00 2001 +From e6797a244f6c5796f8e1f6ddd2843cd8ea08449b Mon Sep 17 00:00:00 2001 From: Dekel Peled Date: Wed, 22 Jan 2020 16:27:14 +0200 Subject: [PATCH] net/mlx5: fix check for VLAN actions +[ upstream commit a2268a4cfb08e70e3f0f0a082033ad5a24a2a07d ] + Flow validation function includes, after all items and actions are validated discretely, a check for VLAN and VXLAN actions. This check is incorrect and redundant. @@ -14,7 +16,6 @@ together with packet reformat actions. Fixes: b41e47da2592 ("net/mlx5: support pop flow action on VLAN header") -Cc: stable@dpdk.org Signed-off-by: Dekel Peled Acked-by: Ori Kam @@ -24,10 +25,10 @@ 1 file changed, 7 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c -index 5a1b42698c..afa3d0e1ce 100644 +index 74d1a68e4a..8a5aea0603 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c -@@ -5060,13 +5060,6 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, +@@ -4830,13 +4830,6 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, "action not supported"); } }