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 A63F9C43381 for ; Fri, 1 Mar 2019 16:31:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6814B20857 for ; Fri, 1 Mar 2019 16:31:56 +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="YJOkQkAW" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388957AbfCAQbz (ORCPT ); Fri, 1 Mar 2019 11:31:55 -0500 Received: from mail-wm1-f65.google.com ([209.85.128.65]:50846 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728449AbfCAQbz (ORCPT ); Fri, 1 Mar 2019 11:31:55 -0500 Received: by mail-wm1-f65.google.com with SMTP id x7so13033368wmj.0 for ; Fri, 01 Mar 2019 08:31:53 -0800 (PST) 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=jOarEQPI6+QVIywDP2HqHuHmPAbcswX++DpcqMhlK2M=; b=YJOkQkAWpCWHKnwSjtsfK+3ZGIvUS5Dhl26TVmACtr8baXru8UjQ69E1No8UsrU2YN kDEfeSU5emBguVJU5BlzYPK+oDQfORscrz2oeIBTnx6KGRapQJ7OnoStv+t+gfGLZnOx VTUXpTH6N3KY0qV378/OJlJhOidL6fNglLqvQ1IOft7AhgFd4N3JjqKgTQu6cgqHxxyv bp7HVuF+PVVvRLHld1SgLKl/0PHR5Lpw2Ree7nuaqwfo12BDkA6sKSV9kXT/445b3pEh pXpWvVWfpUJtjeq2wuAJv4rxXC2GQr3OD+ILvrWV8I1d4SYaPqoW761ekJmAazPeS+01 yWdA== 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=jOarEQPI6+QVIywDP2HqHuHmPAbcswX++DpcqMhlK2M=; b=T+bnMmGvF5P9KeUUGpA/gZedN1nWQs91EUkHeRiAvnz7WKpFpi2BHuVNTZG4wk2iBt AYO6sNZrw4/TJPv6si2qOt0JZb9TyNeyhlYkRPE0huCSw2gM0/HJ2NSK0fhdGCr8PdBp jSKlO+8sLSwJ1m4Nh8qK9Y8n7rQ8sZqyx1GJ3ojAwAMFthZichYxlIgUjH3S8qma7oH1 a0qd/+eYF9IYXUok7gNAKydBe4yKdRLteFlMif9duqijYY5XgnWthTVEIcZtBBzSwmq1 O+Zwp+SR0XU81euslG4YCLGGdPD/BambJ0Jx/SEl84Fedyfm91YYmDuZ3G2vSaFgFiwq nTbA== X-Gm-Message-State: APjAAAXRjKgA1jvdVMG/q4REXvK+nx9Z1PDiTz1CPR7Lpv7aD+FmVJ1H DsUMO5qzSEvbaopgibrQ/liUtw== X-Google-Smtp-Source: AHgI3IZJ9BAJeF0IppL0lbF6bCZfEO+fTe5QE/TvnL0Tebn7/kaeXmHYnxYvXNdNW0CEgY153yyBQA== X-Received: by 2002:a1c:610a:: with SMTP id v10mr3859890wmb.18.1551457912695; Fri, 01 Mar 2019 08:31:52 -0800 (PST) Received: from localhost (ip-89-177-134-16.net.upcbroadband.cz. [89.177.134.16]) by smtp.gmail.com with ESMTPSA id i13sm23097160wrm.86.2019.03.01.08.31.52 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 01 Mar 2019 08:31:52 -0800 (PST) Date: Fri, 1 Mar 2019 17:21:59 +0100 From: Jiri Pirko To: Jakub Kicinski Cc: netdev@vger.kernel.org, davem@davemloft.net, mlxsw@mellanox.com, idosch@mellanox.com, dirk.vandermerwe@netronome.com, f.fainelli@gmail.com, andrew@lunn.ch, vivien.didelot@gmail.com Subject: Re: [patch net-next 2/5] net: devlink: introduce devlink_compat_phys_port_name_get() Message-ID: <20190301162159.GK2314@nanopsycho> References: <20190301081402.6074-1-jiri@resnulli.us> <20190301081402.6074-3-jiri@resnulli.us> <20190301081458.7bb00480@cakuba.netronome.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190301081458.7bb00480@cakuba.netronome.com> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fri, Mar 01, 2019 at 05:14:58PM CET, jakub.kicinski@netronome.com wrote: >On Fri, 1 Mar 2019 09:13:59 +0100, Jiri Pirko wrote: >> From: Jiri Pirko >> >> Introduce devlink_compat_phys_port_name_get() helper that >> gets the physical port name for specified netdevice >> according to devlink port attributes. >> Call this helper from dev_get_phys_port_name() >> in case ndo_get_phys_port_name is not defined. >> >> Signed-off-by: Jiri Pirko >> --- >> include/net/devlink.h | 9 +++++++++ >> net/core/dev.c | 3 ++- >> net/core/devlink.c | 30 ++++++++++++++++++++++++++++-- >> 3 files changed, 39 insertions(+), 3 deletions(-) >> >> diff --git a/include/net/devlink.h b/include/net/devlink.h >> index f34107def48e..ae2cd34da99e 100644 >> --- a/include/net/devlink.h >> +++ b/include/net/devlink.h >> @@ -729,6 +729,8 @@ int devlink_health_report(struct devlink_health_reporter *reporter, >> void devlink_compat_running_version(struct net_device *dev, >> char *buf, size_t len); >> int devlink_compat_flash_update(struct net_device *dev, const char *file_name); >> +int devlink_compat_phys_port_name_get(struct net_device *dev, >> + char *name, size_t len); >> >> #else >> >> @@ -1224,6 +1226,13 @@ devlink_compat_flash_update(struct net_device *dev, const char *file_name) >> { >> return -EOPNOTSUPP; >> } >> + >> +static inline int >> +devlink_compat_phys_port_name_get(struct net_device *dev, >> + char *name, size_t len) >> +{ >> + return -EOPNOTSUPP; >> +} >> #endif >> >> #endif /* _NET_DEVLINK_H_ */ >> diff --git a/net/core/dev.c b/net/core/dev.c >> index 2b67f2aa59dd..a614b26b0842 100644 >> --- a/net/core/dev.c >> +++ b/net/core/dev.c >> @@ -146,6 +146,7 @@ >> #include >> #include >> #include >> +#include >> >> #include "net-sysfs.h" >> >> @@ -7872,7 +7873,7 @@ int dev_get_phys_port_name(struct net_device *dev, >> const struct net_device_ops *ops = dev->netdev_ops; >> >> if (!ops->ndo_get_phys_port_name) >> - return -EOPNOTSUPP; >> + return devlink_compat_phys_port_name_get(dev, name, len); >> return ops->ndo_get_phys_port_name(dev, name, len); >> } >> EXPORT_SYMBOL(dev_get_phys_port_name); >> diff --git a/net/core/devlink.c b/net/core/devlink.c >> index a49dee67e66f..4fd45d4a4818 100644 >> --- a/net/core/devlink.c >> +++ b/net/core/devlink.c >> @@ -5419,8 +5419,8 @@ void devlink_port_attrs_set(struct devlink_port *devlink_port, >> } >> EXPORT_SYMBOL_GPL(devlink_port_attrs_set); >> >> -int devlink_port_get_phys_port_name(struct devlink_port *devlink_port, >> - char *name, size_t len) >> +static int __devlink_port_phys_port_name_get(struct devlink_port *devlink_port, >> + char *name, size_t len) >> { >> struct devlink_port_attrs *attrs = &devlink_port->attrs; >> int n = 0; >> @@ -5450,6 +5450,12 @@ int devlink_port_get_phys_port_name(struct devlink_port *devlink_port, >> >> return 0; >> } >> + >> +int devlink_port_get_phys_port_name(struct devlink_port *devlink_port, >> + char *name, size_t len) >> +{ >> + return __devlink_port_phys_port_name_get(devlink_port, name, len); >> +} >> EXPORT_SYMBOL_GPL(devlink_port_get_phys_port_name); >> >> int devlink_sb_register(struct devlink *devlink, unsigned int sb_index, >> @@ -6469,6 +6475,26 @@ int devlink_compat_flash_update(struct net_device *dev, const char *file_name) >> return ret; >> } >> >> +int devlink_compat_phys_port_name_get(struct net_device *dev, >> + char *name, size_t len) >> +{ >> + struct devlink_port *devlink_port; >> + int err = -EOPNOTSUPP; >> + >> + mutex_lock(&devlink_mutex); >> + devlink_port = netdev_to_devlink_port(dev); >> + if (!devlink_port) >> + goto unlock_list; >> + >> + mutex_lock(&devlink_port->devlink->lock); > >I'm moderately confident you won't be able to take devlink locks from >RTNL code :( I think the locking order is: > > devlink_mutex -> devlink->lock -> rtnl_lock > >No? :( At least NFP assumes that, but I think port splitting does, too. Oh right, thanks for spotting this. Will fix. > >> + err = __devlink_port_phys_port_name_get(devlink_port, name, len); >> + mutex_unlock(&devlink_port->devlink->lock); >> +unlock_list: >> + mutex_unlock(&devlink_mutex); >> + >> + return err; >> +} >> + >> static int __init devlink_init(void) >> { >> return genl_register_family(&devlink_nl_family); >