tracing/osnoise: Fix missed cpus_read_unlock() in start_per_cpu_kthreads()

Zqiang1211 · rostedt · commit 4b6b08f2e45e · 2021-09-08T15:10:24.000-04:00
When start_kthread() return error, the cpus_read_unlock() need to be called. Link: https://lkml.kernel.org/r/20210831022919.27630-1-qiang.zhang@windriver.com Cc: <stable@vger.kernel.org> Fixes: c8895e2 ("trace/osnoise: Support hotplug operations") Acked-by: Daniel Bristot de Oliveira <bristot@kernel.org> Signed-off-by: Qiang.Zhang <qiang.zhang@windriver.com> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
diff --git a/kernel/trace/trace_osnoise.c b/kernel/trace/trace_osnoise.c
@@ -1548,7 +1548,7 @@ static int start_kthread(unsigned int cpu)
 static int start_per_cpu_kthreads(struct trace_array *tr)
 {
 	struct cpumask *current_mask = &save_cpumask;
-	int retval;
+	int retval = 0;
 	int cpu;
 
 	cpus_read_lock();
@@ -1568,13 +1568,13 @@ static int start_per_cpu_kthreads(struct trace_array *tr)
 		retval = start_kthread(cpu);
 		if (retval) {
 			stop_per_cpu_kthreads();
-			return retval;
+			break;
 		}
 	}
 
 	cpus_read_unlock();
 
-	return 0;
+	return retval;
 }
 
 #ifdef CONFIG_HOTPLUG_CPU

Original file line number	Diff line number	Diff line change
`@@ -1548,7 +1548,7 @@ static int start_kthread(unsigned int cpu)`
`1548`	`1548`	`static int start_per_cpu_kthreads(struct trace_array *tr)`
`1549`	`1549`	`{`
`1550`	`1550`	`struct cpumask *current_mask = &save_cpumask;`
`1551`		`- int retval;`
	`1551`	`+ int retval = 0;`
`1552`	`1552`	`int cpu;`
`1553`	`1553`
`1554`	`1554`	`cpus_read_lock();`
`@@ -1568,13 +1568,13 @@ static int start_per_cpu_kthreads(struct trace_array *tr)`
`1568`	`1568`	`retval = start_kthread(cpu);`
`1569`	`1569`	`if (retval) {`
`1570`	`1570`	`stop_per_cpu_kthreads();`
`1571`		`- return retval;`
	`1571`	`+ break;`
`1572`	`1572`	`}`
`1573`	`1573`	`}`
`1574`	`1574`
`1575`	`1575`	`cpus_read_unlock();`
`1576`	`1576`
`1577`		`- return 0;`
	`1577`	`+ return retval;`
`1578`	`1578`	`}`
`1579`	`1579`
`1580`	`1580`	`#ifdef CONFIG_HOTPLUG_CPU`