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=-7.0 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 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 5BDACC43381 for ; Fri, 1 Mar 2019 16:15:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 281332083D for ; Fri, 1 Mar 2019 16:15:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b="UVGFA9JI" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388801AbfCAQPI (ORCPT ); Fri, 1 Mar 2019 11:15:08 -0500 Received: from mail-qk1-f196.google.com ([209.85.222.196]:37711 "EHLO mail-qk1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725966AbfCAQPH (ORCPT ); Fri, 1 Mar 2019 11:15:07 -0500 Received: by mail-qk1-f196.google.com with SMTP id m9so14603033qkl.4 for ; Fri, 01 Mar 2019 08:15:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:in-reply-to:references :organization:mime-version:content-transfer-encoding; bh=Y9xSFBRdG+jtTEDnCv8AshtS/x7/O+U4Qw9/TpQ2OGo=; b=UVGFA9JIyHo3ABweZ2d7kJb8yKnxylV25mf48VVngsMdLBpoUD59tKau5yN16tEa8U oJmP3JUtliVk2aW1fmSh2M/3wtHKkjBEiuqctEeCYAqUebay8qvJaGMNOjyP5i7VIbRr QWiNNUWJttXnFt0j1aKvOvBRJitXC7BWx4I8Yubi7iqZ/R769dJzch8kAzBb42f/h9Bu Rp6Tsdna8moeNJTYW9h+i+DF0Mq8X7KYPEQTBjF0BxPqBZK16Mm9QLDzWUzUZwfDAJaI Y8kx7jzRf5FTh2y0QBn0RFCS7yxly0OZ4aIYRUenhGjGZ2A+bBM8TfOm91JA9/ekP7/O hVsA== 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:in-reply-to :references:organization:mime-version:content-transfer-encoding; bh=Y9xSFBRdG+jtTEDnCv8AshtS/x7/O+U4Qw9/TpQ2OGo=; b=Hi/UHguIPNmAFYx/gnoGagPCDhSRdFk1PqYLIthZBPL4gk7cXnTiBD//0UxgWT7bUU 2dXj9wEtD9MBEY+85r6KPOV01UYYD0xF4PwS6Bh+dNTIwE+Ol4Ud3R1fYRazaP9csvn9 5kPAwNN367EwQoipuxJ8+IsUvEBWLAm96YlkzTQcOivNi9kp0gWfTF0Se68PyYzSkON7 zNdwtIfoeHPSYF6hsS+xMEXhqNlCyuK/UM7OJiJ3Jne8GVyeJxGqj+8u6EUwVbGWuUFN btMBe/ZlF/qjUtlJVS00BE00We6ZkNZzmnsdgYWqUc/tVDpCikHlWvvXefsPwCWxzAvh SbTg== X-Gm-Message-State: APjAAAUKz+0IsoYWAN4ma257+vSjYhmadM1nN5U/N4zvorrxhHuCqxPc 0vp83SqN96TGfsTqM2HfXmvOhA== X-Google-Smtp-Source: APXvYqyTXB9Jl5KfdAJkh8A/GAw+Oduy4+Zy6xQS+1q3njpkLlepqzWM3RuXEDyDkPbSCIgPs5m4qw== X-Received: by 2002:a37:8586:: with SMTP id h128mr4529174qkd.322.1551456906368; Fri, 01 Mar 2019 08:15:06 -0800 (PST) Received: from cakuba.netronome.com ([66.60.152.14]) by smtp.gmail.com with ESMTPSA id 24sm16405856qtu.17.2019.03.01.08.15.05 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 01 Mar 2019 08:15:06 -0800 (PST) Date: Fri, 1 Mar 2019 08:14:58 -0800 From: Jakub Kicinski To: Jiri Pirko 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: <20190301081458.7bb00480@cakuba.netronome.com> In-Reply-To: <20190301081402.6074-3-jiri@resnulli.us> References: <20190301081402.6074-1-jiri@resnulli.us> <20190301081402.6074-3-jiri@resnulli.us> Organization: Netronome Systems, Ltd. MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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. > + 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);