The following commit has been merged into the core/rcu branch of tip:
Commit-ID: f518f154ecef347777db33b7c9b0581f245159f0
Gitweb: https://git.kernel.org/tip/f518f154ecef347777db33b7c9b0581f245159f0
Author: Paul E. McKenney <paulmck@xxxxxxxxxx>
AuthorDate: Mon, 25 May 2020 17:32:56 -07:00
Committer: Paul E. McKenney <paulmck@xxxxxxxxxx>
CommitterDate: Mon, 29 Jun 2020 12:00:44 -07:00
refperf: Dynamically allocate experiment-summary output buffer
Currently, the buffer used to accumulate the experiment-summary output
is fixed size, which will cause problems if someone decides to run
one hundred experiments. This commit therefore dynamically allocates
this buffer.
Cc: Joel Fernandes (Google) <joel@xxxxxxxxxxxxxxxxx>
Signed-off-by: Paul E. McKenney <paulmck@xxxxxxxxxx>
---
kernel/rcu/refperf.c | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/kernel/rcu/refperf.c b/kernel/rcu/refperf.c
index 6324449..75b9cce 100644
--- a/kernel/rcu/refperf.c
+++ b/kernel/rcu/refperf.c
@@ -333,9 +333,10 @@ u64 process_durations(int n)
// point all the timestamps are printed.
static int main_func(void *arg)
{
+ bool errexit = false;
int exp, r;
char buf1[64];
- char buf[512];
+ char *buf;
u64 *result_avg;
set_cpus_allowed_ptr(current, cpumask_of(nreaders % nr_cpu_ids));
@@ -343,8 +344,11 @@ static int main_func(void *arg)
VERBOSE_PERFOUT("main_func task started");
result_avg = kzalloc(nruns * sizeof(*result_avg), GFP_KERNEL);
- if (!result_avg)
+ buf = kzalloc(64 + nruns * 32, GFP_KERNEL);
+ if (!result_avg || !buf) {
VERBOSE_PERFOUT_ERRSTRING("out of memory");
+ errexit = true;
+ }
atomic_inc(&n_init);
// Wait for all threads to start.
@@ -354,7 +358,7 @@ static int main_func(void *arg)
// Start exp readers up per experiment
for (exp = 0; exp < nruns && !torture_must_stop(); exp++) {
- if (!result_avg)
+ if (errexit)
break;
if (torture_must_stop())
goto end;
@@ -391,13 +395,13 @@ static int main_func(void *arg)
strcat(buf, "Threads\tTime(ns)\n");
for (exp = 0; exp < nruns; exp++) {
- if (!result_avg)
+ if (errexit)
break;
sprintf(buf1, "%d\t%llu.%03d\n", exp + 1, result_avg[exp] / 1000, (int)(result_avg[exp] % 1000));
strcat(buf, buf1);
}
- if (result_avg)
+ if (!errexit)
PERFOUT("%s", buf);
// This will shutdown everything including us.
@@ -412,6 +416,8 @@ static int main_func(void *arg)
end:
torture_kthread_stopping("main_func");
+ kfree(result_avg);
+ kfree(buf);
return 0;
}
|