From: Leon Romanovsky Date: Tue, 19 Oct 2021 07:49:54 +0000 (+0300) Subject: devlink: Remove extra device_lock assert checks X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=cb3dc8901ba4f748f46287a42049a3a5c1f6b63c;p=linux.git 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 Signed-off-by: Leon Romanovsky Signed-off-by: David S. Miller --- diff --git a/net/core/devlink.c b/net/core/devlink.c index 3ce6147a2fe8a..3464854015a29 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);