Skip to content

Commit

Permalink
selftests/bpf: Mark uprobe trigger functions with nocf_check attribute
Browse files Browse the repository at this point in the history
Some distros seem to enable the -fcf-protection=branch by default,
which breaks our setup on first instruction of uprobe trigger
functions and place there endbr64 instruction.

Marking them with nocf_check attribute to skip that.

Ignoring unknown attribute warning in gcc for bench objects, because
nocf_check can be used only when -fcf-protection=branch is enabled,
otherwise we get a warning and break compilation.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20240322134936.1075395-1-jolsa@kernel.org
  • Loading branch information
olsajiri authored and anakryiko committed Mar 22, 2024
1 parent 1684d6e commit af8d27b
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
4 changes: 4 additions & 0 deletions tools/include/linux/compiler.h
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@
#define noinline
#endif

#ifndef __nocf_check
#define __nocf_check __attribute__((nocf_check))
#endif

/* Are two types/vars the same type (ignoring qualifiers)? */
#ifndef __same_type
# define __same_type(a, b) __builtin_types_compatible_p(typeof(a), typeof(b))
Expand Down
8 changes: 5 additions & 3 deletions tools/testing/selftests/bpf/benchs/bench_trigger.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
/* adjust slot shift in inc_hits() if changing */
#define MAX_BUCKETS 256

#pragma GCC diagnostic ignored "-Wattributes"

/* BPF triggering benchmarks */
static struct trigger_ctx {
struct trigger_bench *skel;
Expand Down Expand Up @@ -167,7 +169,7 @@ static void trigger_fmodret_setup(void)
* GCC doesn't generate stack setup preample for these functions due to them
* having no input arguments and doing nothing in the body.
*/
__weak void uprobe_target_nop(void)
__nocf_check __weak void uprobe_target_nop(void)
{
asm volatile ("nop");
}
Expand All @@ -176,7 +178,7 @@ __weak void opaque_noop_func(void)
{
}

__weak int uprobe_target_push(void)
__nocf_check __weak int uprobe_target_push(void)
{
/* overhead of function call is negligible compared to uprobe
* triggering, so this shouldn't affect benchmark results much
Expand All @@ -185,7 +187,7 @@ __weak int uprobe_target_push(void)
return 1;
}

__weak void uprobe_target_ret(void)
__nocf_check __weak void uprobe_target_ret(void)
{
asm volatile ("");
}
Expand Down

0 comments on commit af8d27b

Please sign in to comment.