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 DFDB6A051C for ; Tue, 11 Feb 2020 12:40:42 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D75BD1BFA7; Tue, 11 Feb 2020 12:40:42 +0100 (CET) Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by dpdk.org (Postfix) with ESMTP id 8D78E1BFCD for ; Tue, 11 Feb 2020 12:40:41 +0100 (CET) Received: by mail-wm1-f68.google.com with SMTP id p17so3143038wma.1 for ; Tue, 11 Feb 2020 03:40:41 -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=En0qf9IykWF1UGq8V4G1ubUezh1q/FLaR7E54UHQoSU=; b=fw/8H6PSCn/2hc7QVDZ88FRj0ZQDNrJxDpV/k9hFMwYJUURSi9ygdbTX6ebune75ed jCwDpJV/s+M3YwjdopEICCAyTM+fQLo5aJ1b63k9uhhOz95DlML/Imz2+Xiru/XceqjX m9OsAqLr3BMaRW9w6RSG41QsGMASUag6t6oyN3fzn3rX7c87qqei1i4XfGbE8pWzreOF /EV2jlFS6FkF90f1+8Zv1GYYk+0vIZQyYIyZ3xDK1xPnlZjpvBaE0HfiAStELTNfiKZF 3RgSYPNfrYyO+e5a/mnfqgYmy9zOQ4kLnT+ALTzfP263EgTQ9nrinxPc9sJqz3YBK9R7 5zdg== 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=En0qf9IykWF1UGq8V4G1ubUezh1q/FLaR7E54UHQoSU=; b=JH73sev1mbKsYqW3WH6LDH3ff2rQXQyWijQnhRuekNJBPWVt6XPnbf1tfUQjMM6hkb n7k7L/p0Thx6Hb+UflLhwzIyOerRAPIEnagWr4qxbO4jP7L14NDLy2zaaTV2DKrBOuGN hl+nMqXUqnop6lnRnNVf+R72kTjPbn/d6LNNAw3taM6AyqM4NBrTvgkKrAxqANsYKFKX PwFLBgjgWaCrNUGAugWyBDxwnlUJngLOiMeb5UZQajjZgj5Y3hf2YrRj7R9tF110hEa/ 758zDd179Wdy3vEonGspMrPLuyJGOFsTSJPuhjc0uVTEGqeUt1mjlHpKxdr6wEb+PC7u M8jg== X-Gm-Message-State: APjAAAWHJlIHLWAjZHIAk7Hw7zA/h727PAGsOC9pp6jI+zOi76A6qbjX 8TSXM6Tp7hw9tBgholrtfSo= X-Google-Smtp-Source: APXvYqzf+xH7kGTNfriJXHtffaGOjGb2jvLadMTQvScNcsqGCU37xN/lmPZ95wpf2LCM0xi8ddXsYA== X-Received: by 2002:a05:600c:145:: with SMTP id w5mr4996494wmm.157.1581421241255; Tue, 11 Feb 2020 03:40:41 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id z6sm4909915wrw.36.2020.02.11.03.40.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2020 03:40:40 -0800 (PST) From: luca.boccassi@gmail.com To: Dekel Peled Cc: Ori Kam , Viacheslav Ovsiienko , dpdk stable Date: Tue, 11 Feb 2020 11:21:33 +0000 Message-Id: <20200211112216.3929-147-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: allow push VLAN without VID' 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 c4a6f4dae99202dd1d7ada3646799c1d45985b8c Mon Sep 17 00:00:00 2001 From: Dekel Peled Date: Wed, 22 Jan 2020 16:27:16 +0200 Subject: [PATCH] net/mlx5: allow push VLAN without VID [ upstream commit 5507cb79279d03d196133bcc26feace49e8e1fab ] Currently the push VLAN action requires a VID value, either from existing VLAN item, or from following 'set VLAN vid' action. This patch removes this limitation, allowing a push VLAN action with vid value 0. Fixes: b8c0372bc5ac ("net/mlx5: fix set VLAN ID/PCP in new header") Signed-off-by: Dekel Peled Acked-by: Ori Kam Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow_dv.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 155e12b534..7aedfa903b 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -1605,7 +1605,7 @@ flow_dev_get_vlan_info_from_items(const struct rte_flow_item *items, */ static int flow_dv_validate_action_push_vlan(uint64_t action_flags, - uint64_t item_flags, + uint64_t item_flags __rte_unused, const struct rte_flow_action *action, const struct rte_flow_attr *attr, struct rte_flow_error *error) @@ -1622,14 +1622,6 @@ flow_dv_validate_action_push_vlan(uint64_t action_flags, RTE_FLOW_ERROR_TYPE_ACTION, action, "no support for multiple VLAN " "actions"); - if (!mlx5_flow_find_action - (action + 1, RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_VID) && - !(item_flags & MLX5_FLOW_LAYER_OUTER_VLAN)) - return rte_flow_error_set(error, ENOTSUP, - RTE_FLOW_ERROR_TYPE_ACTION, action, - "push VLAN needs to match on VLAN in order to " - "get VLAN VID information because there is " - "no followed set VLAN VID action"); if (action_flags & MLX5_FLOW_ACTION_PORT_ID) return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, action, -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-02-11 11:17:43.744873421 +0000 +++ 0147-net-mlx5-allow-push-VLAN-without-VID.patch 2020-02-11 11:17:38.680006583 +0000 @@ -1,8 +1,10 @@ -From 5507cb79279d03d196133bcc26feace49e8e1fab Mon Sep 17 00:00:00 2001 +From c4a6f4dae99202dd1d7ada3646799c1d45985b8c Mon Sep 17 00:00:00 2001 From: Dekel Peled Date: Wed, 22 Jan 2020 16:27:16 +0200 Subject: [PATCH] net/mlx5: allow push VLAN without VID +[ upstream commit 5507cb79279d03d196133bcc26feace49e8e1fab ] + Currently the push VLAN action requires a VID value, either from existing VLAN item, or from following 'set VLAN vid' action. @@ -10,7 +12,6 @@ vid value 0. Fixes: b8c0372bc5ac ("net/mlx5: fix set VLAN ID/PCP in new header") -Cc: stable@dpdk.org Signed-off-by: Dekel Peled Acked-by: Ori Kam @@ -20,10 +21,10 @@ 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c -index d7176c80ef..59ece01089 100644 +index 155e12b534..7aedfa903b 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c -@@ -1734,7 +1734,7 @@ flow_dev_get_vlan_info_from_items(const struct rte_flow_item *items, +@@ -1605,7 +1605,7 @@ flow_dev_get_vlan_info_from_items(const struct rte_flow_item *items, */ static int flow_dv_validate_action_push_vlan(uint64_t action_flags, @@ -32,7 +33,7 @@ const struct rte_flow_action *action, const struct rte_flow_attr *attr, struct rte_flow_error *error) -@@ -1751,14 +1751,6 @@ flow_dv_validate_action_push_vlan(uint64_t action_flags, +@@ -1622,14 +1622,6 @@ flow_dv_validate_action_push_vlan(uint64_t action_flags, RTE_FLOW_ERROR_TYPE_ACTION, action, "no support for multiple VLAN " "actions");