forked from luck/tmp_suning_uos_patched
perf tools: Remove broken __no_tail_call attribute
The GCC specific __attribute__((optimize)) attribute does not what is commonly expected and is explicitly recommended against using in production code by the GCC people. Unlike what is often expected, it doesn't add to the optimization flags, but it fully replaces them, loosing any and all optimization flags provided by the compiler commandline. The only guaranteed upon means of inhibiting tail-calls is by placing a volatile asm with side-effects after the call such that the tail-call simply cannot be done. Given the original commit wasn't specific on which calls were the problem, this removal might re-introduce the problem, which can then be re-analyzed and cured properly. Signed-off-by: Peter Zijlstra <peterz@infradead.org> Acked-by: Ard Biesheuvel <ardb@kernel.org> Acked-by: Miguel Ojeda <ojeda@kernel.org> Cc: Alexei Starovoitov <ast@kernel.org> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Arvind Sankar <nivedita@alum.mit.edu> Cc: Daniel Borkmann <daniel@iogearbox.net> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Ian Rogers <irogers@google.com> Cc: Josh Poimboeuf <jpoimboe@redhat.com> Cc: Kees Kook <keescook@chromium.org> Cc: Martin Liška <mliska@suse.cz> Cc: Nick Desaulniers <ndesaulniers@google.com> Cc: Randy Dunlap <rdunlap@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Link: http://lore.kernel.org/lkml/20201028081123.GT2628@hirez.programming.kicks-ass.net Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
0dfbe4c646
commit
9ae1e990f1
|
@ -27,18 +27,6 @@
|
||||||
#define __pure __attribute__((pure))
|
#define __pure __attribute__((pure))
|
||||||
#endif
|
#endif
|
||||||
#define noinline __attribute__((noinline))
|
#define noinline __attribute__((noinline))
|
||||||
#ifdef __has_attribute
|
|
||||||
#if __has_attribute(disable_tail_calls)
|
|
||||||
#define __no_tail_call __attribute__((disable_tail_calls))
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
#ifndef __no_tail_call
|
|
||||||
#if GCC_VERSION > 40201
|
|
||||||
#define __no_tail_call __attribute__((optimize("no-optimize-sibling-calls")))
|
|
||||||
#else
|
|
||||||
#define __no_tail_call
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
#ifndef __packed
|
#ifndef __packed
|
||||||
#define __packed __attribute__((packed))
|
#define __packed __attribute__((packed))
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -47,9 +47,6 @@
|
||||||
#ifndef noinline
|
#ifndef noinline
|
||||||
#define noinline
|
#define noinline
|
||||||
#endif
|
#endif
|
||||||
#ifndef __no_tail_call
|
|
||||||
#define __no_tail_call
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Are two types/vars the same type (ignoring qualifiers)? */
|
/* Are two types/vars the same type (ignoring qualifiers)? */
|
||||||
#ifndef __same_type
|
#ifndef __same_type
|
||||||
|
|
|
@ -95,7 +95,7 @@ static int unwind_entry(struct unwind_entry *entry, void *arg)
|
||||||
return strcmp((const char *) symbol, funcs[idx]);
|
return strcmp((const char *) symbol, funcs[idx]);
|
||||||
}
|
}
|
||||||
|
|
||||||
__no_tail_call noinline int test_dwarf_unwind__thread(struct thread *thread)
|
noinline int test_dwarf_unwind__thread(struct thread *thread)
|
||||||
{
|
{
|
||||||
struct perf_sample sample;
|
struct perf_sample sample;
|
||||||
unsigned long cnt = 0;
|
unsigned long cnt = 0;
|
||||||
|
@ -126,7 +126,7 @@ __no_tail_call noinline int test_dwarf_unwind__thread(struct thread *thread)
|
||||||
|
|
||||||
static int global_unwind_retval = -INT_MAX;
|
static int global_unwind_retval = -INT_MAX;
|
||||||
|
|
||||||
__no_tail_call noinline int test_dwarf_unwind__compare(void *p1, void *p2)
|
noinline int test_dwarf_unwind__compare(void *p1, void *p2)
|
||||||
{
|
{
|
||||||
/* Any possible value should be 'thread' */
|
/* Any possible value should be 'thread' */
|
||||||
struct thread *thread = *(struct thread **)p1;
|
struct thread *thread = *(struct thread **)p1;
|
||||||
|
@ -145,7 +145,7 @@ __no_tail_call noinline int test_dwarf_unwind__compare(void *p1, void *p2)
|
||||||
return p1 - p2;
|
return p1 - p2;
|
||||||
}
|
}
|
||||||
|
|
||||||
__no_tail_call noinline int test_dwarf_unwind__krava_3(struct thread *thread)
|
noinline int test_dwarf_unwind__krava_3(struct thread *thread)
|
||||||
{
|
{
|
||||||
struct thread *array[2] = {thread, thread};
|
struct thread *array[2] = {thread, thread};
|
||||||
void *fp = &bsearch;
|
void *fp = &bsearch;
|
||||||
|
@ -164,12 +164,12 @@ __no_tail_call noinline int test_dwarf_unwind__krava_3(struct thread *thread)
|
||||||
return global_unwind_retval;
|
return global_unwind_retval;
|
||||||
}
|
}
|
||||||
|
|
||||||
__no_tail_call noinline int test_dwarf_unwind__krava_2(struct thread *thread)
|
noinline int test_dwarf_unwind__krava_2(struct thread *thread)
|
||||||
{
|
{
|
||||||
return test_dwarf_unwind__krava_3(thread);
|
return test_dwarf_unwind__krava_3(thread);
|
||||||
}
|
}
|
||||||
|
|
||||||
__no_tail_call noinline int test_dwarf_unwind__krava_1(struct thread *thread)
|
noinline int test_dwarf_unwind__krava_1(struct thread *thread)
|
||||||
{
|
{
|
||||||
return test_dwarf_unwind__krava_2(thread);
|
return test_dwarf_unwind__krava_2(thread);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user