From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D6DE6C3A5A0 for ; Mon, 20 Apr 2020 12:57:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id ACBA3206DD for ; Mon, 20 Apr 2020 12:57:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587387437; bh=/18LCMjhBOVrOVNPtODq4mMxo9SzohRK7Tb90ygXrbU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=dJGUun+RSNmXWxmO86/ukt/lImdsgXWvhJnzkCgEuIDgPdwDCbvDgDiY8CC7Bhkhb vVzLWPzSPAf0DrDkNyAs8y8PaCc96C5GZeoDL8/v5CbTjJoDtlzM3UWgzb5QACpEKl 3spaK/JvQx0eXu+bAdmZOOKZyzYJGFOFfDtlwGus= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729783AbgDTM5Q (ORCPT ); Mon, 20 Apr 2020 08:57:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:38624 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728605AbgDTMoh (ORCPT ); Mon, 20 Apr 2020 08:44:37 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B325E2072B; Mon, 20 Apr 2020 12:44:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587386677; bh=/18LCMjhBOVrOVNPtODq4mMxo9SzohRK7Tb90ygXrbU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XzK5HLdkgHWCni2qlGLuYGVsT1NFhqJPh73rVw41zhxUFFVjf2Mu4IpKKvOiPUoOc u7ZVHXml4z8qpuxW/NMQQya986GaXseckvV/O6W3DX0bN75dDw32LRLOTSYkRoOUN/ q+lnXWv2sYHGyJJlZwTU8X2HhPIsf8VatVKp7+18= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dmytro Linkin , Roi Dayan , Saeed Mahameed Subject: [PATCH 5.6 16/71] net/mlx5e: Fix nest_level for vlan pop action Date: Mon, 20 Apr 2020 14:38:30 +0200 Message-Id: <20200420121511.765606627@linuxfoundation.org> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200420121508.491252919@linuxfoundation.org> References: <20200420121508.491252919@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dmytro Linkin [ 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 Signed-off-by: Roi Dayan Signed-off-by: Saeed Mahameed Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c @@ -3269,12 +3269,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)