Commit d25f40ff authored by James Hilliard's avatar James Hilliard Committed by Andrii Nakryiko

libbpf: Ensure functions with always_inline attribute are inline

GCC expects the always_inline attribute to only be set on inline
functions, as such we should make all functions with this attribute
use the __always_inline macro which makes the function inline and
sets the attribute.

Fixes errors like:
/home/buildroot/bpf-next/tools/testing/selftests/bpf/tools/include/bpf/bpf_tracing.h:439:1: error: ‘always_inline’ function might not be inlinable [-Werror=attributes]
  439 | ____##name(unsigned long long *ctx, ##args)
      | ^~~~
Signed-off-by: default avatarJames Hilliard <james.hilliard1@gmail.com>
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
Link: https://lore.kernel.org/bpf/20220803151403.793024-1-james.hilliard1@gmail.com
parent d55dfe58
...@@ -426,7 +426,7 @@ struct pt_regs; ...@@ -426,7 +426,7 @@ struct pt_regs;
*/ */
#define BPF_PROG(name, args...) \ #define BPF_PROG(name, args...) \
name(unsigned long long *ctx); \ name(unsigned long long *ctx); \
static __attribute__((always_inline)) typeof(name(0)) \ static __always_inline typeof(name(0)) \
____##name(unsigned long long *ctx, ##args); \ ____##name(unsigned long long *ctx, ##args); \
typeof(name(0)) name(unsigned long long *ctx) \ typeof(name(0)) name(unsigned long long *ctx) \
{ \ { \
...@@ -435,7 +435,7 @@ typeof(name(0)) name(unsigned long long *ctx) \ ...@@ -435,7 +435,7 @@ typeof(name(0)) name(unsigned long long *ctx) \
return ____##name(___bpf_ctx_cast(args)); \ return ____##name(___bpf_ctx_cast(args)); \
_Pragma("GCC diagnostic pop") \ _Pragma("GCC diagnostic pop") \
} \ } \
static __attribute__((always_inline)) typeof(name(0)) \ static __always_inline typeof(name(0)) \
____##name(unsigned long long *ctx, ##args) ____##name(unsigned long long *ctx, ##args)
struct pt_regs; struct pt_regs;
...@@ -460,7 +460,7 @@ struct pt_regs; ...@@ -460,7 +460,7 @@ struct pt_regs;
*/ */
#define BPF_KPROBE(name, args...) \ #define BPF_KPROBE(name, args...) \
name(struct pt_regs *ctx); \ name(struct pt_regs *ctx); \
static __attribute__((always_inline)) typeof(name(0)) \ static __always_inline typeof(name(0)) \
____##name(struct pt_regs *ctx, ##args); \ ____##name(struct pt_regs *ctx, ##args); \
typeof(name(0)) name(struct pt_regs *ctx) \ typeof(name(0)) name(struct pt_regs *ctx) \
{ \ { \
...@@ -469,7 +469,7 @@ typeof(name(0)) name(struct pt_regs *ctx) \ ...@@ -469,7 +469,7 @@ typeof(name(0)) name(struct pt_regs *ctx) \
return ____##name(___bpf_kprobe_args(args)); \ return ____##name(___bpf_kprobe_args(args)); \
_Pragma("GCC diagnostic pop") \ _Pragma("GCC diagnostic pop") \
} \ } \
static __attribute__((always_inline)) typeof(name(0)) \ static __always_inline typeof(name(0)) \
____##name(struct pt_regs *ctx, ##args) ____##name(struct pt_regs *ctx, ##args)
#define ___bpf_kretprobe_args0() ctx #define ___bpf_kretprobe_args0() ctx
...@@ -484,7 +484,7 @@ ____##name(struct pt_regs *ctx, ##args) ...@@ -484,7 +484,7 @@ ____##name(struct pt_regs *ctx, ##args)
*/ */
#define BPF_KRETPROBE(name, args...) \ #define BPF_KRETPROBE(name, args...) \
name(struct pt_regs *ctx); \ name(struct pt_regs *ctx); \
static __attribute__((always_inline)) typeof(name(0)) \ static __always_inline typeof(name(0)) \
____##name(struct pt_regs *ctx, ##args); \ ____##name(struct pt_regs *ctx, ##args); \
typeof(name(0)) name(struct pt_regs *ctx) \ typeof(name(0)) name(struct pt_regs *ctx) \
{ \ { \
...@@ -540,7 +540,7 @@ static __always_inline typeof(name(0)) ____##name(struct pt_regs *ctx, ##args) ...@@ -540,7 +540,7 @@ static __always_inline typeof(name(0)) ____##name(struct pt_regs *ctx, ##args)
#define BPF_KSYSCALL(name, args...) \ #define BPF_KSYSCALL(name, args...) \
name(struct pt_regs *ctx); \ name(struct pt_regs *ctx); \
extern _Bool LINUX_HAS_SYSCALL_WRAPPER __kconfig; \ extern _Bool LINUX_HAS_SYSCALL_WRAPPER __kconfig; \
static __attribute__((always_inline)) typeof(name(0)) \ static __always_inline typeof(name(0)) \
____##name(struct pt_regs *ctx, ##args); \ ____##name(struct pt_regs *ctx, ##args); \
typeof(name(0)) name(struct pt_regs *ctx) \ typeof(name(0)) name(struct pt_regs *ctx) \
{ \ { \
...@@ -555,7 +555,7 @@ typeof(name(0)) name(struct pt_regs *ctx) \ ...@@ -555,7 +555,7 @@ typeof(name(0)) name(struct pt_regs *ctx) \
return ____##name(___bpf_syscall_args(args)); \ return ____##name(___bpf_syscall_args(args)); \
_Pragma("GCC diagnostic pop") \ _Pragma("GCC diagnostic pop") \
} \ } \
static __attribute__((always_inline)) typeof(name(0)) \ static __always_inline typeof(name(0)) \
____##name(struct pt_regs *ctx, ##args) ____##name(struct pt_regs *ctx, ##args)
#define BPF_KPROBE_SYSCALL BPF_KSYSCALL #define BPF_KPROBE_SYSCALL BPF_KSYSCALL
......
...@@ -232,7 +232,7 @@ long bpf_usdt_cookie(struct pt_regs *ctx) ...@@ -232,7 +232,7 @@ long bpf_usdt_cookie(struct pt_regs *ctx)
*/ */
#define BPF_USDT(name, args...) \ #define BPF_USDT(name, args...) \
name(struct pt_regs *ctx); \ name(struct pt_regs *ctx); \
static __attribute__((always_inline)) typeof(name(0)) \ static __always_inline typeof(name(0)) \
____##name(struct pt_regs *ctx, ##args); \ ____##name(struct pt_regs *ctx, ##args); \
typeof(name(0)) name(struct pt_regs *ctx) \ typeof(name(0)) name(struct pt_regs *ctx) \
{ \ { \
...@@ -241,7 +241,7 @@ typeof(name(0)) name(struct pt_regs *ctx) \ ...@@ -241,7 +241,7 @@ typeof(name(0)) name(struct pt_regs *ctx) \
return ____##name(___bpf_usdt_args(args)); \ return ____##name(___bpf_usdt_args(args)); \
_Pragma("GCC diagnostic pop") \ _Pragma("GCC diagnostic pop") \
} \ } \
static __attribute__((always_inline)) typeof(name(0)) \ static __always_inline typeof(name(0)) \
____##name(struct pt_regs *ctx, ##args) ____##name(struct pt_regs *ctx, ##args)
#endif /* __USDT_BPF_H__ */ #endif /* __USDT_BPF_H__ */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment