From: Moshe Shemesh <moshe@mellanox.com>
To: "David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>
Cc: Jiri Pirko <jiri@mellanox.com>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
Vladyslav Tarasiuk <vladyslavt@mellanox.com>
Subject: [PATCH net-next v3 1/7] devlink: Refactor devlink health reporter constructor
Date: Fri, 10 Jul 2020 15:25:07 +0300 [thread overview]
Message-ID: <1594383913-3295-2-git-send-email-moshe@mellanox.com> (raw)
In-Reply-To: <1594383913-3295-1-git-send-email-moshe@mellanox.com>
From: Vladyslav Tarasiuk <vladyslavt@mellanox.com>
Prepare a common routine in devlink_health_reporter_create() for usage
in similar functions for devlink port health reporters.
Signed-off-by: Vladyslav Tarasiuk <vladyslavt@mellanox.com>
Reviewed-by: Moshe Shemesh <moshe@mellanox.com>
Reviewed-by: Jiri Pirko <jiri@mellanox.com>
---
net/core/devlink.c | 45 ++++++++++++++++++++++++++++-----------------
1 file changed, 28 insertions(+), 17 deletions(-)
diff --git a/net/core/devlink.c b/net/core/devlink.c
index 346d385..a203d35 100644
--- a/net/core/devlink.c
+++ b/net/core/devlink.c
@@ -5321,6 +5321,31 @@ struct devlink_health_reporter {
return NULL;
}
+static struct devlink_health_reporter *
+__devlink_health_reporter_create(struct devlink *devlink,
+ const struct devlink_health_reporter_ops *ops,
+ u64 graceful_period, void *priv)
+{
+ struct devlink_health_reporter *reporter;
+
+ if (WARN_ON(graceful_period && !ops->recover))
+ return ERR_PTR(-EINVAL);
+
+ reporter = kzalloc(sizeof(*reporter), GFP_KERNEL);
+ if (!reporter)
+ return ERR_PTR(-ENOMEM);
+
+ reporter->priv = priv;
+ reporter->ops = ops;
+ reporter->devlink = devlink;
+ reporter->graceful_period = graceful_period;
+ reporter->auto_recover = !!ops->recover;
+ reporter->auto_dump = !!ops->dump;
+ mutex_init(&reporter->dump_lock);
+ refcount_set(&reporter->refcount, 1);
+ return reporter;
+}
+
/**
* devlink_health_reporter_create - create devlink health reporter
*
@@ -5342,25 +5367,11 @@ struct devlink_health_reporter *
goto unlock;
}
- if (WARN_ON(graceful_period && !ops->recover)) {
- reporter = ERR_PTR(-EINVAL);
+ reporter = __devlink_health_reporter_create(devlink, ops,
+ graceful_period, priv);
+ if (IS_ERR(reporter))
goto unlock;
- }
-
- reporter = kzalloc(sizeof(*reporter), GFP_KERNEL);
- if (!reporter) {
- reporter = ERR_PTR(-ENOMEM);
- goto unlock;
- }
- reporter->priv = priv;
- reporter->ops = ops;
- reporter->devlink = devlink;
- reporter->graceful_period = graceful_period;
- reporter->auto_recover = !!ops->recover;
- reporter->auto_dump = !!ops->dump;
- mutex_init(&reporter->dump_lock);
- refcount_set(&reporter->refcount, 1);
list_add_tail(&reporter->list, &devlink->reporter_list);
unlock:
mutex_unlock(&devlink->reporters_lock);
--
1.8.3.1
next prev parent reply other threads:[~2020-07-10 12:26 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-10 12:25 [PATCH net-next v3 0/7] Add devlink-health support for devlink ports Moshe Shemesh
2020-07-10 12:25 ` Moshe Shemesh [this message]
2020-07-10 12:25 ` [PATCH net-next v3 2/7] devlink: Rework devlink health reporter destructor Moshe Shemesh
2020-07-10 12:25 ` [PATCH net-next v3 3/7] devlink: Create generic devlink health reporter search function Moshe Shemesh
2020-07-10 12:25 ` [PATCH net-next v3 4/7] devlink: Implement devlink health reporters on per-port basis Moshe Shemesh
2020-07-10 12:25 ` [PATCH net-next v3 5/7] devlink: Add devlink health port reporters API Moshe Shemesh
2020-07-13 13:18 ` Qian Cai
2020-07-13 14:07 ` Ido Schimmel
2020-07-10 12:25 ` [PATCH net-next v3 6/7] net/mlx5e: Move devlink port register and unregister calls Moshe Shemesh
2020-07-10 12:25 ` [PATCH net-next v3 7/7] net/mlx5e: Move devlink-health rx and tx reporters to devlink port Moshe Shemesh
2020-07-10 21:11 ` [PATCH net-next v3 0/7] Add devlink-health support for devlink ports Jakub Kicinski
2020-07-10 21:32 ` 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=1594383913-3295-2-git-send-email-moshe@mellanox.com \
--to=moshe@mellanox.com \
--cc=davem@davemloft.net \
--cc=jiri@mellanox.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=vladyslavt@mellanox.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).