Skip to content

Commit 8917e73

Browse files
hcodinarobherring
authored andcommitted
of: dynamic: Synchronize of_changeset_destroy() with the devlink removals
In the following sequence: 1) of_platform_depopulate() 2) of_overlay_remove() During the step 1, devices are destroyed and devlinks are removed. During the step 2, OF nodes are destroyed but __of_changeset_entry_destroy() can raise warnings related to missing of_node_put(): ERROR: memory leak, expected refcount 1 instead of 2 ... Indeed, during the devlink removals performed at step 1, the removal itself releasing the device (and the attached of_node) is done by a job queued in a workqueue and so, it is done asynchronously with respect to function calls. When the warning is present, of_node_put() will be called but wrongly too late from the workqueue job. In order to be sure that any ongoing devlink removals are done before the of_node destruction, synchronize the of_changeset_destroy() with the devlink removals. Fixes: 80dd33c ("drivers: base: Fix device link removal") Cc: [email protected] Signed-off-by: Herve Codina <[email protected]> Reviewed-by: Saravana Kannan <[email protected]> Tested-by: Luca Ceresoli <[email protected]> Reviewed-by: Nuno Sa <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Rob Herring <[email protected]>
1 parent 0462c56 commit 8917e73

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

drivers/of/dynamic.c

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
#define pr_fmt(fmt) "OF: " fmt
1111

12+
#include <linux/device.h>
1213
#include <linux/of.h>
1314
#include <linux/spinlock.h>
1415
#include <linux/slab.h>
@@ -667,6 +668,17 @@ void of_changeset_destroy(struct of_changeset *ocs)
667668
{
668669
struct of_changeset_entry *ce, *cen;
669670

671+
/*
672+
* When a device is deleted, the device links to/from it are also queued
673+
* for deletion. Until these device links are freed, the devices
674+
* themselves aren't freed. If the device being deleted is due to an
675+
* overlay change, this device might be holding a reference to a device
676+
* node that will be freed. So, wait until all already pending device
677+
* links are deleted before freeing a device node. This ensures we don't
678+
* free any device node that has a non-zero reference count.
679+
*/
680+
device_link_wait_removal();
681+
670682
list_for_each_entry_safe_reverse(ce, cen, &ocs->entries, node)
671683
__of_changeset_entry_destroy(ce);
672684
}

0 commit comments

Comments
 (0)