83 lines
3.3 KiB
Diff
83 lines
3.3 KiB
Diff
From 69d537ba0b5cd736cd5081d84928f4393856d3db Mon Sep 17 00:00:00 2001
|
||
From: James Hilliard <james.hilliard1@gmail.com>
|
||
Date: Wed, 3 Aug 2022 09:14:03 -0600
|
||
Subject: [PATCH] libbpf: Ensure functions with always_inline attribute are inline
|
||
MIME-Version: 1.0
|
||
Content-Type: text/plain; charset=UTF-8
|
||
Content-Transfer-Encoding: 8bit
|
||
|
||
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: James Hilliard <james.hilliard1@gmail.com>
|
||
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
|
||
Acked-by: Jiri Olsa <jolsa@kernel.org>
|
||
Link: https://lore.kernel.org/bpf/20220803151403.793024-1-james.hilliard1@gmail.com
|
||
|
||
Conflict: remove the modify of src/usdt.bpf.h because the include file
|
||
src/usdt.bpf.h is not exist in current version
|
||
Reference: https://github.com/libbpf/libbpf/commit/69d537ba0b5cd736cd5081d84928f4393856d3db
|
||
---
|
||
src/bpf_tracing.h | 10 +++++-----
|
||
1 file changed, 5 insertions(+), 5 deletions(-)
|
||
|
||
diff --git a/src/bpf_tracing.h b/src/bpf_tracing.h
|
||
index f9ef377..12c0bb5 100644
|
||
--- a/src/bpf_tracing.h
|
||
+++ b/src/bpf_tracing.h
|
||
@@ -424,7 +424,7 @@ struct pt_regs;
|
||
*/
|
||
#define BPF_PROG(name, args...) \
|
||
name(unsigned long long *ctx); \
|
||
-static __attribute__((always_inline)) typeof(name(0)) \
|
||
+static __always_inline typeof(name(0)) \
|
||
____##name(unsigned long long *ctx, ##args); \
|
||
typeof(name(0)) name(unsigned long long *ctx) \
|
||
{ \
|
||
@@ -433,7 +433,7 @@ typeof(name(0)) name(unsigned long long *ctx) \
|
||
return ____##name(___bpf_ctx_cast(args)); \
|
||
_Pragma("GCC diagnostic pop") \
|
||
} \
|
||
-static __attribute__((always_inline)) typeof(name(0)) \
|
||
+static __always_inline typeof(name(0)) \
|
||
____##name(unsigned long long *ctx, ##args)
|
||
|
||
struct pt_regs;
|
||
@@ -458,7 +458,7 @@ struct pt_regs;
|
||
*/
|
||
#define BPF_KPROBE(name, args...) \
|
||
name(struct pt_regs *ctx); \
|
||
-static __attribute__((always_inline)) typeof(name(0)) \
|
||
+static __always_inline typeof(name(0)) \
|
||
____##name(struct pt_regs *ctx, ##args); \
|
||
typeof(name(0)) name(struct pt_regs *ctx) \
|
||
{ \
|
||
@@ -467,7 +467,7 @@ typeof(name(0)) name(struct pt_regs *ctx) \
|
||
return ____##name(___bpf_kprobe_args(args)); \
|
||
_Pragma("GCC diagnostic pop") \
|
||
} \
|
||
-static __attribute__((always_inline)) typeof(name(0)) \
|
||
+static __always_inline typeof(name(0)) \
|
||
____##name(struct pt_regs *ctx, ##args)
|
||
|
||
#define ___bpf_kretprobe_args0() ctx
|
||
@@ -482,7 +482,7 @@ ____##name(struct pt_regs *ctx, ##args)
|
||
*/
|
||
#define BPF_KRETPROBE(name, args...) \
|
||
name(struct pt_regs *ctx); \
|
||
-static __attribute__((always_inline)) typeof(name(0)) \
|
||
+static __always_inline typeof(name(0)) \
|
||
____##name(struct pt_regs *ctx, ##args); \
|
||
typeof(name(0)) name(struct pt_regs *ctx) \
|
||
{ \
|
||
--
|
||
2.33.0
|
||
|