From: "Qiang.Zhang" <[email protected]>
When start_kthread() return error, the cpus_read_unlock() need
to be called.
Fixes: c8895e271f79 ("trace/osnoise: Support hotplug operations")
Cc: <[email protected]> # v5.14+
Signed-off-by: Qiang.Zhang <[email protected]>
---
v1->v2:
Modify submission information and code style, add tags.
kernel/trace/trace_osnoise.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/kernel/trace/trace_osnoise.c b/kernel/trace/trace_osnoise.c
index 65b08b8e5bf8..ce053619f289 100644
--- 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
--
2.17.1
Hi Daniel
Do you have time to review this modification?
Thanks
Qiang.zhang
________________________________________
From: Zhang, Qiang <[email protected]>
Sent: Tuesday, 31 August 2021 10:28
To: [email protected]; [email protected]; [email protected]; [email protected]
Cc: [email protected]
Subject: [PATCH v2] trace/osnoise: Fix missed cpus_read_unlock() in start_per_cpu_kthreads()
From: "Qiang.Zhang" <[email protected]>
When start_kthread() return error, the cpus_read_unlock() need
to be called.
Fixes: c8895e271f79 ("trace/osnoise: Support hotplug operations")
Cc: <[email protected]> # v5.14+
Signed-off-by: Qiang.Zhang <[email protected]>
---
v1->v2:
Modify submission information and code style, add tags.
kernel/trace/trace_osnoise.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/kernel/trace/trace_osnoise.c b/kernel/trace/trace_osnoise.c
index 65b08b8e5bf8..ce053619f289 100644
--- 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
--
2.17.1
On Tue, 31 Aug 2021 10:29:19 +0800
[email protected] wrote:
> From: "Qiang.Zhang" <[email protected]>
>
> When start_kthread() return error, the cpus_read_unlock() need
> to be called.
>
> Fixes: c8895e271f79 ("trace/osnoise: Support hotplug operations")
> Cc: <[email protected]> # v5.14+
FYI, no need to add the "# v5.14+", as it also breaks my scripts. The
"Fixes:" tag is now used to know what stable releases it needs to be
applied to (if any).
Daniel, that goes for you too, as you suggested it ;-)
-- Steve
________________________________________
From: Steven Rostedt <[email protected]>
Sent: Wednesday, 8 September 2021 09:17
To: Zhang, Qiang
Cc: [email protected]; [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH v2] trace/osnoise: Fix missed cpus_read_unlock() in start_per_cpu_kthreads()
[Please note: This e-mail is from an EXTERNAL e-mail address]
On Tue, 31 Aug 2021 10:29:19 +0800
[email protected] wrote:
> From: "Qiang.Zhang" <[email protected]>
>
> When start_kthread() return error, the cpus_read_unlock() need
> to be called.
>
> Fixes: c8895e271f79 ("trace/osnoise: Support hotplug operations")
> Cc: <[email protected]> # v5.14+
>FYI, no need to add the "# v5.14+", as it also breaks my scripts. The
>"Fixes:" tag is now used to know what stable releases it needs to be
>applied to (if any).
>
Thanks Steve
I will resend v3.
>Daniel, that goes for you too, as you suggested it ;-)
>
>-- Steve
On Wed, 8 Sep 2021 02:34:46 +0000
"Zhang, Qiang" <[email protected]> wrote:
> >FYI, no need to add the "# v5.14+", as it also breaks my scripts. The
> >"Fixes:" tag is now used to know what stable releases it needs to be
> >applied to (if any).
> >
> Thanks Steve
> I will resend v3.
>
No need. I fixed it. I'll add Daniel's reviewed by if he gives one.
I'm currently running it through my test suite (with several other patches).
-- Steve
On 9/8/21 4:55 AM, Steven Rostedt wrote:
> On Wed, 8 Sep 2021 02:34:46 +0000
> "Zhang, Qiang" <[email protected]> wrote:
>
>>> FYI, no need to add the "# v5.14+", as it also breaks my scripts. The
>>> "Fixes:" tag is now used to know what stable releases it needs to be
>>> applied to (if any).
>>>
>> Thanks Steve
>> I will resend v3.
>>
>
> No need. I fixed it. I'll add Daniel's reviewed by if he gives one.
Acked-by: Daniel Bristot de Oliveira <[email protected]>
-- Daniel
> I'm currently running it through my test suite (with several other patches).
>
> -- Steve
>