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 C9809C282D9 for ; Wed, 30 Jan 2019 19:05:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 95AAE20989 for ; Wed, 30 Jan 2019 19:05:33 +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="Thkt/Cep" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387466AbfA3TFc (ORCPT ); Wed, 30 Jan 2019 14:05:32 -0500 Received: from mail-qk1-f194.google.com ([209.85.222.194]:40243 "EHLO mail-qk1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387431AbfA3TFc (ORCPT ); Wed, 30 Jan 2019 14:05:32 -0500 Received: by mail-qk1-f194.google.com with SMTP id y16so398606qki.7 for ; Wed, 30 Jan 2019 11:05:31 -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=LfcanYuoC89Ld0O+0Gg1HW7fw3btAlOg9SISrzgSyOM=; b=Thkt/CepeIOTeY45jsV5ROnGtfVLAd6ylJf23KTXmH94H3NxZPRV9kgJDa3giL4mv+ KKx1G2obHv0OcSJ52NVTLFJYk4nn0KoGOJekHY6SXcwYnwlWd1tiFsJXR2970bpH9qlY 53ffO/iPtlYFrztMDebHRpUTp4PsQDGDHdrra4/2Q+98MzMcjvxk3HELrIDCQe/up+X/ sEEalU8EThYMTnnZjDojboRBsDS1ZXh1itn5hOTrIU1EFOGEJi8tda8lu7Zt0LjtuVvi 71F9XnxJJ/VgKqLXMyFkgZpr0o9N2hBpuAR3pYFzZauuiM6FPoCKtMuZvX4AoXTaqKQN RDhQ== 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=LfcanYuoC89Ld0O+0Gg1HW7fw3btAlOg9SISrzgSyOM=; b=uD9x3cfFIv5dged7m7hxIkvaeOv6m5jTFXrWoLOwYyd3yMPIN0dRRw0HiD4qBSnlS0 GlsalThqUUBJiPiXuStB/jdXokiRz5yZFE71qg8oW+ot7HfZu4v+K1Cbw8VBL9rcuXKy o7M70Ku2fgu2pCB8AFQ9LVkjveg1Hj7/6V01kDCfMZsHvaSp4ilAnzws71SwyNGbIkKK fMLAArvwvd9z09GpJV8WeXjWZ/5fxdwc39TT1+RkfmMF4p7Z0Iop5c5CfoD9bF01q41X sdVRq/40t+lPMl/r0Wl9YrogrDhSYx5f+shAH727njXs+C9P9MGJUfNjjogQaHb3+r48 mfVQ== X-Gm-Message-State: AJcUukcD+AIyLRJy+OOdCRcXRGI+bFywTQn7iN4bX+h4rwHz+oK4BslD giRNwixMn2EBRJqsZMrIH+9gdg== X-Google-Smtp-Source: ALg8bN62eDARvbk3CMBWXeAs3frAIwgM/ZHX2G7p/baQUJjIrNQFxeCEJet7SnZKzNtxI6Fb3TKtwg== X-Received: by 2002:a37:5f05:: with SMTP id t5mr29233830qkb.47.1548875131323; Wed, 30 Jan 2019 11:05:31 -0800 (PST) Received: from jkicinski-Precision-T1700.netronome.com ([66.60.152.14]) by smtp.gmail.com with ESMTPSA id d14sm1929604qkl.64.2019.01.30.11.05.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Jan 2019 11:05:30 -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 v2 2/7] devlink: add version reporting to devlink info API Date: Wed, 30 Jan 2019 11:05:08 -0800 Message-Id: <20190130190513.25718-3-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190130190513.25718-1-jakub.kicinski@netronome.com> References: <20190130190513.25718-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 ethtool -i has a few fixed-size fields which can be used to report firmware version and expansion ROM version. Unfortunately, modern hardware has more firmware components. There is usually some datapath microcode, management controller, PXE drivers, and a CPLD load. Running ethtool -i on modern controllers reveals the fact that vendors cram multiple values into firmware version field. Here are some examples from systems I could lay my hands on quickly: tg3: "FFV20.2.17 bc 5720-v1.39" i40e: "6.01 0x800034a4 1.1747.0" nfp: "0.0.3.5 0.25 sriov-2.1.16 nic" Add a new devlink API to allow retrieving multiple versions, and provide user-readable name for those versions. While at it break down the versions into three categories: - fixed - this is the board/fixed component version, usually vendors report information like the board version in the PCI VPD, but it will benefit from naming and common API as well; - running - this is the running firmware version; - stored - this is firmware in the flash, after firmware update this value will reflect the flashed version, while the running version may only be updated after reboot. RFCv2: - remove the nesting in attr DEVLINK_ATTR_INFO_VERSIONS (now versions are mixed with other info attrs)l - have the driver report versions from the same callback as other info. Signed-off-by: Jakub Kicinski --- include/net/devlink.h | 18 ++++++++++++++++ include/uapi/linux/devlink.h | 5 +++++ net/core/devlink.c | 40 ++++++++++++++++++++++++++++++++++++ 3 files changed, 63 insertions(+) diff --git a/include/net/devlink.h b/include/net/devlink.h index 5ef3570a3859..ec72638aa47f 100644 --- a/include/net/devlink.h +++ b/include/net/devlink.h @@ -428,6 +428,12 @@ enum devlink_param_wol_types { .validate = _validate, \ } +enum devlink_version_type { + DEVLINK_VERSION_FIXED, + DEVLINK_VERSION_STORED, + DEVLINK_VERSION_RUNNING, +}; + struct devlink_region; struct devlink_info_req; @@ -614,6 +620,10 @@ int devlink_info_report_serial_number(struct devlink_info_req *req, const char *sn); int devlink_info_report_driver_name(struct devlink_info_req *req, const char *name); +int devlink_info_report_version(struct devlink_info_req *req, + enum devlink_version_type type, + const char *version_name, + const char *version_value); #else @@ -923,6 +933,14 @@ devlink_info_report_serial_number(struct devlink_info_req *req, const char *sn) { return 0; } + +static inline int +devlink_info_report_version(struct devlink_info_req *req, + enum devlink_version_type type, + const char *version_name, const char *version_value) +{ + return 0; +} #endif #endif /* _NET_DEVLINK_H_ */ diff --git a/include/uapi/linux/devlink.h b/include/uapi/linux/devlink.h index fd089baa7c50..a61b87c73c3f 100644 --- a/include/uapi/linux/devlink.h +++ b/include/uapi/linux/devlink.h @@ -294,6 +294,11 @@ enum devlink_attr { DEVLINK_ATTR_INFO_DRV_NAME, /* string */ DEVLINK_ATTR_INFO_SERIAL_NUMBER, /* string */ + DEVLINK_ATTR_INFO_VERSION_FIXED, /* nested */ + DEVLINK_ATTR_INFO_VERSION_RUNNING, /* nested */ + DEVLINK_ATTR_INFO_VERSION_STORED, /* nested */ + DEVLINK_ATTR_INFO_VERSION_NAME, /* string */ + DEVLINK_ATTR_INFO_VERSION_VALUE, /* string */ /* add new attributes above here, update the policy in devlink.c */ diff --git a/net/core/devlink.c b/net/core/devlink.c index 1b941493fdff..e2027d3a5e40 100644 --- a/net/core/devlink.c +++ b/net/core/devlink.c @@ -3732,6 +3732,46 @@ int devlink_info_report_serial_number(struct devlink_info_req *req, } EXPORT_SYMBOL_GPL(devlink_info_report_serial_number); +int devlink_info_report_version(struct devlink_info_req *req, + enum devlink_version_type type, + const char *version_name, + const char *version_value) +{ + static const enum devlink_attr type2attr[] = { + [DEVLINK_VERSION_FIXED] = DEVLINK_ATTR_INFO_VERSION_FIXED, + [DEVLINK_VERSION_STORED] = DEVLINK_ATTR_INFO_VERSION_STORED, + [DEVLINK_VERSION_RUNNING] = DEVLINK_ATTR_INFO_VERSION_RUNNING, + }; + struct nlattr *nest; + int err; + + if (type >= ARRAY_SIZE(type2attr) || !type2attr[type]) + return -EINVAL; + + nest = nla_nest_start(req->msg, type2attr[type]); + if (!nest) + return -EMSGSIZE; + + err = nla_put_string(req->msg, DEVLINK_ATTR_INFO_VERSION_NAME, + version_name); + if (err) + goto nla_put_failure; + + err = nla_put_string(req->msg, DEVLINK_ATTR_INFO_VERSION_VALUE, + version_value); + if (err) + goto nla_put_failure; + + nla_nest_end(req->msg, nest); + + return 0; + +nla_put_failure: + nla_nest_cancel(req->msg, nest); + return err; +} +EXPORT_SYMBOL_GPL(devlink_info_report_version); + static int devlink_nl_info_fill(struct sk_buff *msg, struct devlink *devlink, enum devlink_command cmd, u32 portid, -- 2.19.2