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=-9.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,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 1E37AC43381 for ; Wed, 27 Mar 2019 15:20:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DBA3F2087C for ; Wed, 27 Mar 2019 15:20:38 +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="eY/gnLo9" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731734AbfC0PUi (ORCPT ); Wed, 27 Mar 2019 11:20:38 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:35597 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731183AbfC0PUF (ORCPT ); Wed, 27 Mar 2019 11:20:05 -0400 Received: by mail-wr1-f67.google.com with SMTP id w1so19103521wrp.2 for ; Wed, 27 Mar 2019 08:20:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=resnulli-us.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=RPlB2jvmR1Tjd9TMxuMSlu4JkcU3smr7Kd8NCVDIsuo=; b=eY/gnLo9kjShqcBAHEPHfYZiTYve8XfSgZNXRRWZYEmT/62PD7b33HYS8jUOAkTGr3 E0mPfhKZPsLwe2VoZY3e6uE1SrLpkU/v5voNFukXJ+y75U2xbMxngoEGEwuFKo8KeMoj +fBQJcUvEyFqz2kp6fuHAx0+5HlWFlige/TqvYsBbSWw1GZM9BcO0DFiUpxNn55muzng EIzoz8WIT78V+XaDllPE5YjfQFjOwyTrOIuwTn+I/iZYwy+5ZZJdf58y6lxEcNh4A4lG uQPybjpMMDTpjX+Qjv7BeW5oynRHx6fPnnBIP2zqWPbUKF/epBazXMM+4TMIAEsuZZrZ qO/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=RPlB2jvmR1Tjd9TMxuMSlu4JkcU3smr7Kd8NCVDIsuo=; b=adhBr6lhcw8BnV2zyoM0dN6UFhHlSEEFmr7KeU+w15IuXwjnE/W5Xcsu9iYonAto+e xH+Plx5tpXHH4gpCiSpHnlvKS1EIbiz7RQsbRVm5Agx+oAyJrhx7DY2FSMelBlnBTO3j O9y4nWyaeC/9XRWUiRcdsFg1fhkZ1m6g2acmyrgju06MGWYjOEbt7M6NDGGi1KKXfvxD eNcB4D1EmC1qPBplIjmQbqXLRSivxtqwFfyarLouR4POVG88xKvU2gEoV0zouL0mi/TW ZcSyEnPIiwzORAR2/bZbLIFsKA9JpB8Qt7KFuX+cks1SE5JDLKQ5TjExzBcJH07CxhA7 sGVA== X-Gm-Message-State: APjAAAVKGOofRg5YlWCWB+ejcqSPNHw9E7nQMtkaejJZmkgh2isu+9K3 mjq/fL/OEGAAXGzRkLSpi0t3vCsp4QE= X-Google-Smtp-Source: APXvYqyEwfvZdr1V1g1nHyJP3xw1O4iceNiYy8L+fA8DOOqpHYwr/VosjlYM2vpU0DHJQX7zYWT8Zg== X-Received: by 2002:adf:e541:: with SMTP id z1mr3406237wrm.95.1553700003102; Wed, 27 Mar 2019 08:20:03 -0700 (PDT) Received: from localhost (ip-94-113-223-73.net.upcbroadband.cz. [94.113.223.73]) by smtp.gmail.com with ESMTPSA id h84sm477911wmf.15.2019.03.27.08.20.02 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 27 Mar 2019 08:20:02 -0700 (PDT) From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, mlxsw@mellanox.com, idosch@mellanox.com, jakub.kicinski@netronome.com, f.fainelli@gmail.com, andrew@lunn.ch, vivien.didelot@gmail.com, michael.chan@broadcom.com Subject: [patch net-next v3 03/12] net: devlink: introduce devlink_compat_phys_port_name_get() Date: Wed, 27 Mar 2019 16:19:49 +0100 Message-Id: <20190327151958.2649-4-jiri@resnulli.us> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190327151958.2649-1-jiri@resnulli.us> References: <20190327151958.2649-1-jiri@resnulli.us> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 Reviewed-by: Jakub Kicinski --- v1->v2: - don't take devlink locks - try ndo first and if it returns EOPNOTSUPP fallback to devlink - rebase --- include/net/devlink.h | 9 +++++++++ net/core/dev.c | 11 ++++++++--- net/core/devlink.c | 28 ++++++++++++++++++++++++++-- 3 files changed, 43 insertions(+), 5 deletions(-) diff --git a/include/net/devlink.h b/include/net/devlink.h index 81b5ed04a341..85e577d6ec3b 100644 --- a/include/net/devlink.h +++ b/include/net/devlink.h @@ -739,6 +739,8 @@ devlink_health_reporter_state_update(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 @@ -753,6 +755,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 9ca2d3abfd1a..9823b7713f79 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -146,6 +146,7 @@ #include #include #include +#include #include "net-sysfs.h" @@ -7877,10 +7878,14 @@ int dev_get_phys_port_name(struct net_device *dev, char *name, size_t len) { const struct net_device_ops *ops = dev->netdev_ops; + int err; - if (!ops->ndo_get_phys_port_name) - return -EOPNOTSUPP; - return ops->ndo_get_phys_port_name(dev, name, len); + if (ops->ndo_get_phys_port_name) { + err = ops->ndo_get_phys_port_name(dev, name, len); + if (err != -EOPNOTSUPP) + return err; + } + return devlink_compat_phys_port_name_get(dev, name, len); } EXPORT_SYMBOL(dev_get_phys_port_name); diff --git a/net/core/devlink.c b/net/core/devlink.c index 37d01c39071e..8bb2c3e3f202 100644 --- a/net/core/devlink.c +++ b/net/core/devlink.c @@ -5414,8 +5414,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; @@ -5445,6 +5445,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, @@ -6459,6 +6465,24 @@ 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; + + /* RTNL mutex is held here which ensures that devlink_port + * instance cannot disappear in the middle. No need to take + * any devlink lock as only permanent values are accessed. + */ + ASSERT_RTNL(); + + devlink_port = netdev_to_devlink_port(dev); + if (!devlink_port) + return -EOPNOTSUPP; + + return __devlink_port_phys_port_name_get(devlink_port, name, len); +} + static int __init devlink_init(void) { return genl_register_family(&devlink_nl_family); -- 2.17.2