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 2CEB3A051C for ; Tue, 11 Feb 2020 12:40:48 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 259F21BFA7; Tue, 11 Feb 2020 12:40:48 +0100 (CET) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by dpdk.org (Postfix) with ESMTP id B4C6E1BFEB for ; Tue, 11 Feb 2020 12:40:46 +0100 (CET) Received: by mail-wr1-f67.google.com with SMTP id y11so11954243wrt.6 for ; Tue, 11 Feb 2020 03:40:46 -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=FRCvFbyqirKBkzGO2asmw4e4oQAKWjPaWSgGcgAHIvM=; b=ZQ1J4SSE3tHupbetg2yFpiapEZb2xbCwAXuKHtNyX7J/87i39FUyU/P/BM77qSpa7D mRI3f5+qtvOLGJEa4hmoNKyeUHQfZlk+rW/VHFhodJ6KD2CwcLoL9giNm9VjNkhwCc1p MgHLR/J8ps7dobjxqadHJwBtYF6zlSlgLE9dpMhuXNtGAY3fmIsWckrML+9/xJOUa0Kp MFdsyLu5PtvYX9221M0KLKslBPbR8f8dnenZUR17SUbzJ432srSPHgYqpUMzqjulUZro 0Lh9MvFBcpb0Mtvdnc8lcrE4Dx8HAG82rzhx3PA1put5GXxqePBCjOzorUpXblv95M9C QdRQ== 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=FRCvFbyqirKBkzGO2asmw4e4oQAKWjPaWSgGcgAHIvM=; b=PdzK09eEs4iLYP9/dfCRpot6BU7pS/oUk6tsLQOefif0dTMlJE7JG3hf9SMiHAs0Go D9nwo/rVHRNWnIPV3X1jfUgxDLXbpMv9j+NzHDIqw2FmER/WyVe4QYchwcsNbB/rXxvK A7SSxNTXmUCHV+EeTJAxJqY91lGFYAwK3l5IpoArzyComaorC+5uSBuKMFLyn2ydW1v0 sLh506A3HkrqIZ0xWUVizIw/gFtWpgIf1j7mB5YQgKdCeavYlSV1v60H3Vg8b3UQa+Z6 iB5MWRrf9jX4dYInvKSGsBJiO2AP/7V8Sh921Ic5OownzhoA/b/KXG5MELUicrDmqjvv ugNg== X-Gm-Message-State: APjAAAWggTLojv1ggENyagDqxrWd+taugPwdzq4d2LZr3lxGCiELI0Oe zKNW601cB/2kg9/152fEsH8= X-Google-Smtp-Source: APXvYqyWvTuz4zH5iUNyt80JvhW2MQ0Zb1CYfKBD75nsQjglPr5jeL3+4dmOrf30x6TlcD/7kiXT9g== X-Received: by 2002:a5d:40d1:: with SMTP id b17mr7904862wrq.93.1581421246467; Tue, 11 Feb 2020 03:40:46 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id l6sm4997499wrn.26.2020.02.11.03.40.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2020 03:40:45 -0800 (PST) From: luca.boccassi@gmail.com To: Dekel Peled Cc: Ori Kam , Viacheslav Ovsiienko , dpdk stable Date: Tue, 11 Feb 2020 11:21:36 +0000 Message-Id: <20200211112216.3929-150-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 pop VLAN action validation' 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 e359cab358b59c149adc4a2fb642e1e76c94014f Mon Sep 17 00:00:00 2001 From: Dekel Peled Date: Wed, 22 Jan 2020 16:27:20 +0200 Subject: [PATCH] net/mlx5: fix pop VLAN action validation [ upstream commit 581476d6417f02d1713853a728e44777d36ae551 ] Validation function of 'POP VLAN' action includes check for other 'POP VLAN' actions present in flow. It doesn't check for 'PUSH VLAN' actions present in flow. This patch adds check for 'PUSH VLAN' actions present in flow. 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 | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index a7f5e0b4ad..db86623651 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -1511,17 +1511,10 @@ flow_dv_validate_action_pop_vlan(struct rte_eth_dev *dev, NULL, "pop vlan action not supported for " "egress"); - /* - * Check for inconsistencies: - * fail strip_vlan in a flow that matches packets without VLAN tags. - * fail strip_vlan in a flow that matches packets without explicitly a - * matching on VLAN tag ? - */ - if (action_flags & MLX5_FLOW_ACTION_OF_POP_VLAN) + if (action_flags & MLX5_FLOW_VLAN_ACTIONS) return rte_flow_error_set(error, ENOTSUP, - RTE_FLOW_ERROR_TYPE_UNSPECIFIED, - NULL, - "no support for multiple vlan pop " + RTE_FLOW_ERROR_TYPE_ACTION, action, + "no support for multiple VLAN " "actions"); if (!(item_flags & MLX5_FLOW_LAYER_OUTER_VLAN)) return rte_flow_error_set(error, ENOTSUP, -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-02-11 11:17:43.847965409 +0000 +++ 0150-net-mlx5-fix-pop-VLAN-action-validation.patch 2020-02-11 11:17:38.700006956 +0000 @@ -1,8 +1,10 @@ -From 581476d6417f02d1713853a728e44777d36ae551 Mon Sep 17 00:00:00 2001 +From e359cab358b59c149adc4a2fb642e1e76c94014f Mon Sep 17 00:00:00 2001 From: Dekel Peled Date: Wed, 22 Jan 2020 16:27:20 +0200 Subject: [PATCH] net/mlx5: fix pop VLAN action validation +[ upstream commit 581476d6417f02d1713853a728e44777d36ae551 ] + Validation function of 'POP VLAN' action includes check for other 'POP VLAN' actions present in flow. It doesn't check for 'PUSH VLAN' actions present in flow. @@ -10,7 +12,6 @@ This patch adds check for 'PUSH VLAN' actions present in flow. Fixes: b41e47da2592 ("net/mlx5: support pop flow action on VLAN header") -Cc: stable@dpdk.org Signed-off-by: Dekel Peled Acked-by: Ori Kam @@ -20,10 +21,10 @@ 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c -index 9dc08cec97..de4b765a0e 100644 +index a7f5e0b4ad..db86623651 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c -@@ -1640,17 +1640,10 @@ flow_dv_validate_action_pop_vlan(struct rte_eth_dev *dev, +@@ -1511,17 +1511,10 @@ flow_dv_validate_action_pop_vlan(struct rte_eth_dev *dev, NULL, "pop vlan action not supported for " "egress");