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 AFAC6A0553 for ; Mon, 17 Feb 2020 18:46:35 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A90091DA12; Mon, 17 Feb 2020 18:46:35 +0100 (CET) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by dpdk.org (Postfix) with ESMTP id 440831DA12 for ; Mon, 17 Feb 2020 18:46:34 +0100 (CET) Received: by mail-wr1-f68.google.com with SMTP id w12so20791482wrt.2 for ; Mon, 17 Feb 2020 09:46:34 -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=H0QZN5eHheBSJHxfKGtkHWBDcT/FQe4NzUxS40O8Z2Q=; b=vUa2BZUldoLHYupwILPlzx2vew2jRA0ZSJoStqzLZxfW+F9kGyfWtBB3Hn7F1kMOWg vLwDOh0AE87AdwD6qw+Ys9wZKTYjKBj/4yrHN6b+RD5PGRc1Pu3LbfhvpIQ66WbgkcWn YtZP0tuy9Q1BULJ/Ggl/7lT/wJll2uDXJnYYsiq8fxVVHnAb9JEwz7DQD9VXAwiTI+bg KxkJg5za7/us4g33ENvDMSghPmVVRXiDVWcWSUqpl/7HhksLekm2JoW3+YkcpkXvo4ub Tj4kch+gnM3aGdeKGefLXhIkVGoXa2xdUZSmTU+yCjQE3oW2uNgU6xTKuLUfh76h1SIr hncg== 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=H0QZN5eHheBSJHxfKGtkHWBDcT/FQe4NzUxS40O8Z2Q=; b=T55M+HYnn12XWhCTEBrJbhyl7jxI33vScVR9Ea9Gxjuo/DhmgnksU/i3Y1BdFpRmli kZU+LerFrjsngbSH1Tat0EIvftuA7n6RRvfg2XdlCa+87dFZ13c84r9MC2405Kzs9Tqt gkAVa8Ulu7O/d4QSN3s+GRY+L2KiyieA17GNjLipGYDQLxSeZmnhj4jgTTLQYeSc+WzM REPTwLpxxAXOVyQp3knJZAJGoVom3DyTTqkllblTxrcRDNVtwsng5xwFLJuiIr/IrgS4 Lfi0S1GBu2WZ5ZiCOu1LZJf98M6AoFgawW6VwYWAomrS5HMainSsSIMrf4yuDbn7BZiX BN4g== X-Gm-Message-State: APjAAAXbOtdljIlHxm7VC3OhHRJP3WCbQgze4v6whtM0MIoWmqW/WjTb K1X3h2ThrvHwMm7l6ZF2LSBoT3g9Glsh5Q== X-Google-Smtp-Source: APXvYqwvVg3htutVMb8Jn9vLQ/8Pdl8asuW0NjL2YeqtQeEnIYbb8fApF7IUISJ7i040ra/pYNvX5A== X-Received: by 2002:adf:eed1:: with SMTP id a17mr22163942wrp.97.1581961594045; Mon, 17 Feb 2020 09:46:34 -0800 (PST) Received: from localhost (userh634.uk.uudial.com. [194.69.103.7]) by smtp.gmail.com with ESMTPSA id c77sm208631wmd.12.2020.02.17.09.46.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Feb 2020 09:46:33 -0800 (PST) From: luca.boccassi@gmail.com To: Wisam Jaddo Cc: Raslan Darawsheh , dpdk stable Date: Mon, 17 Feb 2020 17:45:19 +0000 Message-Id: <20200217174546.25334-27-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200217174546.25334-1-luca.boccassi@gmail.com> References: <20200211112216.3929-190-luca.boccassi@gmail.com> <20200217174546.25334-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx5: fix blocker for push VLAN on Rx' 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/19/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 fb0f14db3a4b2d83992e974abc2e9c9c6df7cba5 Mon Sep 17 00:00:00 2001 From: Wisam Jaddo Date: Tue, 11 Feb 2020 15:20:06 +0200 Subject: [PATCH] net/mlx5: fix blocker for push VLAN on Rx [ upstream commit a262726ed482f3c9fba493d0bfc3b4bd53d4c432 ] The blocker should take FDB into consideration, since FDB all directions have transfer ingress in it. Fixes: 55060e62e4d2 ("net/mlx5: block push VLAN action on Rx") Signed-off-by: Wisam Jaddo Acked-by: Raslan Darawsheh --- drivers/net/mlx5/mlx5_flow_dv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index df5e279ff4..f2c5f87fde 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -1617,7 +1617,7 @@ flow_dv_validate_action_push_vlan(uint64_t action_flags, { const struct rte_flow_action_of_push_vlan *push_vlan = action->conf; - if (attr->ingress) + if (!attr->transfer && attr->ingress) return rte_flow_error_set(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ATTR_INGRESS, NULL, -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-02-17 17:00:16.075988013 +0000 +++ 0027-net-mlx5-fix-blocker-for-push-VLAN-on-Rx.patch 2020-02-17 17:00:15.331950795 +0000 @@ -1,13 +1,14 @@ -From a262726ed482f3c9fba493d0bfc3b4bd53d4c432 Mon Sep 17 00:00:00 2001 +From fb0f14db3a4b2d83992e974abc2e9c9c6df7cba5 Mon Sep 17 00:00:00 2001 From: Wisam Jaddo Date: Tue, 11 Feb 2020 15:20:06 +0200 Subject: [PATCH] net/mlx5: fix blocker for push VLAN on Rx +[ upstream commit a262726ed482f3c9fba493d0bfc3b4bd53d4c432 ] + The blocker should take FDB into consideration, since FDB all directions have transfer ingress in it. Fixes: 55060e62e4d2 ("net/mlx5: block push VLAN action on Rx") -Cc: stable@dpdk.org Signed-off-by: Wisam Jaddo Acked-by: Raslan Darawsheh @@ -16,10 +17,10 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c -index ba88325730..d88daeccbc 100644 +index df5e279ff4..f2c5f87fde 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c -@@ -1746,7 +1746,7 @@ flow_dv_validate_action_push_vlan(uint64_t action_flags, +@@ -1617,7 +1617,7 @@ flow_dv_validate_action_push_vlan(uint64_t action_flags, { const struct rte_flow_action_of_push_vlan *push_vlan = action->conf;