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 7F458C169C4 for ; Mon, 11 Feb 2019 06:59:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4415E2070B for ; Mon, 11 Feb 2019 06:59:43 +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="HA/qUg4o" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726107AbfBKG7m (ORCPT ); Mon, 11 Feb 2019 01:59:42 -0500 Received: from mail-qt1-f194.google.com ([209.85.160.194]:43061 "EHLO mail-qt1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725931AbfBKG7l (ORCPT ); Mon, 11 Feb 2019 01:59:41 -0500 Received: by mail-qt1-f194.google.com with SMTP id y4so10979793qtc.10 for ; Sun, 10 Feb 2019 22:59:40 -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=fa1D7xTzpGSJ1/Y3iBQ+NrEeWqLNKBcNmxvozXYCDAg=; b=HA/qUg4ofHsQPWiWKxWFyUFWD+g94zZ9N60z1TFrCKK6gDsquKBsnkpzFHOD7m1lke bPILR/yIQ33jKiP12HOLw6XjuWW04z1TtWCitOuHmBhbUHy4CO4bZEL0fwvHYEZ43P7F ee8bVQxuJ2SeoijVjdlfgmRCpnyhyXJvUHJSe2Jko4xYWQaWR2i3SSB1SYTa6GpYyD5j yO0yZMG+IHnz3Op8utq0/jSou0MworwTdsm6Fnl294P/hbsni1chPYP961cbr5KQXxqi 9NA77co/rqIXx/wuOU3n6zJmIZhSYVlBfIHScYOA7lgFU2qsnIm1ZpN6fy4/lWdKLum8 tlCw== 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=fa1D7xTzpGSJ1/Y3iBQ+NrEeWqLNKBcNmxvozXYCDAg=; b=tksMOpxeTh0Xkr5HUh6I+VEi240n3DtpTj+siqm1W3FMF67GhHXETWGjVXPWOiG9ij sF6bW4dq0daxDXLTGs5KetySrYcQzwXq4MdKmNtmvPl3RLOfu6qV8U3efRYgeApQJeWD h9fBtZcpE2F1/nWtrQFvMx2v3YDN6wj/iSOdsHCI2ovXyTlrtwoXmCVQ9n/ICNju2pzX 50xyKaXuOv8i3iRhNaZbigJn0CqRJvDtwhpebQ0yzd86HapflffFVJ9y0xgZ3lRgnvwH 3npLvTY/WFGL8LfhS/XrtE4yd1PTNK0zIop2VhLhbv9EF3b0/ahBECZtBHRbuGNGr9It nbkA== X-Gm-Message-State: AHQUAuY7iVbtbKJhQtE/2regCEbhxmRdlD1ASuCdljKmkuizp5HaoYKT S+vaV/TPuSRXx/0asBVwqb4nMQ== X-Google-Smtp-Source: AHgI3IaGADWR2dd5dgliKd0vYbbmsaVrEE9mPo4vc4F1vpacE6XkzygEfDpQDJo7A5FYwy8GWD+YAA== X-Received: by 2002:ac8:2524:: with SMTP id 33mr5866109qtm.165.1549868380057; Sun, 10 Feb 2019 22:59:40 -0800 (PST) Received: from jkicinski-Precision-T1700.netronome.com ([66.60.152.14]) by smtp.gmail.com with ESMTPSA id c68sm9677990qkf.65.2019.02.10.22.59.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Feb 2019 22:59:39 -0800 (PST) From: Jakub Kicinski To: davem@davemloft.net, jiri@resnulli.us Cc: netdev@vger.kernel.org, oss-drivers@netronome.com, mkubecek@suse.cz, andrew@lunn.ch, Jakub Kicinski Subject: [RFC 1/3] devlink: add flash update command Date: Sun, 10 Feb 2019 22:59:20 -0800 Message-Id: <20190211065923.22670-2-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190211065923.22670-1-jakub.kicinski@netronome.com> References: <20190211065923.22670-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 Add devlink flash update command. Advanced NICs have firmware stored in flash and often cryptographically secured. Updating that flash is handled by management firmware. Ethtool has a flash update command which served us well, however, it has two shortcomings: - it takes rtnl_lock unnecessarily - really flash update has nothing to do with networking, so using a networking device as a handle is suboptimal, which leads us to the second one: - it requires a functioning netdev - in case device enters an error state and can't spawn a netdev (e.g. communication with the device fails) there is no netdev to use as a handle for flashing. Devlink already has the ability to report the firmware versions, now with the ability to update the firmware/flash we will be able to recover devices in bad state. To enable easy interoperability with ethtool add the target partition ID. We may or may not add a different method of identification, but there is no such immediate need. Signed-off-by: Jakub Kicinski --- include/net/devlink.h | 2 ++ include/uapi/linux/devlink.h | 6 ++++++ net/core/devlink.c | 30 ++++++++++++++++++++++++++++++ 3 files changed, 38 insertions(+) diff --git a/include/net/devlink.h b/include/net/devlink.h index 07660fe4c0e3..55b3478b1291 100644 --- a/include/net/devlink.h +++ b/include/net/devlink.h @@ -529,6 +529,8 @@ struct devlink_ops { struct netlink_ext_ack *extack); int (*info_get)(struct devlink *devlink, struct devlink_info_req *req, struct netlink_ext_ack *extack); + int (*flash_update)(struct devlink *devlink, const char *path, + u32 target, struct netlink_ext_ack *extack); }; static inline void *devlink_priv(struct devlink *devlink) diff --git a/include/uapi/linux/devlink.h b/include/uapi/linux/devlink.h index 72d9f7c89190..f4417283fd1b 100644 --- a/include/uapi/linux/devlink.h +++ b/include/uapi/linux/devlink.h @@ -103,6 +103,8 @@ enum devlink_command { DEVLINK_CMD_HEALTH_REPORTER_DUMP_GET, DEVLINK_CMD_HEALTH_REPORTER_DUMP_CLEAR, + DEVLINK_CMD_FLASH_UPDATE, + /* add new commands above here */ __DEVLINK_CMD_MAX, DEVLINK_CMD_MAX = __DEVLINK_CMD_MAX - 1 @@ -326,6 +328,10 @@ enum devlink_attr { DEVLINK_ATTR_HEALTH_REPORTER_DUMP_TS, /* u64 */ DEVLINK_ATTR_HEALTH_REPORTER_GRACEFUL_PERIOD, /* u64 */ DEVLINK_ATTR_HEALTH_REPORTER_AUTO_RECOVER, /* u8 */ + + DEVLINK_ATTR_FLASH_UPDATE_FILE_NAME, /* string */ + DEVLINK_ATTR_FLASH_UPDATE_TARGET_ID, /* u32 */ + /* add new attributes above here, update the policy in devlink.c */ __DEVLINK_ATTR_MAX, diff --git a/net/core/devlink.c b/net/core/devlink.c index 46c468a1f3dc..a4b5e194e33e 100644 --- a/net/core/devlink.c +++ b/net/core/devlink.c @@ -2660,6 +2660,27 @@ static int devlink_nl_cmd_reload(struct sk_buff *skb, struct genl_info *info) return devlink->ops->reload(devlink, info->extack); } +static int devlink_nl_cmd_flash_update(struct sk_buff *skb, + struct genl_info *info) +{ + struct devlink *devlink = info->user_ptr[0]; + const char *file_name; + u32 target = 0; + + if (!devlink->ops->flash_update) + return -EOPNOTSUPP; + + if (!info->attrs[DEVLINK_ATTR_FLASH_UPDATE_FILE_NAME]) + return -EINVAL; + file_name = nla_data(info->attrs[DEVLINK_ATTR_FLASH_UPDATE_FILE_NAME]); + + if (info->attrs[DEVLINK_ATTR_FLASH_UPDATE_TARGET_ID]) + target = nla_get_u32(info->attrs[DEVLINK_ATTR_FLASH_UPDATE_TARGET_ID]); + + return devlink->ops->flash_update(devlink, file_name, target, + info->extack); +} + static const struct devlink_param devlink_param_generic[] = { { .id = DEVLINK_PARAM_GENERIC_ID_INT_ERR_RESET, @@ -4876,6 +4897,8 @@ static const struct nla_policy devlink_nl_policy[DEVLINK_ATTR_MAX + 1] = { [DEVLINK_ATTR_HEALTH_REPORTER_NAME] = { .type = NLA_NUL_STRING }, [DEVLINK_ATTR_HEALTH_REPORTER_GRACEFUL_PERIOD] = { .type = NLA_U64 }, [DEVLINK_ATTR_HEALTH_REPORTER_AUTO_RECOVER] = { .type = NLA_U8 }, + [DEVLINK_ATTR_FLASH_UPDATE_FILE_NAME] = { .type = NLA_NUL_STRING }, + [DEVLINK_ATTR_FLASH_UPDATE_TARGET_ID] = { .type = NLA_U32 }, }; static const struct genl_ops devlink_nl_ops[] = { @@ -5164,6 +5187,13 @@ static const struct genl_ops devlink_nl_ops[] = { .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK | DEVLINK_NL_FLAG_NO_LOCK, }, + { + .cmd = DEVLINK_CMD_FLASH_UPDATE, + .doit = devlink_nl_cmd_flash_update, + .policy = devlink_nl_policy, + .flags = GENL_ADMIN_PERM, + .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK, + }, }; static struct genl_family devlink_nl_family __ro_after_init = { -- 2.19.2