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=-8.5 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,USER_AGENT_MUTT 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 7A23FC282DA for ; Fri, 19 Apr 2019 18:52:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3CDE820645 for ; Fri, 19 Apr 2019 18:52:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=resnulli-us.20150623.gappssmtp.com header.i=@resnulli-us.20150623.gappssmtp.com header.b="Ik7afanU" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727400AbfDSSwM (ORCPT ); Fri, 19 Apr 2019 14:52:12 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:33157 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725928AbfDSSwL (ORCPT ); Fri, 19 Apr 2019 14:52:11 -0400 Received: by mail-wm1-f66.google.com with SMTP id z6so9488729wmi.0 for ; Fri, 19 Apr 2019 11:52:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=resnulli-us.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=Lff1Mo7lChTlSNONsUu54gpV37QkVacela/T8LZh/eE=; b=Ik7afanUYsz2+v5x1YZhrd7YAnBE01g/WLRDLBET2eAFMYnpubF434PhAYw+UgQAqE sPJijkp/CHJdc10n4QzN7988A+VV1Dmiu/g0OnSVqIdkAD17HWmqLzfVckQ50FzoccS2 tNGE+3YLomHyRJctttICibYgme1sglWMTREdh9neY/9GQlKhxu3VnBd0+dxNoP37p5ux mzYKFXfIiSGg5uRmfPpmcBHRZtVVfzJBxcvrjrHqf5M6Zif+iJI/W/kVa47fV1IJCblw xw46IK+ncM7sVgLi7cMTGqCzFshFpGZ16VmK+waCQ3aVE8zOilni2TxZHZuyWiTtjr3m cgjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=Lff1Mo7lChTlSNONsUu54gpV37QkVacela/T8LZh/eE=; b=nArZa7Xvzn8XLkuGWA3piCOL8rQHEesJ4hbPTonQpH2kG1c3gNESrGG+fevROAP00y WW3WmYb0cFXcYMqbziVcV+V+PSMc+qshlAYBQambeS6sLki0ZwNluGs5znGs4VaxDHKd d3b0gTtqslM0BHs14e+LBfT63ks6l+sb/fJFppUX4Welm9orEM+xwVPu98W53rDVB//Q Bhf/cO0hKi6s16qS9ghP87lfeBe0++yhJxrKmI7jV+JVCyVWNibRQcrTksWzT+LeB/kv ysKgnBhVY4qt8Ozh8d+0RCNfxWWAtOSYAlBUUAEjf8iP1Uhyau9CRNy5N06DOs7wgIon 4SoA== X-Gm-Message-State: APjAAAVJYBDtQ2s2QQEpXwP0sPCH3GXBtyWPcFClMKoavBkll80o4QY6 rhbglxusYZf/unCI96MYBGwLTUxDxBU= X-Google-Smtp-Source: APXvYqw7IVWN2B1ZWcKZJ3CkhpiNhwabPhZLKDH8HaQDC77FhfCXqVsolMTs/n2/nkg8HKfMkzyZAQ== X-Received: by 2002:a1c:e1d4:: with SMTP id y203mr1314385wmg.142.1555653331169; Thu, 18 Apr 2019 22:55:31 -0700 (PDT) Received: from localhost (ip-213-220-234-223.net.upcbroadband.cz. [213.220.234.223]) by smtp.gmail.com with ESMTPSA id y9sm7659544wrn.18.2019.04.18.22.55.30 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 18 Apr 2019 22:55:30 -0700 (PDT) Date: Fri, 19 Apr 2019 07:55:29 +0200 From: Jiri Pirko To: Hangbin Liu Cc: netdev@vger.kernel.org, davem@davemloft.net, Xin Long Subject: Re: [PATCH net] team: fix possible recursive locking when add slaves Message-ID: <20190419055529.GD2247@nanopsycho> References: <20190417121211.21063-1-liuhangbin@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190417121211.21063-1-liuhangbin@gmail.com> User-Agent: Mutt/1.11.3 (2019-02-01) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Wed, Apr 17, 2019 at 02:12:11PM CEST, liuhangbin@gmail.com wrote: >If we add a bond device which is already the master of the team interface, >we will hold the team->lock in team_add_slave() first and then request the >lock in team_set_mac_address() again. The functions are called like: > >- team_add_slave() > - team_port_add() > - team_port_enter() > - team_modeop_port_enter() > - __set_port_dev_addr() > - dev_set_mac_address() > - bond_set_mac_address() > - dev_set_mac_address() > - team_set_mac_address > >Although team_upper_dev_link() would check the upper devices but it is >called too late. Fix it by adding a checking before processing the slave. > >Fixes: 3d249d4ca7d0 ("net: introduce ethernet teaming device") >Signed-off-by: Hangbin Liu >--- > drivers/net/team/team.c | 7 +++++++ > 1 file changed, 7 insertions(+) > >diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c >index 9ce61b019aad..8313c4f2b635 100644 >--- a/drivers/net/team/team.c >+++ b/drivers/net/team/team.c >@@ -1156,6 +1156,13 @@ static int team_port_add(struct team *team, struct net_device *port_dev, > return -EINVAL; > } > >+ if (netdev_has_upper_dev(dev, port_dev)) { >+ NL_SET_ERR_MSG(extack, "Device is already an upper device of the team interface"); >+ netdev_err(dev, "Device %s is already an upper device " >+ "of the team interface\n", portname); No wraps in strings please. Otherwise, this looks fine. Feel free to add my ack: Acked-by: Jiri Pirko >+ return -EBUSY; >+ } >+ > if (port_dev->features & NETIF_F_VLAN_CHALLENGED && > vlan_uses_dev(dev)) { > NL_SET_ERR_MSG(extack, "Device is VLAN challenged and team device has VLAN set up"); >-- >2.19.2 >