From: Parav Pandit <parav@mellanox.com>
To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
michal.lkml@markovi.net, davem@davemloft.net,
gregkh@linuxfoundation.org, jiri@mellanox.com
Cc: parav@mellanox.com
Subject: [RFC net-next 5/8] devlink: Add variant of devlink_register/unregister
Date: Thu, 28 Feb 2019 23:37:49 -0600 [thread overview]
Message-ID: <1551418672-12822-6-git-send-email-parav@mellanox.com> (raw)
In-Reply-To: <1551418672-12822-1-git-send-email-parav@mellanox.com>
Add variants of devlink_register and devlink_unregister which doesn't
explicitly acquire/release devlink_mutex lock, but requires that caller
hold the devlink_mutex lock.
This is required to create child devlink devices while working on
parent devlink device.
Change-Id: I74417158144b28ff51ecfb2d1105c83ebefdf985
Signed-off-by: Parav Pandit <parav@mellanox.com>
---
include/net/devlink.h | 15 ++++++++++++++-
net/core/devlink.c | 36 +++++++++++++++++++++++++++++++-----
2 files changed, 45 insertions(+), 6 deletions(-)
diff --git a/include/net/devlink.h b/include/net/devlink.h
index ae5e0e6..9a067b1 100644
--- a/include/net/devlink.h
+++ b/include/net/devlink.h
@@ -545,7 +545,9 @@ static inline struct devlink *priv_to_devlink(void *priv)
void devlink_init(struct devlink *devlink, const struct devlink_ops *ops);
void devlink_cleanup(struct devlink *devlink);
struct devlink *devlink_alloc(const struct devlink_ops *ops, size_t priv_size);
+void __devlink_register(struct devlink *devlink, struct device *dev);
int devlink_register(struct devlink *devlink, struct device *dev);
+void __devlink_unregister(struct devlink *devlink);
void devlink_unregister(struct devlink *devlink);
void devlink_free(struct devlink *devlink);
int devlink_port_register(struct devlink *devlink,
@@ -713,6 +715,7 @@ int devlink_health_report(struct devlink_health_reporter *reporter,
static inline void devlink_init(struct devlink *devlink,
const struct devlink_ops *ops)
+{
}
static inline void devlink_cleanup(struct devlink *devlink)
@@ -725,11 +728,21 @@ static inline struct devlink *devlink_alloc(const struct devlink_ops *ops,
return kzalloc(sizeof(struct devlink) + priv_size, GFP_KERNEL);
}
-static inline int devlink_register(struct devlink *devlink, struct device *dev)
+static inline void __devlink_register(struct devlink *devlink,
+ struct device *dev)
+{
+}
+
+static inline int devlink_register(struct devlink *devlink,
+ struct device *dev)
{
return 0;
}
+static inline void __devlink_unregister(struct devlink *devlink)
+{
+}
+
static inline void devlink_unregister(struct devlink *devlink)
{
}
diff --git a/net/core/devlink.c b/net/core/devlink.c
index 25492c6..cfbad2c 100644
--- a/net/core/devlink.c
+++ b/net/core/devlink.c
@@ -5262,22 +5262,49 @@ struct devlink *devlink_alloc(const struct devlink_ops *ops, size_t priv_size)
EXPORT_SYMBOL_GPL(devlink_alloc);
/**
- * devlink_register - Register devlink instance
+ * __devlink_register - Register devlink instance
+ * Caller must hold devlink_mutex.
*
* @devlink: devlink
*/
-int devlink_register(struct devlink *devlink, struct device *dev)
+void __devlink_register(struct devlink *devlink, struct device *dev)
{
- mutex_lock(&devlink_mutex);
+ lockdep_assert_held(&devlink_mutex);
devlink->dev = dev;
list_add_tail(&devlink->list, &devlink_list);
devlink_notify(devlink, DEVLINK_CMD_NEW);
+}
+EXPORT_SYMBOL_GPL(__devlink_register);
+
+/**
+ * devlink_register - Register devlink instance
+ *
+ * @devlink: devlink
+ */
+int devlink_register(struct devlink *devlink, struct device *dev)
+{
+ mutex_lock(&devlink_mutex);
+ __devlink_register(devlink, dev);
mutex_unlock(&devlink_mutex);
return 0;
}
EXPORT_SYMBOL_GPL(devlink_register);
/**
+ * __devlink_unregister - Unregister devlink instance
+ * Caller must hold the devlink_mutex while invoking this API.
+ *
+ * @devlink: devlink
+ */
+void __devlink_unregister(struct devlink *devlink)
+{
+ lockdep_assert_held(&devlink_mutex);
+ devlink_notify(devlink, DEVLINK_CMD_DEL);
+ list_del(&devlink->list);
+}
+EXPORT_SYMBOL_GPL(__devlink_unregister);
+
+/**
* devlink_unregister - Unregister devlink instance
*
* @devlink: devlink
@@ -5285,8 +5312,7 @@ int devlink_register(struct devlink *devlink, struct device *dev)
void devlink_unregister(struct devlink *devlink)
{
mutex_lock(&devlink_mutex);
- devlink_notify(devlink, DEVLINK_CMD_DEL);
- list_del(&devlink->list);
+ __devlink_unregister(devlink);
mutex_unlock(&devlink_mutex);
}
EXPORT_SYMBOL_GPL(devlink_unregister);
--
1.8.3.1
next prev parent reply other threads:[~2019-03-01 5:38 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-01 5:37 [RFC net-next 0/8] Introducing subdev bus and devlink extension Parav Pandit
2019-03-01 5:37 ` [RFC net-next 1/8] subdev: Introducing subdev bus Parav Pandit
2019-03-01 7:17 ` Greg KH
2019-03-01 16:35 ` Parav Pandit
2019-03-01 17:00 ` Greg KH
2019-03-26 11:48 ` Lorenzo Pieralisi
2019-03-01 5:37 ` [RFC net-next 2/8] subdev: Introduce pm callbacks Parav Pandit
2019-03-01 5:37 ` [RFC net-next 3/8] modpost: Add support for subdev device id table Parav Pandit
2019-03-01 5:37 ` [RFC net-next 4/8] devlink: Introduce and use devlink_init/cleanup() in alloc/free Parav Pandit
2019-03-01 5:37 ` Parav Pandit [this message]
2019-03-01 5:37 ` [RFC net-next 6/8] devlink: Add support for devlink subdev lifecycle Parav Pandit
2019-03-01 5:37 ` [RFC net-next 7/8] net/mlx5: Add devlink subdev life cycle command support Parav Pandit
2019-03-01 7:18 ` Greg KH
2019-03-01 16:04 ` Parav Pandit
2019-03-01 5:37 ` [RFC net-next 8/8] net/mlx5: Add subdev driver to bind to subdev devices Parav Pandit
2019-03-01 7:21 ` Greg KH
2019-03-01 17:21 ` Parav Pandit
2019-03-05 7:13 ` Greg KH
2019-03-05 17:57 ` Parav Pandit
2019-03-05 19:27 ` Greg KH
2019-03-05 21:37 ` Parav Pandit
2019-03-01 22:12 ` Saeed Mahameed
2019-03-04 16:45 ` Parav Pandit
2019-03-01 20:03 ` [RFC net-next 0/8] Introducing subdev bus and devlink extension Jakub Kicinski
2019-03-04 4:41 ` Parav Pandit
2019-03-05 1:35 ` Jakub Kicinski
2019-03-05 19:46 ` Parav Pandit
2019-03-05 22:39 ` Kirti Wankhede
2019-03-05 23:17 ` Parav Pandit
2019-03-05 23:44 ` Parav Pandit
2019-03-06 0:44 ` Parav Pandit
2019-03-06 3:51 ` Kirti Wankhede
2019-03-06 5:42 ` Parav Pandit
2019-03-07 19:04 ` Kirti Wankhede
2019-03-07 20:27 ` Parav Pandit
2019-03-07 20:53 ` Kirti Wankhede
2019-03-07 21:02 ` Parav Pandit
2019-03-07 21:07 ` Kirti Wankhede
2019-03-07 21:21 ` Parav Pandit
2019-03-07 22:01 ` Kirti Wankhede
2019-03-07 22:31 ` Parav Pandit
2019-03-08 12:19 ` Kirti Wankhede
2019-03-08 17:09 ` Parav Pandit
2019-03-05 1:45 ` Jakub Kicinski
2019-03-05 16:52 ` Parav Pandit
2021-05-31 10:36 ` moyufeng
2021-06-01 5:37 ` Jakub Kicinski
2021-06-01 7:33 ` Yunsheng Lin
2021-06-01 21:34 ` Jakub Kicinski
2021-06-02 2:24 ` Yunsheng Lin
2021-06-02 16:34 ` Jakub Kicinski
2021-06-03 3:46 ` Yunsheng Lin
2021-06-03 17:53 ` Jakub Kicinski
2021-06-04 1:18 ` Yunsheng Lin
2021-06-04 18:41 ` Jakub Kicinski
2021-06-07 1:36 ` Yunsheng Lin
2021-06-07 19:46 ` Jakub Kicinski
2021-06-08 12:10 ` Yunsheng Lin
2021-06-08 17:29 ` Jakub Kicinski
2021-06-09 9:16 ` Yunsheng Lin
2021-06-09 9:38 ` Parav Pandit
2021-06-09 11:05 ` Yunsheng Lin
2021-06-09 11:59 ` Parav Pandit
2021-06-09 12:30 ` Yunsheng Lin
2021-06-09 13:45 ` Parav Pandit
2021-06-10 7:04 ` Yunsheng Lin
2021-06-10 7:17 ` Parav Pandit
2021-06-09 16:40 ` Jakub Kicinski
2021-06-10 6:52 ` Yunsheng Lin
2021-06-09 9:52 ` Parav Pandit
2021-06-09 11:16 ` Yunsheng Lin
2021-06-09 12:00 ` Parav Pandit
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=1551418672-12822-6-git-send-email-parav@mellanox.com \
--to=parav@mellanox.com \
--cc=davem@davemloft.net \
--cc=gregkh@linuxfoundation.org \
--cc=jiri@mellanox.com \
--cc=linux-kernel@vger.kernel.org \
--cc=michal.lkml@markovi.net \
--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).