From: Jiri Pirko <jiri@resnulli.us>
To: Eran Ben Elisha <eranbe@mellanox.com>
Cc: netdev@vger.kernel.org, "David S. Miller" <davem@davemloft.net>,
Jiri Pirko <jiri@mellanox.com>, Aya Levin <ayal@mellanox.com>
Subject: Re: [PATCH net-next 1/2] devlink: Rename devlink health attributes
Date: Thu, 21 Feb 2019 13:31:17 +0100 [thread overview]
Message-ID: <20190221123117.GN2312@nanopsycho> (raw)
In-Reply-To: <1550751122-2788-2-git-send-email-eranbe@mellanox.com>
Thu, Feb 21, 2019 at 01:12:01PM CET, eranbe@mellanox.com wrote:
>From: Aya Levin <ayal@mellanox.com>
>
>Rename devlink health attributes for better reflect the attributes use.
>Add COUNT prefix on error counter attribute and recovery counter
>attribute.
>
>Fixes: 7afe335a8bed ("devlink: Add health get command")
>Signed-off-by: Aya Levin <ayal@mellanox.com>
>Signed-off-by: Eran Ben Elisha <eranbe@mellanox.com>
>Acked-by: Jiri Pirko <jiri@mellanox.com>
>---
> include/uapi/linux/devlink.h | 4 ++--
> net/core/devlink.c | 4 ++--
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
>diff --git a/include/uapi/linux/devlink.h b/include/uapi/linux/devlink.h
>index 53de8802a000..5bb4ea67d84f 100644
>--- a/include/uapi/linux/devlink.h
>+++ b/include/uapi/linux/devlink.h
>@@ -323,8 +323,8 @@ enum devlink_attr {
> DEVLINK_ATTR_HEALTH_REPORTER, /* nested */
> DEVLINK_ATTR_HEALTH_REPORTER_NAME, /* string */
> DEVLINK_ATTR_HEALTH_REPORTER_STATE, /* u8 */
>- DEVLINK_ATTR_HEALTH_REPORTER_ERR, /* u64 */
>- DEVLINK_ATTR_HEALTH_REPORTER_RECOVER, /* u64 */
>+ DEVLINK_ATTR_HEALTH_REPORTER_ERR_COUNT, /* u64 */
>+ DEVLINK_ATTR_HEALTH_REPORTER_RECOVER_COUNT, /* u64 */
Just note, this is still in net-next only, so it is okay to change it.
> DEVLINK_ATTR_HEALTH_REPORTER_DUMP_TS, /* u64 */
> DEVLINK_ATTR_HEALTH_REPORTER_GRACEFUL_PERIOD, /* u64 */
> DEVLINK_ATTR_HEALTH_REPORTER_AUTO_RECOVER, /* u8 */
>diff --git a/net/core/devlink.c b/net/core/devlink.c
>index 04d98550c78c..5135997ecbe7 100644
>--- a/net/core/devlink.c
>+++ b/net/core/devlink.c
>@@ -4650,10 +4650,10 @@ devlink_nl_health_reporter_fill(struct sk_buff *msg,
> if (nla_put_u8(msg, DEVLINK_ATTR_HEALTH_REPORTER_STATE,
> reporter->health_state))
> goto reporter_nest_cancel;
>- if (nla_put_u64_64bit(msg, DEVLINK_ATTR_HEALTH_REPORTER_ERR,
>+ if (nla_put_u64_64bit(msg, DEVLINK_ATTR_HEALTH_REPORTER_ERR_COUNT,
> reporter->error_count, DEVLINK_ATTR_PAD))
> goto reporter_nest_cancel;
>- if (nla_put_u64_64bit(msg, DEVLINK_ATTR_HEALTH_REPORTER_RECOVER,
>+ if (nla_put_u64_64bit(msg, DEVLINK_ATTR_HEALTH_REPORTER_RECOVER_COUNT,
> reporter->recovery_count, DEVLINK_ATTR_PAD))
> goto reporter_nest_cancel;
> if (nla_put_u64_64bit(msg, DEVLINK_ATTR_HEALTH_REPORTER_GRACEFUL_PERIOD,
>--
>2.17.1
>
next prev parent reply other threads:[~2019-02-21 12:41 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-21 12:12 [PATCH net-next 0/2] Devlink health fixes series Eran Ben Elisha
2019-02-21 12:12 ` [PATCH net-next 1/2] devlink: Rename devlink health attributes Eran Ben Elisha
2019-02-21 12:31 ` Jiri Pirko [this message]
2019-02-22 7:59 ` Sergei Shtylyov
2019-02-21 12:12 ` [PATCH net-next 2/2] devlink: Modify reply of DEVLINK_CMD_HEALTH_REPORTER_GET Eran Ben Elisha
2019-02-21 18:39 ` [PATCH net-next 0/2] Devlink health fixes series David Miller
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=20190221123117.GN2312@nanopsycho \
--to=jiri@resnulli.us \
--cc=ayal@mellanox.com \
--cc=davem@davemloft.net \
--cc=eranbe@mellanox.com \
--cc=jiri@mellanox.com \
--cc=netdev@vger.kernel.org \
/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).