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 9/9] netdevsim: move devlink registration under the instance lock
Date: Thu, 5 Jan 2023 22:34:02 -0800 [thread overview]
Message-ID: <20230106063402.485336-10-kuba@kernel.org> (raw)
In-Reply-To: <20230106063402.485336-1-kuba@kernel.org>
To prevent races with netdev code accessing free devlink instances
move the registration under the devlink instance lock.
Core now waits for the instance to be registered before accessing it.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---
drivers/net/netdevsim/dev.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/drivers/net/netdevsim/dev.c b/drivers/net/netdevsim/dev.c
index d25f6e86d901..738784fda117 100644
--- a/drivers/net/netdevsim/dev.c
+++ b/drivers/net/netdevsim/dev.c
@@ -1556,10 +1556,14 @@ int nsim_drv_probe(struct nsim_bus_dev *nsim_bus_dev)
goto err_devlink_unlock;
}
- err = nsim_dev_resources_register(devlink);
+ err = devl_register(devlink);
if (err)
goto err_vfc_free;
+ err = nsim_dev_resources_register(devlink);
+ if (err)
+ goto err_dl_unregister;
+
err = devlink_params_register(devlink, nsim_devlink_params,
ARRAY_SIZE(nsim_devlink_params));
if (err)
@@ -1607,7 +1611,6 @@ int nsim_drv_probe(struct nsim_bus_dev *nsim_bus_dev)
nsim_dev->esw_mode = DEVLINK_ESWITCH_MODE_LEGACY;
devlink_set_features(devlink, DEVLINK_F_RELOAD);
devl_unlock(devlink);
- devlink_register(devlink);
return 0;
err_hwstats_exit:
@@ -1631,6 +1634,8 @@ int nsim_drv_probe(struct nsim_bus_dev *nsim_bus_dev)
ARRAY_SIZE(nsim_devlink_params));
err_resource_unregister:
devl_resources_unregister(devlink);
+err_dl_unregister:
+ devl_unregister(devlink);
err_vfc_free:
kfree(nsim_dev->vfconfigs);
err_devlink_unlock:
@@ -1668,7 +1673,6 @@ void nsim_drv_remove(struct nsim_bus_dev *nsim_bus_dev)
struct nsim_dev *nsim_dev = dev_get_drvdata(&nsim_bus_dev->dev);
struct devlink *devlink = priv_to_devlink(nsim_dev);
- devlink_unregister(devlink);
devl_lock(devlink);
nsim_dev_reload_destroy(nsim_dev);
@@ -1677,6 +1681,7 @@ void nsim_drv_remove(struct nsim_bus_dev *nsim_bus_dev)
devlink_params_unregister(devlink, nsim_devlink_params,
ARRAY_SIZE(nsim_devlink_params));
devl_resources_unregister(devlink);
+ devl_unregister(devlink);
kfree(nsim_dev->vfconfigs);
kfree(nsim_dev->fa_cookie);
devl_unlock(devlink);
--
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 ` [PATCH net-next 7/9] devlink: allow registering parameters after the instance Jakub Kicinski
2023-01-06 12:55 ` 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 ` Jakub Kicinski [this message]
2023-01-06 15:49 ` [PATCH net-next 9/9] netdevsim: move devlink registration under the instance lock 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-10-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).