diff mbox series

[5.5,15/65] net/mlx5e: Fix nest_level for vlan pop action

Message ID	20200420121509.586805644@linuxfoundation.org
State	New
Headers	show Return-Path: <SRS0=w1qd=6E=vger.kernel.org=stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Dmytro Linkin <dmitrolin@mellanox.com>, Roi Dayan <roid@mellanox.com>, Saeed Mahameed <saeedm@mellanox.com> Subject: [PATCH 5.5 15/65] net/mlx5e: Fix nest_level for vlan pop action Date: Mon, 20 Apr 2020 14:38:19 +0200 Message-Id: <20200420121509.586805644@linuxfoundation.org> In-Reply-To: <20200420121505.909671922@linuxfoundation.org> References: <20200420121505.909671922@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk
Series	None \| expand [5.5,02/65] hsr: check protocol version in hsr_newlink() [5.5,04/65] net: dsa: mt7530: fix tagged frames pass-through in VLAN-unaware mode [5.5,07/65] net: phy: micrel: use genphy_read_status for KSZ9131 [5.5,10/65] net: tun: record RX queue in skb before do_xdp_generic() [5.5,13/65] net/mlx5: Fix frequent ioread PCI access during recovery [5.5,15/65] net/mlx5e: Fix nest_level for vlan pop action [5.5,17/65] net: icmp6: do not select saddr from iif when route has prefsrc set [5.5,21/65] ovl: fix value of i_ino for lower hardlink corner case [5.5,22/65] scsi: ufs: Fix ufshcd_hold() caused scheduling while atomic [5.5,25/65] acpi/nfit: improve bounds checking for func [5.5,27/65] pwm: pca9685: Fix PWM/GPIO inter-operation [5.5,29/65] net/bpfilter: remove superfluous testing message [5.5,30/65] ext4: fix incorrect group count in ext4_fill_super error message [5.5,31/65] ext4: fix incorrect inodes per group in error message [5.5,34/65] clk: at91: usb: use proper usbs_mask [5.5,35/65] ARM: dts: imx7-colibri: fix muxing of usbc_det pin [5.5,38/65] ASoC: Intel: mrfld: fix incorrect check on p->sink [5.5,40/65] ALSA: hda/realtek - Enable the headset mic on Asus FX505DT [5.5,41/65] ALSA: usb-audio: Filter error from connector kctl ops, too [5.5,42/65] ALSA: usb-audio: Dont override ignore_ctl_error value from the map [5.5,44/65] ALSA: usb-audio: Check mapping at creating connector controls, too [5.5,46/65] keys: Fix proc_keys_next to increase position index [5.5,47/65] tracing: Fix the race between registering snapshot event trigger and triggering snaps... [5.5,49/65] nl80211: fix NL80211_ATTR_FTM_RESPONDER policy [5.5,51/65] mac80211_hwsim: Use kstrndup() in place of kasprintf() [5.5,52/65] net/mlx5e: Encapsulate updating netdev queues into a function [5.5,55/65] drm/amd/powerplay: force the trim of the mclk dpm_levels if OD is enabled [5.5,57/65] i2c: designware: platdrv: Remove DPM_FLAG_SMART_SUSPEND flag on BYT and CHT [5.5,58/65] drm/i915/perf: Do not clear pollin for small user read buffers [5.5,60/65] irqchip/ti-sci-inta: Fix processing of masked irqs [5.5,64/65] scsi: target: fix hang when multiple threads try to destroy the same iscsi session

Commit Message

Greg KH April 20, 2020, 12:38 p.m. UTC

From: Dmytro Linkin <dmitrolin@mellanox.com>

[ Upstream commit 70f478ca085deec4d6c1f187f773f5827ddce7e8 ]

Current value of nest_level, assigned from net_device lower_level value,
does not reflect the actual number of vlan headers, needed to pop.
For ex., if we have untagged ingress traffic sended over vlan devices,
instead of one pop action, driver will perform two pop actions.
To fix that, calculate nest_level as difference between vlan device and
parent device lower_levels.

Fixes: f3b0a18bb6cb ("net: remove unnecessary variables and callback")
Signed-off-by: Dmytro Linkin <dmitrolin@mellanox.com>
Signed-off-by: Roi Dayan <roid@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 drivers/net/ethernet/mellanox/mlx5/core/en_tc.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff mbox series

Patch

--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
@@ -3221,12 +3221,13 @@  static int add_vlan_pop_action(struct ml
 			       struct mlx5_esw_flow_attr *attr,
 			       u32 *action)
 {
-	int nest_level = attr->parse_attr->filter_dev->lower_level;
 	struct flow_action_entry vlan_act = {
 		.id = FLOW_ACTION_VLAN_POP,
 	};
-	int err = 0;
+	int nest_level, err = 0;
 
+	nest_level = attr->parse_attr->filter_dev->lower_level -
+						priv->netdev->lower_level;
 	while (nest_level--) {
 		err = parse_tc_vlan_action(priv, &vlan_act, attr, action);
 		if (err)