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 1BB1EA051C for ; Tue, 11 Feb 2020 12:40:46 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0BEC51BFE6; Tue, 11 Feb 2020 12:40:46 +0100 (CET) Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by dpdk.org (Postfix) with ESMTP id 1533F1BFA7 for ; Tue, 11 Feb 2020 12:40:45 +0100 (CET) Received: by mail-wr1-f54.google.com with SMTP id y11so11954124wrt.6 for ; Tue, 11 Feb 2020 03:40:45 -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=2PDiolbtAzDJWVn1l2dW5E7tAU4IQDwuyfQR/QHDxNM=; b=fsg2Dogi3u67dIZctdc2aIKEoEu1vQvwEKSCS2c8/lgLk2P9LB0zdFrJuwjLyeHNbL xjETBVEKZVX+2d22kFHGwRZ1JlcaXPQ3pJZ3Lxu954ZHd5loHJoTqy1fDeAy4U+pNY+e UVBItkUWexYmmLYInAnvdv8Gd1N9Xle/Fj9UMAHWaettlye7By5z3Iz8oN/gwTGzMXpS IgMQGbn8dll9adqYHj5HjmAsfNSxxbrECJphs2HjI5+4yEpzVPFRSgQ23hU4H59Bkzqt MtyVsEOszHTYJVlX3G1d9hmwmebzgcn36GIcHV6Y0Bf50iZkBWBLWnolf2sTJynUmivI LYCg== 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=2PDiolbtAzDJWVn1l2dW5E7tAU4IQDwuyfQR/QHDxNM=; b=UFCKavZe/dlzjPyYVvZ9c92Uk4GFn/HY1NNGp56T9pz4eALlDnbd24Nj6gjWp+89Z3 Ja/ETwI0wjlgi9t7kDbXYYz8CQPkvYzR2iHhRoip7n8h+JA40rjgJNbuYh8GW4k1lGo3 N1qDv0szbfPYtiqNPX+WxafwElfGEltmZgglFmTqzqUWQoT00+HRdYtcDwQp4Bsi9VlZ PHdm4arEFvbwr9SMR0PxZZqBQOqicdnwpXmGmeRZTaTxspvBwD/+PBe0FCKu7LJKNmje FRG3X+eoce87JBaQ1cNNl/ziJTqzUItyV3fjADQdWQRqivIqW9PiLMo7kvwIo0wTbaKl ycSg== X-Gm-Message-State: APjAAAUnnemLpQ+u1UzXcXFNGhWhlCb/UstQykf40xB1LmrlTd+JeYLv xub+COjHOeL9Udqvb62V+8k= X-Google-Smtp-Source: APXvYqyrTBhfncLjBZJVAHwRb5ouEx98rqJxsA+czOmdoKMayKJeE12Oj3XAd5c0Dh2zqdJdva7dmA== X-Received: by 2002:a5d:5148:: with SMTP id u8mr8573904wrt.132.1581421244817; Tue, 11 Feb 2020 03:40:44 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id f11sm3367687wml.3.2020.02.11.03.40.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2020 03:40:44 -0800 (PST) From: luca.boccassi@gmail.com To: Dekel Peled Cc: Ori Kam , Viacheslav Ovsiienko , dpdk stable Date: Tue, 11 Feb 2020 11:21:35 +0000 Message-Id: <20200211112216.3929-149-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: block pop VLAN action on Tx' 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 1e752a0e282a4fd5d20fe6f77dde0b27e7fea2ce Mon Sep 17 00:00:00 2001 From: Dekel Peled Date: Wed, 22 Jan 2020 16:27:19 +0200 Subject: [PATCH] net/mlx5: block pop VLAN action on Tx [ upstream commit 159e9217a5cfd2949aceab6a7fe0516d8fce5ba5 ] Add missing check in validation function of 'pop VLAN' action. Action is not allowed for egress flow rules. 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 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index c189a4d919..a7f5e0b4ad 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -1505,6 +1505,12 @@ flow_dv_validate_action_pop_vlan(struct rte_eth_dev *dev, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, "pop vlan action is not supported"); + if (attr->egress) + return rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_ATTR_EGRESS, + NULL, + "pop vlan action not supported for " + "egress"); /* * Check for inconsistencies: * fail strip_vlan in a flow that matches packets without VLAN tags. -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-02-11 11:17:43.813465278 +0000 +++ 0149-net-mlx5-block-pop-VLAN-action-on-Tx.patch 2020-02-11 11:17:38.692006807 +0000 @@ -1,13 +1,14 @@ -From 159e9217a5cfd2949aceab6a7fe0516d8fce5ba5 Mon Sep 17 00:00:00 2001 +From 1e752a0e282a4fd5d20fe6f77dde0b27e7fea2ce Mon Sep 17 00:00:00 2001 From: Dekel Peled Date: Wed, 22 Jan 2020 16:27:19 +0200 Subject: [PATCH] net/mlx5: block pop VLAN action on Tx +[ upstream commit 159e9217a5cfd2949aceab6a7fe0516d8fce5ba5 ] + Add missing check in validation function of 'pop VLAN' action. Action is not allowed for egress flow rules. Fixes: b41e47da2592 ("net/mlx5: support pop flow action on VLAN header") -Cc: stable@dpdk.org Signed-off-by: Dekel Peled Acked-by: Ori Kam @@ -17,10 +18,10 @@ 1 file changed, 6 insertions(+) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c -index 1ed677ff21..9dc08cec97 100644 +index c189a4d919..a7f5e0b4ad 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c -@@ -1634,6 +1634,12 @@ flow_dv_validate_action_pop_vlan(struct rte_eth_dev *dev, +@@ -1505,6 +1505,12 @@ flow_dv_validate_action_pop_vlan(struct rte_eth_dev *dev, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, "pop vlan action is not supported");