From: Jakub Kicinski <kuba@kernel.org>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, edumazet@google.com, pabeni@redhat.com,
jacob.e.keller@intel.com, jiri@resnulli.us,
Jakub Kicinski <kuba@kernel.org>
Subject: [PATCH net-next 7/9] devlink: allow registering parameters after the instance
Date: Thu, 5 Jan 2023 22:34:00 -0800 [thread overview]
Message-ID: <20230106063402.485336-8-kuba@kernel.org> (raw)
In-Reply-To: <20230106063402.485336-1-kuba@kernel.org>
It's most natural to register the instance first and then its
subobjects. Now that we can use the instance lock to protect
the atomicity of all init - it should also be safe.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---
net/devlink/leftover.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/net/devlink/leftover.c b/net/devlink/leftover.c
index 491f821c8b77..1e23b2da78cc 100644
--- a/net/devlink/leftover.c
+++ b/net/devlink/leftover.c
@@ -5263,7 +5263,13 @@ static void devlink_param_notify(struct devlink *devlink,
WARN_ON(cmd != DEVLINK_CMD_PARAM_NEW && cmd != DEVLINK_CMD_PARAM_DEL &&
cmd != DEVLINK_CMD_PORT_PARAM_NEW &&
cmd != DEVLINK_CMD_PORT_PARAM_DEL);
- ASSERT_DEVLINK_REGISTERED(devlink);
+
+ /* devlink_notify_register() / devlink_notify_unregister()
+ * will replay the notifications if the params are added/removed
+ * outside of the lifetime of the instance.
+ */
+ if (!devl_is_registered(devlink))
+ return;
msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
if (!msg)
@@ -10915,8 +10921,6 @@ int devlink_params_register(struct devlink *devlink,
const struct devlink_param *param = params;
int i, err;
- ASSERT_DEVLINK_NOT_REGISTERED(devlink);
-
for (i = 0; i < params_count; i++, param++) {
err = devlink_param_register(devlink, param);
if (err)
@@ -10947,8 +10951,6 @@ void devlink_params_unregister(struct devlink *devlink,
const struct devlink_param *param = params;
int i;
- ASSERT_DEVLINK_NOT_REGISTERED(devlink);
-
for (i = 0; i < params_count; i++, param++)
devlink_param_unregister(devlink, param);
}
@@ -10968,8 +10970,6 @@ int devlink_param_register(struct devlink *devlink,
{
struct devlink_param_item *param_item;
- ASSERT_DEVLINK_NOT_REGISTERED(devlink);
-
WARN_ON(devlink_param_verify(param));
WARN_ON(devlink_param_find_by_name(&devlink->param_list, param->name));
@@ -10985,6 +10985,7 @@ int devlink_param_register(struct devlink *devlink,
param_item->param = param;
list_add_tail(¶m_item->list, &devlink->param_list);
+ devlink_param_notify(devlink, 0, param_item, DEVLINK_CMD_PARAM_NEW);
return 0;
}
EXPORT_SYMBOL_GPL(devlink_param_register);
@@ -10999,11 +11000,10 @@ void devlink_param_unregister(struct devlink *devlink,
{
struct devlink_param_item *param_item;
- ASSERT_DEVLINK_NOT_REGISTERED(devlink);
-
param_item =
devlink_param_find_by_name(&devlink->param_list, param->name);
WARN_ON(!param_item);
+ devlink_param_notify(devlink, 0, param_item, DEVLINK_CMD_PARAM_DEL);
list_del(¶m_item->list);
kfree(param_item);
}
@@ -11063,8 +11063,6 @@ int devlink_param_driverinit_value_set(struct devlink *devlink, u32 param_id,
{
struct devlink_param_item *param_item;
- ASSERT_DEVLINK_NOT_REGISTERED(devlink);
-
param_item = devlink_param_find_by_id(&devlink->param_list, param_id);
if (!param_item)
return -EINVAL;
@@ -11078,6 +11076,8 @@ int devlink_param_driverinit_value_set(struct devlink *devlink, u32 param_id,
else
param_item->driverinit_value = init_val;
param_item->driverinit_value_valid = true;
+
+ devlink_param_notify(devlink, 0, param_item, DEVLINK_CMD_PARAM_NEW);
return 0;
}
EXPORT_SYMBOL_GPL(devlink_param_driverinit_value_set);
--
2.38.1
next prev parent reply other threads:[~2023-01-06 6:34 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-06 6:33 [PATCH net-next 0/9] devlink: remove the wait-for-references on unregister Jakub Kicinski
2023-01-06 6:33 ` [PATCH net-next 1/9] devlink: bump the instance index directly when iterating Jakub Kicinski
2023-01-06 12:17 ` Jiri Pirko
2023-01-06 6:33 ` [PATCH net-next 2/9] devlink: update the code in netns move to latest helpers Jakub Kicinski
2023-01-06 6:33 ` [PATCH net-next 3/9] devlink: protect devlink->dev by the instance lock Jakub Kicinski
2023-01-06 12:18 ` Jiri Pirko
2023-01-06 6:33 ` [PATCH net-next 4/9] devlink: always check if the devlink instance is registered Jakub Kicinski
2023-01-06 12:41 ` Jiri Pirko
2023-01-06 17:03 ` Jacob Keller
2023-01-06 21:19 ` Jakub Kicinski
2023-01-07 9:05 ` Jiri Pirko
2023-01-06 6:33 ` [PATCH net-next 5/9] devlink: remove the registration guarantee of references Jakub Kicinski
2023-01-06 12:42 ` Jiri Pirko
2023-01-06 6:33 ` [PATCH net-next 6/9] devlink: don't require setting features before registration Jakub Kicinski
2023-01-06 12:43 ` Jiri Pirko
2023-01-06 6:34 ` Jakub Kicinski [this message]
2023-01-06 12:55 ` [PATCH net-next 7/9] devlink: allow registering parameters after the instance Jiri Pirko
2023-01-06 21:22 ` Jakub Kicinski
2023-01-07 9:20 ` Jiri Pirko
2023-01-10 0:21 ` Jacob Keller
2023-01-10 16:35 ` Jiri Pirko
2023-01-10 20:22 ` Jakub Kicinski
2023-01-11 9:32 ` Jiri Pirko
2023-01-11 16:45 ` Jakub Kicinski
2023-01-11 21:29 ` Jacob Keller
2023-01-12 7:07 ` Leon Romanovsky
2023-01-12 14:59 ` Jiri Pirko
2023-01-12 19:58 ` Leon Romanovsky
2023-01-13 7:50 ` Jiri Pirko
2023-01-15 8:35 ` Leon Romanovsky
2023-01-16 10:33 ` Jiri Pirko
2023-01-16 11:25 ` Leon Romanovsky
2023-01-12 19:20 ` Jakub Kicinski
2023-01-12 20:09 ` Leon Romanovsky
2023-01-12 22:44 ` Jacob Keller
2023-01-13 6:45 ` Leon Romanovsky
2023-01-13 7:53 ` Jiri Pirko
2023-01-11 13:21 ` Jiri Pirko
2023-01-06 6:34 ` [PATCH net-next 8/9] netdevsim: rename a label Jakub Kicinski
2023-01-06 12:56 ` Jiri Pirko
2023-01-06 6:34 ` [PATCH net-next 9/9] netdevsim: move devlink registration under the instance lock Jakub Kicinski
2023-01-06 15:49 ` Jiri Pirko
2023-01-06 13:10 ` [PATCH net-next 0/9] devlink: remove the wait-for-references on unregister patchwork-bot+netdevbpf
2023-01-06 15:49 ` Jiri Pirko
2023-01-06 17:06 ` Jacob Keller
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=20230106063402.485336-8-kuba@kernel.org \
--to=kuba@kernel.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=jacob.e.keller@intel.com \
--cc=jiri@resnulli.us \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.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).