Commit cb3dc890 authored by Leon Romanovsky's avatar Leon Romanovsky Committed by David S. Miller

devlink: Remove extra device_lock assert checks

PCI core code in the pci_call_probe() has a path that doesn't hold
device_lock. It happens because the ->probe() is called through the
workqueue mechanism.

   349 static int pci_call_probe(struct pci_driver *drv, struct pci_dev *dev,
   350                           const struct pci_device_id *id)
   351 {
   352
....
   377         if (cpu < nr_cpu_ids)
   378                 error = work_on_cpu(cpu, local_pci_probe, &ddi);

Luckily enough, the core still ensures that only single flow is executed,
so it safe to remove the assert checks that anyway were added for annotations
purposes.

Fixes: b88f7b12 ("devlink: Annotate devlink API calls")
Reported-by: default avatarAmit Cohen <amcohen@nvidia.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3c71e0c9
...@@ -9147,7 +9147,6 @@ void devlink_register(struct devlink *devlink) ...@@ -9147,7 +9147,6 @@ void devlink_register(struct devlink *devlink)
{ {
ASSERT_DEVLINK_NOT_REGISTERED(devlink); ASSERT_DEVLINK_NOT_REGISTERED(devlink);
/* Make sure that we are in .probe() routine */ /* Make sure that we are in .probe() routine */
device_lock_assert(devlink->dev);
mutex_lock(&devlink_mutex); mutex_lock(&devlink_mutex);
xa_set_mark(&devlinks, devlink->index, DEVLINK_REGISTERED); xa_set_mark(&devlinks, devlink->index, DEVLINK_REGISTERED);
...@@ -9165,7 +9164,6 @@ void devlink_unregister(struct devlink *devlink) ...@@ -9165,7 +9164,6 @@ void devlink_unregister(struct devlink *devlink)
{ {
ASSERT_DEVLINK_REGISTERED(devlink); ASSERT_DEVLINK_REGISTERED(devlink);
/* Make sure that we are in .remove() routine */ /* Make sure that we are in .remove() routine */
device_lock_assert(devlink->dev);
devlink_put(devlink); devlink_put(devlink);
wait_for_completion(&devlink->comp); wait_for_completion(&devlink->comp);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment