From: Moshe Shemesh <moshe@mellanox.com>
To: "David S. Miller" <davem@davemloft.net>
Cc: Jiri Pirko <jiri@mellanox.com>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
Vladyslav Tarasiuk <vladyslavt@mellanox.com>
Subject: [PATCH net-next v2 2/7] devlink: Rework devlink health reporter destructor
Date: Fri, 3 Jul 2020 06:27:33 +0300 [thread overview]
Message-ID: <1593746858-6548-3-git-send-email-moshe@mellanox.com> (raw)
In-Reply-To: <1593746858-6548-1-git-send-email-moshe@mellanox.com>
From: Vladyslav Tarasiuk <vladyslavt@mellanox.com>
Devlink keeps its own reference to every reporter in a list and inits
refcount to 1 upon reporter's creation. Existing destructor waits to
free the memory indefinitely using msleep() until all references except
devlink's own are put.
Rework this mechanism by moving memory free routine to a separate
function, which is called when the last reporter reference is put.
Besides, it allows to call __devlink_health_reporter_destroy() while
locked on a reporters list mutex in symmetry to
__devlink_health_reporter_create(), which is required in follow-up
patch.
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 | 37 ++++++++++++++++++++++++-------------
1 file changed, 24 insertions(+), 13 deletions(-)
diff --git a/net/core/devlink.c b/net/core/devlink.c
index dfd7fe2..dcf8006 100644
--- a/net/core/devlink.c
+++ b/net/core/devlink.c
@@ -5353,6 +5353,29 @@ struct devlink_health_reporter *
}
EXPORT_SYMBOL_GPL(devlink_health_reporter_create);
+static void
+devlink_health_reporter_free(struct devlink_health_reporter *reporter)
+{
+ mutex_destroy(&reporter->dump_lock);
+ if (reporter->dump_fmsg)
+ devlink_fmsg_free(reporter->dump_fmsg);
+ kfree(reporter);
+}
+
+static void
+devlink_health_reporter_put(struct devlink_health_reporter *reporter)
+{
+ if (refcount_dec_and_test(&reporter->refcount))
+ devlink_health_reporter_free(reporter);
+}
+
+static void
+__devlink_health_reporter_destroy(struct devlink_health_reporter *reporter)
+{
+ list_del(&reporter->list);
+ devlink_health_reporter_put(reporter);
+}
+
/**
* devlink_health_reporter_destroy - destroy devlink health reporter
*
@@ -5362,14 +5385,8 @@ struct devlink_health_reporter *
devlink_health_reporter_destroy(struct devlink_health_reporter *reporter)
{
mutex_lock(&reporter->devlink->reporters_lock);
- list_del(&reporter->list);
+ __devlink_health_reporter_destroy(reporter);
mutex_unlock(&reporter->devlink->reporters_lock);
- while (refcount_read(&reporter->refcount) > 1)
- msleep(100);
- mutex_destroy(&reporter->dump_lock);
- if (reporter->dump_fmsg)
- devlink_fmsg_free(reporter->dump_fmsg);
- kfree(reporter);
}
EXPORT_SYMBOL_GPL(devlink_health_reporter_destroy);
@@ -5639,12 +5656,6 @@ int devlink_health_report(struct devlink_health_reporter *reporter,
return NULL;
}
-static void
-devlink_health_reporter_put(struct devlink_health_reporter *reporter)
-{
- refcount_dec(&reporter->refcount);
-}
-
void
devlink_health_reporter_state_update(struct devlink_health_reporter *reporter,
enum devlink_health_reporter_state state)
--
1.8.3.1
next prev parent reply other threads:[~2020-07-03 3:28 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-03 3:27 [PATCH net-next v2 0/7] Add devlink-health support for devlink ports Moshe Shemesh
2020-07-03 3:27 ` [PATCH net-next v2 1/7] devlink: Refactor devlink health reporter constructor Moshe Shemesh
2020-07-03 3:27 ` Moshe Shemesh [this message]
2020-07-03 3:27 ` [PATCH net-next v2 3/7] devlink: Create generic devlink health reporter search function Moshe Shemesh
2020-07-03 3:27 ` [PATCH net-next v2 4/7] devlink: Implement devlink health reporters on per-port basis Moshe Shemesh
2020-07-03 3:27 ` [PATCH net-next v2 5/7] devlink: Add devlink health port reporters API Moshe Shemesh
2020-07-03 3:27 ` [PATCH net-next v2 6/7] net/mlx5e: Move devlink port register and unregister calls Moshe Shemesh
2020-07-03 3:27 ` [PATCH net-next v2 7/7] net/mlx5e: Move devlink-health rx and tx reporters to devlink port Moshe Shemesh
2020-07-03 23:44 ` [PATCH net-next v2 0/7] Add devlink-health support for devlink ports Jakub Kicinski
2020-07-04 14:16 ` Jiri Pirko
2020-07-05 16:48 ` Jakub Kicinski
2020-07-06 12:09 ` Moshe Shemesh
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=1593746858-6548-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=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).