lkml.org 
[lkml]   [2016]   [Jul]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.6 03/31] net: Dont forget pr_fmt on net_dbg_ratelimited for CONFIG_DYNAMIC_DEBUG
    Date
    4.6-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: "Jason A. Donenfeld" <Jason@zx2c4.com>

    [ Upstream commit daddef76c3deaaa7922f9d7b18edbf0a061215c3 ]

    The implementation of net_dbg_ratelimited in the CONFIG_DYNAMIC_DEBUG
    case was added with 2c94b5373 ("net: Implement net_dbg_ratelimited() for
    CONFIG_DYNAMIC_DEBUG case"). The implementation strategy was to take the
    usual definition of the dynamic_pr_debug macro, but alter it by adding a
    call to "net_ratelimit()" in the if statement. This is, in fact, the
    correct approach.

    However, while doing this, the author of the commit forgot to surround
    fmt by pr_fmt, resulting in unprefixed log messages appearing in the
    console. So, this commit adds back the pr_fmt(fmt) invocation, making
    net_dbg_ratelimited properly consistent across DEBUG, no DEBUG, and
    DYNAMIC_DEBUG cases, and bringing parity with the behavior of
    dynamic_pr_debug as well.

    Fixes: 2c94b5373 ("net: Implement net_dbg_ratelimited() for CONFIG_DYNAMIC_DEBUG case")
    Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
    Cc: Tim Bingham <tbingham@akamai.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    include/linux/net.h | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    --- a/include/linux/net.h
    +++ b/include/linux/net.h
    @@ -252,7 +252,8 @@ do { \
    DEFINE_DYNAMIC_DEBUG_METADATA(descriptor, fmt); \
    if (unlikely(descriptor.flags & _DPRINTK_FLAGS_PRINT) && \
    net_ratelimit()) \
    - __dynamic_pr_debug(&descriptor, fmt, ##__VA_ARGS__); \
    + __dynamic_pr_debug(&descriptor, pr_fmt(fmt), \
    + ##__VA_ARGS__); \
    } while (0)
    #elif defined(DEBUG)
    #define net_dbg_ratelimited(fmt, ...) \

    \
     
     \ /
      Last update: 2016-07-07 04:21    [W:3.964 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site