Skip to contentSkip to conversation

platform/chrome: cros_usbpd_notify: Fix error handling in cros_usbpd_notify_init()

PATCH Applied Yuan Can 4 participants 9 messages Nov 17, 2022 – Nov 28, 2022

Subsystems (3)
lore
Share & tools
lore

Yuan Can

author
#0 lore raw

PATCH 1/1 platform/chrome: cros_usbpd_notify: Fix error handling in cros_usbpd_notify_init()

The following WARNING message was given when rmmod cros_usbpd_notify:

Unexpected driver unregister!

 WARNING: CPU: 0 PID: 253 at drivers/base/driver.c:270 driver_unregister+0x8a/0xb0
 Modules linked in: cros_usbpd_notify(-)
 CPU: 0 PID: 253 Comm: rmmod Not tainted 6.1.0-rc3 #24
 ...
 Call Trace:
  <TASK>
  cros_usbpd_notify_exit+0x11/0x1e [cros_usbpd_notify]
  __x64_sys_delete_module+0x3c7/0x570
  ? __ia32_sys_delete_module+0x570/0x570
  ? lock_is_held_type+0xe3/0x140
  ? syscall_enter_from_user_mode+0x17/0x50
  ? rcu_read_lock_sched_held+0xa0/0xd0
  ? syscall_enter_from_user_mode+0x1c/0x50
  do_syscall_64+0x37/0x90
  entry_SYSCALL_64_after_hwframe+0x63/0xcd
 RIP: 0033:0x7f333fe9b1b7

The reason is that the cros_usbpd_notify_init() does not check the return value of platform_driver_register(), and the cros_usbpd_notify can install successfully even if platform_driver_register() failed.

Fix by checking the return value of platform_driver_register() and unregister cros_usbpd_notify_plat_driver when it failed.

Fixes ec2daf6e33f9 ("platform: chrome: Add cros-usbpd-notify driver")
---
 drivers/platform/chrome/cros_usbpd_notify.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/platform/chrome/cros_usbpd_notify.c +5 -1
index 4b5a81c9dc6d..10670b6588e3 100644
@@ -239,7 +239,11 @@ static int __init cros_usbpd_notify_init(void)
 		return ret;
 
 #ifdef CONFIG_ACPI
-	platform_driver_register(&cros_usbpd_notify_acpi_driver);
+	ret = platform_driver_register(&cros_usbpd_notify_acpi_driver);
+	if (ret) {
+		platform_driver_unregister(&cros_usbpd_notify_plat_driver);
+		return ret;
+	}
 #endif
 	return 0;
 }
Signature · 1 line
2.17.1
#1 lore raw

Hi Yuan,

Quoted 21 lines · Yuan Can

The following WARNING message was given when rmmod cros_usbpd_notify:

Unexpected driver unregister!

 WARNING: CPU: 0 PID: 253 at drivers/base/driver.c:270 driver_unregister+0x8a/0xb0
 Modules linked in: cros_usbpd_notify(-)
 CPU: 0 PID: 253 Comm: rmmod Not tainted 6.1.0-rc3 #24
 ...
 Call Trace:
  <TASK>
  cros_usbpd_notify_exit+0x11/0x1e [cros_usbpd_notify]
  __x64_sys_delete_module+0x3c7/0x570
  ? __ia32_sys_delete_module+0x570/0x570
  ? lock_is_held_type+0xe3/0x140
  ? syscall_enter_from_user_mode+0x17/0x50
  ? rcu_read_lock_sched_held+0xa0/0xd0
  ? syscall_enter_from_user_mode+0x1c/0x50
  do_syscall_64+0x37/0x90
  entry_SYSCALL_64_after_hwframe+0x63/0xcd
 RIP: 0033:0x7f333fe9b1b7
Quoted 5 lines

The reason is that the cros_usbpd_notify_init() does not check the return value of platform_driver_register(), and the cros_usbpd_notify can install successfully even if platform_driver_register() failed.

Fix by checking the return value of platform_driver_register() and

Can you provide details regarding why cros_usbpd_notify_acpi_driver registration is failing on your system (logs or other details) ?

Thanks,

- Prashant

author
#2 lore raw
Quoted 23 lines · Prashant Malani

Hi Yuan,

Quoted 20 lines · Yuan Can

The following WARNING message was given when rmmod cros_usbpd_notify:

Unexpected driver unregister!

  WARNING: CPU: 0 PID: 253 at drivers/base/driver.c:270 driver_unregister+0x8a/0xb0
  Modules linked in: cros_usbpd_notify(-)
  CPU: 0 PID: 253 Comm: rmmod Not tainted 6.1.0-rc3 #24
  ...
  Call Trace:
   <TASK>
   cros_usbpd_notify_exit+0x11/0x1e [cros_usbpd_notify]
   __x64_sys_delete_module+0x3c7/0x570
   ? __ia32_sys_delete_module+0x570/0x570
   ? lock_is_held_type+0xe3/0x140
   ? syscall_enter_from_user_mode+0x17/0x50
   ? rcu_read_lock_sched_held+0xa0/0xd0
   ? syscall_enter_from_user_mode+0x1c/0x50
   do_syscall_64+0x37/0x90
   entry_SYSCALL_64_after_hwframe+0x63/0xcd
  RIP: 0033:0x7f333fe9b1b7
Quoted 7 lines
Quoted 5 lines

The reason is that the cros_usbpd_notify_init() does not check the return value of platform_driver_register(), and the cros_usbpd_notify can install successfully even if platform_driver_register() failed.

Fix by checking the return value of platform_driver_register() and

Can you provide details regarding why cros_usbpd_notify_acpi_driver registration is failing on your system (logs or other details) ?

The reason could be an OOM happend when platform_driver_register() tries to allocate memory,

a simple call graph:

platform_driver_register()
driver_register()
bus_add_driver()
dev = kzalloc(...) # OOM happened

Signature · 2 lines
Best regards,
Yuan Can
#3 lore raw
Quoted 17 lines · Yuan Can
Quoted 10 lines · Prashant Malani

Hi Yuan,

Quoted 5 lines · Yuan Can

The reason is that the cros_usbpd_notify_init() does not check the return value of platform_driver_register(), and the cros_usbpd_notify can install successfully even if platform_driver_register() failed.

Fix by checking the return value of platform_driver_register() and

Can you provide details regarding why cros_usbpd_notify_acpi_driver registration is failing on your system (logs or other details) ?

The reason could be an OOM happend when platform_driver_register() tries to allocate memory,

Quoted 7 lines

a simple call graph:

platform_driver_register()
driver_register()
bus_add_driver()
dev = kzalloc(...) # OOM happened

Sure, but is that what you're seeing? Can you share logs from your repro case?

I've got no problems with the change itself, but find the platform_driver_register()
failure to be quite odd here.

Thanks,

author
#4 lore raw
Quoted 16 lines · Prashant Malani
Quoted 15 lines · Yuan Can
Quoted 10 lines · Prashant Malani

Hi Yuan,

Quoted 5 lines · Yuan Can

The reason is that the cros_usbpd_notify_init() does not check the return value of platform_driver_register(), and the cros_usbpd_notify can install successfully even if platform_driver_register() failed.

Fix by checking the return value of platform_driver_register() and

Can you provide details regarding why cros_usbpd_notify_acpi_driver registration is failing on your system (logs or other details) ?

The reason could be an OOM happend when platform_driver_register() tries to allocate memory,

Quoted 8 lines
Quoted 7 lines

a simple call graph:

platform_driver_register()
driver_register()
bus_add_driver()
dev = kzalloc(...) # OOM happened

Sure, but is that what you're seeing? Can you share logs from your repro case?

Yes, that the reason, this problem is triggered by the OOM fault-injection test.

Signature · 2 lines
Best regards,
Yuan Can
#5 lore raw
Quoted 21 lines · Yuan Can
Quoted 18 lines · Prashant Malani
Quoted 17 lines · Yuan Can
Quoted 10 lines · Prashant Malani

Hi Yuan,

Quoted 5 lines · Yuan Can

The reason is that the cros_usbpd_notify_init() does not check the return value of platform_driver_register(), and the cros_usbpd_notify can install successfully even if platform_driver_register() failed.

Fix by checking the return value of platform_driver_register() and

Can you provide details regarding why cros_usbpd_notify_acpi_driver registration is failing on your system (logs or other details) ?

The reason could be an OOM happend when platform_driver_register() tries to allocate memory,

a simple call graph:

Quoted 8 lines
Quoted 6 lines
Quoted 5 lines

platform_driver_register()
driver_register()
bus_add_driver()
dev = kzalloc(...) # OOM happened

Sure, but is that what you're seeing? Can you share logs from your repro case?

Yes, that the reason, this problem is triggered by the OOM fault-injection test.

Alright. Thanks for providing that detail.

Best regards,

-Prashant

Reviewed-by on v1 1/1
#6 lore raw
In reply to Yuan Can
Quoted 20 lines · Yuan Can

The following WARNING message was given when rmmod cros_usbpd_notify:

Unexpected driver unregister!

 WARNING: CPU: 0 PID: 253 at drivers/base/driver.c:270 driver_unregister+0x8a/0xb0
 Modules linked in: cros_usbpd_notify(-)
 CPU: 0 PID: 253 Comm: rmmod Not tainted 6.1.0-rc3 #24
 ...
 Call Trace:
  <TASK>
  cros_usbpd_notify_exit+0x11/0x1e [cros_usbpd_notify]
  __x64_sys_delete_module+0x3c7/0x570
  ? __ia32_sys_delete_module+0x570/0x570
  ? lock_is_held_type+0xe3/0x140
  ? syscall_enter_from_user_mode+0x17/0x50
  ? rcu_read_lock_sched_held+0xa0/0xd0
  ? syscall_enter_from_user_mode+0x1c/0x50
  do_syscall_64+0x37/0x90
  entry_SYSCALL_64_after_hwframe+0x63/0xcd
 RIP: 0033:0x7f333fe9b1b7
Quoted 6 lines

The reason is that the cros_usbpd_notify_init() does not check the return value of platform_driver_register(), and the cros_usbpd_notify can install successfully even if platform_driver_register() failed.

Fix by checking the return value of platform_driver_register() and unregister cros_usbpd_notify_plat_driver when it failed.

On first glance, the last part looked wrong (if register() fails, we don't need to call unregister()), but these are two different drivers getting registered. Looks good to me, then.

Quoted 2 lines
Fixes ec2daf6e33f9 ("platform: chrome: Add cros-usbpd-notify driver")
Quoted 25 lines
---
 drivers/platform/chrome/cros_usbpd_notify.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/platform/chrome/cros_usbpd_notify.c +5 -1
index 4b5a81c9dc6d..10670b6588e3 100644
@@ -239,7 +239,11 @@ static int __init cros_usbpd_notify_init(void)
 		return ret;
 
 #ifdef CONFIG_ACPI
-	platform_driver_register(&cros_usbpd_notify_acpi_driver);
+	ret = platform_driver_register(&cros_usbpd_notify_acpi_driver);
+	if (ret) {
+		platform_driver_unregister(&cros_usbpd_notify_plat_driver);
+		return ret;
+	}
 #endif
 	return 0;
 }
Signature · 1 line
2.17.1
#7 lore raw
In reply to Yuan Can
This patch was applied to chrome-platform/linux.git (for-kernelci) by Prashant Malani <[email protected]>:

Hello:

This patch was applied to chrome-platform/linux.git (for-kernelci) by Prashant Malani <[email protected]>:

Quoted 20 lines · On Thu, 17 Nov 2022 08:08:23 +0000 you wrote:

The following WARNING message was given when rmmod cros_usbpd_notify:

Unexpected driver unregister!

 WARNING: CPU: 0 PID: 253 at drivers/base/driver.c:270 driver_unregister+0x8a/0xb0
 Modules linked in: cros_usbpd_notify(-)
 CPU: 0 PID: 253 Comm: rmmod Not tainted 6.1.0-rc3 #24
 ...
 Call Trace:
  <TASK>
  cros_usbpd_notify_exit+0x11/0x1e [cros_usbpd_notify]
  __x64_sys_delete_module+0x3c7/0x570
  ? __ia32_sys_delete_module+0x570/0x570
  ? lock_is_held_type+0xe3/0x140
  ? syscall_enter_from_user_mode+0x17/0x50
  ? rcu_read_lock_sched_held+0xa0/0xd0
  ? syscall_enter_from_user_mode+0x1c/0x50
  do_syscall_64+0x37/0x90
  entry_SYSCALL_64_after_hwframe+0x63/0xcd
 RIP: 0033:0x7f333fe9b1b7
Quoted 1 line

[...]

Here is the summary with links:
- platform/chrome: cros_usbpd_notify: Fix error handling in cros_usbpd_notify_init()

    https://git.kernel.org/chrome-platform/c/5a2d96623670

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
#8 lore raw
In reply to Yuan Can
This patch was applied to chrome-platform/linux.git (for-next) by Prashant Malani <[email protected]>:

Hello:

This patch was applied to chrome-platform/linux.git (for-next) by Prashant Malani <[email protected]>:

Quoted 20 lines · On Thu, 17 Nov 2022 08:08:23 +0000 you wrote:

The following WARNING message was given when rmmod cros_usbpd_notify:

Unexpected driver unregister!

 WARNING: CPU: 0 PID: 253 at drivers/base/driver.c:270 driver_unregister+0x8a/0xb0
 Modules linked in: cros_usbpd_notify(-)
 CPU: 0 PID: 253 Comm: rmmod Not tainted 6.1.0-rc3 #24
 ...
 Call Trace:
  <TASK>
  cros_usbpd_notify_exit+0x11/0x1e [cros_usbpd_notify]
  __x64_sys_delete_module+0x3c7/0x570
  ? __ia32_sys_delete_module+0x570/0x570
  ? lock_is_held_type+0xe3/0x140
  ? syscall_enter_from_user_mode+0x17/0x50
  ? rcu_read_lock_sched_held+0xa0/0xd0
  ? syscall_enter_from_user_mode+0x1c/0x50
  do_syscall_64+0x37/0x90
  entry_SYSCALL_64_after_hwframe+0x63/0xcd
 RIP: 0033:0x7f333fe9b1b7
Quoted 1 line

[...]

Here is the summary with links:
- platform/chrome: cros_usbpd_notify: Fix error handling in cros_usbpd_notify_init()

    https://git.kernel.org/chrome-platform/c/5a2d96623670

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html