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=-9.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,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 A0F70C43381 for ; Fri, 1 Mar 2019 08:14:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 70BC9218AE for ; Fri, 1 Mar 2019 08:14:10 +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="hGy2sbAZ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733248AbfCAIOJ (ORCPT ); Fri, 1 Mar 2019 03:14:09 -0500 Received: from mail-wm1-f68.google.com ([209.85.128.68]:35737 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733205AbfCAIOI (ORCPT ); Fri, 1 Mar 2019 03:14:08 -0500 Received: by mail-wm1-f68.google.com with SMTP id y15so11349136wma.0 for ; Fri, 01 Mar 2019 00:14:06 -0800 (PST) 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=4ne2+2Nr8PMmgU9ZlIWb/MuuugaDo725pZGeqx2G6as=; b=hGy2sbAZDJwVIRXvEjvkrYP82pYwVr4kkKQzwt0zwKn7ucUMNU4Y2Ra0VJQydHkFtG 5NvGKBB7oRMwYDKpJxiDvteWS6v/nbtUJLspRXUAknAjI9u61k5zNg38dTowhb/Qyhds /C7dnzJ63gaB0+fLZe13t0nhjNxx2ur20856HShRMNxIzBwx/ErGryl0Gy6FcKCffbGX lWSFsGZSyiKyvm47TIubrquf7u0KTfddb/rVVy2d8Kc1Fd3PsIYT/fMC1X3oSWWjekdn g2kjnrIHbGRtym8GWstEQ00LkaWqIWiAWe86/gNEjs4hRubJqshEAYE3hb0fCQQpKwZI lXLg== 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=4ne2+2Nr8PMmgU9ZlIWb/MuuugaDo725pZGeqx2G6as=; b=jRmtWi8DKwgCo6by+cEL/rGykqUNv5Hk7XGhV6K6cNBEGxGgfLOLFZVBvZcMPKfF4c 2IAsLITN31F1enY+goEW8K4X5UmYLQHO1rm3/wPAdP+mSciZ/VXC1nCX2TA23AX/dW6W /k8r6gFQuWc9hLkzn7zivnVYBP7Hy0BN7ztF/6ZUv/m5hdwNJ/+xWQJ6w4bspUSzBNMw HAr71TH+SBsnGfDt00B9WQP++QnZoOlEhP10OGn0r8n2AG5HXt8AKOBUdTN1yQCtryWY iDbf8TvlWtmGzC2UnKptzk28njjJYMdI3Z56cLc0xBw+WcrRyH5LqCd4v1TMkho0mSKS fPJA== X-Gm-Message-State: AHQUAuZghOwIGAii5YwyICDkhCSGZRr4x2fsVNZ7swh5aNZDSozoELty 32UoIyS2Dqei3RodhRjGti37y03B9SNb3g== X-Google-Smtp-Source: APXvYqyKinFWgV8vqAUIwZhR3W9ir4WNGWDI5vWSRz3wuXEbh57UAWljoMJm8SuQzOPyG8CBSW1cFw== X-Received: by 2002:a1c:7ec2:: with SMTP id z185mr2441185wmc.69.1551428045923; Fri, 01 Mar 2019 00:14:05 -0800 (PST) Received: from localhost (ip-89-177-134-16.net.upcbroadband.cz. [89.177.134.16]) by smtp.gmail.com with ESMTPSA id h9sm48053708wrv.11.2019.03.01.00.14.05 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 01 Mar 2019 00:14:05 -0800 (PST) From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, mlxsw@mellanox.com, idosch@mellanox.com, jakub.kicinski@netronome.com, dirk.vandermerwe@netronome.com, f.fainelli@gmail.com, andrew@lunn.ch, vivien.didelot@gmail.com Subject: [patch net-next 2/5] net: devlink: introduce devlink_compat_phys_port_name_get() Date: Fri, 1 Mar 2019 09:13:59 +0100 Message-Id: <20190301081402.6074-3-jiri@resnulli.us> X-Mailer: git-send-email 2.14.5 In-Reply-To: <20190301081402.6074-1-jiri@resnulli.us> References: <20190301081402.6074-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 --- 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); + 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); -- 2.14.5