From: Moshe Shemesh <moshe@mellanox.com>
To: "David S. Miller" <davem@davemloft.net>,
Jiri Pirko <jiri@mellanox.com>,
Vasundhara Volam <vasundhara-v.volam@broadcom.com>
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
Moshe Shemesh <moshe@mellanox.com>
Subject: [PATCH net-next RFC 02/13] devlink: Add reload levels data to dev get
Date: Mon, 27 Jul 2020 14:02:22 +0300 [thread overview]
Message-ID: <1595847753-2234-3-git-send-email-moshe@mellanox.com> (raw)
In-Reply-To: <1595847753-2234-1-git-send-email-moshe@mellanox.com>
Expose devlink reload supported levels and driver's default level to the
user through devlink dev get command.
Examples:
$ devlink dev show
pci/0000:82:00.0:
reload_levels_info:
default_level driver
supported_levels:
driver fw_reset fw_live_patch
pci/0000:82:00.1:
reload_levels_info:
default_level driver
supported_levels:
driver fw_reset fw_live_patch
$ devlink dev show -jp
{
"dev": {
"pci/0000:82:00.0": {
"reload_levels_info": {
"default_level": "driver",
"supported_levels": [ "driver","fw_reset","fw_live_patch" ]
}
},
"pci/0000:82:00.1": {
"reload_levels_info": {
"default_level": "driver",
"supported_levels": [ "driver","fw_reset","fw_live_patch" ]
}
}
}
}
Signed-off-by: Moshe Shemesh <moshe@mellanox.com>
---
include/uapi/linux/devlink.h | 3 +++
net/core/devlink.c | 38 +++++++++++++++++++++++++++++++-----
2 files changed, 36 insertions(+), 5 deletions(-)
diff --git a/include/uapi/linux/devlink.h b/include/uapi/linux/devlink.h
index fa5f66db5012..249e921ff106 100644
--- a/include/uapi/linux/devlink.h
+++ b/include/uapi/linux/devlink.h
@@ -476,6 +476,9 @@ enum devlink_attr {
DEVLINK_ATTR_PORT_SPLITTABLE, /* u8 */
DEVLINK_ATTR_RELOAD_LEVEL, /* u8 */
+ DEVLINK_ATTR_RELOAD_DEFAULT_LEVEL, /* u8 */
+ DEVLINK_ATTR_RELOAD_SUPPORTED_LEVELS, /* nested */
+ DEVLINK_ATTR_RELOAD_LEVELS_INFO, /* nested */
/* add new attributes above here, update the policy in devlink.c */
diff --git a/net/core/devlink.c b/net/core/devlink.c
index 31b367a1612d..f1812fc620d4 100644
--- a/net/core/devlink.c
+++ b/net/core/devlink.c
@@ -462,6 +462,11 @@ static int devlink_nl_put_handle(struct sk_buff *msg, struct devlink *devlink)
return 0;
}
+static bool devlink_reload_supported(struct devlink *devlink)
+{
+ return devlink->ops->reload_down && devlink->ops->reload_up;
+}
+
static bool
devlink_reload_level_is_supported(struct devlink *devlink, enum devlink_reload_level level)
{
@@ -472,7 +477,9 @@ static int devlink_nl_fill(struct sk_buff *msg, struct devlink *devlink,
enum devlink_command cmd, u32 portid,
u32 seq, int flags)
{
+ struct nlattr *reload_levels_info, *supported_levels;
void *hdr;
+ int i;
hdr = genlmsg_put(msg, portid, seq, &devlink_nl_family, flags, cmd);
if (!hdr)
@@ -483,9 +490,35 @@ static int devlink_nl_fill(struct sk_buff *msg, struct devlink *devlink,
if (nla_put_u8(msg, DEVLINK_ATTR_RELOAD_FAILED, devlink->reload_failed))
goto nla_put_failure;
+ if (devlink_reload_supported(devlink)) {
+ reload_levels_info = nla_nest_start(msg, DEVLINK_ATTR_RELOAD_LEVELS_INFO);
+ if (!reload_levels_info)
+ goto nla_put_failure;
+ if (nla_put_u8(msg, DEVLINK_ATTR_RELOAD_DEFAULT_LEVEL,
+ devlink->ops->default_reload_level))
+ goto reload_levels_info_nest_cancel;
+
+ supported_levels = nla_nest_start(msg, DEVLINK_ATTR_RELOAD_SUPPORTED_LEVELS);
+ if (!supported_levels)
+ goto reload_levels_info_nest_cancel;
+
+ for (i = 0; i <= DEVLINK_RELOAD_LEVEL_MAX; i++) {
+ if (!devlink_reload_level_is_supported(devlink, i))
+ continue;
+ if (nla_put_u8(msg, DEVLINK_ATTR_RELOAD_LEVEL, i))
+ goto supported_levels_nest_cancel;
+ }
+ nla_nest_end(msg, supported_levels);
+ nla_nest_end(msg, reload_levels_info);
+ }
+
genlmsg_end(msg, hdr);
return 0;
+supported_levels_nest_cancel:
+ nla_nest_cancel(msg, supported_levels);
+reload_levels_info_nest_cancel:
+ nla_nest_cancel(msg, reload_levels_info);
nla_put_failure:
genlmsg_cancel(msg, hdr);
return -EMSGSIZE;
@@ -2943,11 +2976,6 @@ static void devlink_reload_netns_change(struct devlink *devlink,
DEVLINK_CMD_PARAM_NEW);
}
-static bool devlink_reload_supported(const struct devlink *devlink)
-{
- return devlink->ops->reload_down && devlink->ops->reload_up;
-}
-
static void devlink_reload_failed_set(struct devlink *devlink,
bool reload_failed)
{
--
2.17.1
next prev parent reply other threads:[~2020-07-27 11:07 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-27 11:02 [PATCH net-next RFC 00/13] Add devlink reload level option Moshe Shemesh
2020-07-27 11:02 ` [PATCH net-next RFC 01/13] devlink: Add reload level option to devlink reload command Moshe Shemesh
2020-07-28 0:58 ` Jakub Kicinski
2020-07-28 13:58 ` Jiri Pirko
2020-07-28 16:47 ` Jacob Keller
2020-07-28 18:44 ` Jakub Kicinski
2020-07-28 19:18 ` Jacob Keller
2020-07-28 20:06 ` Jakub Kicinski
2020-07-29 14:54 ` Moshe Shemesh
2020-07-29 21:07 ` Jakub Kicinski
2020-07-30 12:30 ` Moshe Shemesh
2020-07-30 23:11 ` Jakub Kicinski
2020-08-01 21:32 ` Moshe Shemesh
2020-08-03 14:14 ` Jiri Pirko
2020-08-03 20:57 ` Jakub Kicinski
2020-08-04 10:04 ` Jiri Pirko
2020-08-04 20:39 ` Jakub Kicinski
2020-08-05 11:02 ` Jiri Pirko
2020-08-06 18:25 ` Jakub Kicinski
2020-08-06 22:56 ` Jacob Keller
2020-08-09 13:21 ` Moshe Shemesh
2020-08-10 16:53 ` Jakub Kicinski
2020-08-10 17:09 ` Jacob Keller
2020-08-10 18:17 ` Jakub Kicinski
2020-08-11 5:46 ` Jiri Pirko
2020-07-27 11:02 ` Moshe Shemesh [this message]
2020-07-28 0:58 ` [PATCH net-next RFC 02/13] devlink: Add reload levels data to dev get Jakub Kicinski
2020-07-29 14:37 ` Moshe Shemesh
2020-07-29 21:11 ` Jakub Kicinski
2020-07-30 12:05 ` Moshe Shemesh
2020-07-27 11:02 ` [PATCH net-next RFC 03/13] net/mlx5: Add functions to set/query MFRL register Moshe Shemesh
2020-07-27 11:02 ` [PATCH net-next RFC 04/13] net/mlx5: Set cap for pci sync for fw update event Moshe Shemesh
2020-07-27 11:02 ` [PATCH net-next RFC 05/13] net/mlx5: Handle sync reset request event Moshe Shemesh
2020-07-27 11:02 ` [PATCH net-next RFC 06/13] net/mlx5: Handle sync reset now event Moshe Shemesh
2020-07-27 11:02 ` [PATCH net-next RFC 07/13] net/mlx5: Handle sync reset abort event Moshe Shemesh
2020-07-27 11:02 ` [PATCH net-next RFC 08/13] net/mlx5: Add support for devlink reload level fw reset Moshe Shemesh
2020-07-27 11:02 ` [PATCH net-next RFC 09/13] devlink: Add enable_remote_dev_reset generic parameter Moshe Shemesh
2020-07-28 0:59 ` Jakub Kicinski
2020-07-29 14:42 ` Moshe Shemesh
2020-07-29 20:57 ` Jakub Kicinski
2020-07-30 12:08 ` Moshe Shemesh
2020-07-27 11:02 ` [PATCH net-next RFC 10/13] net/mlx5: Add devlink param enable_remote_dev_reset support Moshe Shemesh
2020-07-28 0:59 ` Jakub Kicinski
2020-07-27 11:02 ` [PATCH net-next RFC 11/13] net/mlx5: Add support for fw live patch event Moshe Shemesh
2020-07-27 11:02 ` [PATCH net-next RFC 12/13] net/mlx5: Add support for devlink reload level live patch Moshe Shemesh
2020-07-27 11:02 ` [PATCH net-next RFC 13/13] devlink: Add Documentation/networking/devlink/devlink-reload.rst Moshe Shemesh
2020-07-28 5:25 ` [PATCH net-next RFC 00/13] Add devlink reload level option Vasundhara Volam
2020-07-28 16:43 ` Jacob Keller
2020-08-03 10:24 ` Vasundhara Volam
2020-08-03 12:17 ` Moshe Shemesh
2020-08-03 12:47 ` Vasundhara Volam
2020-08-03 13:52 ` Moshe Shemesh
2020-08-04 10:13 ` Vasundhara Volam
2020-08-05 6:32 ` Moshe Shemesh
2020-08-05 6:55 ` Vasundhara Volam
2020-08-05 8:20 ` Moshe Shemesh
2020-08-12 9:34 ` Vasundhara Volam
2020-07-28 16:37 ` Jacob Keller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1595847753-2234-3-git-send-email-moshe@mellanox.com \
--to=moshe@mellanox.com \
--cc=davem@davemloft.net \
--cc=jiri@mellanox.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=vasundhara-v.volam@broadcom.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).