ARM: OMAP2+: Grab reference to device nodes where needed
Subsystems (4)
PATCH 1/1 ARM: OMAP2+: Grab reference to device nodes where needed
After commit 'of: fix of_node leak caused in of_find_node_opts_by_path', the following error may be reported when running omap images.
OF: ERROR: Bad of_node_put() on /ocp at 68000000
CPU: 0 PID: 0 Comm: swapper Not tainted 4.10.0-rc7-next-20170210 #1 Hardware name: Generic OMAP3-GP (Flattened Device Tree) [<c0310604>] (unwind_backtrace) from [<c030bbf4>] (show_stack+0x10/0x14) [<c030bbf4>] (show_stack) from [<c05add8c>] (dump_stack+0x98/0xac) [<c05add8c>] (dump_stack) from [<c05af1b0>] (kobject_release+0x48/0x7c) [<c05af1b0>] (kobject_release) from [<c0ad1aa4>] (of_find_node_by_name+0x74/0x94) [<c0ad1aa4>] (of_find_node_by_name) from [<c1215bd4>] (omap3xxx_hwmod_is_hs_ip_block_usable+0x24/0x2c) [<c1215bd4>] (omap3xxx_hwmod_is_hs_ip_block_usable) from [<c1215d5c>] (omap3xxx_hwmod_init+0x180/0x274) [<c1215d5c>] (omap3xxx_hwmod_init) from [<c120faa8>] (omap3_init_early+0xa0/0x11c) [<c120faa8>] (omap3_init_early) from [<c120fb2c>] (omap3430_init_early+0x8/0x30) [<c120fb2c>] (omap3430_init_early) from [<c1204710>] (setup_arch+0xc04/0xc34)
[<c1204710>] (setup_arch) from [<c1200948>] (start_kernel+0x68/0x38c) [<c1200948>] (start_kernel) from [<8020807c>] (0x8020807c)
of_find_node_by_name() drops the reference to the passed device node, so it is necessary to grab an extra one if it is still needed after the call.
--- arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +8 -2
@@ -3117,6 +3117,7 @@ static int __init omap3xxx_hwmod_is_hs_ip_block_usable(struct device_node *bus,if (!bus)return (omap_type () ==OMAP2_DEVICE_TYPE_GP ) ?1 :0 ; +of_node_get (bus);if (of_device_is_available (of_find_node_by_name (bus, dev_name)))return 1 ;
@@ -3189,15 +3190,20 @@ int __init omap3xxx_hwmod_init(void)if (h_sham &&omap3xxx_hwmod_is_hs_ip_block_usable (bus,"sham" )) { r =omap_hwmod_register_links (h_sham); -if (r <0 ) +if (r <0 ) { +of_node_put (bus);return r; + } }if (h_aes &&omap3xxx_hwmod_is_hs_ip_block_usable (bus,"aes" )) { r =omap_hwmod_register_links (h_aes); -if (r <0 ) +if (r <0 ) { +of_node_put (bus);return r; + } } +of_node_put (bus);/* * Register hwmod links specific to certain ES levels of a
Signature · 1 line
2.7.4
ping ... this problem is now seen in mainline.
Guenter
Quoted 71 lines · Guenter Roeck
After commit 'of: fix
of_nodeleak caused inof_find_node_opts_by_path', the following error may be reported when running omap images.OF: ERROR: Bad
of_node_put()on /ocp at 68000000CPU: 0 PID: 0 Comm: swapper Not tainted 4.10.0-rc7-next-20170210 #1 Hardware name: Generic OMAP3-GP (Flattened Device Tree) [<c0310604>] (unwind_backtrace) from [<c030bbf4>] (show_stack+0x10/0x14) [<c030bbf4>] (show_stack) from [<c05add8c>] (dump_stack+0x98/0xac) [<c05add8c>] (dump_stack) from [<c05af1b0>] (kobject_release+0x48/0x7c) [<c05af1b0>] (kobject_release) from [<c0ad1aa4>] (of_find_node_by_name+0x74/0x94) [<c0ad1aa4>] (of_find_node_by_name) from [<c1215bd4>] (omap3xxx_hwmod_is_hs_ip_block_usable+0x24/0x2c) [<c1215bd4>] (omap3xxx_hwmod_is_hs_ip_block_usable) from [<c1215d5c>] (omap3xxx_hwmod_init+0x180/0x274) [<c1215d5c>] (omap3xxx_hwmod_init) from [<c120faa8>] (omap3_init_early+0xa0/0x11c) [<c120faa8>] (omap3_init_early) from [<c120fb2c>] (omap3430_init_early+0x8/0x30) [<c120fb2c>] (omap3430_init_early) from [<c1204710>] (setup_arch+0xc04/0xc34)[<
c1204710>] (setup_arch) from [<c1200948>] (start_kernel+0x68/0x38c) [<c1200948>] (start_kernel) from [<8020807c>] (0x8020807c)
of_find_node_by_name()drops the reference to the passed device node, so it is necessary to grab an extra one if it is still needed after the call.Cc Qi Hou <[email protected]>Cc Peter Rosin <[email protected]>Cc Rob Herring <[email protected]>Signed-off-by Guenter Roeck <[email protected]>--- arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +8
-2@@ -3117,6 +3117,7 @@ static int __init omap3xxx_hwmod_is_hs_ip_block_usable(struct device_node *bus,if (!bus)return (omap_type () ==OMAP2_DEVICE_TYPE_GP ) ?1 :0 ; +of_node_get (bus);if (of_device_is_available (of_find_node_by_name (bus, dev_name)))return 1 ;@@ -3189,15 +3190,20 @@ int __init omap3xxx_hwmod_init(void)if (h_sham &&omap3xxx_hwmod_is_hs_ip_block_usable (bus,"sham" )) { r =omap_hwmod_register_links (h_sham); -if (r <0 ) +if (r <0 ) { +of_node_put (bus);return r; + } }if (h_aes &&omap3xxx_hwmod_is_hs_ip_block_usable (bus,"aes" )) { r =omap_hwmod_register_links (h_aes); -if (r <0 ) +if (r <0 ) { +of_node_put (bus);return r; + } } +of_node_put (bus);/* * Register hwmod links specific to certain ES levels of a
Tony Lindgren
maintainerQuoted 1 line · Guenter Roeck
ping ... this problem is now seen in mainline.
Oops sorry I had accidentally tagged this with "next" instead of "fixes".
Looking at the patch though, can't we make of_node_get/put local to omap3xxx_hwmod_is_hs_ip_block_usable()?
Regards,
Tony
Quoted 9 lines · Tony Lindgren
Quoted 1 line · Guenter Roeck
ping ... this problem is now seen in mainline.
Oops sorry I had accidentally tagged this with "next" instead of "fixes".
Looking at the patch though, can't we make of_node_get/put local to
omap3xxx_hwmod_is_hs_ip_block_usable()?
Not really.
Strictly speaking the patch fixes two problems:
1) of_find_node_by_name() gets a reference on "bus", thus of_node_put() is necessary to release it. This is the change in omap3xxx_hwmod_init().
2) of_find_node_by_name() drops a reference to the passed device node, thus it is necessary to call of_node_get(bus) in omap3xxx_hwmod_is_hs_ip_block_usable().
I should have stated that more clearly in the description.
We could ignore 1) to get rid of the warning, but that would leave us with a dangling reference to the bus node. I could also improve the description, or split the patch in two. Let me know what you prefer.
Another possible change would be to use of_get_child_by_name() instead of of_find_node_by_name(). That would, however, only search immediate children of the 'ocp' node, not all nodes. I think that is what is actually intended here, but I am not entirely sure. Thoughts ?
Either case, turns out I'll have to re-submit the patch because, as mentioned above, of_find_node_by_name() gets a reference to the device node it returns, so a put on that node is necessary in omap3xxx_hwmod_is_hs_ip_block_usable().
Guenter
Tony Lindgren
maintainerQuoted 12 lines · Guenter Roeck
Quoted 9 lines · Tony Lindgren
Quoted 1 line · Guenter Roeck
ping ... this problem is now seen in mainline.
Oops sorry I had accidentally tagged this with "next" instead of "fixes".
Looking at the patch though, can't we make of_node_get/put local to
omap3xxx_hwmod_is_hs_ip_block_usable()?Not really.
Quoted 8 lines
Strictly speaking the patch fixes two problems:
1)of_find_node_by_name()gets a reference on "bus", thusof_node_put()is necessary to release it. This is the change inomap3xxx_hwmod_init().
2)of_find_node_by_name()drops a reference to the passed device node, thus it is necessary to callof_node_get(bus)inomap3xxx_hwmod_is_hs_ip_block_usable().I should have stated that more clearly in the description.
OK
Quoted 3 lines
We could ignore 1) to get rid of the warning, but that would leave us with a dangling reference to the bus node. I could also improve the description, or split the patch in two. Let me know what you prefer.
Once patch is just fine with me.
Quoted 4 lines
Another possible change would be to use
of_get_child_by_name()instead ofof_find_node_by_name(). That would, however, only search immediate children of the 'ocp' node, not all nodes. I think that is what is actually intended here, but I am not entirely sure. Thoughts ?
Yes that would be better.
Quoted 3 lines
Either case, turns out I'll have to re-submit the patch because, as mentioned above,
of_find_node_by_name()gets a reference to the device node it returns, so a put on that node is necessary inomap3xxx_hwmod_is_hs_ip_block_usable().
OK
Thanks,
Tony