diff options
| author |   Leon Romanovsky <leonro@nvidia.com> | 2021-10-19 10:49:54 +0300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2021-10-19 13:16:14 +0100 |
| commit | cb3dc8901ba4f748f46287a42049a3a5c1f6b63c (patch) | |
| tree | 72f9000e295fb251aa729503a58ac8491f24baf3 /net | |
| parent | ethernet: Remove redundant statement (diff) | |
| download | linux-dev-cb3dc8901ba4f748f46287a42049a3a5c1f6b63c.tar.xz linux-dev-cb3dc8901ba4f748f46287a42049a3a5c1f6b63c.zip | |
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: b88f7b1203bf ("devlink: Annotate devlink API calls")
Reported-by: Amit Cohen <amcohen@nvidia.com>
Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/devlink.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/core/devlink.c b/net/core/devlink.c index 3ce6147a2fe8..3464854015a2 100644 --- a/net/core/devlink.c +++ b/net/core/devlink.c @@ -9147,7 +9147,6 @@ void devlink_register(struct devlink *devlink) { ASSERT_DEVLINK_NOT_REGISTERED(devlink); /* Make sure that we are in .probe() routine */ - device_lock_assert(devlink->dev); mutex_lock(&devlink_mutex); xa_set_mark(&devlinks, devlink->index, DEVLINK_REGISTERED); @@ -9165,7 +9164,6 @@ void devlink_unregister(struct devlink *devlink) { ASSERT_DEVLINK_REGISTERED(devlink); /* Make sure that we are in .remove() routine */ - device_lock_assert(devlink->dev); devlink_put(devlink); wait_for_completion(&devlink->comp); |