From: Jiri Olsa <jolsa@kernel.org>
To: Steven Rostedt <rostedt@goodmis.org>,
Masami Hiramatsu <mhiramat@kernel.org>,
Andrii Nakryiko <andrii@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>,
Nathan Chancellor <nathan@kernel.org>,
linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org,
bpf@vger.kernel.org
Subject: [PATCH] uprobe: Do not use UPROBE_SWBP_INSN as static initializer
Date: Tue, 18 Jun 2024 21:43:06 +0200 [thread overview]
Message-ID: <20240618194306.1577022-1-jolsa@kernel.org> (raw)
Nathan reported compilation fail for loongarch arch:
kernel/events/uprobes.c: In function 'arch_uprobe_trampoline':
arch/loongarch/include/asm/uprobes.h:12:33: error: initializer element is not constant
12 | #define UPROBE_SWBP_INSN larch_insn_gen_break(BRK_UPROBE_BP)
| ^~~~~~~~~~~~~~~~~~~~
kernel/events/uprobes.c:1479:39: note: in expansion of macro 'UPROBE_SWBP_INSN'
1479 | static uprobe_opcode_t insn = UPROBE_SWBP_INSN;
Loongarch defines UPROBE_SWBP_INSN as function call, so we can't
use it to initialize static variable.
Cc: Oleg Nesterov <oleg@redhat.com>
Fixes: ff474a78cef5 ("uprobe: Add uretprobe syscall to speed up return probe")
Reported-by: Nathan Chancellor <nathan@kernel.org>
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
kernel/events/uprobes.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
index 2816e65729ac..6986bd993702 100644
--- a/kernel/events/uprobes.c
+++ b/kernel/events/uprobes.c
@@ -1476,8 +1476,9 @@ static int xol_add_vma(struct mm_struct *mm, struct xol_area *area)
void * __weak arch_uprobe_trampoline(unsigned long *psize)
{
- static uprobe_opcode_t insn = UPROBE_SWBP_INSN;
+ static uprobe_opcode_t insn;
+ insn = insn ?: UPROBE_SWBP_INSN;
*psize = UPROBE_SWBP_INSN_SIZE;
return &insn;
}
--
2.45.1
next reply other threads:[~2024-06-18 19:43 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-18 19:43 Jiri Olsa [this message]
2024-06-20 19:00 ` [PATCH] uprobe: Do not use UPROBE_SWBP_INSN as static initializer Andrii Nakryiko
2024-06-20 19:38 ` Oleg Nesterov
2024-06-20 21:30 ` Andrii Nakryiko
2024-06-21 12:01 ` Oleg Nesterov
2024-06-21 13:17 ` Jiri Olsa
2024-06-27 13:44 ` Jiri Olsa
2024-06-27 14:20 ` Masami Hiramatsu
2024-06-27 15:29 ` Oleg Nesterov
2024-06-27 16:02 ` [PATCH] LoongArch: uprobes: make UPROBE_SWBP_INSN/UPROBE_XOLBP_INSN constant Oleg Nesterov
2024-06-27 16:51 ` Andrii Nakryiko
2024-06-27 17:38 ` Oleg Nesterov
2024-06-28 4:30 ` Masami Hiramatsu
2024-06-29 12:48 ` Tiezhu Yang
2024-06-29 13:38 ` Oleg Nesterov
2024-06-29 13:48 ` Huacai Chen
2024-06-29 15:03 ` [PATCH] LoongArch: make the users of larch_insn_gen_break() constant Oleg Nesterov
2024-06-30 1:43 ` Huacai Chen
2024-06-30 6:29 ` Oleg Nesterov
2024-07-01 6:22 ` Tiezhu Yang
2024-07-01 15:01 ` Huacai Chen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240618194306.1577022-1-jolsa@kernel.org \
--to=jolsa@kernel.org \
--cc=andrii@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-trace-kernel@vger.kernel.org \
--cc=mhiramat@kernel.org \
--cc=nathan@kernel.org \
--cc=oleg@redhat.com \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).