2023-03-09 15:08:02

by Tom Rix

Subject: [PATCH] tracing/osnoise: set several trace_osnoise.c variables storage-class-specifier to static

smatch reports several similar warnings
kernel/trace/trace_osnoise.c:220:1: warning:
symbol '__pcpu_scope_per_cpu_osnoise_var' was not declared. Should it be static?
kernel/trace/trace_osnoise.c:243:1: warning:
symbol '__pcpu_scope_per_cpu_timerlat_var' was not declared. Should it be static?
kernel/trace/trace_osnoise.c:335:14: warning:
symbol 'interface_lock' was not declared. Should it be static?
kernel/trace/trace_osnoise.c:2242:5: warning:
symbol 'timerlat_min_period' was not declared. Should it be static?
kernel/trace/trace_osnoise.c:2243:5: warning:
symbol 'timerlat_max_period' was not declared. Should it be static?

These variables are only used in trace_osnoise.c, so it should be static

Signed-off-by: Tom Rix <[email protected]>
---
kernel/trace/trace_osnoise.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/kernel/trace/trace_osnoise.c b/kernel/trace/trace_osnoise.c
index f68ca1e6460f..cf395d2e8775 100644
--- a/kernel/trace/trace_osnoise.c
+++ b/kernel/trace/trace_osnoise.c
@@ -217,7 +217,7 @@ struct osnoise_variables {
/*
* Per-cpu runtime information.
*/
-DEFINE_PER_CPU(struct osnoise_variables, per_cpu_osnoise_var);
+static DEFINE_PER_CPU(struct osnoise_variables, per_cpu_osnoise_var);

/*
* this_cpu_osn_var - Return the per-cpu osnoise_variables on its relative CPU
@@ -240,7 +240,7 @@ struct timerlat_variables {
u64 count;
};

-DEFINE_PER_CPU(struct timerlat_variables, per_cpu_timerlat_var);
+static DEFINE_PER_CPU(struct timerlat_variables, per_cpu_timerlat_var);

/*
* this_cpu_tmr_var - Return the per-cpu timerlat_variables on its relative CPU
@@ -332,7 +332,7 @@ struct timerlat_sample {
/*
* Protect the interface.
*/
-struct mutex interface_lock;
+static struct mutex interface_lock;

/*
* Tracer data.
@@ -2239,8 +2239,8 @@ static struct trace_min_max_param osnoise_print_stack = {
/*
* osnoise/timerlat_period: min 100 us, max 1 s
*/
-u64 timerlat_min_period = 100;
-u64 timerlat_max_period = 1000000;
+static u64 timerlat_min_period = 100;
+static u64 timerlat_max_period = 1000000;
static struct trace_min_max_param timerlat_period = {
.lock = &interface_lock,
.val = &osnoise_data.timerlat_period,
--
2.27.0

2023-03-10 05:25:27

by Masami Hiramatsu

Subject: Re: [PATCH] tracing/osnoise: set several trace_osnoise.c variables storage-class-specifier to static

On Thu, 9 Mar 2023 10:04:14 -0500
Tom Rix <[email protected]> wrote:

> smatch reports several similar warnings
> kernel/trace/trace_osnoise.c:220:1: warning:
> symbol '__pcpu_scope_per_cpu_osnoise_var' was not declared. Should it be static?
> kernel/trace/trace_osnoise.c:243:1: warning:
> symbol '__pcpu_scope_per_cpu_timerlat_var' was not declared. Should it be static?
> kernel/trace/trace_osnoise.c:335:14: warning:
> symbol 'interface_lock' was not declared. Should it be static?
> kernel/trace/trace_osnoise.c:2242:5: warning:
> symbol 'timerlat_min_period' was not declared. Should it be static?
> kernel/trace/trace_osnoise.c:2243:5: warning:
> symbol 'timerlat_max_period' was not declared. Should it be static?
>
> These variables are only used in trace_osnoise.c, so it should be static
>

Looks good to me.

Acked-by: Masami Hiramatsu (Google) <[email protected]>

Thanks!

> Signed-off-by: Tom Rix <[email protected]>
> ---
> kernel/trace/trace_osnoise.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/kernel/trace/trace_osnoise.c b/kernel/trace/trace_osnoise.c
> index f68ca1e6460f..cf395d2e8775 100644
> --- a/kernel/trace/trace_osnoise.c
> +++ b/kernel/trace/trace_osnoise.c
> @@ -217,7 +217,7 @@ struct osnoise_variables {
> /*
> * Per-cpu runtime information.
> */
> -DEFINE_PER_CPU(struct osnoise_variables, per_cpu_osnoise_var);
> +static DEFINE_PER_CPU(struct osnoise_variables, per_cpu_osnoise_var);
>
> /*
> * this_cpu_osn_var - Return the per-cpu osnoise_variables on its relative CPU
> @@ -240,7 +240,7 @@ struct timerlat_variables {
> u64 count;
> };
>
> -DEFINE_PER_CPU(struct timerlat_variables, per_cpu_timerlat_var);
> +static DEFINE_PER_CPU(struct timerlat_variables, per_cpu_timerlat_var);
>
> /*
> * this_cpu_tmr_var - Return the per-cpu timerlat_variables on its relative CPU
> @@ -332,7 +332,7 @@ struct timerlat_sample {
> /*
> * Protect the interface.
> */
> -struct mutex interface_lock;
> +static struct mutex interface_lock;
>
> /*
> * Tracer data.
> @@ -2239,8 +2239,8 @@ static struct trace_min_max_param osnoise_print_stack = {
> /*
> * osnoise/timerlat_period: min 100 us, max 1 s
> */
> -u64 timerlat_min_period = 100;
> -u64 timerlat_max_period = 1000000;
> +static u64 timerlat_min_period = 100;
> +static u64 timerlat_max_period = 1000000;
> static struct trace_min_max_param timerlat_period = {
> .lock = &interface_lock,
> .val = &osnoise_data.timerlat_period,
> --
> 2.27.0
>


--
Masami Hiramatsu (Google) <[email protected]>

2023-03-10 13:53:36

by Daniel Bristot de Oliveira

Subject: Re: [PATCH] tracing/osnoise: set several trace_osnoise.c variables storage-class-specifier to static

On 3/9/23 16:04, Tom Rix wrote:
> smatch reports several similar warnings
> kernel/trace/trace_osnoise.c:220:1: warning:
> symbol '__pcpu_scope_per_cpu_osnoise_var' was not declared. Should it be static?
> kernel/trace/trace_osnoise.c:243:1: warning:
> symbol '__pcpu_scope_per_cpu_timerlat_var' was not declared. Should it be static?
> kernel/trace/trace_osnoise.c:335:14: warning:
> symbol 'interface_lock' was not declared. Should it be static?
> kernel/trace/trace_osnoise.c:2242:5: warning:
> symbol 'timerlat_min_period' was not declared. Should it be static?
> kernel/trace/trace_osnoise.c:2243:5: warning:
> symbol 'timerlat_max_period' was not declared. Should it be static?
>
> These variables are only used in trace_osnoise.c, so it should be static
>
> Signed-off-by: Tom Rix <[email protected]>

Acked-by: Daniel Bristot de Oliveira <[email protected]>

-- Daniel