lkml.org 
[lkml]   [2016]   [Feb]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16.y-ckt 172/180] printk: help pr_debug and pr_devel to optimize out arguments
    Date
    3.16.7-ckt24 -stable review patch.  If anyone has any objections, please let me know.

    ---8<------------------------------------------------------------

    From: Aaron Conole <aconole@redhat.com>

    commit fe22cd9b7c980b8b948ec85f034a8668c57ec867 upstream.

    Currently, pr_debug and pr_devel will not elide function call arguments
    appearing in calls to the no_printk for these macros. This is because
    all side effects must be honored before proceeding to the 0-value
    assignment in no_printk.

    The behavior is contrary to documentation found in the CodingStyle and
    the header file where these functions are declared.

    This patch corrects that behavior by shunting out the call to no_printk
    completely. The format string is still checked by gcc for correctness,
    but no code seems to be emitted in common cases.

    [akpm@linux-foundation.org: remove braces, per Joe]
    Fixes: 5264f2f75d86 ("include/linux/printk.h: use and neaten no_printk")
    Signed-off-by: Aaron Conole <aconole@redhat.com>
    Reported-by: Dmitry Vyukov <dvyukov@google.com>
    Cc: Joe Perches <joe@perches.com>
    Cc: Jason Baron <jbaron@akamai.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    include/linux/printk.h | 12 ++++++------
    1 file changed, 6 insertions(+), 6 deletions(-)

    diff --git a/include/linux/printk.h b/include/linux/printk.h
    index 319ff7e53efb..4b0636bcf268 100644
    --- a/include/linux/printk.h
    +++ b/include/linux/printk.h
    @@ -104,13 +104,13 @@ struct va_format {

    /*
    * Dummy printk for disabled debugging statements to use whilst maintaining
    - * gcc's format and side-effect checking.
    + * gcc's format checking.
    */
    -static inline __printf(1, 2)
    -int no_printk(const char *fmt, ...)
    -{
    - return 0;
    -}
    +#define no_printk(fmt, ...) \
    +do { \
    + if (0) \
    + printk(fmt, ##__VA_ARGS__); \
    +} while (0)

    #ifdef CONFIG_EARLY_PRINTK
    extern asmlinkage __printf(1, 2)
    \
     
     \ /
      Last update: 2016-02-04 00:21    [W:4.083 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site