d975e59709
[ Upstream commit e3e2cf3d5b1fe800b032e14c0fdcd9a6fb20cf3b ]
An optimized build such as:
make -C tools/perf CLANG=1 CC=clang EXTRA_CFLAGS="-O3
will turn the dereference operation into a ud2 instruction, raising a
SIGILL rather than a SIGSEGV. Use raise(..) for correctness and clarity.
Similar issues were addressed in Numfor Mbiziwo-Tiapo's patch:
https://lkml.org/lkml/2019/7/8/1234
Committer testing:
Before:
[root@quaco ~]# perf test hooks
55: perf hooks : Ok
[root@quaco ~]# perf test -v hooks
55: perf hooks :
--- start ---
test child forked, pid 17092
SIGSEGV is observed as expected, try to recover.
Fatal error (SEGFAULT) in perf hook 'test'
test child finished with 0
---- end ----
perf hooks: Ok
[root@quaco ~]#
After:
[root@quaco ~]# perf test hooks
55: perf hooks : Ok
[root@quaco ~]# perf test -v hooks
55: perf hooks :
--- start ---
test child forked, pid 17909
SIGSEGV is observed as expected, try to recover.
Fatal error (SEGFAULT) in perf hook 'test'
test child finished with 0
---- end ----
perf hooks: Ok
[root@quaco ~]#
Fixes: a074865e60 ("perf tools: Introduce perf hooks")
Signed-off-by: Ian Rogers <irogers@google.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lore.kernel.org/lkml/20190925195924.152834-2-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
48 lines
1,006 B
C
48 lines
1,006 B
C
// SPDX-License-Identifier: GPL-2.0
|
|
#include <signal.h>
|
|
#include <stdlib.h>
|
|
|
|
#include "tests.h"
|
|
#include "debug.h"
|
|
#include "util.h"
|
|
#include "perf-hooks.h"
|
|
|
|
static void sigsegv_handler(int sig __maybe_unused)
|
|
{
|
|
pr_debug("SIGSEGV is observed as expected, try to recover.\n");
|
|
perf_hooks__recover();
|
|
signal(SIGSEGV, SIG_DFL);
|
|
raise(SIGSEGV);
|
|
exit(-1);
|
|
}
|
|
|
|
|
|
static void the_hook(void *_hook_flags)
|
|
{
|
|
int *hook_flags = _hook_flags;
|
|
|
|
*hook_flags = 1234;
|
|
|
|
/* Generate a segfault, test perf_hooks__recover */
|
|
raise(SIGSEGV);
|
|
}
|
|
|
|
int test__perf_hooks(struct test *test __maybe_unused, int subtest __maybe_unused)
|
|
{
|
|
int hook_flags = 0;
|
|
|
|
signal(SIGSEGV, sigsegv_handler);
|
|
perf_hooks__set_hook("test", the_hook, &hook_flags);
|
|
perf_hooks__invoke_test();
|
|
|
|
/* hook is triggered? */
|
|
if (hook_flags != 1234) {
|
|
pr_debug("Setting failed: %d (%p)\n", hook_flags, &hook_flags);
|
|
return TEST_FAIL;
|
|
}
|
|
|
|
/* the buggy hook is removed? */
|
|
if (perf_hooks__get_hook("test"))
|
|
return TEST_FAIL;
|
|
return TEST_OK;
|
|
}
|