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,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 AE25FC282D7 for ; Wed, 30 Jan 2019 23:42:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 66750218AF for ; Wed, 30 Jan 2019 23:42:18 +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="MPBNWmC9" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730781AbfA3XmQ (ORCPT ); Wed, 30 Jan 2019 18:42:16 -0500 Received: from mail-qt1-f196.google.com ([209.85.160.196]:39702 "EHLO mail-qt1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730573AbfA3XmP (ORCPT ); Wed, 30 Jan 2019 18:42:15 -0500 Received: by mail-qt1-f196.google.com with SMTP id u47so1609544qtj.6 for ; Wed, 30 Jan 2019 15:42:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yrPQCboyABw7XvXpp/YBX+wbOSFyy4j6SEfCv88SmKU=; b=MPBNWmC9KuEBkJGwQ96MSKiSSailJ0xAYwmV/sHxOWQOeGZRQpkVfkXg2+LiDXf9DD HBmgNIDEEPcAJV5EX7YU5xzu9GAsUbq1dw99IprvQZU2VoZdTqCOPw+hFOXy/O2H0q/X M3NE8pyo8LcaA4hqa2T4AhyryiaYqWZRVFgyBWO0dBoC8/ueaicW2f2hwXl7edZVwFFl HqU5i1v0L/0YKvPm1w71ZWwLwGWR8K/pYxpVNlqyOi8zvN6+rncCaLLkOz8ZnATIoSnY YyxY82HLXd37ofc0uQ3TjKdkq4Pp3LsSzA9i51vCjgkR2zEwC9ISkIUAFhAz0gqqymQR faKw== 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:mime-version:content-transfer-encoding; bh=yrPQCboyABw7XvXpp/YBX+wbOSFyy4j6SEfCv88SmKU=; b=ACsz03aXLPLJG0kunh3ZTKs2sco+esZTimuzeb3mIiVfHI246P7XEMpBSpffUuCxm9 CUaSZpe65qF/gd8jtuIvTva9zR0qtcLMOzUR0sRoTS45nJiCY6gLTA8BZNa5f7yl2x2J qNn6g57cqk9Yn0YXclwQADId+rHIjtsOinBOU73bY2B/Crl6nKs7yKvmU1ADL54atEtD cGGUW+jDSanhxQ4fk8xMIBiVZodexADQyTyHng8t4tyaAllEmf2C4yZZnv6oBFjgd/Vl N3e/zDa3NInhVAklSSCM/OvD2fdzg1X1R2OnoNuKQWmV4cyhhRUeQABKingnm5W8X12y cfww== X-Gm-Message-State: AJcUukfvKcl4MccoXNJ+tdaUz/vdw6bOGFXdV8Mw2uMQEmFDLESdvOUe ILenIS+psR31/ML3LpsYS4SUBA== X-Google-Smtp-Source: ALg8bN7vtMFDFFMtqP/AEN3hrXMJ8wwlkcVyxhHz9AYWxneIuRyQUTfjQ1YRMEGuhykS8cfXtxxYfQ== X-Received: by 2002:ac8:7451:: with SMTP id h17mr31474344qtr.319.1548891734014; Wed, 30 Jan 2019 15:42:14 -0800 (PST) Received: from jkicinski-Precision-T1700.netronome.com ([66.60.152.14]) by smtp.gmail.com with ESMTPSA id q21sm4009163qtk.79.2019.01.30.15.42.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Jan 2019 15:42:13 -0800 (PST) From: Jakub Kicinski To: davem@davemloft.net Cc: netdev@vger.kernel.org, oss-drivers@netronome.com, jiri@resnulli.us, andrew@lunn.ch, f.fainelli@gmail.com, mkubecek@suse.cz, eugenem@fb.com, jonathan.lemon@gmail.com, Jakub Kicinski Subject: [PATCH net-next v3 8/8] ethtool: add compat for devlink info Date: Wed, 30 Jan 2019 15:41:33 -0800 Message-Id: <20190130234133.4298-9-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190130234133.4298-1-jakub.kicinski@netronome.com> References: <20190130234133.4298-1-jakub.kicinski@netronome.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org If driver did not fill the fw_version field, try to call into the new devlink get_info op and collect the versions that way. We assume ethtool was always reporting running versions. v3 (Jiri): - do a dump and then parse it instead of special handling; - concatenate all versions (well, all that fit :)). Signed-off-by: Jakub Kicinski --- include/net/devlink.h | 7 +++++ net/core/devlink.c | 63 +++++++++++++++++++++++++++++++++++++++++++ net/core/ethtool.c | 7 +++++ 3 files changed, 77 insertions(+) diff --git a/include/net/devlink.h b/include/net/devlink.h index 6b417f141fd6..3d9ebd548bac 100644 --- a/include/net/devlink.h +++ b/include/net/devlink.h @@ -637,6 +637,8 @@ int devlink_info_version_stored_put(struct devlink_info_req *req, int devlink_info_version_running_put(struct devlink_info_req *req, const char *version_name, const char *version_value); +void devlink_compat_running_version(struct net_device *dev, + char *buf, size_t len); #else @@ -970,6 +972,11 @@ devlink_info_version_running_put(struct devlink_info_req *req, { return 0; } + +static inline void +devlink_compat_running_version(struct net_device *dev, char *buf, size_t len) +{ +} #endif #endif /* _NET_DEVLINK_H_ */ diff --git a/net/core/devlink.c b/net/core/devlink.c index e31b6d617837..eb839d74bcc0 100644 --- a/net/core/devlink.c +++ b/net/core/devlink.c @@ -5278,6 +5278,69 @@ int devlink_region_snapshot_create(struct devlink_region *region, u64 data_len, } EXPORT_SYMBOL_GPL(devlink_region_snapshot_create); +static void __devlink_compat_running_version(struct devlink *devlink, + char *buf, size_t len) +{ + const struct nlattr *nlattr; + struct devlink_info_req req; + struct sk_buff *msg; + int rem, err; + + if (!devlink->ops->info_get) + return; + + msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL); + if (!msg) + return; + + req.msg = msg; + err = devlink->ops->info_get(devlink, &req, NULL); + if (err) + goto free_msg; + + nla_for_each_attr(nlattr, (void *)msg->data, msg->len, rem) { + const struct nlattr *kv; + int rem_kv; + + if (nla_type(nlattr) != DEVLINK_ATTR_INFO_VERSION_RUNNING) + continue; + + nla_for_each_nested(kv, nlattr, rem_kv) { + if (nla_type(kv) != DEVLINK_ATTR_INFO_VERSION_VALUE) + continue; + + strlcat(buf, nla_data(kv), len); + strlcat(buf, " ", len); + } + } +free_msg: + nlmsg_free(msg); +} + +void devlink_compat_running_version(struct net_device *dev, + char *buf, size_t len) +{ + struct devlink_port *devlink_port; + struct devlink *devlink; + + mutex_lock(&devlink_mutex); + list_for_each_entry(devlink, &devlink_list, list) { + mutex_lock(&devlink->lock); + list_for_each_entry(devlink_port, &devlink->port_list, list) { + if (devlink_port->type == DEVLINK_PORT_TYPE_ETH || + devlink_port->type_dev == dev) { + __devlink_compat_running_version(devlink, + buf, len); + mutex_unlock(&devlink->lock); + goto out; + } + } + mutex_unlock(&devlink->lock); + } +out: + mutex_unlock(&devlink_mutex); +} + static int __init devlink_module_init(void) { return genl_register_family(&devlink_nl_family); diff --git a/net/core/ethtool.c b/net/core/ethtool.c index 158264f7cfaf..197a4dfb712d 100644 --- a/net/core/ethtool.c +++ b/net/core/ethtool.c @@ -27,6 +27,7 @@ #include #include #include +#include #include /* @@ -803,6 +804,12 @@ static noinline_for_stack int ethtool_get_drvinfo(struct net_device *dev, if (ops->get_eeprom_len) info.eedump_len = ops->get_eeprom_len(dev); + rtnl_unlock(); + if (!info.fw_version[0]) + devlink_compat_running_version(dev, info.fw_version, + sizeof(info.fw_version)); + rtnl_lock(); + if (copy_to_user(useraddr, &info, sizeof(info))) return -EFAULT; return 0; -- 2.19.2