From 7987d2b5b5b13a1b1ce278b93cf7cc38c099c43b Mon Sep 17 00:00:00 2001 From: Stanislav Fomichev Date: Thu, 10 Feb 2022 14:52:37 +0800 Subject: [PATCH] bpf: Remove inline from bpf_do_trace_printk mainline inclusion from mainline-v5.9-rc1 commit 0d360d64b01231cdb36e1936de889f308fd9317f category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I4PKDW CVE: NA -------------------------------- I get the following error during compilation on my side: kernel/trace/bpf_trace.c: In function 'bpf_do_trace_printk': kernel/trace/bpf_trace.c:386:34: error: function 'bpf_do_trace_printk' can never be inlined because it uses variable argument lists static inline __printf(1, 0) int bpf_do_trace_printk(const char *fmt, ...) ^ Fixes: ac5a72ea5c89 ("bpf: Use dedicated bpf_trace_printk event instead of trace_printk()") Signed-off-by: Stanislav Fomichev Signed-off-by: Alexei Starovoitov Link: https://lore.kernel.org/bpf/20200806182612.1390883-1-sdf@google.com Signed-off-by: Liu Xinpeng # openEuler_contributor Signed-off-by: Ctyun Kernel # openEuler_contributor Signed-off-by: Pu Lehui Reviewed-by: Yang Jihong Signed-off-by: Yang Yingliang --- kernel/trace/bpf_trace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c index f359f79d9b69..f45e0ca388ed 100644 --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c @@ -326,7 +326,7 @@ static DEFINE_RAW_SPINLOCK(trace_printk_lock); #define BPF_TRACE_PRINTK_SIZE 1024 -static inline __printf(1, 0) int bpf_do_trace_printk(const char *fmt, ...) +static __printf(1, 0) int bpf_do_trace_printk(const char *fmt, ...) { static char buf[BPF_TRACE_PRINTK_SIZE]; unsigned long flags; -- GitLab