Received: by 2002:ac0:946b:0:0:0:0:0 with SMTP id j40csp2671838imj; Mon, 11 Feb 2019 06:48:57 -0800 (PST) X-Google-Smtp-Source: AHgI3IbEAOPJ/E1CLlMvPhBjeRPxbjnYjfBS5ljgIruwZTtP8t3/YO6EGMewR/fx4OgPQ0Ozb8FG X-Received: by 2002:a17:902:848f:: with SMTP id c15mr36695735plo.119.1549896537168; Mon, 11 Feb 2019 06:48:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549896537; cv=none; d=google.com; s=arc-20160816; b=EN/5g+GM4ipNVbFDdPPAeFfgdGj8f8vxIKEi+gAuP6yepcZi14E6tbcR3NJczbkPt4 yW0A05WH8pPQGljrPrWWojm7U0hDfB+/sN2QbsMby90wnTpTVvkbgcjJ4hXGNaQ2Ew4H hZQseJLuYTsMDo6ZzMPq/2ghTB/thfcbwPDhb68tRJvF7Z5Hq9qAwlrpbeIqRc3QVX7B 6kPM5htuC3NREHvfQE/0dqMJdmwH11ubwxivMKxFKfVT6hUYs0LiDjgGyNJ6AsY1XmkI 6mixxAM6EhOZHVMDazUefHP6/cUzVcIcBTQ1OP340tHUyWPERNaVkNYjHiFKltEGRX+U ZQOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=1ZZipEBLkIMALREN9/IJb4ke0X5Hosw6jM2lCTQfjHU=; b=DHF4BpriJVWRu7yZJIOqQ56bvDwCjsxip0ProGyCJjD1cU5ZvOx9nFxzY8cpLCuYOn rsIjZi/hJV5uvpSsAS02SShwj/OLTvrb7SU0mcPIEmVCKzcSs4G4HoKK4MwRvOeQYcN+ q1upf827g9PDjJAcseLT30lHFvKz/BOAb5/hpKT532+b6Nnm4TZ7qj+xgIgsY0Roja0p vp+uG0tvV3PxKqWATh7yLmLcgwn1JWoF3gNqA/o6bG2pBYBjEp3qFryHLiz12jEQsDrE GNxJ09+Ann1AXDvHXbU2UsS3HDaiga5jEIvFhWzz7ooYZ+NsZoEK/JCJgExKC1Fj9ht8 0jUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=eN8aYjV9; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 5si9736186pgm.5.2019.02.11.06.48.41; Mon, 11 Feb 2019 06:48:57 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=eN8aYjV9; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732932AbfBKOrL (ORCPT + 99 others); Mon, 11 Feb 2019 09:47:11 -0500 Received: from mail.kernel.org ([198.145.29.99]:60374 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387466AbfBKOrH (ORCPT ); Mon, 11 Feb 2019 09:47:07 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.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 9D28920700; Mon, 11 Feb 2019 14:47:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549896427; bh=8BfHLx4J0MXaCmnBpClkZhqJ0Tq+FwW46TGM08K3WH4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eN8aYjV9CgSFfqCaC5jAyXBN/FQsN8ItBUfIANSejsBzx8M2A9v8tRHLoIXhu/WLC 9K8N8CykHk3qQ7aLBVL2OV6S812nG5VeOYQ6CcpNn9LCQzl5RzMX6Y74XlVclos/Dh QnQhOFUXogMJ6hi5/CrrTuPqgnlnawYiQh1uH2Oc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ido Schimmel , Petr Machata , "David S. Miller" , Sasha Levin Subject: [PATCH 4.19 180/313] mlxsw: spectrum: Properly cleanup LAG uppers when removing port from LAG Date: Mon, 11 Feb 2019 15:17:40 +0100 Message-Id: <20190211141905.361686243@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211141852.749630980@linuxfoundation.org> References: <20190211141852.749630980@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore 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 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit be2d6f421f680e01d58f7cd452646e0d8586d49b ] When a LAG device or a VLAN device on top of it is enslaved to a bridge, the driver propagates the CHANGEUPPER event to the LAG's slaves. This causes each physical port to increase the reference count of the internal representation of the bridge port by calling mlxsw_sp_port_bridge_join(). However, when a port is removed from a LAG, the corresponding leave() function is not called and the reference count is not decremented. This leads to ugly hacks such as mlxsw_sp_bridge_port_should_destroy() that try to understand if the bridge port should be destroyed even when its reference count is not 0. Instead, make sure that when a port is unlinked from a LAG it would see the same events as if the LAG (or its uppers) were unlinked from a bridge. The above is achieved by walking the LAG's uppers when a port is unlinked and calling mlxsw_sp_port_bridge_leave() for each upper that is enslaved to a bridge. Signed-off-by: Ido Schimmel Reviewed-by: Petr Machata Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- .../net/ethernet/mellanox/mlxsw/spectrum.c | 23 ++++++++++++++++ .../mellanox/mlxsw/spectrum_switchdev.c | 27 +------------------ 2 files changed, 24 insertions(+), 26 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c index de821a9fdfaf..d64cd8d44d83 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c @@ -4235,6 +4235,25 @@ void mlxsw_sp_port_dev_put(struct mlxsw_sp_port *mlxsw_sp_port) dev_put(mlxsw_sp_port->dev); } +static void +mlxsw_sp_port_lag_uppers_cleanup(struct mlxsw_sp_port *mlxsw_sp_port, + struct net_device *lag_dev) +{ + struct net_device *br_dev = netdev_master_upper_dev_get(lag_dev); + struct net_device *upper_dev; + struct list_head *iter; + + if (netif_is_bridge_port(lag_dev)) + mlxsw_sp_port_bridge_leave(mlxsw_sp_port, lag_dev, br_dev); + + netdev_for_each_upper_dev_rcu(lag_dev, upper_dev, iter) { + if (!netif_is_bridge_port(upper_dev)) + continue; + br_dev = netdev_master_upper_dev_get(upper_dev); + mlxsw_sp_port_bridge_leave(mlxsw_sp_port, upper_dev, br_dev); + } +} + static int mlxsw_sp_lag_create(struct mlxsw_sp *mlxsw_sp, u16 lag_id) { char sldr_pl[MLXSW_REG_SLDR_LEN]; @@ -4427,6 +4446,10 @@ static void mlxsw_sp_port_lag_leave(struct mlxsw_sp_port *mlxsw_sp_port, /* Any VLANs configured on the port are no longer valid */ mlxsw_sp_port_vlan_flush(mlxsw_sp_port); + /* Make the LAG and its directly linked uppers leave bridges they + * are memeber in + */ + mlxsw_sp_port_lag_uppers_cleanup(mlxsw_sp_port, lag_dev); if (lag->ref_count == 1) mlxsw_sp_lag_destroy(mlxsw_sp, lag_id); diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c index 0d9ea37c5d21..cdec48bcc6ad 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c @@ -282,30 +282,6 @@ mlxsw_sp_bridge_port_destroy(struct mlxsw_sp_bridge_port *bridge_port) kfree(bridge_port); } -static bool -mlxsw_sp_bridge_port_should_destroy(const struct mlxsw_sp_bridge_port * - bridge_port) -{ - struct net_device *dev = bridge_port->dev; - struct mlxsw_sp *mlxsw_sp; - - if (is_vlan_dev(dev)) - mlxsw_sp = mlxsw_sp_lower_get(vlan_dev_real_dev(dev)); - else - mlxsw_sp = mlxsw_sp_lower_get(dev); - - /* In case ports were pulled from out of a bridged LAG, then - * it's possible the reference count isn't zero, yet the bridge - * port should be destroyed, as it's no longer an upper of ours. - */ - if (!mlxsw_sp && list_empty(&bridge_port->vlans_list)) - return true; - else if (bridge_port->ref_count == 0) - return true; - else - return false; -} - static struct mlxsw_sp_bridge_port * mlxsw_sp_bridge_port_get(struct mlxsw_sp_bridge *bridge, struct net_device *brport_dev) @@ -343,8 +319,7 @@ static void mlxsw_sp_bridge_port_put(struct mlxsw_sp_bridge *bridge, { struct mlxsw_sp_bridge_device *bridge_device; - bridge_port->ref_count--; - if (!mlxsw_sp_bridge_port_should_destroy(bridge_port)) + if (--bridge_port->ref_count != 0) return; bridge_device = bridge_port->bridge_device; mlxsw_sp_bridge_port_destroy(bridge_port); -- 2.19.1