Commit f60edf5b authored by Andrii Nakryiko's avatar Andrii Nakryiko Committed by Alexei Starovoitov
Browse files

libbpf: Use 100-character limit to make bpf_tracing.h easier to read 



Improve bpf_tracing.h's macro definition readability by keeping them
single-line and better aligned. This makes it easier to follow all those
variadic patterns.

Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Acked-by: default avatarYonghong Song <yhs@fb.com>
Link: https://lore.kernel.org/bpf/20211222213924.1869758-2-andrii@kernel.org
parent 3cc31d79

tools/lib/bpf/bpf_tracing.h

+22 −32
Original line number Diff line number Diff line
@@ -302,8 +302,7 @@ struct pt_regs; 
#define ___bpf_nth(_, _1, _2, _3, _4, _5, _6, _7, _8, _9, _a, _b, _c, N, ...) N

#endif

#ifndef ___bpf_narg

#define ___bpf_narg(...) \

	___bpf_nth(_, ##__VA_ARGS__, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0)

#define ___bpf_narg(...) ___bpf_nth(_, ##__VA_ARGS__, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0)

#endif



#define ___bpf_ctx_cast0()            ctx
@@ -319,8 +318,7 @@ struct pt_regs; 
#define ___bpf_ctx_cast10(x, args...) ___bpf_ctx_cast9(args), (void *)ctx[9]

#define ___bpf_ctx_cast11(x, args...) ___bpf_ctx_cast10(args), (void *)ctx[10]

#define ___bpf_ctx_cast12(x, args...) ___bpf_ctx_cast11(args), (void *)ctx[11]

#define ___bpf_ctx_cast(args...) \

	___bpf_apply(___bpf_ctx_cast, ___bpf_narg(args))(args)

#define ___bpf_ctx_cast(args...)      ___bpf_apply(___bpf_ctx_cast, ___bpf_narg(args))(args)



/*

 * BPF_PROG is a convenience wrapper for generic tp_btf/fentry/fexit and
@@ -354,18 +352,12 @@ ____##name(unsigned long long *ctx, ##args) 
struct pt_regs;



#define ___bpf_kprobe_args0()           ctx

#define ___bpf_kprobe_args1(x) \

	___bpf_kprobe_args0(), (void *)PT_REGS_PARM1(ctx)

#define ___bpf_kprobe_args2(x, args...) \

	___bpf_kprobe_args1(args), (void *)PT_REGS_PARM2(ctx)

#define ___bpf_kprobe_args3(x, args...) \

	___bpf_kprobe_args2(args), (void *)PT_REGS_PARM3(ctx)

#define ___bpf_kprobe_args4(x, args...) \

	___bpf_kprobe_args3(args), (void *)PT_REGS_PARM4(ctx)

#define ___bpf_kprobe_args5(x, args...) \

	___bpf_kprobe_args4(args), (void *)PT_REGS_PARM5(ctx)

#define ___bpf_kprobe_args(args...) \

	___bpf_apply(___bpf_kprobe_args, ___bpf_narg(args))(args)

#define ___bpf_kprobe_args1(x)          ___bpf_kprobe_args0(), (void *)PT_REGS_PARM1(ctx)

#define ___bpf_kprobe_args2(x, args...) ___bpf_kprobe_args1(args), (void *)PT_REGS_PARM2(ctx)

#define ___bpf_kprobe_args3(x, args...) ___bpf_kprobe_args2(args), (void *)PT_REGS_PARM3(ctx)

#define ___bpf_kprobe_args4(x, args...) ___bpf_kprobe_args3(args), (void *)PT_REGS_PARM4(ctx)

#define ___bpf_kprobe_args5(x, args...) ___bpf_kprobe_args4(args), (void *)PT_REGS_PARM5(ctx)

#define ___bpf_kprobe_args(args...)     ___bpf_apply(___bpf_kprobe_args, ___bpf_narg(args))(args)



/*

 * BPF_KPROBE serves the same purpose for kprobes as BPF_PROG for
@@ -392,10 +384,8 @@ static __attribute__((always_inline)) typeof(name(0)) \ 
____##name(struct pt_regs *ctx, ##args)



#define ___bpf_kretprobe_args0()       ctx

#define ___bpf_kretprobe_args1(x) \

	___bpf_kretprobe_args0(), (void *)PT_REGS_RC(ctx)

#define ___bpf_kretprobe_args(args...) \

	___bpf_apply(___bpf_kretprobe_args, ___bpf_narg(args))(args)

#define ___bpf_kretprobe_args1(x)      ___bpf_kretprobe_args0(), (void *)PT_REGS_RC(ctx)

#define ___bpf_kretprobe_args(args...) ___bpf_apply(___bpf_kretprobe_args, ___bpf_narg(args))(args)



/*

 * BPF_KRETPROBE is similar to BPF_KPROBE, except, it only provides optional