From: Josh Poimboeuf <jpoimboe@redhat.com>
To: Peter Zijlstra <peterz@infradead.org>
Cc: tglx@linutronix.de, linux-kernel@vger.kernel.org, x86@kernel.org
Subject: Re: [RFC][PATCH 04/16] objtool: Annotate identity_mapped()
Date: Sun, 15 Mar 2020 10:45:08 -0500 [thread overview]
Message-ID: <20200315154508.m4b6ttdp3hb7pfla@treble> (raw)
In-Reply-To: <20200313143429.GB12521@hirez.programming.kicks-ass.net>
On Fri, Mar 13, 2020 at 03:34:29PM +0100, Peter Zijlstra wrote:
> This conflicts with:
>
> 7acfe5315312 ("objtool: Improve call destination function detection")
>
> which wasn't in the tree we were working against :/
>
> I've resolved it something like so.
>
> ---
> --- a/tools/objtool/check.c
> +++ b/tools/objtool/check.c
> @@ -406,7 +406,7 @@ static void add_ignores(struct objtool_f
> {
> struct instruction *insn;
> struct section *sec;
> - struct symbol *func;
> + struct symbol *sym;
> struct rela *rela;
>
> sec = find_section_by_name(file->elf, ".rela.discard.func_stack_frame_non_standard");
> @@ -416,12 +416,12 @@ static void add_ignores(struct objtool_f
> list_for_each_entry(rela, &sec->rela_list, list) {
> switch (rela->sym->type) {
> case STT_FUNC:
> - func = rela->sym;
> + sym = rela->sym;
> break;
>
> case STT_SECTION:
> - func = find_func_by_offset(rela->sym->sec, rela->addend);
> - if (!func)
> + sym = find_symbol_by_offset(rela->sym->sec, rela->addend);
> + if (!sym || (sym->type != STT_FUNC || sym->type != STT_NOTYPE))
^^
&&
--
Josh
next prev parent reply other threads:[~2020-03-15 15:46 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-12 13:41 [RFC][PATCH 00/16] objtool: vmlinux.o and noinstr validation Peter Zijlstra
2020-03-12 13:41 ` [RFC][PATCH 01/16] objtool: Introduce validate_return() Peter Zijlstra
2020-03-12 13:41 ` [RFC][PATCH 02/16] objtool: Rename func_for_each_insn() Peter Zijlstra
2020-03-12 13:41 ` [RFC][PATCH 03/16] objtool: Rename func_for_each_insn_all() Peter Zijlstra
2020-03-12 13:41 ` [RFC][PATCH 04/16] objtool: Annotate identity_mapped() Peter Zijlstra
2020-03-13 14:34 ` Peter Zijlstra
2020-03-15 15:45 ` Josh Poimboeuf [this message]
2020-03-13 16:46 ` Brian Gerst
2020-03-13 17:22 ` Peter Zijlstra
2020-03-12 13:41 ` [RFC][PATCH 05/16] objtool: Optimize find_symbol_by_index() Peter Zijlstra
2020-03-15 16:09 ` Josh Poimboeuf
2020-03-15 16:18 ` Josh Poimboeuf
2020-03-15 16:10 ` Josh Poimboeuf
2020-03-17 11:55 ` Miroslav Benes
2020-03-17 14:08 ` Peter Zijlstra
2020-03-12 13:41 ` [RFC][PATCH 06/16] objtool: Add a statistics mode Peter Zijlstra
2020-03-15 16:20 ` Josh Poimboeuf
2020-03-12 13:41 ` [RFC][PATCH 07/16] objtool: Optimize find_section_by_index() Peter Zijlstra
2020-03-15 16:24 ` Josh Poimboeuf
2020-03-12 13:41 ` [RFC][PATCH 08/16] Optimize find_section_by_name() Peter Zijlstra
2020-03-15 16:25 ` Josh Poimboeuf
2020-03-17 12:22 ` Miroslav Benes
2020-03-17 14:10 ` Peter Zijlstra
2020-03-12 13:41 ` [RFC][PATCH 09/16] objtool: Optimize find_symbol_*() and read_symbols() Peter Zijlstra
2020-03-15 15:48 ` Josh Poimboeuf
2020-03-15 16:41 ` Josh Poimboeuf
2020-03-12 13:41 ` [RFC][PATCH 10/16] objtool: Resize insn_hash Peter Zijlstra
2020-03-12 13:41 ` [RFC][PATCH 11/16] objtool: Optimize find_symbol_by_name() Peter Zijlstra
2020-03-12 13:41 ` [RFC][PATCH 12/16] objtool: Optimize read_sections() Peter Zijlstra
2020-03-15 16:53 ` Josh Poimboeuf
2020-03-12 13:41 ` [RFC][PATCH 13/16] objtool: Delete cleanup() Peter Zijlstra
2020-03-12 13:41 ` [RFC][PATCH 14/16] objtool: Optimize find_rela_by_dest_range() Peter Zijlstra
2020-03-12 13:41 ` [RFC][PATCH 15/16] objtool: Implement noinstr validation Peter Zijlstra
2020-03-15 18:03 ` Josh Poimboeuf
2020-03-16 13:24 ` Peter Zijlstra
2020-03-16 16:19 ` Josh Poimboeuf
2020-03-16 16:21 ` Josh Poimboeuf
2020-03-16 16:46 ` Peter Zijlstra
2020-03-16 16:48 ` Peter Zijlstra
2020-03-16 19:20 ` Josh Poimboeuf
2020-03-12 13:41 ` [RFC][PATCH 16/16] objtool: Optimize !vmlinux.o again Peter Zijlstra
2020-03-12 21:57 ` [RFC][PATCH v2 " Peter Zijlstra
2020-03-12 16:23 ` [RFC][PATCH 00/16] objtool: vmlinux.o and noinstr validation Peter Zijlstra
2020-03-12 17:44 ` Josh Poimboeuf
2020-03-12 22:23 ` Peter Zijlstra
2020-03-17 0:56 ` Masami Hiramatsu
2020-03-17 9:26 ` Thomas Gleixner
2020-03-17 14:20 ` Masami Hiramatsu
2020-03-17 12:14 ` Peter Zijlstra
2020-03-15 18:12 ` Josh Poimboeuf
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=20200315154508.m4b6ttdp3hb7pfla@treble \
--to=jpoimboe@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--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).