From: Peter Zijlstra <peterz@infradead.org>
To: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Steven Rostedt <rostedt@goodmis.org>,
Ingo Molnar <mingo@kernel.org>,
Suleiman Souhlal <suleiman@google.com>, bpf <bpf@vger.kernel.org>,
linux-kernel@vger.kernel.org, Borislav Petkov <bp@suse.de>,
Josh Poimboeuf <jpoimboe@kernel.org>,
x86@kernel.org
Subject: Re: [PATCH 1/2] x86/kprobes: Fix kprobes instruction boudary check with CONFIG_RETHUNK
Date: Wed, 7 Sep 2022 13:44:37 +0200 [thread overview]
Message-ID: <YxiEJUn03gAJqm71@hirez.programming.kicks-ass.net> (raw)
In-Reply-To: <YxhwGkmRy/kJa9fG@hirez.programming.kicks-ass.net>
On Wed, Sep 07, 2022 at 12:19:06PM +0200, Peter Zijlstra wrote:
> On Wed, Sep 07, 2022 at 06:49:57PM +0900, Masami Hiramatsu wrote:
> > Yeah, this looks good to me. What I just need is to add expanding
> > queue buffer. (can we use xarray for this purpose?)
>
> Yeah, xarray might just work.
>
> I need to go fetch the kids from school, but if I remember I'll modify
> objtool to tell us the max number required here (for any one particular
> build obviously).
quick hack below suggests we need 405 for a x86_64 defconfig+kvm_guest.config vmlinux.o.
$ OBJTOOL_ARGS="--stats" make O=defconfig-build/ -j12 vmlinux.o
...
max_targets: 405 (hidinput_connect)
...
And if you look at the output of:
$ ./scripts/objdump-func defconfig-build/vmlinux.o hidinput_connect
I'm inclined to believe this. That function is crazy. So yeah, we
definitely need something dynamic.
---
tools/objtool/check.c | 12 ++++++++++++
tools/objtool/include/objtool/elf.h | 1 +
2 files changed, 13 insertions(+)
diff --git a/tools/objtool/check.c b/tools/objtool/check.c
index e55fdf952a3a..897d3b83ab70 100644
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@ -3295,6 +3295,9 @@ static struct instruction *next_insn_to_validate(struct objtool_file *file,
return next_insn_same_sec(file, insn);
}
+static int max_targets = 0;
+static char *max_name = NULL;
+
/*
* Follow the branch starting at the given instruction, and recursively follow
* any other branches (jumps). Meanwhile, track the frame pointer state at
@@ -3312,6 +3315,14 @@ static int validate_branch(struct objtool_file *file, struct symbol *func,
sec = insn->sec;
+ if (!insn->visited && func) {
+ func->targets++;
+ if (func->targets > max_targets) {
+ max_targets = func->targets;
+ max_name = func->name;
+ }
+ }
+
while (1) {
next_insn = next_insn_to_validate(file, insn);
@@ -4305,6 +4316,7 @@ int check(struct objtool_file *file)
printf("nr_cfi: %ld\n", nr_cfi);
printf("nr_cfi_reused: %ld\n", nr_cfi_reused);
printf("nr_cfi_cache: %ld\n", nr_cfi_cache);
+ printf("max_targets: %d (%s)\n", max_targets, max_name);
}
out:
diff --git a/tools/objtool/include/objtool/elf.h b/tools/objtool/include/objtool/elf.h
index 16f4067b82ae..a707becdef50 100644
--- a/tools/objtool/include/objtool/elf.h
+++ b/tools/objtool/include/objtool/elf.h
@@ -61,6 +61,7 @@ struct symbol {
u8 fentry : 1;
u8 profiling_func : 1;
struct list_head pv_target;
+ int targets;
};
struct reloc {
next prev parent reply other threads:[~2022-09-07 11:44 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-07 0:55 [PATCH 0/2] x86/kprobes: Fixes for CONFIG_RETHUNK Masami Hiramatsu (Google)
2022-09-07 0:55 ` [PATCH 1/2] x86/kprobes: Fix kprobes instruction boudary check with CONFIG_RETHUNK Masami Hiramatsu (Google)
2022-09-07 7:06 ` Peter Zijlstra
2022-09-07 9:01 ` [PATCH] objtool,x86: Teach decode about LOOP* instructions Peter Zijlstra
2022-09-07 9:06 ` David Laight
2022-09-07 9:40 ` Peter Zijlstra
2022-09-07 11:13 ` David Laight
2022-09-15 14:24 ` [tip: objtool/core] " tip-bot2 for Peter Zijlstra
2022-09-07 9:12 ` [PATCH 1/2] x86/kprobes: Fix kprobes instruction boudary check with CONFIG_RETHUNK Masami Hiramatsu
2022-09-07 9:38 ` Peter Zijlstra
2022-09-07 9:53 ` Masami Hiramatsu
2022-09-07 8:02 ` Peter Zijlstra
2022-09-07 8:11 ` Peter Zijlstra
2022-09-07 9:49 ` Masami Hiramatsu
2022-09-07 10:19 ` Peter Zijlstra
2022-09-07 11:44 ` Peter Zijlstra [this message]
2022-09-07 13:05 ` Peter Zijlstra
2022-09-07 14:14 ` Masami Hiramatsu
2022-09-07 14:27 ` Peter Zijlstra
2022-09-07 15:22 ` Masami Hiramatsu
2022-09-07 12:56 ` Peter Zijlstra
2022-09-07 13:49 ` Masami Hiramatsu
2022-09-07 14:28 ` Peter Zijlstra
2022-09-07 12:59 ` Peter Zijlstra
2022-09-07 13:53 ` Masami Hiramatsu
2022-09-07 0:55 ` [PATCH 2/2] x86/kprobes: Fix optprobe optimization " Masami Hiramatsu (Google)
2022-09-07 6:52 ` [PATCH 0/2] x86/kprobes: Fixes for CONFIG_RETHUNK Peter Zijlstra
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=YxiEJUn03gAJqm71@hirez.programming.kicks-ass.net \
--to=peterz@infradead.org \
--cc=bp@suse.de \
--cc=bpf@vger.kernel.org \
--cc=jpoimboe@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mhiramat@kernel.org \
--cc=mingo@kernel.org \
--cc=rostedt@goodmis.org \
--cc=suleiman@google.com \
--cc=x86@kernel.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).