Skip to contentSkip to conversation

PM: QoS: Fix misc device registration unwind

PATCH Applied Yuho Choi 2 participants 2 messages Jun 8 – Jun 9

Subsystems (2)
lore
Share & tools
lore

Yuho Choi

author
#0 lore raw

PATCH 1/1 PM: QoS: Fix misc device registration unwind

cpu_latency_qos_init() registers cpu_dma_latency first and, when CONFIG_PM_QOS_CPU_SYSTEM_WAKEUP is enabled, registers cpu_wakeup_latency afterwards. The second registration overwrites the first return value.

As a result, a failure to register cpu_dma_latency can be masked if the second registration succeeds. Conversely, if cpu_dma_latency succeeds and cpu_wakeup_latency fails, the function returns an error while leaving the first misc device registered.

Return immediately on the first registration failure and deregister cpu_dma_latency if the second registration fails.

Fixes a4e6512a79d8 ("PM: QoS: Introduce a CPU system wakeup QoS limit")
---
 kernel/power/qos.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)
kernel/power/qos.c +8 -3
index 398b994b73aa..1944dbeb0d4c 100644
@@ -519,18 +519,23 @@ static int __init cpu_latency_qos_init(void)
 	int ret;
 
 	ret = misc_register(&cpu_latency_qos_miscdev);
-	if (ret < 0)
+	if (ret < 0) {
 		pr_err("%s: %s setup failed\n", __func__,
 		       cpu_latency_qos_miscdev.name);
+		return ret;
+	}
 
 #ifdef CONFIG_PM_QOS_CPU_SYSTEM_WAKEUP
 	ret = misc_register(&cpu_wakeup_latency_qos_miscdev);
-	if (ret < 0)
+	if (ret < 0) {
 		pr_err("%s: %s setup failed\n", __func__,
 		       cpu_wakeup_latency_qos_miscdev.name);
+		misc_deregister(&cpu_latency_qos_miscdev);
+		return ret;
+	}
 #endif
 
-	return ret;
+	return 0;
 }
 late_initcall(cpu_latency_qos_init);
 #endif /* CONFIG_CPU_IDLE */
Signature · 1 line
2.43.0
maintainer Applied
#1 lore raw
Quoted 41 lines · Yuho Choi

cpu_latency_qos_init() registers cpu_dma_latency first and, when CONFIG_PM_QOS_CPU_SYSTEM_WAKEUP is enabled, registers cpu_wakeup_latency afterwards. The second registration overwrites the first return value.

As a result, a failure to register cpu_dma_latency can be masked if the second registration succeeds. Conversely, if cpu_dma_latency succeeds and cpu_wakeup_latency fails, the function returns an error while leaving the first misc device registered.

Return immediately on the first registration failure and deregister cpu_dma_latency if the second registration fails.

Fixes a4e6512a79d8 ("PM: QoS: Introduce a CPU system wakeup QoS limit")
---
 kernel/power/qos.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)
kernel/power/qos.c +5 -2
index 398b994b73aa..1944dbeb0d4c 100644
@@ -519,18 +519,23 @@ static int __init cpu_latency_qos_init(void)
        int ret;
 
        ret = misc_register(&cpu_latency_qos_miscdev);
-       if (ret < 0)
+       if (ret < 0) {
                pr_err("%s: %s setup failed\n", __func__,
                       cpu_latency_qos_miscdev.name);
+               return ret;
+       }
 
 #ifdef CONFIG_PM_QOS_CPU_SYSTEM_WAKEUP
        ret = misc_register(&cpu_wakeup_latency_qos_miscdev);
-       if (ret < 0)
+       if (ret < 0) {
                pr_err("%s: %s setup failed\n", __func__,
                       cpu_wakeup_latency_qos_miscdev.name);
+               misc_deregister(&cpu_latency_qos_miscdev);

kernel/power/qos.c static int __init cpu_latency_qos_init(void)

Quoted 10 lines
kernel/power/qos.c +3 -2
+               return ret;
+       }
 #endif
 
-       return ret;
+       return 0;
 }
 late_initcall(cpu_latency_qos_init);
 #endif /* CONFIG_CPU_IDLE */
--

Applied as 7.2 material, thanks!