* [PATCH v2 iproute2-next 01/11] devlink: Refactor validation of finding required arguments
2019-02-21 13:42 [PATCH v2 iproute2-next 00/11] Add support for devlink health Aya Levin
@ 2019-02-21 13:42 ` Aya Levin
2019-02-21 13:42 ` [PATCH v2 iproute2-next 02/11] devlink: Fix print of uint64_t Aya Levin
` (9 subsequent siblings)
10 siblings, 0 replies; 20+ messages in thread
From: Aya Levin @ 2019-02-21 13:42 UTC (permalink / raw)
To: David Ahern; +Cc: netdev, Jiri Pirko, Moshe Shemesh, Eran Ben Elisha, Aya Levin
Introducing argument's metadata structure matching a bitmap flag per
required argument and an error message if missing. Using this static
array to refactor validation of finding required arguments in devlink
command line and to ease further maintenance.
Signed-off-by: Aya Levin <ayal@mellanox.com>
Reviewed-by: Moshe Shemesh <moshe@mellanox.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
---
devlink/devlink.c | 153 ++++++++++++++++--------------------------------------
1 file changed, 45 insertions(+), 108 deletions(-)
diff --git a/devlink/devlink.c b/devlink/devlink.c
index d823512a4030..fbaf9c9fabda 100644
--- a/devlink/devlink.c
+++ b/devlink/devlink.c
@@ -39,6 +39,7 @@
#define PARAM_CMODE_RUNTIME_STR "runtime"
#define PARAM_CMODE_DRIVERINIT_STR "driverinit"
#define PARAM_CMODE_PERMANENT_STR "permanent"
+#define DL_ARGS_REQUIRED_MAX_ERR_LEN 80
static int g_new_line_count;
@@ -950,6 +951,49 @@ static int param_cmode_get(const char *cmodestr,
return 0;
}
+struct dl_args_metadata {
+ uint32_t o_flag;
+ char err_msg[DL_ARGS_REQUIRED_MAX_ERR_LEN];
+};
+
+static const struct dl_args_metadata dl_args_required[] = {
+ {DL_OPT_PORT_TYPE, "Port type not set."},
+ {DL_OPT_PORT_COUNT, "Port split count option expected."},
+ {DL_OPT_SB_POOL, "Pool index option expected."},
+ {DL_OPT_SB_SIZE, "Pool size option expected."},
+ {DL_OPT_SB_TYPE, "Pool type option expected."},
+ {DL_OPT_SB_THTYPE, "Pool threshold type option expected."},
+ {DL_OPT_SB_TH, "Threshold option expected."},
+ {DL_OPT_SB_TC, "TC index option expected."},
+ {DL_OPT_ESWITCH_MODE, "E-Switch mode option expected."},
+ {DL_OPT_ESWITCH_INLINE_MODE, "E-Switch inline-mode option expected."},
+ {DL_OPT_DPIPE_TABLE_NAME, "Dpipe table name expected."},
+ {DL_OPT_DPIPE_TABLE_COUNTERS, "Dpipe table counter state expected."},
+ {DL_OPT_ESWITCH_ENCAP_MODE, "E-Switch encapsulation option expected."},
+ {DL_OPT_PARAM_NAME, "Parameter name expected."},
+ {DL_OPT_PARAM_VALUE, "Value to set expected."},
+ {DL_OPT_PARAM_CMODE, "Configuration mode expected."},
+ {DL_OPT_REGION_SNAPSHOT_ID, "Region snapshot id expected."},
+ {DL_OPT_REGION_ADDRESS, "Region address value expected."},
+ {DL_OPT_REGION_LENGTH, "Region length value expected."},
+};
+
+static int dl_args_finding_required_validate(uint32_t o_required,
+ uint32_t o_found)
+{
+ uint32_t o_flag;
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(dl_args_required); i++) {
+ o_flag = dl_args_required[i].o_flag;
+ if ((o_required & o_flag) && !(o_found & o_flag)) {
+ pr_err("%s\n", dl_args_required[i].err_msg);
+ return -EINVAL;
+ }
+ }
+ return 0;
+}
+
static int dl_argv_parse(struct dl *dl, uint32_t o_required,
uint32_t o_optional)
{
@@ -1198,114 +1242,7 @@ static int dl_argv_parse(struct dl *dl, uint32_t o_required,
opts->present |= DL_OPT_SB;
}
- if ((o_required & DL_OPT_PORT_TYPE) && !(o_found & DL_OPT_PORT_TYPE)) {
- pr_err("Port type option expected.\n");
- return -EINVAL;
- }
-
- if ((o_required & DL_OPT_PORT_COUNT) &&
- !(o_found & DL_OPT_PORT_COUNT)) {
- pr_err("Port split count option expected.\n");
- return -EINVAL;
- }
-
- if ((o_required & DL_OPT_SB_POOL) && !(o_found & DL_OPT_SB_POOL)) {
- pr_err("Pool index option expected.\n");
- return -EINVAL;
- }
-
- if ((o_required & DL_OPT_SB_SIZE) && !(o_found & DL_OPT_SB_SIZE)) {
- pr_err("Pool size option expected.\n");
- return -EINVAL;
- }
-
- if ((o_required & DL_OPT_SB_TYPE) && !(o_found & DL_OPT_SB_TYPE)) {
- pr_err("Pool type option expected.\n");
- return -EINVAL;
- }
-
- if ((o_required & DL_OPT_SB_THTYPE) && !(o_found & DL_OPT_SB_THTYPE)) {
- pr_err("Pool threshold type option expected.\n");
- return -EINVAL;
- }
-
- if ((o_required & DL_OPT_SB_TH) && !(o_found & DL_OPT_SB_TH)) {
- pr_err("Threshold option expected.\n");
- return -EINVAL;
- }
-
- if ((o_required & DL_OPT_SB_TC) && !(o_found & DL_OPT_SB_TC)) {
- pr_err("TC index option expected.\n");
- return -EINVAL;
- }
-
- if ((o_required & DL_OPT_ESWITCH_MODE) &&
- !(o_found & DL_OPT_ESWITCH_MODE)) {
- pr_err("E-Switch mode option expected.\n");
- return -EINVAL;
- }
-
- if ((o_required & DL_OPT_ESWITCH_INLINE_MODE) &&
- !(o_found & DL_OPT_ESWITCH_INLINE_MODE)) {
- pr_err("E-Switch inline-mode option expected.\n");
- return -EINVAL;
- }
-
- if ((o_required & DL_OPT_DPIPE_TABLE_NAME) &&
- !(o_found & DL_OPT_DPIPE_TABLE_NAME)) {
- pr_err("Dpipe table name expected\n");
- return -EINVAL;
- }
-
- if ((o_required & DL_OPT_DPIPE_TABLE_COUNTERS) &&
- !(o_found & DL_OPT_DPIPE_TABLE_COUNTERS)) {
- pr_err("Dpipe table counter state expected\n");
- return -EINVAL;
- }
-
- if ((o_required & DL_OPT_ESWITCH_ENCAP_MODE) &&
- !(o_found & DL_OPT_ESWITCH_ENCAP_MODE)) {
- pr_err("E-Switch encapsulation option expected.\n");
- return -EINVAL;
- }
-
- if ((o_required & DL_OPT_PARAM_NAME) &&
- !(o_found & DL_OPT_PARAM_NAME)) {
- pr_err("Parameter name expected.\n");
- return -EINVAL;
- }
-
- if ((o_required & DL_OPT_PARAM_VALUE) &&
- !(o_found & DL_OPT_PARAM_VALUE)) {
- pr_err("Value to set expected.\n");
- return -EINVAL;
- }
-
- if ((o_required & DL_OPT_PARAM_CMODE) &&
- !(o_found & DL_OPT_PARAM_CMODE)) {
- pr_err("Configuration mode expected.\n");
- return -EINVAL;
- }
-
- if ((o_required & DL_OPT_REGION_SNAPSHOT_ID) &&
- !(o_found & DL_OPT_REGION_SNAPSHOT_ID)) {
- pr_err("Region snapshot id expected.\n");
- return -EINVAL;
- }
-
- if ((o_required & DL_OPT_REGION_ADDRESS) &&
- !(o_found & DL_OPT_REGION_ADDRESS)) {
- pr_err("Region address value expected.\n");
- return -EINVAL;
- }
-
- if ((o_required & DL_OPT_REGION_LENGTH) &&
- !(o_found & DL_OPT_REGION_LENGTH)) {
- pr_err("Region length value expected.\n");
- return -EINVAL;
- }
-
- return 0;
+ return dl_args_finding_required_validate(o_required, o_found);
}
static void dl_opts_put(struct nlmsghdr *nlh, struct dl *dl)
--
2.14.1
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH v2 iproute2-next 02/11] devlink: Fix print of uint64_t
2019-02-21 13:42 [PATCH v2 iproute2-next 00/11] Add support for devlink health Aya Levin
2019-02-21 13:42 ` [PATCH v2 iproute2-next 01/11] devlink: Refactor validation of finding required arguments Aya Levin
@ 2019-02-21 13:42 ` Aya Levin
2019-02-21 13:42 ` [PATCH v2 iproute2-next 03/11] devlink: Fix boolean JSON print Aya Levin
` (8 subsequent siblings)
10 siblings, 0 replies; 20+ messages in thread
From: Aya Levin @ 2019-02-21 13:42 UTC (permalink / raw)
To: David Ahern; +Cc: netdev, Jiri Pirko, Moshe Shemesh, Eran Ben Elisha, Aya Levin
This patch prints uint64_t with its corresponding format and avoid implicit
cast to uint32_t.
Signed-off-by: Aya Levin <ayal@mellanox.com>
Reviewed-by: Moshe Shemesh <moshe@mellanox.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
---
devlink/devlink.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/devlink/devlink.c b/devlink/devlink.c
index fbaf9c9fabda..2c921f3811fc 100644
--- a/devlink/devlink.c
+++ b/devlink/devlink.c
@@ -1626,7 +1626,14 @@ static void pr_out_u64(struct dl *dl, const char *name, uint64_t val)
if (val == (uint64_t) -1)
return pr_out_str(dl, name, "unlimited");
- return pr_out_uint(dl, name, val);
+ if (dl->json_output) {
+ jsonw_u64_field(dl->jw, name, val);
+ } else {
+ if (g_indent_newline)
+ pr_out("%s %lu", name, val);
+ else
+ pr_out(" %s %lu", name, val);
+ }
}
static void pr_out_region_chunk_start(struct dl *dl, uint64_t addr)
--
2.14.1
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH v2 iproute2-next 03/11] devlink: Fix boolean JSON print
2019-02-21 13:42 [PATCH v2 iproute2-next 00/11] Add support for devlink health Aya Levin
2019-02-21 13:42 ` [PATCH v2 iproute2-next 01/11] devlink: Refactor validation of finding required arguments Aya Levin
2019-02-21 13:42 ` [PATCH v2 iproute2-next 02/11] devlink: Fix print of uint64_t Aya Levin
@ 2019-02-21 13:42 ` Aya Levin
2019-02-21 13:42 ` [PATCH v2 iproute2-next 04/11] devlink: Add helper functions for name and value separately Aya Levin
` (7 subsequent siblings)
10 siblings, 0 replies; 20+ messages in thread
From: Aya Levin @ 2019-02-21 13:42 UTC (permalink / raw)
To: David Ahern; +Cc: netdev, Jiri Pirko, Moshe Shemesh, Eran Ben Elisha, Aya Levin
This patch removes the inverted commas from boolean values in JSON
format: true/false instead of "true"/"false".
Signed-off-by: Aya Levin <ayal@mellanox.com>
Reviewed-by: Moshe Shemesh <moshe@mellanox.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
---
devlink/devlink.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/devlink/devlink.c b/devlink/devlink.c
index 2c921f3811fc..b073ae020d52 100644
--- a/devlink/devlink.c
+++ b/devlink/devlink.c
@@ -1603,10 +1603,10 @@ static void pr_out_str(struct dl *dl, const char *name, const char *val)
static void pr_out_bool(struct dl *dl, const char *name, bool val)
{
- if (val)
- pr_out_str(dl, name, "true");
+ if (dl->json_output)
+ jsonw_bool_field(dl->jw, name, val);
else
- pr_out_str(dl, name, "false");
+ pr_out_str(dl, name, val ? "true" : "false");
}
static void pr_out_uint(struct dl *dl, const char *name, unsigned int val)
--
2.14.1
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH v2 iproute2-next 04/11] devlink: Add helper functions for name and value separately
2019-02-21 13:42 [PATCH v2 iproute2-next 00/11] Add support for devlink health Aya Levin
` (2 preceding siblings ...)
2019-02-21 13:42 ` [PATCH v2 iproute2-next 03/11] devlink: Fix boolean JSON print Aya Levin
@ 2019-02-21 13:42 ` Aya Levin
2019-02-21 14:08 ` Jiri Pirko
2019-02-21 18:02 ` Stephen Hemminger
2019-02-21 13:42 ` [PATCH v2 iproute2-next 05/11] devlink: Add devlink health show command Aya Levin
` (6 subsequent siblings)
10 siblings, 2 replies; 20+ messages in thread
From: Aya Levin @ 2019-02-21 13:42 UTC (permalink / raw)
To: David Ahern; +Cc: netdev, Jiri Pirko, Moshe Shemesh, Eran Ben Elisha, Aya Levin
Add a new helper functions which outputs only values (without name
label) for different types: boolean, uint, uint64, string and binary.
In addition add a helper function which prints only the name label.
Signed-off-by: Aya Levin <ayal@mellanox.com>
Reviewed-by: Moshe Shemesh <moshe@mellanox.com>
---
devlink/devlink.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 65 insertions(+), 1 deletion(-)
diff --git a/devlink/devlink.c b/devlink/devlink.c
index b073ae020d52..5d69c4f24f29 100644
--- a/devlink/devlink.c
+++ b/devlink/devlink.c
@@ -1588,7 +1588,6 @@ static void pr_out_port_handle_end(struct dl *dl)
pr_out("\n");
}
-
static void pr_out_str(struct dl *dl, const char *name, const char *val)
{
if (dl->json_output) {
@@ -1636,6 +1635,71 @@ static void pr_out_u64(struct dl *dl, const char *name, uint64_t val)
}
}
+static void pr_out_bool_value(struct dl *dl, bool value)
+{
+ if (dl->json_output)
+ jsonw_bool(dl->jw, value);
+ else
+ pr_out(" %s", value ? "true" : "false");
+}
+
+static void pr_out_uint_value(struct dl *dl, unsigned int value)
+{
+ if (dl->json_output)
+ jsonw_uint(dl->jw, value);
+ else
+ pr_out(" %u", value);
+}
+
+static void pr_out_uint64_value(struct dl *dl, uint64_t value)
+{
+ if (dl->json_output)
+ jsonw_u64(dl->jw, value);
+ else
+ pr_out(" %lu", value);
+}
+
+static void pr_out_binary_value(struct dl *dl, uint8_t *data, uint32_t len)
+{
+ int i = 1;
+
+ if (dl->json_output)
+ jsonw_start_array(dl->jw);
+ else
+ pr_out("\n");
+
+ while (i < len) {
+ if (dl->json_output) {
+ jsonw_printf(dl->jw, "%d", data[i]);
+ } else {
+ pr_out(" %02x", data[i]);
+ if (!(i % 16))
+ pr_out("\n");
+ }
+ i++;
+ }
+ if (dl->json_output)
+ jsonw_end_array(dl->jw);
+ else if ((i - 1) % 16)
+ pr_out("\n");
+}
+
+static void pr_out_str_value(struct dl *dl, const char *value)
+{
+ if (dl->json_output)
+ jsonw_string(dl->jw, value);
+ else
+ pr_out(" %s", value);
+}
+
+static void pr_out_name(struct dl *dl, const char *name)
+{
+ if (dl->json_output)
+ jsonw_name(dl->jw, name);
+ else
+ pr_out(" %s:", name);
+}
+
static void pr_out_region_chunk_start(struct dl *dl, uint64_t addr)
{
if (dl->json_output) {
--
2.14.1
^ permalink raw reply related [flat|nested] 20+ messages in thread* Re: [PATCH v2 iproute2-next 04/11] devlink: Add helper functions for name and value separately
2019-02-21 13:42 ` [PATCH v2 iproute2-next 04/11] devlink: Add helper functions for name and value separately Aya Levin
@ 2019-02-21 14:08 ` Jiri Pirko
2019-02-24 8:07 ` Aya Levin
2019-02-21 18:02 ` Stephen Hemminger
1 sibling, 1 reply; 20+ messages in thread
From: Jiri Pirko @ 2019-02-21 14:08 UTC (permalink / raw)
To: Aya Levin; +Cc: David Ahern, netdev, Jiri Pirko, Moshe Shemesh, Eran Ben Elisha
Thu, Feb 21, 2019 at 02:42:40PM CET, ayal@mellanox.com wrote:
>Add a new helper functions which outputs only values (without name
>label) for different types: boolean, uint, uint64, string and binary.
>In addition add a helper function which prints only the name label.
>
>Signed-off-by: Aya Levin <ayal@mellanox.com>
>Reviewed-by: Moshe Shemesh <moshe@mellanox.com>
>---
> devlink/devlink.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
> 1 file changed, 65 insertions(+), 1 deletion(-)
>
>diff --git a/devlink/devlink.c b/devlink/devlink.c
>index b073ae020d52..5d69c4f24f29 100644
>--- a/devlink/devlink.c
>+++ b/devlink/devlink.c
>@@ -1588,7 +1588,6 @@ static void pr_out_port_handle_end(struct dl *dl)
> pr_out("\n");
> }
>
>-
Please avoid changes like this.
[...]
^ permalink raw reply [flat|nested] 20+ messages in thread* Re: [PATCH v2 iproute2-next 04/11] devlink: Add helper functions for name and value separately
2019-02-21 14:08 ` Jiri Pirko
@ 2019-02-24 8:07 ` Aya Levin
0 siblings, 0 replies; 20+ messages in thread
From: Aya Levin @ 2019-02-24 8:07 UTC (permalink / raw)
To: Jiri Pirko
Cc: David Ahern, netdev, Jiri Pirko, Moshe Shemesh, Eran Ben Elisha
On 2/21/2019 4:08 PM, Jiri Pirko wrote:
> Thu, Feb 21, 2019 at 02:42:40PM CET, ayal@mellanox.com wrote:
>> Add a new helper functions which outputs only values (without name
>> label) for different types: boolean, uint, uint64, string and binary.
>> In addition add a helper function which prints only the name label.
>>
>> Signed-off-by: Aya Levin <ayal@mellanox.com>
>> Reviewed-by: Moshe Shemesh <moshe@mellanox.com>
>> ---
>> devlink/devlink.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
>> 1 file changed, 65 insertions(+), 1 deletion(-)
>>
>> diff --git a/devlink/devlink.c b/devlink/devlink.c
>> index b073ae020d52..5d69c4f24f29 100644
>> --- a/devlink/devlink.c
>> +++ b/devlink/devlink.c
>> @@ -1588,7 +1588,6 @@ static void pr_out_port_handle_end(struct dl *dl)
>> pr_out("\n");
>> }
>>
>> -
>
> Please avoid changes like this.
Thanks,
Will fix in next version
>
>
> [...]
>
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH v2 iproute2-next 04/11] devlink: Add helper functions for name and value separately
2019-02-21 13:42 ` [PATCH v2 iproute2-next 04/11] devlink: Add helper functions for name and value separately Aya Levin
2019-02-21 14:08 ` Jiri Pirko
@ 2019-02-21 18:02 ` Stephen Hemminger
2019-02-22 8:58 ` Jiri Pirko
1 sibling, 1 reply; 20+ messages in thread
From: Stephen Hemminger @ 2019-02-21 18:02 UTC (permalink / raw)
To: Aya Levin; +Cc: David Ahern, netdev, Jiri Pirko, Moshe Shemesh, Eran Ben Elisha
On Thu, 21 Feb 2019 15:42:40 +0200
Aya Levin <ayal@mellanox.com> wrote:
> Add a new helper functions which outputs only values (without name
> label) for different types: boolean, uint, uint64, string and binary.
> In addition add a helper function which prints only the name label.
>
> Signed-off-by: Aya Levin <ayal@mellanox.com>
> Reviewed-by: Moshe Shemesh <moshe@mellanox.com>
> ---
> devlink/devlink.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
> 1 file changed, 65 insertions(+), 1 deletion(-)
>
> diff --git a/devlink/devlink.c b/devlink/devlink.c
> index b073ae020d52..5d69c4f24f29 100644
> --- a/devlink/devlink.c
> +++ b/devlink/devlink.c
> @@ -1588,7 +1588,6 @@ static void pr_out_port_handle_end(struct dl *dl)
> pr_out("\n");
> }
>
> -
> static void pr_out_str(struct dl *dl, const char *name, const char *val)
> {
> if (dl->json_output) {
> @@ -1636,6 +1635,71 @@ static void pr_out_u64(struct dl *dl, const char *name, uint64_t val)
> }
> }
>
> +static void pr_out_bool_value(struct dl *dl, bool value)
> +{
> + if (dl->json_output)
> + jsonw_bool(dl->jw, value);
> + else
> + pr_out(" %s", value ? "true" : "false");
> +}
> +
> +static void pr_out_uint_value(struct dl *dl, unsigned int value)
> +{
> + if (dl->json_output)
> + jsonw_uint(dl->jw, value);
> + else
> + pr_out(" %u", value);
> +}
> +
> +static void pr_out_uint64_value(struct dl *dl, uint64_t value)
> +{
> + if (dl->json_output)
> + jsonw_u64(dl->jw, value);
> + else
> + pr_out(" %lu", value);
> +}
> +
> +static void pr_out_binary_value(struct dl *dl, uint8_t *data, uint32_t len)
> +{
> + int i = 1;
> +
> + if (dl->json_output)
> + jsonw_start_array(dl->jw);
> + else
> + pr_out("\n");
> +
> + while (i < len) {
> + if (dl->json_output) {
> + jsonw_printf(dl->jw, "%d", data[i]);
> + } else {
> + pr_out(" %02x", data[i]);
> + if (!(i % 16))
> + pr_out("\n");
> + }
> + i++;
> + }
> + if (dl->json_output)
> + jsonw_end_array(dl->jw);
> + else if ((i - 1) % 16)
> + pr_out("\n");
> +}
> +
> +static void pr_out_str_value(struct dl *dl, const char *value)
> +{
> + if (dl->json_output)
> + jsonw_string(dl->jw, value);
> + else
> + pr_out(" %s", value);
> +}
> +
> +static void pr_out_name(struct dl *dl, const char *name)
> +{
> + if (dl->json_output)
> + jsonw_name(dl->jw, name);
> + else
> + pr_out(" %s:", name);
> +}
> +
> static void pr_out_region_chunk_start(struct dl *dl, uint64_t addr)
> {
> if (dl->json_output) {
NAK
Please convert devlink to use existing iproute2 json_print infrasructure
rather than reinventing it.
^ permalink raw reply [flat|nested] 20+ messages in thread* Re: [PATCH v2 iproute2-next 04/11] devlink: Add helper functions for name and value separately
2019-02-21 18:02 ` Stephen Hemminger
@ 2019-02-22 8:58 ` Jiri Pirko
2019-02-22 18:01 ` Stephen Hemminger
0 siblings, 1 reply; 20+ messages in thread
From: Jiri Pirko @ 2019-02-22 8:58 UTC (permalink / raw)
To: Stephen Hemminger
Cc: Aya Levin, David Ahern, netdev, Jiri Pirko, Moshe Shemesh,
Eran Ben Elisha
Thu, Feb 21, 2019 at 07:02:11PM CET, stephen@networkplumber.org wrote:
>On Thu, 21 Feb 2019 15:42:40 +0200
>Aya Levin <ayal@mellanox.com> wrote:
>
>> Add a new helper functions which outputs only values (without name
>> label) for different types: boolean, uint, uint64, string and binary.
>> In addition add a helper function which prints only the name label.
>>
>> Signed-off-by: Aya Levin <ayal@mellanox.com>
>> Reviewed-by: Moshe Shemesh <moshe@mellanox.com>
>> ---
>> devlink/devlink.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
>> 1 file changed, 65 insertions(+), 1 deletion(-)
>>
>> diff --git a/devlink/devlink.c b/devlink/devlink.c
>> index b073ae020d52..5d69c4f24f29 100644
>> --- a/devlink/devlink.c
>> +++ b/devlink/devlink.c
>> @@ -1588,7 +1588,6 @@ static void pr_out_port_handle_end(struct dl *dl)
>> pr_out("\n");
>> }
>>
>> -
>> static void pr_out_str(struct dl *dl, const char *name, const char *val)
>> {
>> if (dl->json_output) {
>> @@ -1636,6 +1635,71 @@ static void pr_out_u64(struct dl *dl, const char *name, uint64_t val)
>> }
>> }
>>
>> +static void pr_out_bool_value(struct dl *dl, bool value)
>> +{
>> + if (dl->json_output)
>> + jsonw_bool(dl->jw, value);
>> + else
>> + pr_out(" %s", value ? "true" : "false");
>> +}
>> +
>> +static void pr_out_uint_value(struct dl *dl, unsigned int value)
>> +{
>> + if (dl->json_output)
>> + jsonw_uint(dl->jw, value);
>> + else
>> + pr_out(" %u", value);
>> +}
>> +
>> +static void pr_out_uint64_value(struct dl *dl, uint64_t value)
>> +{
>> + if (dl->json_output)
>> + jsonw_u64(dl->jw, value);
>> + else
>> + pr_out(" %lu", value);
>> +}
>> +
>> +static void pr_out_binary_value(struct dl *dl, uint8_t *data, uint32_t len)
>> +{
>> + int i = 1;
>> +
>> + if (dl->json_output)
>> + jsonw_start_array(dl->jw);
>> + else
>> + pr_out("\n");
>> +
>> + while (i < len) {
>> + if (dl->json_output) {
>> + jsonw_printf(dl->jw, "%d", data[i]);
>> + } else {
>> + pr_out(" %02x", data[i]);
>> + if (!(i % 16))
>> + pr_out("\n");
>> + }
>> + i++;
>> + }
>> + if (dl->json_output)
>> + jsonw_end_array(dl->jw);
>> + else if ((i - 1) % 16)
>> + pr_out("\n");
>> +}
>> +
>> +static void pr_out_str_value(struct dl *dl, const char *value)
>> +{
>> + if (dl->json_output)
>> + jsonw_string(dl->jw, value);
>> + else
>> + pr_out(" %s", value);
>> +}
>> +
>> +static void pr_out_name(struct dl *dl, const char *name)
>> +{
>> + if (dl->json_output)
>> + jsonw_name(dl->jw, name);
>> + else
>> + pr_out(" %s:", name);
>> +}
>> +
>> static void pr_out_region_chunk_start(struct dl *dl, uint64_t addr)
>> {
>> if (dl->json_output) {
>
>NAK
>
>Please convert devlink to use existing iproute2 json_print infrasructure
>rather than reinventing it.
That requires whole devlink/devlink.c code change. Could this be done as
a follow-up?
^ permalink raw reply [flat|nested] 20+ messages in thread* Re: [PATCH v2 iproute2-next 04/11] devlink: Add helper functions for name and value separately
2019-02-22 8:58 ` Jiri Pirko
@ 2019-02-22 18:01 ` Stephen Hemminger
2019-02-22 17:59 ` Jiri Pirko
0 siblings, 1 reply; 20+ messages in thread
From: Stephen Hemminger @ 2019-02-22 18:01 UTC (permalink / raw)
To: Jiri Pirko
Cc: Aya Levin, David Ahern, netdev, Jiri Pirko, Moshe Shemesh,
Eran Ben Elisha
On Fri, 22 Feb 2019 09:58:32 +0100
Jiri Pirko <jiri@resnulli.us> wrote:
> Thu, Feb 21, 2019 at 07:02:11PM CET, stephen@networkplumber.org wrote:
> >On Thu, 21 Feb 2019 15:42:40 +0200
> >Aya Levin <ayal@mellanox.com> wrote:
> >
> >> Add a new helper functions which outputs only values (without name
> >> label) for different types: boolean, uint, uint64, string and binary.
> >> In addition add a helper function which prints only the name label.
> >>
> >> Signed-off-by: Aya Levin <ayal@mellanox.com>
> >> Reviewed-by: Moshe Shemesh <moshe@mellanox.com>
> >> ---
> >> devlink/devlink.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
> >> 1 file changed, 65 insertions(+), 1 deletion(-)
> >>
> >> diff --git a/devlink/devlink.c b/devlink/devlink.c
> >> index b073ae020d52..5d69c4f24f29 100644
> >> --- a/devlink/devlink.c
> >> +++ b/devlink/devlink.c
> >> @@ -1588,7 +1588,6 @@ static void pr_out_port_handle_end(struct dl *dl)
> >> pr_out("\n");
> >> }
> >>
> >> -
> >> static void pr_out_str(struct dl *dl, const char *name, const char *val)
> >> {
> >> if (dl->json_output) {
> >> @@ -1636,6 +1635,71 @@ static void pr_out_u64(struct dl *dl, const char *name, uint64_t val)
> >> }
> >> }
> >>
> >> +static void pr_out_bool_value(struct dl *dl, bool value)
> >> +{
> >> + if (dl->json_output)
> >> + jsonw_bool(dl->jw, value);
> >> + else
> >> + pr_out(" %s", value ? "true" : "false");
> >> +}
> >> +
> >> +static void pr_out_uint_value(struct dl *dl, unsigned int value)
> >> +{
> >> + if (dl->json_output)
> >> + jsonw_uint(dl->jw, value);
> >> + else
> >> + pr_out(" %u", value);
> >> +}
> >> +
> >> +static void pr_out_uint64_value(struct dl *dl, uint64_t value)
> >> +{
> >> + if (dl->json_output)
> >> + jsonw_u64(dl->jw, value);
> >> + else
> >> + pr_out(" %lu", value);
> >> +}
> >> +
> >> +static void pr_out_binary_value(struct dl *dl, uint8_t *data, uint32_t len)
> >> +{
> >> + int i = 1;
> >> +
> >> + if (dl->json_output)
> >> + jsonw_start_array(dl->jw);
> >> + else
> >> + pr_out("\n");
> >> +
> >> + while (i < len) {
> >> + if (dl->json_output) {
> >> + jsonw_printf(dl->jw, "%d", data[i]);
> >> + } else {
> >> + pr_out(" %02x", data[i]);
> >> + if (!(i % 16))
> >> + pr_out("\n");
> >> + }
> >> + i++;
> >> + }
> >> + if (dl->json_output)
> >> + jsonw_end_array(dl->jw);
> >> + else if ((i - 1) % 16)
> >> + pr_out("\n");
> >> +}
> >> +
> >> +static void pr_out_str_value(struct dl *dl, const char *value)
> >> +{
> >> + if (dl->json_output)
> >> + jsonw_string(dl->jw, value);
> >> + else
> >> + pr_out(" %s", value);
> >> +}
> >> +
> >> +static void pr_out_name(struct dl *dl, const char *name)
> >> +{
> >> + if (dl->json_output)
> >> + jsonw_name(dl->jw, name);
> >> + else
> >> + pr_out(" %s:", name);
> >> +}
> >> +
> >> static void pr_out_region_chunk_start(struct dl *dl, uint64_t addr)
> >> {
> >> if (dl->json_output) {
> >
> >NAK
> >
> >Please convert devlink to use existing iproute2 json_print infrasructure
> >rather than reinventing it.
>
> That requires whole devlink/devlink.c code change. Could this be done as
> a follow-up?
There is a tradeoff, if more code creeps in it is harder to do the code change.
Can you commit to a timeframe to convert the JSON support code?
^ permalink raw reply [flat|nested] 20+ messages in thread* Re: [PATCH v2 iproute2-next 04/11] devlink: Add helper functions for name and value separately
2019-02-22 18:01 ` Stephen Hemminger
@ 2019-02-22 17:59 ` Jiri Pirko
0 siblings, 0 replies; 20+ messages in thread
From: Jiri Pirko @ 2019-02-22 17:59 UTC (permalink / raw)
To: Stephen Hemminger
Cc: Aya Levin, David Ahern, netdev, Jiri Pirko, Moshe Shemesh,
Eran Ben Elisha
Fri, Feb 22, 2019 at 07:01:25PM CET, stephen@networkplumber.org wrote:
>On Fri, 22 Feb 2019 09:58:32 +0100
>Jiri Pirko <jiri@resnulli.us> wrote:
>
>> Thu, Feb 21, 2019 at 07:02:11PM CET, stephen@networkplumber.org wrote:
>> >On Thu, 21 Feb 2019 15:42:40 +0200
>> >Aya Levin <ayal@mellanox.com> wrote:
>> >
>> >> Add a new helper functions which outputs only values (without name
>> >> label) for different types: boolean, uint, uint64, string and binary.
>> >> In addition add a helper function which prints only the name label.
>> >>
>> >> Signed-off-by: Aya Levin <ayal@mellanox.com>
>> >> Reviewed-by: Moshe Shemesh <moshe@mellanox.com>
>> >> ---
>> >> devlink/devlink.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
>> >> 1 file changed, 65 insertions(+), 1 deletion(-)
>> >>
>> >> diff --git a/devlink/devlink.c b/devlink/devlink.c
>> >> index b073ae020d52..5d69c4f24f29 100644
>> >> --- a/devlink/devlink.c
>> >> +++ b/devlink/devlink.c
>> >> @@ -1588,7 +1588,6 @@ static void pr_out_port_handle_end(struct dl *dl)
>> >> pr_out("\n");
>> >> }
>> >>
>> >> -
>> >> static void pr_out_str(struct dl *dl, const char *name, const char *val)
>> >> {
>> >> if (dl->json_output) {
>> >> @@ -1636,6 +1635,71 @@ static void pr_out_u64(struct dl *dl, const char *name, uint64_t val)
>> >> }
>> >> }
>> >>
>> >> +static void pr_out_bool_value(struct dl *dl, bool value)
>> >> +{
>> >> + if (dl->json_output)
>> >> + jsonw_bool(dl->jw, value);
>> >> + else
>> >> + pr_out(" %s", value ? "true" : "false");
>> >> +}
>> >> +
>> >> +static void pr_out_uint_value(struct dl *dl, unsigned int value)
>> >> +{
>> >> + if (dl->json_output)
>> >> + jsonw_uint(dl->jw, value);
>> >> + else
>> >> + pr_out(" %u", value);
>> >> +}
>> >> +
>> >> +static void pr_out_uint64_value(struct dl *dl, uint64_t value)
>> >> +{
>> >> + if (dl->json_output)
>> >> + jsonw_u64(dl->jw, value);
>> >> + else
>> >> + pr_out(" %lu", value);
>> >> +}
>> >> +
>> >> +static void pr_out_binary_value(struct dl *dl, uint8_t *data, uint32_t len)
>> >> +{
>> >> + int i = 1;
>> >> +
>> >> + if (dl->json_output)
>> >> + jsonw_start_array(dl->jw);
>> >> + else
>> >> + pr_out("\n");
>> >> +
>> >> + while (i < len) {
>> >> + if (dl->json_output) {
>> >> + jsonw_printf(dl->jw, "%d", data[i]);
>> >> + } else {
>> >> + pr_out(" %02x", data[i]);
>> >> + if (!(i % 16))
>> >> + pr_out("\n");
>> >> + }
>> >> + i++;
>> >> + }
>> >> + if (dl->json_output)
>> >> + jsonw_end_array(dl->jw);
>> >> + else if ((i - 1) % 16)
>> >> + pr_out("\n");
>> >> +}
>> >> +
>> >> +static void pr_out_str_value(struct dl *dl, const char *value)
>> >> +{
>> >> + if (dl->json_output)
>> >> + jsonw_string(dl->jw, value);
>> >> + else
>> >> + pr_out(" %s", value);
>> >> +}
>> >> +
>> >> +static void pr_out_name(struct dl *dl, const char *name)
>> >> +{
>> >> + if (dl->json_output)
>> >> + jsonw_name(dl->jw, name);
>> >> + else
>> >> + pr_out(" %s:", name);
>> >> +}
>> >> +
>> >> static void pr_out_region_chunk_start(struct dl *dl, uint64_t addr)
>> >> {
>> >> if (dl->json_output) {
>> >
>> >NAK
>> >
>> >Please convert devlink to use existing iproute2 json_print infrasructure
>> >rather than reinventing it.
>>
>> That requires whole devlink/devlink.c code change. Could this be done as
>> a follow-up?
>
>There is a tradeoff, if more code creeps in it is harder to do the code change.
>Can you commit to a timeframe to convert the JSON support code?
Okay, I'll take care of it in March. Promise.
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH v2 iproute2-next 05/11] devlink: Add devlink health show command
2019-02-21 13:42 [PATCH v2 iproute2-next 00/11] Add support for devlink health Aya Levin
` (3 preceding siblings ...)
2019-02-21 13:42 ` [PATCH v2 iproute2-next 04/11] devlink: Add helper functions for name and value separately Aya Levin
@ 2019-02-21 13:42 ` Aya Levin
2019-02-21 14:25 ` Jiri Pirko
2019-02-21 13:42 ` [PATCH v2 iproute2-next 06/11] devlink: Add devlink health recover command Aya Levin
` (5 subsequent siblings)
10 siblings, 1 reply; 20+ messages in thread
From: Aya Levin @ 2019-02-21 13:42 UTC (permalink / raw)
To: David Ahern; +Cc: netdev, Jiri Pirko, Moshe Shemesh, Eran Ben Elisha, Aya Levin
Add devlink health show command which displays status and configuration
info on a specific reporter on a device or dump the info on all
reporters on all devices. The patch also contains helper functions to
display status and dump's time stamp.
Example:
$ devlink health show pci/0000:00:09.0 reporter tx
pci/0000:00:09.0:
name tx
state healthy error 0 recover 1 last_dump_date 2019-02-14 last_dump_time 10:10:10 grace_period 600 auto_recover true
$ devlink health show pci/0000:00:09.0 reporter tx -jp
{
"health":{
"pci/0000:00:0a.0":[
{
"name":"tx",
"state":"healthy",
"error":0,
"recover":1,
"last_dump_date":"2019-Feb-14",
"last_dump_time":"10:10:10",
"grace_period":600,
"auto_recover":true
}
]
}
Signed-off-by: Aya Levin <ayal@mellanox.com>
Reviewed-by: Moshe Shemesh <moshe@mellanox.com>
---
devlink/devlink.c | 188 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 187 insertions(+), 1 deletion(-)
diff --git a/devlink/devlink.c b/devlink/devlink.c
index 5d69c4f24f29..5685f1e5113a 100644
--- a/devlink/devlink.c
+++ b/devlink/devlink.c
@@ -22,6 +22,7 @@
#include <linux/devlink.h>
#include <libmnl/libmnl.h>
#include <netinet/ether.h>
+#include <sys/sysinfo.h>
#include "SNAPSHOT.h"
#include "list.h"
@@ -41,6 +42,10 @@
#define PARAM_CMODE_PERMANENT_STR "permanent"
#define DL_ARGS_REQUIRED_MAX_ERR_LEN 80
+#define HEALTH_REPORTER_STATE_HEALTHY_STR "healthy"
+#define HEALTH_REPORTER_STATE_ERROR_STR "error"
+#define HEALTH_REPORTER_TIMESTAMP_FMT_LEN 80
+
static int g_new_line_count;
#define pr_err(args...) fprintf(stderr, ##args)
@@ -200,6 +205,7 @@ static void ifname_map_free(struct ifname_map *ifname_map)
#define DL_OPT_REGION_SNAPSHOT_ID BIT(22)
#define DL_OPT_REGION_ADDRESS BIT(23)
#define DL_OPT_REGION_LENGTH BIT(24)
+#define DL_OPT_HEALTH_REPORTER_NAME BIT(25)
struct dl_opts {
uint32_t present; /* flags of present items */
@@ -231,6 +237,7 @@ struct dl_opts {
uint32_t region_snapshot_id;
uint64_t region_address;
uint64_t region_length;
+ const char *reporter_name;
};
struct dl {
@@ -391,6 +398,13 @@ static const enum mnl_attr_data_type devlink_policy[DEVLINK_ATTR_MAX + 1] = {
[DEVLINK_ATTR_INFO_VERSION_STORED] = MNL_TYPE_NESTED,
[DEVLINK_ATTR_INFO_VERSION_NAME] = MNL_TYPE_STRING,
[DEVLINK_ATTR_INFO_VERSION_VALUE] = MNL_TYPE_STRING,
+ [DEVLINK_ATTR_HEALTH_REPORTER] = MNL_TYPE_NESTED,
+ [DEVLINK_ATTR_HEALTH_REPORTER_NAME] = MNL_TYPE_STRING,
+ [DEVLINK_ATTR_HEALTH_REPORTER_STATE] = MNL_TYPE_U8,
+ [DEVLINK_ATTR_HEALTH_REPORTER_ERR_COUNT] = MNL_TYPE_U64,
+ [DEVLINK_ATTR_HEALTH_REPORTER_RECOVER_COUNT] = MNL_TYPE_U64,
+ [DEVLINK_ATTR_HEALTH_REPORTER_DUMP_TS] = MNL_TYPE_U64,
+ [DEVLINK_ATTR_HEALTH_REPORTER_GRACEFUL_PERIOD] = MNL_TYPE_U64,
};
static int attr_cb(const struct nlattr *attr, void *data)
@@ -976,6 +990,7 @@ static const struct dl_args_metadata dl_args_required[] = {
{DL_OPT_REGION_SNAPSHOT_ID, "Region snapshot id expected."},
{DL_OPT_REGION_ADDRESS, "Region address value expected."},
{DL_OPT_REGION_LENGTH, "Region length value expected."},
+ {DL_OPT_HEALTH_REPORTER_NAME, "Reporter's name is expected."},
};
static int dl_args_finding_required_validate(uint32_t o_required,
@@ -1229,6 +1244,13 @@ static int dl_argv_parse(struct dl *dl, uint32_t o_required,
if (err)
return err;
o_found |= DL_OPT_REGION_LENGTH;
+ } else if (dl_argv_match(dl, "reporter") &&
+ (o_all & DL_OPT_HEALTH_REPORTER_NAME)) {
+ dl_arg_inc(dl);
+ err = dl_argv_str(dl, &opts->reporter_name);
+ if (err)
+ return err;
+ o_found |= DL_OPT_HEALTH_REPORTER_NAME;
} else {
pr_err("Unknown option \"%s\"\n", dl_argv(dl));
return -EINVAL;
@@ -1326,6 +1348,9 @@ static void dl_opts_put(struct nlmsghdr *nlh, struct dl *dl)
if (opts->present & DL_OPT_REGION_LENGTH)
mnl_attr_put_u64(nlh, DEVLINK_ATTR_REGION_CHUNK_LEN,
opts->region_length);
+ if (opts->present & DL_OPT_HEALTH_REPORTER_NAME)
+ mnl_attr_put_strz(nlh, DEVLINK_ATTR_HEALTH_REPORTER_NAME,
+ opts->reporter_name);
}
static int dl_argv_parse_put(struct nlmsghdr *nlh, struct dl *dl,
@@ -5739,11 +5764,168 @@ static int cmd_region(struct dl *dl)
return -ENOENT;
}
+enum devlink_health_reporter_state {
+ DEVLINK_HEALTH_REPORTER_STATE_HEALTHY,
+ DEVLINK_HEALTH_REPORTER_STATE_ERROR,
+};
+
+static const char *health_state_name(uint8_t state)
+{
+ switch (state) {
+ case DEVLINK_HEALTH_REPORTER_STATE_HEALTHY:
+ return HEALTH_REPORTER_STATE_HEALTHY_STR;
+ case DEVLINK_HEALTH_REPORTER_STATE_ERROR:
+ return HEALTH_REPORTER_STATE_ERROR_STR;
+ default:
+ return "<unknown state>";
+ }
+}
+
+static void format_logtime(uint64_t time_ms, char *ts_date, char *ts_time)
+{
+ struct sysinfo s_info;
+ struct tm *info;
+ time_t now, sec;
+ int err;
+
+ time(&now);
+ info = localtime(&now);
+ err = sysinfo(&s_info);
+ if (err)
+ goto out;
+ /* Subtract uptime in sec from now yields the time of system
+ * uptime. To this, add time_ms which is the amount of
+ * milliseconds elapsed between uptime and the dump taken.
+ */
+ sec = now - s_info.uptime + time_ms / 1000;
+ info = localtime(&sec);
+out:
+ strftime(ts_date, HEALTH_REPORTER_TIMESTAMP_FMT_LEN, "%Y-%m-%d", info);
+ strftime(ts_time, HEALTH_REPORTER_TIMESTAMP_FMT_LEN, "%H:%M:%S", info);
+}
+
+static void pr_out_health(struct dl *dl, struct nlattr **tb_health)
+{
+ struct nlattr *tb[DEVLINK_ATTR_MAX + 1] = {};
+ enum devlink_health_reporter_state state;
+ const struct nlattr *attr;
+ uint64_t time_ms;
+ int err;
+
+ state = DEVLINK_HEALTH_REPORTER_STATE_HEALTHY;
+
+ err = mnl_attr_parse_nested(tb_health[DEVLINK_ATTR_HEALTH_REPORTER],
+ attr_cb, tb);
+ if (err != MNL_CB_OK)
+ return;
+
+ if (!tb[DEVLINK_ATTR_HEALTH_REPORTER_NAME] ||
+ !tb[DEVLINK_ATTR_HEALTH_REPORTER_ERR_COUNT] ||
+ !tb[DEVLINK_ATTR_HEALTH_REPORTER_RECOVER_COUNT] ||
+ !tb[DEVLINK_ATTR_HEALTH_REPORTER_STATE])
+ return;
+
+ pr_out_handle_start_arr(dl, tb_health);
+
+ pr_out_str(dl, "name",
+ mnl_attr_get_str(tb[DEVLINK_ATTR_HEALTH_REPORTER_NAME]));
+ if (!dl->json_output) {
+ __pr_out_newline();
+ __pr_out_indent_inc();
+ }
+ state = mnl_attr_get_u8(tb[DEVLINK_ATTR_HEALTH_REPORTER_STATE]);
+ pr_out_str(dl, "state", health_state_name(state));
+ pr_out_u64(dl, "error",
+ mnl_attr_get_u64(tb[DEVLINK_ATTR_HEALTH_REPORTER_ERR_COUNT]));
+ pr_out_u64(dl, "recover",
+ mnl_attr_get_u64(tb[DEVLINK_ATTR_HEALTH_REPORTER_RECOVER_COUNT]));
+ if (tb[DEVLINK_ATTR_HEALTH_REPORTER_DUMP_TS]) {
+ char dump_date[HEALTH_REPORTER_TIMESTAMP_FMT_LEN];
+ char dump_time[HEALTH_REPORTER_TIMESTAMP_FMT_LEN];
+ attr = tb[DEVLINK_ATTR_HEALTH_REPORTER_DUMP_TS];
+ time_ms = mnl_attr_get_u64(attr);
+ format_logtime(time_ms, dump_date, dump_time);
+
+ pr_out_str(dl, "last_dump_date", dump_date);
+ pr_out_str(dl, "last_dump_time", dump_time);
+ }
+ if (tb[DEVLINK_ATTR_HEALTH_REPORTER_GRACEFUL_PERIOD])
+ pr_out_u64(dl, "grace_period",
+ mnl_attr_get_u64(tb[DEVLINK_ATTR_HEALTH_REPORTER_GRACEFUL_PERIOD]));
+ if (tb[DEVLINK_ATTR_HEALTH_REPORTER_AUTO_RECOVER])
+ pr_out_bool(dl, "auto_recover",
+ mnl_attr_get_u8(tb[DEVLINK_ATTR_HEALTH_REPORTER_AUTO_RECOVER]));
+
+ __pr_out_indent_dec();
+ pr_out_handle_end(dl);
+}
+
+static int cmd_health_show_cb(const struct nlmsghdr *nlh, void *data)
+{
+ struct genlmsghdr *genl = mnl_nlmsg_get_payload(nlh);
+ struct nlattr *tb[DEVLINK_ATTR_MAX + 1] = {};
+ struct dl *dl = data;
+
+ mnl_attr_parse(nlh, sizeof(*genl), attr_cb, tb);
+ if (!tb[DEVLINK_ATTR_BUS_NAME] || !tb[DEVLINK_ATTR_DEV_NAME] ||
+ !tb[DEVLINK_ATTR_HEALTH_REPORTER])
+ return MNL_CB_ERROR;
+
+ pr_out_health(dl, tb);
+
+ return MNL_CB_OK;
+}
+
+static int cmd_health_show(struct dl *dl)
+{
+ struct nlmsghdr *nlh;
+ uint16_t flags = NLM_F_REQUEST | NLM_F_ACK;
+ int err;
+
+ if (dl_argc(dl) == 0)
+ flags |= NLM_F_DUMP;
+ nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_HEALTH_REPORTER_GET,
+ flags);
+
+ if (dl_argc(dl) > 0) {
+ err = dl_argv_parse_put(nlh, dl,
+ DL_OPT_HANDLE |
+ DL_OPT_HEALTH_REPORTER_NAME, 0);
+ if (err)
+ return err;
+ }
+ pr_out_section_start(dl, "health");
+
+ err = _mnlg_socket_sndrcv(dl->nlg, nlh, cmd_health_show_cb, dl);
+ pr_out_section_end(dl);
+ return err;
+}
+
+static void cmd_health_help(void)
+{
+ pr_err("Usage: devlink health show [ dev DEV reporter REPORTER_NAME ]\n");
+}
+
+static int cmd_health(struct dl *dl)
+{
+ if (dl_argv_match(dl, "help")) {
+ cmd_health_help();
+ return 0;
+ } else if (dl_argv_match(dl, "show") ||
+ dl_argv_match(dl, "list") || dl_no_arg(dl)) {
+ dl_arg_inc(dl);
+ return cmd_health_show(dl);
+ }
+
+ pr_err("Command \"%s\" not found\n", dl_argv(dl));
+ return -ENOENT;
+}
+
static void help(void)
{
pr_err("Usage: devlink [ OPTIONS ] OBJECT { COMMAND | help }\n"
" devlink [ -f[orce] ] -b[atch] filename\n"
- "where OBJECT := { dev | port | sb | monitor | dpipe | resource | region }\n"
+ "where OBJECT := { dev | port | sb | monitor | dpipe | resource | region | health }\n"
" OPTIONS := { -V[ersion] | -n[o-nice-names] | -j[son] | -p[retty] | -v[erbose] }\n");
}
@@ -5776,7 +5958,11 @@ static int dl_cmd(struct dl *dl, int argc, char **argv)
} else if (dl_argv_match(dl, "region")) {
dl_arg_inc(dl);
return cmd_region(dl);
+ } else if (dl_argv_match(dl, "health")) {
+ dl_arg_inc(dl);
+ return cmd_health(dl);
}
+
pr_err("Object \"%s\" not found\n", dl_argv(dl));
return -ENOENT;
}
--
2.14.1
^ permalink raw reply related [flat|nested] 20+ messages in thread* Re: [PATCH v2 iproute2-next 05/11] devlink: Add devlink health show command
2019-02-21 13:42 ` [PATCH v2 iproute2-next 05/11] devlink: Add devlink health show command Aya Levin
@ 2019-02-21 14:25 ` Jiri Pirko
0 siblings, 0 replies; 20+ messages in thread
From: Jiri Pirko @ 2019-02-21 14:25 UTC (permalink / raw)
To: Aya Levin; +Cc: David Ahern, netdev, Jiri Pirko, Moshe Shemesh, Eran Ben Elisha
Thu, Feb 21, 2019 at 02:42:41PM CET, ayal@mellanox.com wrote:
>Add devlink health show command which displays status and configuration
>info on a specific reporter on a device or dump the info on all
>reporters on all devices. The patch also contains helper functions to
What "patch"? Please format the description as you would command the
codebase what to do.
>display status and dump's time stamp.
[...]
>+static void pr_out_health(struct dl *dl, struct nlattr **tb_health)
>+{
>+ struct nlattr *tb[DEVLINK_ATTR_MAX + 1] = {};
>+ enum devlink_health_reporter_state state;
>+ const struct nlattr *attr;
>+ uint64_t time_ms;
>+ int err;
>+
>+ state = DEVLINK_HEALTH_REPORTER_STATE_HEALTHY;
Pointless assignment.
>+
>+ err = mnl_attr_parse_nested(tb_health[DEVLINK_ATTR_HEALTH_REPORTER],
>+ attr_cb, tb);
>+ if (err != MNL_CB_OK)
>+ return;
>+
>+ if (!tb[DEVLINK_ATTR_HEALTH_REPORTER_NAME] ||
>+ !tb[DEVLINK_ATTR_HEALTH_REPORTER_ERR_COUNT] ||
>+ !tb[DEVLINK_ATTR_HEALTH_REPORTER_RECOVER_COUNT] ||
>+ !tb[DEVLINK_ATTR_HEALTH_REPORTER_STATE])
>+ return;
>+
>+ pr_out_handle_start_arr(dl, tb_health);
>+
>+ pr_out_str(dl, "name",
>+ mnl_attr_get_str(tb[DEVLINK_ATTR_HEALTH_REPORTER_NAME]));
>+ if (!dl->json_output) {
>+ __pr_out_newline();
>+ __pr_out_indent_inc();
>+ }
>+ state = mnl_attr_get_u8(tb[DEVLINK_ATTR_HEALTH_REPORTER_STATE]);
>+ pr_out_str(dl, "state", health_state_name(state));
>+ pr_out_u64(dl, "error",
>+ mnl_attr_get_u64(tb[DEVLINK_ATTR_HEALTH_REPORTER_ERR_COUNT]));
>+ pr_out_u64(dl, "recover",
>+ mnl_attr_get_u64(tb[DEVLINK_ATTR_HEALTH_REPORTER_RECOVER_COUNT]));
>+ if (tb[DEVLINK_ATTR_HEALTH_REPORTER_DUMP_TS]) {
>+ char dump_date[HEALTH_REPORTER_TIMESTAMP_FMT_LEN];
>+ char dump_time[HEALTH_REPORTER_TIMESTAMP_FMT_LEN];
Newline here please.
>+ attr = tb[DEVLINK_ATTR_HEALTH_REPORTER_DUMP_TS];
>+ time_ms = mnl_attr_get_u64(attr);
>+ format_logtime(time_ms, dump_date, dump_time);
>+
>+ pr_out_str(dl, "last_dump_date", dump_date);
>+ pr_out_str(dl, "last_dump_time", dump_time);
>+ }
[...]
>@@ -5776,7 +5958,11 @@ static int dl_cmd(struct dl *dl, int argc, char **argv)
> } else if (dl_argv_match(dl, "region")) {
> dl_arg_inc(dl);
> return cmd_region(dl);
>+ } else if (dl_argv_match(dl, "health")) {
>+ dl_arg_inc(dl);
>+ return cmd_health(dl);
> }
>+
Please avoid newlines like this. Unrelated to the patch.
> pr_err("Object \"%s\" not found\n", dl_argv(dl));
> return -ENOENT;
> }
>--
>2.14.1
>
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH v2 iproute2-next 06/11] devlink: Add devlink health recover command
2019-02-21 13:42 [PATCH v2 iproute2-next 00/11] Add support for devlink health Aya Levin
` (4 preceding siblings ...)
2019-02-21 13:42 ` [PATCH v2 iproute2-next 05/11] devlink: Add devlink health show command Aya Levin
@ 2019-02-21 13:42 ` Aya Levin
2019-02-21 13:42 ` [PATCH v2 iproute2-next 07/11] devlink: Add devlink health diagnose command Aya Levin
` (4 subsequent siblings)
10 siblings, 0 replies; 20+ messages in thread
From: Aya Levin @ 2019-02-21 13:42 UTC (permalink / raw)
To: David Ahern; +Cc: netdev, Jiri Pirko, Moshe Shemesh, Eran Ben Elisha, Aya Levin
Add devlink health recover command which enables the user to initiate a
recovery on a reporter (if a recovery cb was supplied by the reporter).
This operation will increment the recoveries counter displayed in the
show command.
Example:
$ devlink health recover pci/0000:00:09.0 reporter tx
Signed-off-by: Aya Levin <ayal@mellanox.com>
Reviewed-by: Moshe Shemesh <moshe@mellanox.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
---
devlink/devlink.c | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/devlink/devlink.c b/devlink/devlink.c
index 5685f1e5113a..3ec0ef4b95b2 100644
--- a/devlink/devlink.c
+++ b/devlink/devlink.c
@@ -5764,6 +5764,23 @@ static int cmd_region(struct dl *dl)
return -ENOENT;
}
+static int cmd_health_recover(struct dl *dl)
+{
+ struct nlmsghdr *nlh;
+ int err;
+
+ nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_HEALTH_REPORTER_RECOVER,
+ NLM_F_REQUEST | NLM_F_ACK);
+
+ err = dl_argv_parse_put(nlh, dl,
+ DL_OPT_HANDLE | DL_OPT_HEALTH_REPORTER_NAME, 0);
+ if (err)
+ return err;
+
+ dl_opts_put(nlh, dl);
+ return _mnlg_socket_sndrcv(dl->nlg, nlh, NULL, NULL);
+}
+
enum devlink_health_reporter_state {
DEVLINK_HEALTH_REPORTER_STATE_HEALTHY,
DEVLINK_HEALTH_REPORTER_STATE_ERROR,
@@ -5904,6 +5921,7 @@ static int cmd_health_show(struct dl *dl)
static void cmd_health_help(void)
{
pr_err("Usage: devlink health show [ dev DEV reporter REPORTER_NAME ]\n");
+ pr_err(" devlink health recover DEV reporter REPORTER_NAME\n");
}
static int cmd_health(struct dl *dl)
@@ -5915,6 +5933,9 @@ static int cmd_health(struct dl *dl)
dl_argv_match(dl, "list") || dl_no_arg(dl)) {
dl_arg_inc(dl);
return cmd_health_show(dl);
+ } else if (dl_argv_match(dl, "recover")) {
+ dl_arg_inc(dl);
+ return cmd_health_recover(dl);
}
pr_err("Command \"%s\" not found\n", dl_argv(dl));
--
2.14.1
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH v2 iproute2-next 07/11] devlink: Add devlink health diagnose command
2019-02-21 13:42 [PATCH v2 iproute2-next 00/11] Add support for devlink health Aya Levin
` (5 preceding siblings ...)
2019-02-21 13:42 ` [PATCH v2 iproute2-next 06/11] devlink: Add devlink health recover command Aya Levin
@ 2019-02-21 13:42 ` Aya Levin
2019-02-21 14:28 ` Jiri Pirko
2019-02-21 13:42 ` [PATCH v2 iproute2-next 08/11] devlink: Add devlink health dump show command Aya Levin
` (3 subsequent siblings)
10 siblings, 1 reply; 20+ messages in thread
From: Aya Levin @ 2019-02-21 13:42 UTC (permalink / raw)
To: David Ahern; +Cc: netdev, Jiri Pirko, Moshe Shemesh, Eran Ben Elisha, Aya Levin
Add devlink health diagnose command: enabling retrieval of diagnostics data
by the user on a reporter on a device. The command's output is a
free text defined by the reporter.
This patch also introduces an infra structure for flexible format
output. This allow the command to display different data fields
according to the reporter.
Example:
$ devlink health diagnose pci/0000:00:0a.0 reporter tx
SQs:
sqn: 4403 HW state: 1 stopped: false
sqn: 4408 HW state: 1 stopped: false
sqn: 4413 HW state: 1 stopped: false
sqn: 4418 HW state: 1 stopped: false
sqn: 4423 HW state: 1 stopped: false
$ devlink health diagnose pci/0000:00:0a.0 reporter tx -jp
{
"SQs":[
{
"sqn":4403,
"HW state":1,
"stopped":false
},
{
"sqn":4408,
"HW state":1,
"stopped":false
},
{
"sqn":4413,
"HW state":1,
"stopped":false
},
{
"sqn":4418,
"HW state":1,
"stopped":false
},
{
"sqn":4423,
"HW state":1,
"stopped":false
}
]
}
Signed-off-by: Aya Levin <ayal@mellanox.com>
Reviewed-by: Moshe Shemesh <moshe@mellanox.com>
---
devlink/devlink.c | 187 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 187 insertions(+)
diff --git a/devlink/devlink.c b/devlink/devlink.c
index 3ec0ef4b95b2..ef6a72f0b04e 100644
--- a/devlink/devlink.c
+++ b/devlink/devlink.c
@@ -23,6 +23,7 @@
#include <libmnl/libmnl.h>
#include <netinet/ether.h>
#include <sys/sysinfo.h>
+#include <sys/queue.h>
#include "SNAPSHOT.h"
#include "list.h"
@@ -5764,6 +5765,188 @@ static int cmd_region(struct dl *dl)
return -ENOENT;
}
+static int fmsg_value_show(struct dl *dl, int type, struct nlattr *nl_data)
+{
+ uint8_t *data;
+ uint32_t len;
+
+ switch (type) {
+ case MNL_TYPE_FLAG:
+ pr_out_bool_value(dl, mnl_attr_get_u8(nl_data));
+ break;
+ case MNL_TYPE_U8:
+ pr_out_uint_value(dl, mnl_attr_get_u8(nl_data));
+ break;
+ case MNL_TYPE_U16:
+ pr_out_uint_value(dl, mnl_attr_get_u16(nl_data));
+ break;
+ case MNL_TYPE_U32:
+ pr_out_uint_value(dl, mnl_attr_get_u32(nl_data));
+ break;
+ case MNL_TYPE_U64:
+ pr_out_uint64_value(dl, mnl_attr_get_u64(nl_data));
+ break;
+ case MNL_TYPE_NUL_STRING:
+ pr_out_str_value(dl, mnl_attr_get_str(nl_data));
+ break;
+ case MNL_TYPE_BINARY:
+ len = mnl_attr_get_payload_len(nl_data);
+ data = mnl_attr_get_payload(nl_data);
+ pr_out_binary_value(dl, data, len);
+ break;
+ default:
+ return -EINVAL;
+ }
+ return MNL_CB_OK;
+}
+
+struct nest_qentry {
+ int attr_type;
+ TAILQ_ENTRY(nest_qentry) nest_entries;
+};
+
+struct fmsg_cb_data {
+ struct dl *dl;
+ uint8_t value_type;
+ TAILQ_HEAD(, nest_qentry) qhead;
+};
+
+static int cmd_fmsg_nest_queue(struct fmsg_cb_data *fmsg_data,
+ uint8_t *attr_value, bool insert)
+{
+ struct nest_qentry *entry = NULL;
+
+ if (insert) {
+ entry = malloc(sizeof(struct nest_qentry));
+ if (!entry)
+ return -ENOMEM;
+
+ entry->attr_type = *attr_value;
+ TAILQ_INSERT_HEAD(&fmsg_data->qhead, entry, nest_entries);
+ } else {
+ if (TAILQ_EMPTY(&fmsg_data->qhead))
+ return MNL_CB_ERROR;
+ entry = TAILQ_FIRST(&fmsg_data->qhead);
+ *attr_value = entry->attr_type;
+ TAILQ_REMOVE(&fmsg_data->qhead, entry, nest_entries);
+ free(entry);
+ }
+ return MNL_CB_OK;
+}
+
+static int cmd_fmsg_nest(struct fmsg_cb_data *fmsg_data, uint8_t nest_value,
+ bool start)
+{
+ struct dl *dl = fmsg_data->dl;
+ uint8_t value = nest_value;
+ int err;
+
+ err = cmd_fmsg_nest_queue(fmsg_data, &value, start);
+ if (err != MNL_CB_OK)
+ return err;
+
+ switch (value) {
+ case DEVLINK_ATTR_FMSG_OBJ_NEST_START:
+ if (start)
+ pr_out_entry_start(dl);
+ else
+ pr_out_entry_end(dl);
+ break;
+ case DEVLINK_ATTR_FMSG_PAIR_NEST_START:
+ break;
+ case DEVLINK_ATTR_FMSG_ARR_NEST_START:
+ if (dl->json_output) {
+ if (start)
+ jsonw_start_array(dl->jw);
+ else
+ jsonw_end_array(dl->jw);
+ } else {
+ if (start) {
+ __pr_out_newline();
+ __pr_out_indent_inc();
+ } else {
+ __pr_out_indent_dec();
+ }
+ }
+ break;
+ default:
+ return -EINVAL;
+ }
+ return MNL_CB_OK;
+}
+
+static int cmd_fmsg_object_cb(const struct nlmsghdr *nlh, void *data)
+{
+ struct genlmsghdr *genl = mnl_nlmsg_get_payload(nlh);
+ struct nlattr *tb[DEVLINK_ATTR_MAX + 1] = {};
+ struct fmsg_cb_data *fmsg_data = data;
+ struct dl *dl = fmsg_data->dl;
+ struct nlattr *nla_object;
+ int attr_type;
+ int err;
+
+ mnl_attr_parse(nlh, sizeof(*genl), attr_cb, tb);
+ if (!tb[DEVLINK_ATTR_FMSG])
+ return MNL_CB_ERROR;
+
+ mnl_attr_for_each_nested(nla_object, tb[DEVLINK_ATTR_FMSG]) {
+ attr_type = mnl_attr_get_type(nla_object);
+ switch (attr_type) {
+ case DEVLINK_ATTR_FMSG_OBJ_NEST_START:
+ case DEVLINK_ATTR_FMSG_PAIR_NEST_START:
+ case DEVLINK_ATTR_FMSG_ARR_NEST_START:
+ err = cmd_fmsg_nest(fmsg_data, attr_type, true);
+ if (err != MNL_CB_OK)
+ return err;
+ break;
+ case DEVLINK_ATTR_FMSG_NEST_END:
+ err = cmd_fmsg_nest(fmsg_data, attr_type, false);
+ if (err != MNL_CB_OK)
+ return err;
+ break;
+ case DEVLINK_ATTR_FMSG_OBJ_NAME:
+ pr_out_name(dl, mnl_attr_get_str(nla_object));
+ break;
+ case DEVLINK_ATTR_FMSG_OBJ_VALUE_TYPE:
+ fmsg_data->value_type = mnl_attr_get_u8(nla_object);
+ break;
+ case DEVLINK_ATTR_FMSG_OBJ_VALUE_DATA:
+ err = fmsg_value_show(dl, fmsg_data->value_type,
+ nla_object);
+ if (err != MNL_CB_OK)
+ return err;
+ break;
+ default:
+ return -EINVAL;
+ }
+ }
+ return MNL_CB_OK;
+}
+
+static int cmd_health_object_common(struct dl *dl, uint8_t cmd)
+{
+ struct fmsg_cb_data data;
+ struct nlmsghdr *nlh;
+ int err;
+
+ nlh = mnlg_msg_prepare(dl->nlg, cmd, NLM_F_REQUEST | NLM_F_ACK);
+
+ err = dl_argv_parse_put(nlh, dl,
+ DL_OPT_HANDLE | DL_OPT_HEALTH_REPORTER_NAME, 0);
+ if (err)
+ return err;
+
+ data.dl = dl;
+ TAILQ_INIT(&data.qhead);
+ err = _mnlg_socket_sndrcv(dl->nlg, nlh, cmd_fmsg_object_cb, &data);
+ return err;
+}
+
+static int cmd_health_diagnose(struct dl *dl)
+{
+ return cmd_health_object_common(dl, DEVLINK_CMD_HEALTH_REPORTER_DIAGNOSE);
+}
+
static int cmd_health_recover(struct dl *dl)
{
struct nlmsghdr *nlh;
@@ -5922,6 +6105,7 @@ static void cmd_health_help(void)
{
pr_err("Usage: devlink health show [ dev DEV reporter REPORTER_NAME ]\n");
pr_err(" devlink health recover DEV reporter REPORTER_NAME\n");
+ pr_err(" devlink health diagnose DEV reporter REPORTER_NAME\n");
}
static int cmd_health(struct dl *dl)
@@ -5936,6 +6120,9 @@ static int cmd_health(struct dl *dl)
} else if (dl_argv_match(dl, "recover")) {
dl_arg_inc(dl);
return cmd_health_recover(dl);
+ } else if (dl_argv_match(dl, "diagnose")) {
+ dl_arg_inc(dl);
+ return cmd_health_diagnose(dl);
}
pr_err("Command \"%s\" not found\n", dl_argv(dl));
--
2.14.1
^ permalink raw reply related [flat|nested] 20+ messages in thread* Re: [PATCH v2 iproute2-next 07/11] devlink: Add devlink health diagnose command
2019-02-21 13:42 ` [PATCH v2 iproute2-next 07/11] devlink: Add devlink health diagnose command Aya Levin
@ 2019-02-21 14:28 ` Jiri Pirko
0 siblings, 0 replies; 20+ messages in thread
From: Jiri Pirko @ 2019-02-21 14:28 UTC (permalink / raw)
To: Aya Levin; +Cc: David Ahern, netdev, Jiri Pirko, Moshe Shemesh, Eran Ben Elisha
Thu, Feb 21, 2019 at 02:42:43PM CET, ayal@mellanox.com wrote:
>Add devlink health diagnose command: enabling retrieval of diagnostics data
>by the user on a reporter on a device. The command's output is a
>free text defined by the reporter.
>
>This patch also introduces an infra structure for flexible format
>output. This allow the command to display different data fields
>according to the reporter.
>Example:
>$ devlink health diagnose pci/0000:00:0a.0 reporter tx
>SQs:
> sqn: 4403 HW state: 1 stopped: false
> sqn: 4408 HW state: 1 stopped: false
> sqn: 4413 HW state: 1 stopped: false
> sqn: 4418 HW state: 1 stopped: false
> sqn: 4423 HW state: 1 stopped: false
>
>$ devlink health diagnose pci/0000:00:0a.0 reporter tx -jp
>{
> "SQs":[
> {
> "sqn":4403,
> "HW state":1,
> "stopped":false
> },
> {
> "sqn":4408,
> "HW state":1,
> "stopped":false
> },
> {
> "sqn":4413,
> "HW state":1,
> "stopped":false
> },
> {
> "sqn":4418,
> "HW state":1,
> "stopped":false
> },
> {
> "sqn":4423,
> "HW state":1,
> "stopped":false
> }
> ]
>}
>
>Signed-off-by: Aya Levin <ayal@mellanox.com>
>Reviewed-by: Moshe Shemesh <moshe@mellanox.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH v2 iproute2-next 08/11] devlink: Add devlink health dump show command
2019-02-21 13:42 [PATCH v2 iproute2-next 00/11] Add support for devlink health Aya Levin
` (6 preceding siblings ...)
2019-02-21 13:42 ` [PATCH v2 iproute2-next 07/11] devlink: Add devlink health diagnose command Aya Levin
@ 2019-02-21 13:42 ` Aya Levin
2019-02-21 13:42 ` [PATCH v2 iproute2-next 09/11] devlink: Add devlink health dump clear command Aya Levin
` (2 subsequent siblings)
10 siblings, 0 replies; 20+ messages in thread
From: Aya Levin @ 2019-02-21 13:42 UTC (permalink / raw)
To: David Ahern; +Cc: netdev, Jiri Pirko, Moshe Shemesh, Eran Ben Elisha, Aya Levin
Add devlink dump show command which displays the last saved dump.
Devlink health saves a single dump. If a dump is not already stored
by the devlink for this reporter, devlink generates a new dump. The dump
can be generated automatically when a reporter reports on an
error or manually by user's request.
The dump's output is defined by the reporter. The command uses the
infra structure for flexible format output introduced in previous patch.
Example:
$ devlink health dump show pci/0000:00:09.0 reporter tx
Signed-off-by: Aya Levin <ayal@mellanox.com>
Reviewed-by: Moshe Shemesh <moshe@mellanox.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
---
devlink/devlink.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/devlink/devlink.c b/devlink/devlink.c
index ef6a72f0b04e..627f8e819aa5 100644
--- a/devlink/devlink.c
+++ b/devlink/devlink.c
@@ -5942,6 +5942,11 @@ static int cmd_health_object_common(struct dl *dl, uint8_t cmd)
return err;
}
+static int cmd_health_dump_show(struct dl *dl)
+{
+ return cmd_health_object_common(dl, DEVLINK_CMD_HEALTH_REPORTER_DUMP_GET);
+}
+
static int cmd_health_diagnose(struct dl *dl)
{
return cmd_health_object_common(dl, DEVLINK_CMD_HEALTH_REPORTER_DIAGNOSE);
@@ -6106,6 +6111,7 @@ static void cmd_health_help(void)
pr_err("Usage: devlink health show [ dev DEV reporter REPORTER_NAME ]\n");
pr_err(" devlink health recover DEV reporter REPORTER_NAME\n");
pr_err(" devlink health diagnose DEV reporter REPORTER_NAME\n");
+ pr_err(" devlink health dump show DEV reporter REPORTER_NAME\n");
}
static int cmd_health(struct dl *dl)
@@ -6123,6 +6129,12 @@ static int cmd_health(struct dl *dl)
} else if (dl_argv_match(dl, "diagnose")) {
dl_arg_inc(dl);
return cmd_health_diagnose(dl);
+ } else if (dl_argv_match(dl, "dump")) {
+ dl_arg_inc(dl);
+ if (dl_argv_match(dl, "show")) {
+ dl_arg_inc(dl);
+ return cmd_health_dump_show(dl);
+ }
}
pr_err("Command \"%s\" not found\n", dl_argv(dl));
--
2.14.1
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH v2 iproute2-next 09/11] devlink: Add devlink health dump clear command
2019-02-21 13:42 [PATCH v2 iproute2-next 00/11] Add support for devlink health Aya Levin
` (7 preceding siblings ...)
2019-02-21 13:42 ` [PATCH v2 iproute2-next 08/11] devlink: Add devlink health dump show command Aya Levin
@ 2019-02-21 13:42 ` Aya Levin
2019-02-21 13:42 ` [PATCH v2 iproute2-next 10/11] devlink: Add devlink health set command Aya Levin
2019-02-21 13:42 ` [PATCH v2 iproute2-next 11/11] devlink: Add devlink-health man page Aya Levin
10 siblings, 0 replies; 20+ messages in thread
From: Aya Levin @ 2019-02-21 13:42 UTC (permalink / raw)
To: David Ahern; +Cc: netdev, Jiri Pirko, Moshe Shemesh, Eran Ben Elisha, Aya Levin
Add devlink dump clear command which deletes the last saved dump file.
Clearing the last saved dump enables a new dump file to be saved.
Example:
$ devlink health dump clear pci/0000:00:09.0 reporter tx
Signed-off-by: Aya Levin <ayal@mellanox.com>
Reviewed-by: Moshe Shemesh <moshe@mellanox.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
---
devlink/devlink.c | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/devlink/devlink.c b/devlink/devlink.c
index 627f8e819aa5..f36bbeca5641 100644
--- a/devlink/devlink.c
+++ b/devlink/devlink.c
@@ -5765,6 +5765,23 @@ static int cmd_region(struct dl *dl)
return -ENOENT;
}
+static int cmd_health_dump_clear(struct dl *dl)
+{
+ struct nlmsghdr *nlh;
+ int err;
+
+ nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_HEALTH_REPORTER_DUMP_CLEAR,
+ NLM_F_REQUEST | NLM_F_ACK);
+
+ err = dl_argv_parse_put(nlh, dl,
+ DL_OPT_HANDLE | DL_OPT_HEALTH_REPORTER_NAME, 0);
+ if (err)
+ return err;
+
+ dl_opts_put(nlh, dl);
+ return _mnlg_socket_sndrcv(dl->nlg, nlh, NULL, NULL);
+}
+
static int fmsg_value_show(struct dl *dl, int type, struct nlattr *nl_data)
{
uint8_t *data;
@@ -6112,6 +6129,7 @@ static void cmd_health_help(void)
pr_err(" devlink health recover DEV reporter REPORTER_NAME\n");
pr_err(" devlink health diagnose DEV reporter REPORTER_NAME\n");
pr_err(" devlink health dump show DEV reporter REPORTER_NAME\n");
+ pr_err(" devlink health dump clear DEV reporter REPORTER_NAME\n");
}
static int cmd_health(struct dl *dl)
@@ -6134,6 +6152,9 @@ static int cmd_health(struct dl *dl)
if (dl_argv_match(dl, "show")) {
dl_arg_inc(dl);
return cmd_health_dump_show(dl);
+ } else if (dl_argv_match(dl, "clear")) {
+ dl_arg_inc(dl);
+ return cmd_health_dump_clear(dl);
}
}
--
2.14.1
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH v2 iproute2-next 10/11] devlink: Add devlink health set command
2019-02-21 13:42 [PATCH v2 iproute2-next 00/11] Add support for devlink health Aya Levin
` (8 preceding siblings ...)
2019-02-21 13:42 ` [PATCH v2 iproute2-next 09/11] devlink: Add devlink health dump clear command Aya Levin
@ 2019-02-21 13:42 ` Aya Levin
2019-02-21 13:42 ` [PATCH v2 iproute2-next 11/11] devlink: Add devlink-health man page Aya Levin
10 siblings, 0 replies; 20+ messages in thread
From: Aya Levin @ 2019-02-21 13:42 UTC (permalink / raw)
To: David Ahern; +Cc: netdev, Jiri Pirko, Moshe Shemesh, Eran Ben Elisha, Aya Levin
Add devlink set command which enables the user to configure parameters
related to the devlink health mechanism per reporter.
1) grace_period [msec] time interval between auto recoveries.
2) auto_recover [true/false] whether the devlink should execute automatic
recover on error.
Please note that this command fails (not supported) when the reporter
doesn't support a recovery method.
This patch also introduce a helper function to retrieve a boolean value
as an input parameter.
Example:
$ devlink health set pci/0000:00:09.0 reporter tx grace_period 3500
$ devlink health set pci/0000:00:09.0 reporter tx auto_recover false
Signed-off-by: Aya Levin <ayal@mellanox.com>
Reviewed-by: Moshe Shemesh <moshe@mellanox.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
---
devlink/devlink.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 66 insertions(+)
diff --git a/devlink/devlink.c b/devlink/devlink.c
index f36bbeca5641..8834c1c5f517 100644
--- a/devlink/devlink.c
+++ b/devlink/devlink.c
@@ -207,6 +207,8 @@ static void ifname_map_free(struct ifname_map *ifname_map)
#define DL_OPT_REGION_ADDRESS BIT(23)
#define DL_OPT_REGION_LENGTH BIT(24)
#define DL_OPT_HEALTH_REPORTER_NAME BIT(25)
+#define DL_OPT_HEALTH_REPORTER_GRACEFUL_PERIOD BIT(26)
+#define DL_OPT_HEALTH_REPORTER_AUTO_RECOVER BIT(27)
struct dl_opts {
uint32_t present; /* flags of present items */
@@ -239,6 +241,8 @@ struct dl_opts {
uint64_t region_address;
uint64_t region_length;
const char *reporter_name;
+ uint64_t reporter_graceful_period;
+ bool reporter_auto_recover;
};
struct dl {
@@ -837,6 +841,24 @@ static int dl_argv_uint16_t(struct dl *dl, uint16_t *p_val)
return 0;
}
+static int dl_argv_bool(struct dl *dl, bool *p_val)
+{
+ char *str = dl_argv_next(dl);
+ int err;
+
+ if (!str) {
+ pr_err("Boolean argument expected\n");
+ return -EINVAL;
+ }
+
+ err = strtobool(str, p_val);
+ if (err) {
+ pr_err("\"%s\" is not a valid boolean value\n", str);
+ return err;
+ }
+ return 0;
+}
+
static int dl_argv_str(struct dl *dl, const char **p_str)
{
const char *str = dl_argv_next(dl);
@@ -1252,6 +1274,21 @@ static int dl_argv_parse(struct dl *dl, uint32_t o_required,
if (err)
return err;
o_found |= DL_OPT_HEALTH_REPORTER_NAME;
+ } else if (dl_argv_match(dl, "grace_period") &&
+ (o_all & DL_OPT_HEALTH_REPORTER_GRACEFUL_PERIOD)) {
+ dl_arg_inc(dl);
+ err = dl_argv_uint64_t(dl,
+ &opts->reporter_graceful_period);
+ if (err)
+ return err;
+ o_found |= DL_OPT_HEALTH_REPORTER_GRACEFUL_PERIOD;
+ } else if (dl_argv_match(dl, "auto_recover") &&
+ (o_all & DL_OPT_HEALTH_REPORTER_AUTO_RECOVER)) {
+ dl_arg_inc(dl);
+ err = dl_argv_bool(dl, &opts->reporter_auto_recover);
+ if (err)
+ return err;
+ o_found |= DL_OPT_HEALTH_REPORTER_AUTO_RECOVER;
} else {
pr_err("Unknown option \"%s\"\n", dl_argv(dl));
return -EINVAL;
@@ -1352,6 +1389,14 @@ static void dl_opts_put(struct nlmsghdr *nlh, struct dl *dl)
if (opts->present & DL_OPT_HEALTH_REPORTER_NAME)
mnl_attr_put_strz(nlh, DEVLINK_ATTR_HEALTH_REPORTER_NAME,
opts->reporter_name);
+ if (opts->present & DL_OPT_HEALTH_REPORTER_GRACEFUL_PERIOD)
+ mnl_attr_put_u64(nlh,
+ DEVLINK_ATTR_HEALTH_REPORTER_GRACEFUL_PERIOD,
+ opts->reporter_graceful_period);
+ if (opts->present & DL_OPT_HEALTH_REPORTER_AUTO_RECOVER)
+ mnl_attr_put_u8(nlh, DEVLINK_ATTR_HEALTH_REPORTER_AUTO_RECOVER,
+ opts->reporter_auto_recover);
+
}
static int dl_argv_parse_put(struct nlmsghdr *nlh, struct dl *dl,
@@ -5765,6 +5810,23 @@ static int cmd_region(struct dl *dl)
return -ENOENT;
}
+static int cmd_health_set_params(struct dl *dl)
+{
+ struct nlmsghdr *nlh;
+ int err;
+
+ nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_HEALTH_REPORTER_SET,
+ NLM_F_REQUEST | NLM_F_ACK);
+ err = dl_argv_parse(dl, DL_OPT_HANDLE | DL_OPT_HEALTH_REPORTER_NAME,
+ DL_OPT_HEALTH_REPORTER_GRACEFUL_PERIOD |
+ DL_OPT_HEALTH_REPORTER_AUTO_RECOVER);
+ if (err)
+ return err;
+
+ dl_opts_put(nlh, dl);
+ return _mnlg_socket_sndrcv(dl->nlg, nlh, NULL, NULL);
+}
+
static int cmd_health_dump_clear(struct dl *dl)
{
struct nlmsghdr *nlh;
@@ -6130,6 +6192,7 @@ static void cmd_health_help(void)
pr_err(" devlink health diagnose DEV reporter REPORTER_NAME\n");
pr_err(" devlink health dump show DEV reporter REPORTER_NAME\n");
pr_err(" devlink health dump clear DEV reporter REPORTER_NAME\n");
+ pr_err(" devlink health set DEV reporter REPORTER_NAME { grace_period | auto_recover } { msec | boolean }\n");
}
static int cmd_health(struct dl *dl)
@@ -6156,6 +6219,9 @@ static int cmd_health(struct dl *dl)
dl_arg_inc(dl);
return cmd_health_dump_clear(dl);
}
+ } else if (dl_argv_match(dl, "set")) {
+ dl_arg_inc(dl);
+ return cmd_health_set_params(dl);
}
pr_err("Command \"%s\" not found\n", dl_argv(dl));
--
2.14.1
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH v2 iproute2-next 11/11] devlink: Add devlink-health man page
2019-02-21 13:42 [PATCH v2 iproute2-next 00/11] Add support for devlink health Aya Levin
` (9 preceding siblings ...)
2019-02-21 13:42 ` [PATCH v2 iproute2-next 10/11] devlink: Add devlink health set command Aya Levin
@ 2019-02-21 13:42 ` Aya Levin
10 siblings, 0 replies; 20+ messages in thread
From: Aya Levin @ 2019-02-21 13:42 UTC (permalink / raw)
To: David Ahern; +Cc: netdev, Jiri Pirko, Moshe Shemesh, Eran Ben Elisha, Aya Levin
Add a man page describing devlink health's command set. Also add a
reference link from devlink main man page.
Signed-off-by: Aya Levin <ayal@mellanox.com>
Reviewed-by: Moshe Shemesh <moshe@mellanox.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
---
man/man8/devlink-health.8 | 197 ++++++++++++++++++++++++++++++++++++++++++++++
man/man8/devlink.8 | 7 +-
2 files changed, 203 insertions(+), 1 deletion(-)
create mode 100644 man/man8/devlink-health.8
diff --git a/man/man8/devlink-health.8 b/man/man8/devlink-health.8
new file mode 100644
index 000000000000..7ed0ae4534dc
--- /dev/null
+++ b/man/man8/devlink-health.8
@@ -0,0 +1,197 @@
+.TH DEVLINK\-HEALTH 8 "20 Feb 2019" "iproute2" "Linux"
+.SH NAME
+devlink-health \- devlink health reporting and recovery
+.SH SYNOPSIS
+.sp
+.ad l
+.in +8
+.ti -8
+.B devlink
+.RI "[ " OPTIONS " ]"
+.B health
+.RI " { " COMMAND " | "
+.BR help " }"
+.sp
+
+.ti -8
+.IR OPTIONS " := { "
+\fB\-V\fR[\fIersion\fR] }
+
+.ti -8
+.BR "devlink health show"
+.RI "[ " DEV ""
+.B reporter
+.RI ""REPORTER " ] "
+
+.ti -8
+.BR "devlink health recover"
+.RI "" DEV ""
+.B reporter
+.RI "" REPORTER ""
+
+.ti -8
+.BR "devlink health diagnose"
+.RI "" DEV ""
+.B reporter
+.RI "" REPORTER ""
+
+.ti -8
+.BR "devlink health dump show"
+.RI "" DEV ""
+.B reporter
+.RI "" REPORTER ""
+
+.ti -8
+.BR "devlink health dump clear"
+.RI "" DEV ""
+.B reporter
+.RI "" REPORTER ""
+
+.ti -8
+.BR "devlink health set"
+.RI "" DEV ""
+.B reporter
+.RI "" REPORTER ""
+.RI " { "
+.B grace_period | auto_recover
+.RI " } { "
+.RI "" msec ""
+.RI "|"
+.RI "" boolean ""
+.RI " } "
+.ti -8
+.B devlink health help
+
+.SH "DESCRIPTION"
+.SS devlink health show - Show status and configuration on all supported reporters on all devlink devices.
+
+.PP
+.I "DEV"
+- specifies the devlink device.
+
+.PP
+.I "REPORTER"
+- specifies the reporter's name registered on the devlink device.
+
+.SS devlink health recover - Initiate a recovery operation on a reporter.
+This action performs a recovery and increases the recoveries counter on success.
+
+.PP
+.I "DEV"
+- specifies the devlink device.
+
+.PP
+.I "REPORTER"
+- specifies the reporter's name registered on the devlink device.
+
+.SS devlink health diagnose - Retrieve diagnostics data on a reporter.
+
+.PP
+.I "DEV"
+- specifies the devlink device.
+
+.PP
+.I "REPORTER"
+- specifies the reporter's name registered on the devlink device.
+
+.SS devlink health dump show - Display the last saved dump.
+
+.PD 0
+.P
+devlink health saves a single dump per reporter. If an dump is
+.P
+not already stored by the Devlink, this command will generate a new
+.P
+dump. The dump can be generated either automatically when a
+.P
+reporter reports on an error or manually at the user's request.
+.PD
+
+.PP
+.I "DEV"
+- specifies the devlink device.
+
+.PP
+.I "REPORTER"
+- specifies the reporter's name registered on the devlink device.
+
+.SS devlink health dump clear - Delete the saved dump.
+Deleting the saved dump enables a generation of a new dump on
+.PD 0
+.P
+the next "devlink health dump show" command.
+.PD
+
+.PP
+.I "DEV"
+- specifies the devlink device.
+
+.PP
+.I "REPORTER"
+- specifies the reporter's name registered on the devlink device.
+
+.SS devlink health set - Enable the user to configure:
+.PD 0
+1) grace_period [msec] - Time interval between consecutive auto recoveries.
+.P
+2) auto_recover [true/false] - Indicates whether the devlink should execute automatic recover on error.
+.P
+Please note that this command is not supported on a reporter which
+doesn't support a recovery method.
+.PD
+
+.PP
+.I "DEV"
+- specifies the devlink device.
+
+.PP
+.I "REPORTER"
+- specifies the reporter's name registered on the devlink device.
+
+.SH "EXAMPLES"
+.PP
+devlink health show
+.RS 4
+List status and configuration of available reporters on devices.
+.RE
+.PP
+devlink health recover pci/0000:00:09.0 reporter tx
+.RS 4
+Initiate recovery on tx reporter registered on pci/0000:00:09.0.
+.RE
+.PP
+devlink health diagnose pci/0000:00:09.0 reporter tx
+.RS 4
+List diagnostics data on the specified device and reporter.
+.RE
+.PP
+devlink health dump show pci/0000:00:09.0 reporter tx
+.RS 4
+Display the last saved dump on the specified device and reporter.
+.RE
+.PP
+devlink health dump clear pci/0000:00:09.0 reporter tx
+.RS 4
+Delete saved dump on the specified device and reporter.
+.RE
+.PP
+devlink health set pci/0000:00:09.0 reporter tx grace_period 3500
+.RS 4
+Set time interval between auto recoveries to minimum of 3500 msec on
+the specified device and reporter.
+.RE
+.PP
+devlink health set pci/0000:00:09.0 reporter tx auto_recover false
+.RS 4
+Turn off auto recovery on the specified device and reporter.
+.RE
+.SH SEE ALSO
+.BR devlink (8),
+.BR devlink-dev (8),
+.BR devlink-port (8),
+.BR devlink-param (8),
+.BR devlink-region (8),
+.br
+
+.SH AUTHOR
+Aya Levin <ayal@mellanox.com>
diff --git a/man/man8/devlink.8 b/man/man8/devlink.8
index 8d527e7e1d60..13d4dcd908b3 100644
--- a/man/man8/devlink.8
+++ b/man/man8/devlink.8
@@ -7,7 +7,7 @@ devlink \- Devlink tool
.in +8
.ti -8
.B devlink
-.RI "[ " OPTIONS " ] { " dev | port | monitor | sb | resource | region " } { " COMMAND " | "
+.RI "[ " OPTIONS " ] { " dev | port | monitor | sb | resource | region | health " } { " COMMAND " | "
.BR help " }"
.sp
@@ -78,6 +78,10 @@ Turn on verbose output.
.B region
- devlink address region access
+.TP
+.B health
+- devlink reporting and recovery
+
.SS
.I COMMAND
@@ -109,6 +113,7 @@ Exit status is 0 if command was successful or a positive integer upon failure.
.BR devlink-sb (8),
.BR devlink-resource (8),
.BR devlink-region (8),
+.BR devlink-health (8),
.br
.SH REPORTING BUGS
--
2.14.1
^ permalink raw reply related [flat|nested] 20+ messages in thread