1 files changed, 23 insertions, 15 deletions

diff --git a/tools/perf/bench/numa.c b/tools/perf/bench/numa.c
index 30d1c3225b46..d4c83c60b9b2 100644
--- a/tools/perf/bench/numa.c
+++ b/tools/perf/bench/numa.c
@@ -429,14 +429,14 @@ static int parse_cpu_list(const char *arg)
         return 0;
 }
 
-static void parse_setup_cpu_list(void)
+static int parse_setup_cpu_list(void)
 {
         struct thread_data *td;
         char *str0, *str;
         int t;
 
         if (!g->p.cpu_list_str)
-                return;
+                return 0;
 
         dprintf("g->p.nr_tasks: %d\n", g->p.nr_tasks);
 
@@ -500,8 +500,12 @@ static void parse_setup_cpu_list(void)
 
                 dprintf("CPUs: %d_%d-%d#%dx%d\n", bind_cpu_0, bind_len, bind_cpu_1, step, mul);
 
-                BUG_ON(bind_cpu_0 < 0 || bind_cpu_0 >= g->p.nr_cpus);
-                BUG_ON(bind_cpu_1 < 0 || bind_cpu_1 >= g->p.nr_cpus);
+                if (bind_cpu_0 >= g->p.nr_cpus || bind_cpu_1 >= g->p.nr_cpus) {
+                        printf("\nTest not applicable, system has only %d CPUs.\n", g->p.nr_cpus);
+                        return -1;
+                }
+
+                BUG_ON(bind_cpu_0 < 0 || bind_cpu_1 < 0);
                 BUG_ON(bind_cpu_0 > bind_cpu_1);
 
                 for (bind_cpu = bind_cpu_0; bind_cpu <= bind_cpu_1; bind_cpu += step) {
@@ -541,6 +545,7 @@ out:
                 printf("# NOTE: %d tasks bound, %d tasks unbound\n", t, g->p.nr_tasks - t);
 
         free(str0);
+        return 0;
 }
 
 static int parse_cpus_opt(const struct option *opt __maybe_unused,
@@ -561,14 +566,14 @@ static int parse_node_list(const char *arg)
         return 0;
 }
 
-static void parse_setup_node_list(void)
+static int parse_setup_node_list(void)
 {
         struct thread_data *td;
         char *str0, *str;
         int t;
 
         if (!g->p.node_list_str)
-                return;
+                return 0;
 
         dprintf("g->p.nr_tasks: %d\n", g->p.nr_tasks);
 
@@ -619,8 +624,12 @@ static void parse_setup_node_list(void)
 
                 dprintf("NODEs: %d-%d #%d\n", bind_node_0, bind_node_1, step);
 
-                BUG_ON(bind_node_0 < 0 || bind_node_0 >= g->p.nr_nodes);
-                BUG_ON(bind_node_1 < 0 || bind_node_1 >= g->p.nr_nodes);
+                if (bind_node_0 >= g->p.nr_nodes || bind_node_1 >= g->p.nr_nodes) {
+                        printf("\nTest not applicable, system has only %d nodes.\n", g->p.nr_nodes);
+                        return -1;
+                }
+
+                BUG_ON(bind_node_0 < 0 || bind_node_1 < 0);
                 BUG_ON(bind_node_0 > bind_node_1);
 
                 for (bind_node = bind_node_0; bind_node <= bind_node_1; bind_node += step) {
@@ -651,6 +660,7 @@ out:
                 printf("# NOTE: %d tasks mem-bound, %d tasks unbound\n", t, g->p.nr_tasks - t);
 
         free(str0);
+        return 0;
 }
 
 static int parse_nodes_opt(const struct option *opt __maybe_unused,
@@ -1110,7 +1120,7 @@ static void *worker_thread(void *__tdata)
                 /* Check whether our max runtime timed out: */
                 if (g->p.nr_secs) {
                         timersub(&stop, &start0, &diff);
-                        if (diff.tv_sec >= g->p.nr_secs) {
+                        if ((u32)diff.tv_sec >= g->p.nr_secs) {
                                 g->stop_work = true;
                                 break;
                         }
@@ -1157,7 +1167,7 @@ static void *worker_thread(void *__tdata)
                         runtime_ns_max += diff.tv_usec * 1000;
 
                         if (details >= 0) {
-                                printf(" #%2d / %2d: %14.2lf nsecs/op [val: %016lx]\n",
+                                printf(" #%2d / %2d: %14.2lf nsecs/op [val: %016"PRIx64"]\n",
                                         process_nr, thread_nr, runtime_ns_max / bytes_done, val);
                         }
                         fflush(stdout);
@@ -1356,8 +1366,8 @@ static int init(void)
         init_thread_data();
 
         tprintf("#\n");
-        parse_setup_cpu_list();
-        parse_setup_node_list();
+        if (parse_setup_cpu_list() || parse_setup_node_list())
+                return -1;
         tprintf("#\n");
 
         print_summary();
@@ -1600,7 +1610,6 @@ static int run_bench_numa(const char *name, const char **argv)
         return 0;
 
 err:
-        usage_with_options(numa_usage, options);
         return -1;
 }
 
@@ -1701,8 +1710,7 @@ static int bench_all(void)
         BUG_ON(ret < 0);
 
         for (i = 0; i < nr; i++) {
-                if (run_bench_numa(tests[i][0], tests[i] + 1))
-                        return -1;
+                run_bench_numa(tests[i][0], tests[i] + 1);
         }
 
         printf("\n");