tools/rtla: Remove unneeded nr_cpus arguments

nr_cpus does not change at runtime, so passing it through function
arguments is unnecessary.

Use the global nr_cpus instead of propagating it via parameters.

Signed-off-by: Costa Shulyupin <costa.shul@redhat.com>
Link: https://lore.kernel.org/r/20260306194953.2511960-3-costa.shul@redhat.com
Signed-off-by: Tomas Glozar <tglozar@redhat.com>

diff --git a/tools/tracing/rtla/src/osnoise_hist.c b/tools/tracing/rtla/src/osnoise_hist.c
index 00b8c95cbf85cf79338b55489d5c9a15ca99d45b..f39f60d3b00ebab48d38b619f0503b6e6fcd327a 100644 (file)
--- a/tools/tracing/rtla/src/osnoise_hist.c
+++ b/tools/tracing/rtla/src/osnoise_hist.c
@@ -62,7 +62,7 @@ static void osnoise_free_hist_tool(struct osnoise_tool *tool)
  * osnoise_alloc_histogram - alloc runtime data
  */
 static struct osnoise_hist_data
-*osnoise_alloc_histogram(int nr_cpus, int entries, int bucket_size)
+*osnoise_alloc_histogram(int entries, int bucket_size)
 {
        struct osnoise_hist_data *data;
        int cpu;
@@ -651,7 +651,7 @@ static struct osnoise_tool
        if (!tool)
                return NULL;
 
-       tool->data = osnoise_alloc_histogram(nr_cpus, params->hist.entries,
+       tool->data = osnoise_alloc_histogram(params->hist.entries,
                                             params->hist.bucket_size);
        if (!tool->data)
                goto out_err;

diff --git a/tools/tracing/rtla/src/osnoise_top.c b/tools/tracing/rtla/src/osnoise_top.c
index 9a6cd9a2470ab0af6f4b14cff684d3775c1ced04..3a241b69f622d76df1e9ac4adb764f0ad717868f 100644 (file)
--- a/tools/tracing/rtla/src/osnoise_top.c
+++ b/tools/tracing/rtla/src/osnoise_top.c
@@ -51,7 +51,7 @@ static void osnoise_free_top_tool(struct osnoise_tool *tool)
 /*
  * osnoise_alloc_histogram - alloc runtime data
  */
-static struct osnoise_top_data *osnoise_alloc_top(int nr_cpus)
+static struct osnoise_top_data *osnoise_alloc_top(void)
 {
        struct osnoise_top_data *data;
 
@@ -495,7 +495,7 @@ struct osnoise_tool *osnoise_init_top(struct common_params *params)
        if (!tool)
                return NULL;
 
-       tool->data = osnoise_alloc_top(nr_cpus);
+       tool->data = osnoise_alloc_top();
        if (!tool->data) {
                osnoise_destroy_tool(tool);
                return NULL;

diff --git a/tools/tracing/rtla/src/timerlat_bpf.c b/tools/tracing/rtla/src/timerlat_bpf.c
index 05adf18303dfe2fff631962bdeb9c828ebd1ed05..dd3cf71d74e5c072fe8a29338306e25f96702522 100644 (file)
--- a/tools/tracing/rtla/src/timerlat_bpf.c
+++ b/tools/tracing/rtla/src/timerlat_bpf.c
@@ -147,24 +147,23 @@ static int get_value(struct bpf_map *map_irq,
                     int key,
                     long long *value_irq,
                     long long *value_thread,
-                    long long *value_user,
-                    int cpus)
+                    long long *value_user)
 {
        int err;
 
        err = bpf_map__lookup_elem(map_irq, &key,
                                   sizeof(unsigned int), value_irq,
-                                  sizeof(long long) * cpus, 0);
+                                  sizeof(long long) * nr_cpus, 0);
        if (err)
                return err;
        err = bpf_map__lookup_elem(map_thread, &key,
                                   sizeof(unsigned int), value_thread,
-                                  sizeof(long long) * cpus, 0);
+                                  sizeof(long long) * nr_cpus, 0);
        if (err)
                return err;
        err = bpf_map__lookup_elem(map_user, &key,
                                   sizeof(unsigned int), value_user,
-                                  sizeof(long long) * cpus, 0);
+                                  sizeof(long long) * nr_cpus, 0);
        if (err)
                return err;
        return 0;
@@ -176,13 +175,12 @@ static int get_value(struct bpf_map *map_irq,
 int timerlat_bpf_get_hist_value(int key,
                                long long *value_irq,
                                long long *value_thread,
-                               long long *value_user,
-                               int cpus)
+                               long long *value_user)
 {
        return get_value(bpf->maps.hist_irq,
                         bpf->maps.hist_thread,
                         bpf->maps.hist_user,
-                        key, value_irq, value_thread, value_user, cpus);
+                        key, value_irq, value_thread, value_user);
 }
 
 /*
@@ -191,13 +189,12 @@ int timerlat_bpf_get_hist_value(int key,
 int timerlat_bpf_get_summary_value(enum summary_field key,
                                   long long *value_irq,
                                   long long *value_thread,
-                                  long long *value_user,
-                                  int cpus)
+                                  long long *value_user)
 {
        return get_value(bpf->maps.summary_irq,
                         bpf->maps.summary_thread,
                         bpf->maps.summary_user,
-                        key, value_irq, value_thread, value_user, cpus);
+                        key, value_irq, value_thread, value_user);
 }
 
 /*

diff --git a/tools/tracing/rtla/src/timerlat_bpf.h b/tools/tracing/rtla/src/timerlat_bpf.h
index 169abeaf4363993298d87fcbf4da47d41cd1f389..531c9ef16f51d8cadca9fe3866c0ff51d1f28103 100644 (file)
--- a/tools/tracing/rtla/src/timerlat_bpf.h
+++ b/tools/tracing/rtla/src/timerlat_bpf.h
@@ -23,13 +23,11 @@ int timerlat_bpf_restart_tracing(void);
 int timerlat_bpf_get_hist_value(int key,
                                long long *value_irq,
                                long long *value_thread,
-                               long long *value_user,
-                               int cpus);
+                               long long *value_user);
 int timerlat_bpf_get_summary_value(enum summary_field key,
                                   long long *value_irq,
                                   long long *value_thread,
-                                  long long *value_user,
-                                  int cpus);
+                                  long long *value_user);
 int timerlat_load_bpf_action_program(const char *program_path);
 static inline int have_libbpf_support(void) { return 1; }
 #else
@@ -45,16 +43,14 @@ static inline int timerlat_bpf_restart_tracing(void) { return -1; };
 static inline int timerlat_bpf_get_hist_value(int key,
                                              long long *value_irq,
                                              long long *value_thread,
-                                             long long *value_user,
-                                             int cpus)
+                                             long long *value_user)
 {
        return -1;
 }
 static inline int timerlat_bpf_get_summary_value(enum summary_field key,
                                                 long long *value_irq,
                                                 long long *value_thread,
-                                                long long *value_user,
-                                                int cpus)
+                                                long long *value_user)
 {
        return -1;
 }

diff --git a/tools/tracing/rtla/src/timerlat_hist.c b/tools/tracing/rtla/src/timerlat_hist.c
index 3ebe41eed9f6a1ea4c481a811e7e17851d83ff65..7e735b62488c3a68710dc3ca6cd24ed39e86218c 100644 (file)
--- a/tools/tracing/rtla/src/timerlat_hist.c
+++ b/tools/tracing/rtla/src/timerlat_hist.c
@@ -83,7 +83,7 @@ static void timerlat_free_histogram_tool(struct osnoise_tool *tool)
  * timerlat_alloc_histogram - alloc runtime data
  */
 static struct timerlat_hist_data
-*timerlat_alloc_histogram(int nr_cpus, int entries, int bucket_size)
+*timerlat_alloc_histogram(int entries, int bucket_size)
 {
        struct timerlat_hist_data *data;
        int cpu;
@@ -211,7 +211,7 @@ static int timerlat_hist_bpf_pull_data(struct osnoise_tool *tool)
        /* Pull histogram */
        for (i = 0; i < data->entries; i++) {
                err = timerlat_bpf_get_hist_value(i, value_irq, value_thread,
-                                                 value_user, data->nr_cpus);
+                                                 value_user);
                if (err)
                        return err;
                for (j = 0; j < data->nr_cpus; j++) {
@@ -223,8 +223,7 @@ static int timerlat_hist_bpf_pull_data(struct osnoise_tool *tool)
 
        /* Pull summary */
        err = timerlat_bpf_get_summary_value(SUMMARY_COUNT,
-                                            value_irq, value_thread, value_user,
-                                            data->nr_cpus);
+                                            value_irq, value_thread, value_user);
        if (err)
                return err;
        for (i = 0; i < data->nr_cpus; i++) {
@@ -234,8 +233,7 @@ static int timerlat_hist_bpf_pull_data(struct osnoise_tool *tool)
        }
 
        err = timerlat_bpf_get_summary_value(SUMMARY_MIN,
-                                            value_irq, value_thread, value_user,
-                                            data->nr_cpus);
+                                            value_irq, value_thread, value_user);
        if (err)
                return err;
        for (i = 0; i < data->nr_cpus; i++) {
@@ -245,8 +243,7 @@ static int timerlat_hist_bpf_pull_data(struct osnoise_tool *tool)
        }
 
        err = timerlat_bpf_get_summary_value(SUMMARY_MAX,
-                                            value_irq, value_thread, value_user,
-                                            data->nr_cpus);
+                                            value_irq, value_thread, value_user);
        if (err)
                return err;
        for (i = 0; i < data->nr_cpus; i++) {
@@ -256,8 +253,7 @@ static int timerlat_hist_bpf_pull_data(struct osnoise_tool *tool)
        }
 
        err = timerlat_bpf_get_summary_value(SUMMARY_SUM,
-                                            value_irq, value_thread, value_user,
-                                            data->nr_cpus);
+                                            value_irq, value_thread, value_user);
        if (err)
                return err;
        for (i = 0; i < data->nr_cpus; i++) {
@@ -267,8 +263,7 @@ static int timerlat_hist_bpf_pull_data(struct osnoise_tool *tool)
        }
 
        err = timerlat_bpf_get_summary_value(SUMMARY_OVERFLOW,
-                                            value_irq, value_thread, value_user,
-                                            data->nr_cpus);
+                                            value_irq, value_thread, value_user);
        if (err)
                return err;
        for (i = 0; i < data->nr_cpus; i++) {
@@ -1045,7 +1040,7 @@ static struct osnoise_tool
        if (!tool)
                return NULL;
 
-       tool->data = timerlat_alloc_histogram(nr_cpus, params->hist.entries,
+       tool->data = timerlat_alloc_histogram(params->hist.entries,
                                              params->hist.bucket_size);
        if (!tool->data)
                goto out_err;

diff --git a/tools/tracing/rtla/src/timerlat_top.c b/tools/tracing/rtla/src/timerlat_top.c
index 4105638f45c494ed04f918df5e2e97dbc17684cb..994e89a57cd38debcc36fa63bb44392ad3d73f5c 100644 (file)
--- a/tools/tracing/rtla/src/timerlat_top.c
+++ b/tools/tracing/rtla/src/timerlat_top.c
@@ -62,7 +62,7 @@ static void timerlat_free_top_tool(struct osnoise_tool *tool)
 /*
  * timerlat_alloc_histogram - alloc runtime data
  */
-static struct timerlat_top_data *timerlat_alloc_top(int nr_cpus)
+static struct timerlat_top_data *timerlat_alloc_top(void)
 {
        struct timerlat_top_data *data;
        int cpu;
@@ -196,8 +196,7 @@ static int timerlat_top_bpf_pull_data(struct osnoise_tool *tool)
 
        /* Pull summary */
        err = timerlat_bpf_get_summary_value(SUMMARY_CURRENT,
-                                            value_irq, value_thread, value_user,
-                                            data->nr_cpus);
+                                            value_irq, value_thread, value_user);
        if (err)
                return err;
        for (i = 0; i < data->nr_cpus; i++) {
@@ -207,8 +206,7 @@ static int timerlat_top_bpf_pull_data(struct osnoise_tool *tool)
        }
 
        err = timerlat_bpf_get_summary_value(SUMMARY_COUNT,
-                                            value_irq, value_thread, value_user,
-                                            data->nr_cpus);
+                                            value_irq, value_thread, value_user);
        if (err)
                return err;
        for (i = 0; i < data->nr_cpus; i++) {
@@ -218,8 +216,7 @@ static int timerlat_top_bpf_pull_data(struct osnoise_tool *tool)
        }
 
        err = timerlat_bpf_get_summary_value(SUMMARY_MIN,
-                                            value_irq, value_thread, value_user,
-                                            data->nr_cpus);
+                                            value_irq, value_thread, value_user);
        if (err)
                return err;
        for (i = 0; i < data->nr_cpus; i++) {
@@ -229,8 +226,7 @@ static int timerlat_top_bpf_pull_data(struct osnoise_tool *tool)
        }
 
        err = timerlat_bpf_get_summary_value(SUMMARY_MAX,
-                                            value_irq, value_thread, value_user,
-                                            data->nr_cpus);
+                                            value_irq, value_thread, value_user);
        if (err)
                return err;
        for (i = 0; i < data->nr_cpus; i++) {
@@ -240,8 +236,7 @@ static int timerlat_top_bpf_pull_data(struct osnoise_tool *tool)
        }
 
        err = timerlat_bpf_get_summary_value(SUMMARY_SUM,
-                                            value_irq, value_thread, value_user,
-                                            data->nr_cpus);
+                                            value_irq, value_thread, value_user);
        if (err)
                return err;
        for (i = 0; i < data->nr_cpus; i++) {
@@ -791,7 +786,7 @@ static struct osnoise_tool
        if (!top)
                return NULL;
 
-       top->data = timerlat_alloc_top(nr_cpus);
+       top->data = timerlat_alloc_top();
        if (!top->data)
                goto out_err;
 

diff --git a/tools/tracing/rtla/src/timerlat_u.c b/tools/tracing/rtla/src/timerlat_u.c
index a569fe7f93aab13c7600f389607096acbc1830d9..03b4e68e8b1e68b59071762458eb990dc18c673f 100644 (file)
--- a/tools/tracing/rtla/src/timerlat_u.c
+++ b/tools/tracing/rtla/src/timerlat_u.c
@@ -99,7 +99,7 @@ static int timerlat_u_main(int cpu, struct timerlat_u_params *params)
  *
  * Return the number of processes that received the kill.
  */
-static int timerlat_u_send_kill(pid_t *procs, int nr_cpus)
+static int timerlat_u_send_kill(pid_t *procs)
 {
        int killed = 0;
        int i, retval;
@@ -169,7 +169,7 @@ void *timerlat_u_dispatcher(void *data)
 
                /* parent */
                if (pid == -1) {
-                       timerlat_u_send_kill(procs, nr_cpus);
+                       timerlat_u_send_kill(procs);
                        debug_msg("Failed to create child processes");
                        pthread_exit(&retval);
                }
@@ -196,7 +196,7 @@ void *timerlat_u_dispatcher(void *data)
                sleep(1);
        }
 
-       timerlat_u_send_kill(procs, nr_cpus);
+       timerlat_u_send_kill(procs);
 
        while (procs_count) {
                pid = waitpid(-1, &wstatus, 0);