lkml.org 
[lkml]   [2021]   [Oct]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip: objtool/core] objtool: Shrink struct instruction
    The following commit has been merged into the objtool/core branch of tip:

    Commit-ID: c509331b41b7365e17396c246e8c5797bccc8074
    Gitweb: https://git.kernel.org/tip/c509331b41b7365e17396c246e8c5797bccc8074
    Author: Peter Zijlstra <peterz@infradead.org>
    AuthorDate: Tue, 26 Oct 2021 14:01:35 +02:00
    Committer: Peter Zijlstra <peterz@infradead.org>
    CommitterDate: Thu, 28 Oct 2021 23:25:25 +02:00

    objtool: Shrink struct instruction

    Any one instruction can only ever call a single function, therefore
    insn->mcount_loc_node is superfluous and can use insn->call_node.

    This shrinks struct instruction, which is by far the most numerous
    structure objtool creates.

    Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
    Reviewed-by: Borislav Petkov <bp@suse.de>
    Acked-by: Josh Poimboeuf <jpoimboe@redhat.com>
    Tested-by: Alexei Starovoitov <ast@kernel.org>
    Link: https://lore.kernel.org/r/20211026120309.785456706@infradead.org
    ---
    tools/objtool/check.c | 6 +++---
    tools/objtool/include/objtool/check.h | 1 -
    2 files changed, 3 insertions(+), 4 deletions(-)

    diff --git a/tools/objtool/check.c b/tools/objtool/check.c
    index 8ab6f24..ce3c25f 100644
    --- a/tools/objtool/check.c
    +++ b/tools/objtool/check.c
    @@ -701,7 +701,7 @@ static int create_mcount_loc_sections(struct objtool_file *file)
    return 0;

    idx = 0;
    - list_for_each_entry(insn, &file->mcount_loc_list, mcount_loc_node)
    + list_for_each_entry(insn, &file->mcount_loc_list, call_node)
    idx++;

    sec = elf_create_section(file->elf, "__mcount_loc", 0, sizeof(unsigned long), idx);
    @@ -709,7 +709,7 @@ static int create_mcount_loc_sections(struct objtool_file *file)
    return -1;

    idx = 0;
    - list_for_each_entry(insn, &file->mcount_loc_list, mcount_loc_node) {
    + list_for_each_entry(insn, &file->mcount_loc_list, call_node) {

    loc = (unsigned long *)sec->data->d_buf + idx;
    memset(loc, 0, sizeof(unsigned long));
    @@ -1051,7 +1051,7 @@ static void annotate_call_site(struct objtool_file *file,

    insn->type = INSN_NOP;

    - list_add_tail(&insn->mcount_loc_node, &file->mcount_loc_list);
    + list_add_tail(&insn->call_node, &file->mcount_loc_list);
    return;
    }
    }
    diff --git a/tools/objtool/include/objtool/check.h b/tools/objtool/include/objtool/check.h
    index 07e99c2..6cfff07 100644
    --- a/tools/objtool/include/objtool/check.h
    +++ b/tools/objtool/include/objtool/check.h
    @@ -40,7 +40,6 @@ struct instruction {
    struct list_head list;
    struct hlist_node hash;
    struct list_head call_node;
    - struct list_head mcount_loc_node;
    struct section *sec;
    unsigned long offset;
    unsigned int len;
    \
     
     \ /
      Last update: 2021-10-29 10:10    [W:3.310 / U:0.296 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site