James Clark
fa423fe6d9
[ Upstream commitff16aeb9b8] The 2 second sleep can cause the test to fail on very slow network file systems because Perf ends up being killed before it finishes starting up. Fix it by making the leafloop workload end after a fixed time like the other workloads so there is no need to kill it after 2 seconds. Also remove the 1 second start sampling delay because it is similarly fragile. Instead, search through all samples for a matching one, rather than just checking the first sample and hoping it's in the right place. Fixes:cd6382d827("perf test arm64: Test unwinding using fame-pointer (fp) mode") Signed-off-by: James Clark <james.clark@arm.com> Acked-by: Namhyung Kim <namhyung@kernel.org> Cc: German Gomez <german.gomez@arm.com> Cc: Spoorthy S <spoorts2@in.ibm.com> Cc: Kajol Jain <kjain@linux.ibm.com> Signed-off-by: Namhyung Kim <namhyung@kernel.org> Link: https://lore.kernel.org/r/20240612140316.3006660-1-james.clark@arm.com Signed-off-by: Sasha Levin <sashal@kernel.org>
47 lines
749 B
C
47 lines
749 B
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#include <signal.h>
|
|
#include <stdlib.h>
|
|
#include <linux/compiler.h>
|
|
#include <unistd.h>
|
|
#include "../tests.h"
|
|
|
|
/* We want to check these symbols in perf script */
|
|
noinline void leaf(volatile int b);
|
|
noinline void parent(volatile int b);
|
|
|
|
static volatile int a;
|
|
static volatile sig_atomic_t done;
|
|
|
|
static void sighandler(int sig __maybe_unused)
|
|
{
|
|
done = 1;
|
|
}
|
|
|
|
noinline void leaf(volatile int b)
|
|
{
|
|
while (!done)
|
|
a += b;
|
|
}
|
|
|
|
noinline void parent(volatile int b)
|
|
{
|
|
leaf(b);
|
|
}
|
|
|
|
static int leafloop(int argc, const char **argv)
|
|
{
|
|
int sec = 1;
|
|
|
|
if (argc > 0)
|
|
sec = atoi(argv[0]);
|
|
|
|
signal(SIGINT, sighandler);
|
|
signal(SIGALRM, sighandler);
|
|
alarm(sec);
|
|
|
|
parent(sec);
|
|
return 0;
|
|
}
|
|
|
|
DEFINE_WORKLOAD(leafloop);
|