lkml.org 
[lkml]   [2023]   [May]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip: objtool/core] objtool: Include backtrace in verbose mode
    The following commit has been merged into the objtool/core branch of tip:

    Commit-ID: ced23d2e3762ecfb859ae65d3a351218edff7205
    Gitweb: https://git.kernel.org/tip/ced23d2e3762ecfb859ae65d3a351218edff7205
    Author: Josh Poimboeuf <jpoimboe@kernel.org>
    AuthorDate: Tue, 18 Apr 2023 14:27:49 -07:00
    Committer: Josh Poimboeuf <jpoimboe@kernel.org>
    CommitterDate: Tue, 16 May 2023 06:31:52 -07:00

    objtool: Include backtrace in verbose mode

    Include backtrace in verbose mode. This makes it easy to gather all the
    information needed for diagnosing objtool warnings.

    Reviewed-by: Miroslav Benes <mbenes@suse.cz>
    Link: https://lore.kernel.org/r/c255224fabcf7e64bac232fec1c77c9fc2d7d7ab.1681853186.git.jpoimboe@kernel.org
    Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
    ---
    tools/objtool/Documentation/objtool.txt | 4 ++--
    tools/objtool/check.c | 26 +++++++++---------------
    tools/objtool/include/objtool/warn.h | 14 +++++++------
    3 files changed, 20 insertions(+), 24 deletions(-)

    diff --git a/tools/objtool/Documentation/objtool.txt b/tools/objtool/Documentation/objtool.txt
    index 8db1f29..9ec8cbf 100644
    --- a/tools/objtool/Documentation/objtool.txt
    +++ b/tools/objtool/Documentation/objtool.txt
    @@ -246,8 +246,8 @@ Objtool warnings

    NOTE: When requesting help with an objtool warning, please recreate with
    OBJTOOL_VERBOSE=1 (e.g., "make OBJTOOL_VERBOSE=1") and send the full
    -output, including any disassembly below the warning, to the objtool
    -maintainers.
    +output, including any disassembly or backtrace below the warning, to the
    +objtool maintainers.

    For asm files, if you're getting an error which doesn't make sense,
    first make sure that the affected code follows the above rules.
    diff --git a/tools/objtool/check.c b/tools/objtool/check.c
    index 0bd0ca4..71985f3 100644
    --- a/tools/objtool/check.c
    +++ b/tools/objtool/check.c
    @@ -3657,8 +3657,7 @@ static int validate_branch(struct objtool_file *file, struct symbol *func,

    ret = validate_branch(file, func, alt->insn, state);
    if (ret) {
    - if (opts.backtrace)
    - BT_FUNC("(alt)", insn);
    + BT_INSN(insn, "(alt)");
    return ret;
    }
    }
    @@ -3703,8 +3702,7 @@ static int validate_branch(struct objtool_file *file, struct symbol *func,
    ret = validate_branch(file, func,
    insn->jump_dest, state);
    if (ret) {
    - if (opts.backtrace)
    - BT_FUNC("(branch)", insn);
    + BT_INSN(insn, "(branch)");
    return ret;
    }
    }
    @@ -3802,8 +3800,8 @@ static int validate_unwind_hint(struct objtool_file *file,
    {
    if (insn->hint && !insn->visited && !insn->ignore) {
    int ret = validate_branch(file, insn_func(insn), insn, *state);
    - if (ret && opts.backtrace)
    - BT_FUNC("<=== (hint)", insn);
    + if (ret)
    + BT_INSN(insn, "<=== (hint)");
    return ret;
    }

    @@ -3861,8 +3859,7 @@ static int validate_unret(struct objtool_file *file, struct instruction *insn)

    ret = validate_unret(file, alt->insn);
    if (ret) {
    - if (opts.backtrace)
    - BT_FUNC("(alt)", insn);
    + BT_INSN(insn, "(alt)");
    return ret;
    }
    }
    @@ -3888,10 +3885,8 @@ static int validate_unret(struct objtool_file *file, struct instruction *insn)
    }
    ret = validate_unret(file, insn->jump_dest);
    if (ret) {
    - if (opts.backtrace) {
    - BT_FUNC("(branch%s)", insn,
    - insn->type == INSN_JUMP_CONDITIONAL ? "-cond" : "");
    - }
    + BT_INSN(insn, "(branch%s)",
    + insn->type == INSN_JUMP_CONDITIONAL ? "-cond" : "");
    return ret;
    }

    @@ -3913,8 +3908,7 @@ static int validate_unret(struct objtool_file *file, struct instruction *insn)

    ret = validate_unret(file, dest);
    if (ret) {
    - if (opts.backtrace)
    - BT_FUNC("(call)", insn);
    + BT_INSN(insn, "(call)");
    return ret;
    }
    /*
    @@ -4216,8 +4210,8 @@ static int validate_symbol(struct objtool_file *file, struct section *sec,
    state->uaccess = sym->uaccess_safe;

    ret = validate_branch(file, insn_func(insn), insn, *state);
    - if (ret && opts.backtrace)
    - BT_FUNC("<=== (sym)", insn);
    + if (ret)
    + BT_INSN(insn, "<=== (sym)");
    return ret;
    }

    diff --git a/tools/objtool/include/objtool/warn.h b/tools/objtool/include/objtool/warn.h
    index f195dea..ac04d3f 100644
    --- a/tools/objtool/include/objtool/warn.h
    +++ b/tools/objtool/include/objtool/warn.h
    @@ -63,12 +63,14 @@ static inline char *offstr(struct section *sec, unsigned long offset)
    _insn->sym->warned = 1; \
    })

    -#define BT_FUNC(format, insn, ...) \
    -({ \
    - struct instruction *_insn = (insn); \
    - char *_str = offstr(_insn->sec, _insn->offset); \
    - WARN(" %s: " format, _str, ##__VA_ARGS__); \
    - free(_str); \
    +#define BT_INSN(insn, format, ...) \
    +({ \
    + if (opts.verbose || opts.backtrace) { \
    + struct instruction *_insn = (insn); \
    + char *_str = offstr(_insn->sec, _insn->offset); \
    + WARN(" %s: " format, _str, ##__VA_ARGS__); \
    + free(_str); \
    + } \
    })

    #define WARN_ELF(format, ...) \
    \
     
     \ /
      Last update: 2023-05-18 13:10    [W:2.903 / U:0.892 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site