lkml.org 
[lkml]   [2021]   [Feb]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    Subject[PATCH v2 1/4] bug: Remove redundant condition check in report_bug
    From
    report_bug() will return early if it cannot find a bug corresponding to
    the provided address. The subsequent test for the bug will always be
    true so remove it.

    Signed-off-by: Andrew Scull <ascull@google.com>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
    ---
    lib/bug.c | 33 +++++++++++++++------------------
    1 file changed, 15 insertions(+), 18 deletions(-)

    diff --git a/lib/bug.c b/lib/bug.c
    index 7103440c0ee1..4ab398a2de93 100644
    --- a/lib/bug.c
    +++ b/lib/bug.c
    @@ -158,30 +158,27 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)

    file = NULL;
    line = 0;
    - warning = 0;

    - if (bug) {
    #ifdef CONFIG_DEBUG_BUGVERBOSE
    #ifndef CONFIG_GENERIC_BUG_RELATIVE_POINTERS
    - file = bug->file;
    + file = bug->file;
    #else
    - file = (const char *)bug + bug->file_disp;
    + file = (const char *)bug + bug->file_disp;
    #endif
    - line = bug->line;
    + line = bug->line;
    #endif
    - warning = (bug->flags & BUGFLAG_WARNING) != 0;
    - once = (bug->flags & BUGFLAG_ONCE) != 0;
    - done = (bug->flags & BUGFLAG_DONE) != 0;
    -
    - if (warning && once) {
    - if (done)
    - return BUG_TRAP_TYPE_WARN;
    -
    - /*
    - * Since this is the only store, concurrency is not an issue.
    - */
    - bug->flags |= BUGFLAG_DONE;
    - }
    + warning = (bug->flags & BUGFLAG_WARNING) != 0;
    + once = (bug->flags & BUGFLAG_ONCE) != 0;
    + done = (bug->flags & BUGFLAG_DONE) != 0;
    +
    + if (warning && once) {
    + if (done)
    + return BUG_TRAP_TYPE_WARN;
    +
    + /*
    + * Since this is the only store, concurrency is not an issue.
    + */
    + bug->flags |= BUGFLAG_DONE;
    }

    /*
    --
    2.30.0.617.g56c4b15f3c-goog
    \
     
     \ /
      Last update: 2021-02-23 16:59    [W:3.030 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site