coresight: trbe: remove cpuhp instance node before remove cpuhp state
PATCH 1/1 coresight: trbe: remove cpuhp instance node before remove cpuhp state
cpuhp_state_add_instance() and cpuhp_state_remove_instance() should be used in pairs. Or there will lead to the warn on cpuhp_remove_multi_state() since the cpuhp_step list is not empty.
The following is the error log with 'rmmod coresight-trbe':
Error: Removing state 215 which has instances left.
Call trace: __cpuhp_remove_state_cpuslocked+0x144/0x160 __cpuhp_remove_state+0xac/0x100 arm_trbe_device_remove+0x2c/0x60 [coresight_trbe] platform_remove+0x34/0x70 device_remove+0x54/0x90 device_release_driver_internal+0x1e4/0x250 driver_detach+0x5c/0xb0 bus_remove_driver+0x64/0xc0 driver_unregister+0x3c/0x70 platform_driver_unregister+0x20/0x30 arm_trbe_exit+0x1c/0x658 [coresight_trbe] __arm64_sys_delete_module+0x1ac/0x24c invoke_syscall+0x50/0x120 el0_svc_common.constprop.0+0x58/0x1a0 do_el0_svc+0x38/0xd0 el0_svc+0x2c/0xc0 el0t_64_sync_handler+0x1ac/0x1b0 el0t_64_sync+0x19c/0x1a0 ---[ end trace 0000000000000000 ]---
--- drivers/hwtracing/coresight/coresight-trbe.c | 1 + 1 file changed, 1 insertion(+)
drivers/hwtracing/coresight/coresight-trbe.c +1 -0
@@ -1434,6 +1434,7 @@ static int arm_trbe_probe_cpuhp(struct trbe_drvdata *drvdata)static void arm_trbe_remove_cpuhp (struct trbe_drvdata *drvdata) { +cpuhp_state_remove_instance (drvdata->trbe_online, &drvdata->hotplug_node);cpuhp_remove_multi_state (drvdata->trbe_online); }
--
2.24.0
Quoted 38 lines · Yang Shen
cpuhp_state_add_instance()andcpuhp_state_remove_instance()should be used in pairs. Or there will lead to the warn oncpuhp_remove_multi_state()since thecpuhp_steplist is not empty.The following is the error log with 'rmmod coresight-trbe':
Error: Removing state 215 which has instances left.Call trace: __cpuhp_remove_state_cpuslocked+0x144/0x160 __cpuhp_remove_state+0xac/0x100 arm_trbe_device_remove+0x2c/0x60 [coresight_trbe] platform_remove+0x34/0x70 device_remove+0x54/0x90 device_release_driver_internal+0x1e4/0x250 driver_detach+0x5c/0xb0 bus_remove_driver+0x64/0xc0 driver_unregister+0x3c/0x70 platform_driver_unregister+0x20/0x30 arm_trbe_exit+0x1c/0x658 [coresight_trbe] __arm64_sys_delete_module+0x1ac/0x24c invoke_syscall+0x50/0x120 el0_svc_common.constprop.0+0x58/0x1a0 do_el0_svc+0x38/0xd0 el0_svc+0x2c/0xc0 el0t_64_sync_handler+0x1ac/0x1b0 el0t_64_sync+0x19c/0x1a0 ---[ end trace 0000000000000000 ]---Fixes 3fbf7f011f24 ("coresight: sink: Add TRBE driver")Signed-off-by Yang Shen <[email protected]>--- drivers/hwtracing/coresight/coresight-trbe.c | 1 + 1 file changed, 1 insertion(+)drivers/hwtracing/coresight/coresight-trbe.c +0
-0
drivers/hwtracing/coresight/coresight-trbe.c static int arm_trbe_probe_cpuhp(struct trbe_drvdata *drvdata) · line 1440
Quoted 7 lines
drivers/hwtracing/coresight/coresight-trbe.c +1
-0@@ -1434,6 +1434,7 @@ static int arm_trbe_probe_cpuhp(struct trbe_drvdata *drvdata)static void arm_trbe_remove_cpuhp (struct trbe_drvdata *drvdata) { +cpuhp_state_remove_instance (drvdata->trbe_online, &drvdata->hotplug_node);cpuhp_remove_multi_state (drvdata->trbe_online); }
Applied to coresight next.
https://git.kernel.org/coresight/c/5fefef85b0d3
Thanks
Suzuki
Quoted 3 lines
--
2.24.0
Anshuman Khandual
Reviewed-byQuoted 28 lines · Suzuki Kuruppassery Poulose
Quoted 27 lines · Yang Shen
cpuhp_state_add_instance()andcpuhp_state_remove_instance()should be used in pairs. Or there will lead to the warn oncpuhp_remove_multi_state()since thecpuhp_steplist is not empty.The following is the error log with 'rmmod coresight-trbe':
Error: Removing state 215 which has instances left.Call trace: __cpuhp_remove_state_cpuslocked+0x144/0x160 __cpuhp_remove_state+0xac/0x100 arm_trbe_device_remove+0x2c/0x60 [coresight_trbe] platform_remove+0x34/0x70 device_remove+0x54/0x90 device_release_driver_internal+0x1e4/0x250 driver_detach+0x5c/0xb0 bus_remove_driver+0x64/0xc0 driver_unregister+0x3c/0x70 platform_driver_unregister+0x20/0x30 arm_trbe_exit+0x1c/0x658 [coresight_trbe] __arm64_sys_delete_module+0x1ac/0x24c invoke_syscall+0x50/0x120 el0_svc_common.constprop.0+0x58/0x1a0 do_el0_svc+0x38/0xd0 el0_svc+0x2c/0xc0 el0t_64_sync_handler+0x1ac/0x1b0 el0t_64_sync+0x19c/0x1a0 ---[ end trace 0000000000000000 ]---
Quoted 2 lines
Quoted 2 lines
Fixes 3fbf7f011f24 ("coresight: sink: Add TRBE driver")Signed-off-by Yang Shen <[email protected]>
Quoted 19 lines
Quoted 9 lines
---
drivers/hwtracing/coresight/coresight-trbe.c| 1 +1 file changed, 1 insertion(+)drivers/hwtracing/coresight/coresight-trbe.c +0
-0drivers/hwtracing/coresight/coresight-trbe.c static int arm_trbe_probe_cpuhp(struct trbe_drvdata *drvdata) · line 1440
Quoted 7 lines
drivers/hwtracing/coresight/coresight-trbe.c +1
-0@@ -1434,6 +1434,7 @@ static int arm_trbe_probe_cpuhp(struct trbe_drvdata *drvdata) static void arm_trbe_remove_cpuhp(struct trbe_drvdata *drvdata) { + cpuhp_state_remove_instance(drvdata->trbe_online, &drvdata->hotplug_node); cpuhp_remove_multi_state(drvdata->trbe_online); }Applied to coresight next.
Quoted 1 line
Hi Suzuki,
Could you please add the above tag for the patch. Thank you.
- Anshuman
Suzuki Kuruppassery Poulose
maintainerQuoted 55 lines · Anshuman Khandual
Quoted 28 lines · Suzuki Kuruppassery Poulose
Quoted 27 lines · Yang Shen
cpuhp_state_add_instance()andcpuhp_state_remove_instance()should be used in pairs. Or there will lead to the warn oncpuhp_remove_multi_state()since thecpuhp_steplist is not empty.The following is the error log with 'rmmod coresight-trbe':
Error: Removing state 215 which has instances left.Call trace: __cpuhp_remove_state_cpuslocked+0x144/0x160 __cpuhp_remove_state+0xac/0x100 arm_trbe_device_remove+0x2c/0x60 [coresight_trbe] platform_remove+0x34/0x70 device_remove+0x54/0x90 device_release_driver_internal+0x1e4/0x250 driver_detach+0x5c/0xb0 bus_remove_driver+0x64/0xc0 driver_unregister+0x3c/0x70 platform_driver_unregister+0x20/0x30 arm_trbe_exit+0x1c/0x658 [coresight_trbe] __arm64_sys_delete_module+0x1ac/0x24c invoke_syscall+0x50/0x120 el0_svc_common.constprop.0+0x58/0x1a0 do_el0_svc+0x38/0xd0 el0_svc+0x2c/0xc0 el0t_64_sync_handler+0x1ac/0x1b0 el0t_64_sync+0x19c/0x1a0 ---[ end trace 0000000000000000 ]---Quoted 2 lines
Quoted 2 lines
Fixes 3fbf7f011f24 ("coresight: sink: Add TRBE driver")Signed-off-by Yang Shen <[email protected]>Reviewed-by Anshuman Khandual <[email protected]>Quoted 19 lines
Quoted 9 lines
--- drivers/hwtracing/coresight/coresight-trbe.c | 1 + 1 file changed, 1 insertion(+)drivers/hwtracing/coresight/coresight-trbe.c +0
-0drivers/hwtracing/coresight/coresight-trbe.c static int arm_trbe_probe_cpuhp(struct trbe_drvdata *drvdata) · line 1440
Quoted 7 lines
drivers/hwtracing/coresight/coresight-trbe.c +1
-0@@ -1434,6 +1434,7 @@ static int arm_trbe_probe_cpuhp(struct trbe_drvdata *drvdata) static void arm_trbe_remove_cpuhp(struct trbe_drvdata *drvdata) { + cpuhp_state_remove_instance(drvdata->trbe_online, &drvdata->hotplug_node); cpuhp_remove_multi_state(drvdata->trbe_online); }Applied to coresight next.
Quoted 5 lines
Quoted 1 line
Hi Suzuki,
Could you please add the above tag for the patch. Thank you.
Sorry, its too late. It is already in the upstream tree.
Suzuki