log: convert pr_*() to logging
Subsystems (2)
cover log: convert pr_*() to logging
In drivers we use a family of printing functions including pr_err() and pr_cont(). CONFIG_LOGLEVEL is used to control which of these lead to output via printf().
Our logging functions allow finer grained control of output. So replace printf() by the matching logging functions. The usage of CONFIG_LOGLEVEL remains unchanged.
The first patch changes the k3-j721e RAM driver to avoid a duplicate use of the macro name BIT_MASK().
The second patch ensures that debug_cond() can be used like a function.
The third patch provides macros for logging at levels EMERGENCY, ALERT, CRITICAL and for message continuation.
The fourth patch uses the logging macros to implement the pr_*() macros.
The fifth patch provices a unit test.
Heinrich Schuchardt (5):
ram: k3-j721e: rename BIT_MASK()
log: make debug_cond() function like
log: provide missing macros
log: convert pr_*() to logging
test: unit test for pr_err(), pr_cont()
drivers/ram/k3-j721e/lpddr4.c | 14 ++--- drivers/ram/k3-j721e/lpddr4_private.h | 20 ++++--- include/linux/bitops.h | 4 +- include/linux/printk.h | 82 +++++++++++++++------------ include/log.h | 25 +++++--- test/log/Makefile | 1 + test/log/pr_cont_test.c | 45 +++++++++++++++ 7 files changed, 129 insertions(+), 62 deletions(-) create mode 100644 test/log/pr_cont_test.c
--
2.29.2
PATCH 1/5 ram: k3-j721e: rename BIT_MASK()
The macro BIT_MASK is already defined in include/linux/bitops.h. To avoid name collisions rename BIT_MASK() in drivers/ram/k3-j721e/lpddr4_private.h to LPDDR4_BIT_MASK().
Remove superfluous parantheses.
Remove superfluous comparison to 0.
--- drivers/ram/k3-j721e/lpddr4.c | 14 +++++++------- drivers/ram/k3-j721e/lpddr4_private.h | 20 ++++++++++++-------- 2 files changed, 19 insertions(+), 15 deletions(-)
drivers/ram/k3-j721e/lpddr4.c +7 -7
@@ -719,7 +719,7 @@ uint32_t lpddr4_checkctlinterrupt(const lpddr4_privatedata * pd,/* MISRA compliance (Shifting operation) check */ if (fieldshift <WORD_SHIFT ) { -if (((ctlirqstatus >> fieldshift) &BIT_MASK ) >0U ) { +if ((ctlirqstatus >> fieldshift) &LPDDR4_BIT_MASK ) { *irqstatus = true; }else { *irqstatus = false;
@@ -746,11 +746,11 @@ uint32_t lpddr4_ackctlinterrupt(const lpddr4_privatedata * pd,if (localinterrupt >WORD_SHIFT ) { localinterrupt = (localinterrupt - (uint32_t )WORD_SHIFT ); - regval = ((uint32_t )BIT_MASK << localinterrupt); + regval = (uint32_t )LPDDR4_BIT_MASK << localinterrupt;CPS_REG_WRITE (&(ctlregbase->LPDDR4__INT_ACK_1__REG), regval); }else { - regval = ((uint32_t )BIT_MASK << localinterrupt); + regval = (uint32_t )LPDDR4_BIT_MASK << localinterrupt;CPS_REG_WRITE (&(ctlregbase->LPDDR4__INT_ACK_0__REG), regval); }
@@ -823,7 +823,7 @@ uint32_t lpddr4_checkphyindepinterrupt(const lpddr4_privatedata * pd, phyindepirqstatus =CPS_REG_READ (&(ctlregbase->LPDDR4__PI_INT_STATUS__REG)); *irqstatus = - (((phyindepirqstatus >> (uint32_t ) intr) &BIT_MASK ) >0U ); + !!((phyindepirqstatus >> (uint32_t )intr) &LPDDR4_BIT_MASK ); }return result; }
@@ -841,7 +841,7 @@ uint32_t lpddr4_ackphyindepinterrupt(const lpddr4_privatedata * pd,lpddr4_ctlregs *ctlregbase = (lpddr4_ctlregs *) pd->ctlbase;/* Write 1 to the requested bit to ACk the interrupt */ - regval = ((uint32_t )BIT_MASK << ui32shiftinterrupt); + regval = (uint32_t )LPDDR4_BIT_MASK << ui32shiftinterrupt;CPS_REG_WRITE (&(ctlregbase->LPDDR4__PI_INT_ACK__REG), regval); }
@@ -894,7 +894,7 @@ static void lpddr4_checkwrlvlerror(lpddr4_ctlregs * ctlregbase, (volatile uint32_t *)(&(ctlregbase->LPDDR4__PHY_WRLVL_ERROR_OBS_0__REG));/* PHY_WRLVL_ERROR_OBS_X[1:0] should be zero */ - errbitmask = (BIT_MASK <<1 ) | (BIT_MASK ); + errbitmask = (LPDDR4_BIT_MASK <<1 ) |LPDDR4_BIT_MASK ;for (snum =0U ; snum <DSLICE_NUM ; snum++) { regval =CPS_REG_READ (regaddress);if ((regval & errbitmask) !=0U ) {
@@ -1054,7 +1054,7 @@ static void lpddr4_seterrors(lpddr4_ctlregs * ctlregbase, lpddr4_debuginfo * debuginfo, bool * errfoundptr) { -uint32_t errbitmask = (BIT_MASK <<0x1U ) | (BIT_MASK ); +uint32_t errbitmask = (LPDDR4_BIT_MASK <<0x1U ) |LPDDR4_BIT_MASK ;/* Check PLL observation registers for PLL lock errors */ debuginfo->pllerror =
drivers/ram/k3-j721e/lpddr4_private.h +12 -8
@@ -14,9 +14,9 @@#define VERSION_0 (0x54d5da40U)#define VERSION_1 (0xc1865a1U) -#define BIT_MASK (0x1U) -#define BYTE_MASK (0xffU) -#define NIBBLE_MASK (0xfU) +#define LPDDR4_BIT_MASK (0x1U) +#define BYTE_MASK (0xffU) +#define NIBBLE_MASK (0xfU)#define WORD_SHIFT (32U)#define WORD_MASK (0xffffffffU)
@@ -46,11 +46,15 @@#define IO_CALIB_DONE ((uint32_t)0x1U << 23U)#define IO_CALIB_FIELD ((uint32_t)NIBBLE_MASK << 28U)#define IO_CALIB_STATE ((uint32_t)0xBU << 28U) -#define RX_CAL_DONE ((uint32_t)BIT_MASK << 4U) -#define CA_TRAIN_RL (((uint32_t)BIT_MASK << 5U) | ((uint32_t)BIT_MASK << 4U)) +#define RX_CAL_DONE ((uint32_t)LPDDR4_BIT_MASK << 4U) +#define CA_TRAIN_RL (((uint32_t)LPDDR4_BIT_MASK << 5U) | \ + ((uint32_t)LPDDR4_BIT_MASK << 4U))#define WR_LVL_STATE (((uint32_t)NIBBLE_MASK) << 13U) -#define GATE_LVL_ERROR_FIELDS (((uint32_t)BIT_MASK << 7U) | ((uint32_t)BIT_MASK << 6U)) -#define READ_LVL_ERROR_FIELDS ((((uint32_t)NIBBLE_MASK) << 28U) | (((uint32_t)BYTE_MASK) << 16U)) -#define DQ_LVL_STATUS (((uint32_t)BIT_MASK << 26U) | (((uint32_t)BYTE_MASK) << 18U)) +#define GATE_LVL_ERROR_FIELDS (((uint32_t)LPDDR4_BIT_MASK << 7U) | \ + ((uint32_t)LPDDR4_BIT_MASK << 6U)) +#define READ_LVL_ERROR_FIELDS ((((uint32_t)NIBBLE_MASK) << 28U) | \ + (((uint32_t)BYTE_MASK) << 16U)) +#define DQ_LVL_STATUS (((uint32_t)LPDDR4_BIT_MASK << 26U) | \ + (((uint32_t)BYTE_MASK) << 18U))#endif /* LPDDR4_PRIV_H */
--
2.29.2
PATCH 1/5 ram: k3-j721e: rename BIT_MASK()
Quoted 5 lines · Heinrich Schuchardt
The macro
BIT_MASKis already defined ininclude/linux/bitops.h. To avoid name collisions renameBIT_MASK()indrivers/ram/k3-j721e/lpddr4_private.htoLPDDR4_BIT_MASK().
Quoted 8 lines
Remove superfluous parantheses.
Remove superfluous comparison to 0.Signed-off-by Heinrich Schuchardt <[email protected]>--- drivers/ram/k3-j721e/lpddr4.c | 14 +++++++------- drivers/ram/k3-j721e/lpddr4_private.h | 20 ++++++++++++-------- 2 files changed, 19 insertions(+), 15 deletions(-)
PATCH 1/5 ram: k3-j721e: rename BIT_MASK()
In reply to Heinrich SchuchardtQuoted 9 lines · Heinrich Schuchardt
The macro
BIT_MASKis already defined ininclude/linux/bitops.h. To avoid name collisions renameBIT_MASK()indrivers/ram/k3-j721e/lpddr4_private.htoLPDDR4_BIT_MASK().Remove superfluous parantheses.
Remove superfluous comparison to 0.Signed-off-by Heinrich Schuchardt <[email protected]>Reviewed-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20210118/f26c83f6/attachment.sig>
PATCH 2/5 log: make debug_cond() function like
In reply to Heinrich SchuchardtChange debug_cond() such that it can be used instead of a function like debug().
--- include/log.h | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)
include/log.h +8 -9
@@ -217,10 +217,9 @@ static inline int _log_nop(enum log_category_t cat, enum log_level_t level,#if !_DEBUG &&CONFIG_IS_ENABLED (LOG ) #define debug_cond(cond, fmt, args...) \ - do { \ - if (1) \ - log(LOG_CATEGORY, LOGL_DEBUG, fmt, ##args); \ - } while (0) +({ \ + log(LOG_CATEGORY, LOGL_DEBUG, fmt, ##args); \ +})#else /* _DEBUG */
@@ -229,11 +228,11 @@ static inline int _log_nop(enum log_category_t cat, enum log_level_t level,* computed by a preprocessor in the best case, allowing for the best * optimization. */ -#define debug_cond(cond, fmt, args...) \ - do { \ - if (cond) \ - printf(pr_fmt(fmt), ##args); \ - } while (0) +#define debug_cond(cond, fmt, args...) \ +({ \ + if (cond) \ + printf(pr_fmt(fmt), ##args); \ +})#endif /* _DEBUG */
--
2.29.2
PATCH 2/5 log: make debug_cond() function like
Quoted 9 lines · Heinrich Schuchardt
Change
debug_cond()such that it can be used instead of a function likedebug().Signed-off-by Heinrich Schuchardt <[email protected]>--- include/log.h | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)
PATCH 2/5 log: make debug_cond() function like
In reply to Heinrich SchuchardtQuoted 5 lines · Heinrich Schuchardt
Change
debug_cond()such that it can be used instead of a function likedebug().Signed-off-by Heinrich Schuchardt <[email protected]>Reviewed-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20210118/b11f801d/attachment.sig>
PATCH 3/5 log: provide missing macros
In reply to Heinrich SchuchardtWith commit d094a0734cee ("log: allow for message continuation") we have defined a special log level and category for message continuation. Let's have a macro for using these.
If logging is enabled log_cont() will create a continuation log output with the same logging level and category as the previous message.
If logging is not enabled, log_cont() will print like printf().
Provide macros for logging levels LOG_EMERG, LOG_ALERT, LOG_CRIT.
--- include/log.h | 8 ++++++++ 1 file changed, 8 insertions(+)
include/log.h +8 -0
@@ -156,6 +156,9 @@ static inline int _log_nop(enum log_category_t cat, enum log_level_t level,*/ #if CONFIG_IS_ENABLED (LOG )#define _LOG_MAX_LEVEL CONFIG_VAL(LOG_MAX_LEVEL) +#define log_emer(_fmt...) log(LOG_CATEGORY, LOGL_EMERG, ##_fmt) +#define log_alert(_fmt...) log(LOG_CATEGORY, LOGL_ALERT, ##_fmt) +#define log_crit(_fmt...) log(LOG_CATEGORY, LOGL_CRIT, ##_fmt) #define log_err(_fmt...) log(LOG_CATEGORY, LOGL_ERR, ##_fmt) #define log_warning(_fmt...) log(LOG_CATEGORY, LOGL_WARNING, ##_fmt) #define log_notice(_fmt...) log(LOG_CATEGORY, LOGL_NOTICE, ##_fmt)
@@ -163,12 +166,17 @@ static inline int _log_nop(enum log_category_t cat, enum log_level_t level, #define log_debug(_fmt...) log(LOG_CATEGORY, LOGL_DEBUG, ##_fmt) #define log_content(_fmt...) log(LOG_CATEGORY, LOGL_DEBUG_CONTENT, ##_fmt) #define log_io(_fmt...) log(LOG_CATEGORY, LOGL_DEBUG_IO, ##_fmt) +#define log_cont(_fmt...) log(LOGC_CONT, LOGL_CONT, ##_fmt)#else #define _LOG_MAX_LEVEL LOGL_INFO +#define log_emerg (_fmt, ...) printf(_fmt, ##__VA_ARGS__) +#define log_alert (_fmt, ...) printf(_fmt, ##__VA_ARGS__) +#define log_crit (_fmt, ...) printf(_fmt, ##__VA_ARGS__)#define log_err (_fmt, ...) printf(_fmt, ##__VA_ARGS__)#define log_warning (_fmt, ...) printf(_fmt, ##__VA_ARGS__)#define log_notice (_fmt, ...) printf(_fmt, ##__VA_ARGS__)#define log_info (_fmt, ...) printf(_fmt, ##__VA_ARGS__) +#define log_cont (_fmt, ...) printf(_fmt, ##__VA_ARGS__)#define log_debug (_fmt, ...) debug(_fmt, ##__VA_ARGS__) #define log_content(_fmt...) log_nop(LOG_CATEGORY, \ LOGL_DEBUG_CONTENT, ##_fmt)
--
2.29.2
PATCH 3/5 log: provide missing macros
Quoted 8 lines · Heinrich Schuchardt
With commit
d094a0734cee("log: allow for message continuation") we have defined a special log level and category for message continuation. Let's have a macro for using these.If logging is enabled
log_cont()will create a continuation log output with the same logging level and category as the previous message.
Quoted 8 lines
If logging is not enabled,
log_cont()will print likeprintf().Provide macros for logging levels
LOG_EMERG,LOG_ALERT,LOG_CRIT.Signed-off-by Heinrich Schuchardt <[email protected]>--- include/log.h | 8 ++++++++ 1 file changed, 8 insertions(+)
PATCH 3/5 log: provide missing macros
In reply to Heinrich SchuchardtQuoted 7 lines · Heinrich Schuchardt
With commit
d094a0734cee("log: allow for message continuation") we have defined a special log level and category for message continuation. Let's have a macro for using these.If logging is enabled
log_cont()will create a continuation log output with the same logging level and category as the previous message.
Quoted 6 lines
If logging is not enabled,
log_cont()will print likeprintf().Provide macros for logging levels
LOG_EMERG,LOG_ALERT,LOG_CRIT.Signed-off-by Heinrich Schuchardt <[email protected]>Reviewed-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20210118/2ee5fcc6/attachment.sig>
PATCH 4/5 log: convert pr_*() to logging
In reply to Heinrich SchuchardtIn drivers we use a family of printing functions including pr_err() and pr_cont(). CONFIG_LOGLEVEL is used to control which of these lead to output via printf().
Our logging functions allow finer grained control of output. So replace printf() by the matching logging functions. The usage of CONFIG_LOGLEVEL remains unchanged.
--- include/linux/bitops.h | 4 ++- include/linux/printk.h | 82 +++++++++++++++++++++++------------------- 2 files changed, 48 insertions(+), 38 deletions(-)
include/linux/bitops.h +3 -1
@@ -6,7 +6,6 @@#include <asm/types.h> #include <asm-generic/bitsperlong.h> #include <linux/compiler.h> -#include <linux/kernel.h> #ifdef __KERNEL__#define BIT (nr) (1UL << (nr))
@@ -19,6 +18,9 @@#define BITS_TO_LONGS (nr) DIV_ROUND_UP(nr, BITS_PER_BYTE * sizeof(long))#endif +/* kernel.h includes log.h which include bitops.h */ +#include <linux/kernel.h> +/* * Create a contiguous bitmask starting at bit position @l and ending at * position @h. For example
include/linux/printk.h +45 -37
100 lines not on this page · raw message
--
2.29.2
PATCH 4/5 log: convert pr_*() to logging
Hi Heinrich,
Quoted 82 lines · Heinrich Schuchardt
In drivers we use a family of printing functions including
pr_err()andpr_cont().CONFIG_LOGLEVELis used to control which of these lead to output viaprintf().Our logging functions allow finer grained control of output. So replace
printf()by the matching logging functions. The usage ofCONFIG_LOGLEVELremains unchanged.Signed-off-by Heinrich Schuchardt <[email protected]>--- include/linux/bitops.h | 4 ++- include/linux/printk.h | 82 +++++++++++++++++++++++------------------- 2 files changed, 48 insertions(+), 38 deletions(-)include/linux/bitops.h +3
-1@@ -6,7 +6,6 @@#include <asm/types.h> #include <asm-generic/bitsperlong.h> #include <linux/compiler.h> -#include <linux/kernel.h> #ifdef __KERNEL__#define BIT (nr) (1UL << (nr))@@ -19,6 +18,9 @@#define BITS_TO_LONGS (nr) DIV_ROUND_UP(nr, BITS_PER_BYTE * sizeof(long))#endif +/* kernel.h includes log.h which include bitops.h */ +#include <linux/kernel.h> +/* * Create a contiguous bitmask starting at bit position @l and ending at * position @h. For example include/linux/printk.h +1
-25@@ -1,6 +1,7 @@#ifndef __KERNEL_PRINTK__#define __KERNEL_PRINTK__ +#include <log.h> #include <stdio.h> #include <linux/compiler.h> @@ -28,49 +29,56 @@0 ; \ }) -#define __printk (level, fmt, ...) \ -({ \ - level < CONFIG_LOGLEVEL ? printk(fmt, ##__VA_ARGS__) : 0; \ -}) -#ifndef pr_fmt#define pr_fmt (fmt) fmt#endif -#define pr_emerg (fmt, ...) \ - __printk(0, pr_fmt(fmt), ##__VA_ARGS__) -#define pr_alert (fmt, ...) \ - __printk(1, pr_fmt(fmt), ##__VA_ARGS__) -#define pr_crit (fmt, ...) \ - __printk(2, pr_fmt(fmt), ##__VA_ARGS__) -#define pr_err (fmt, ...) \ - __printk(3, pr_fmt(fmt), ##__VA_ARGS__) -#define pr_warning (fmt, ...) \ - __printk(4, pr_fmt(fmt), ##__VA_ARGS__) -#define pr_warn pr_warning -#define pr_notice (fmt, ...) \ - __printk(5, pr_fmt(fmt), ##__VA_ARGS__) -#define pr_info (fmt, ...) \ - __printk(6, pr_fmt(fmt), ##__VA_ARGS__) - -#define pr_cont (fmt, ...) \ - printk(fmt, ##__VA_ARGS__) - -/* pr_devel() should produce zero code unless DEBUG is defined */
include/linux/printk.h line 38
Quoted 10 lines
include/linux/printk.h +3
-7-#ifdef DEBUG -#define pr_devel (fmt, ...) \ - __printk(7, pr_fmt(fmt), ##__VA_ARGS__) -#else -#define pr_devel (fmt, ...) \ - no_printk(pr_fmt(fmt), ##__VA_ARGS__) -#endif +#define pr_emerg (fmt, ...) \ +({ \ + CONFIG_LOGLEVEL > 0 ? log_emerg(fmt, ##__VA_ARGS__) : 0; \
Should this use CONFIG_VAL(LOGLEVEL) ?
Also I don't suppose there is a way to implement this in the __printk() macro?
Quoted 52 lines
include/linux/printk.h +41
-6+}) +#define pr_alert (fmt, ...) \ +({ \ + CONFIG_LOGLEVEL > 1 ? log_alert(fmt, ##__VA_ARGS__) : 0; \ +}) +#define pr_crit (fmt, ...) \ +({ \ + CONFIG_LOGLEVEL > 2 ? log_crit(fmt, ##__VA_ARGS__) : 0; \ +}) +#define pr_err (fmt, ...) \ +({ \ + CONFIG_LOGLEVEL > 3 ? log_err(fmt, ##__VA_ARGS__) : 0; \ +}) +#define pr_warn (fmt, ...) \ +({ \ + CONFIG_LOGLEVEL > 4 ? log_warning(fmt, ##__VA_ARGS__) : 0; \ +}) +#define pr_notice (fmt, ...) \ +({ \ + CONFIG_LOGLEVEL > 5 ? log_notice(fmt, ##__VA_ARGS__) : 0; \ +}) +#define pr_info (fmt, ...) \ +({ \ + CONFIG_LOGLEVEL > 6 ? log_info(fmt, ##__VA_ARGS__) : 0; \ +}) +#define pr_debug (fmt, ...) \ +({ \ + CONFIG_LOGLEVEL > 7 ? log_debug(fmt, ##__VA_ARGS__) : 0; \ +}) +#define pr_devel (fmt, ...) \ +({ \ + CONFIG_LOGLEVEL > 7 ? log_debug(fmt, ##__VA_ARGS__) : 0; \ +}) -#ifdef DEBUG -#define pr_debug (fmt, ...) \ - __printk(7, pr_fmt(fmt), ##__VA_ARGS__) +#ifdef CONFIG_LOG +#define pr_cont (fmt, ...) \ +({ \ + gd->logl_prev < CONFIG_LOGLEVEL ? \ + log_cont(fmt, ##__VA_ARGS__) : 0; \ +})#else -#define pr_debug (fmt, ...) \ - no_printk(pr_fmt(fmt), ##__VA_ARGS__) +#define pr_cont (fmt, ...) \ + printk(fmt, ##__VA_ARGS__)#endif #define printk_once (fmt, ...) \ --
Quoted 2 lines
2.29.2
Regards,
Simon
PATCH 4/5 log: convert pr_*() to logging
In reply to Heinrich SchuchardtQuoted 8 lines · Heinrich Schuchardt
In drivers we use a family of printing functions including
pr_err()andpr_cont().CONFIG_LOGLEVELis used to control which of these lead to output viaprintf().Our logging functions allow finer grained control of output. So replace
printf()by the matching logging functions. The usage ofCONFIG_LOGLEVELremains unchanged.
Quoted 5 lines
Signed-off-by Heinrich Schuchardt <[email protected]>--- include/linux/bitops.h | 4 ++- include/linux/printk.h | 82 +++++++++++++++++++++++------------------- 2 files changed, 48 insertions(+), 38 deletions(-)
This causes some fairly massive growth in various subsystems such as ubi and we might want to look at what, if anything, we can do, before growing some platforms by 15KiB (xilinx_zynqmp_virt) due to strings. Thanks.
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20210116/b35a374b/attachment.sig>
PATCH 4/5 log: convert pr_*() to logging
Quoted 16 lines · Tom Rini
Quoted 8 lines · Heinrich Schuchardt
In drivers we use a family of printing functions including
pr_err()andpr_cont().CONFIG_LOGLEVELis used to control which of these lead to output viaprintf().Our logging functions allow finer grained control of output. So replace
printf()by the matching logging functions. The usage ofCONFIG_LOGLEVELremains unchanged.Quoted 5 lines
Signed-off-by Heinrich Schuchardt <[email protected]>--- include/linux/bitops.h | 4 ++- include/linux/printk.h | 82 +++++++++++++++++++++++------------------- 2 files changed, 48 insertions(+), 38 deletions(-)
Quoted 3 lines
This causes some fairly massive growth in various subsystems such as ubi and we might want to look at what, if anything, we can do, before growing some platforms by 15KiB (
xilinx_zynqmp_virt) due to strings.
xilinx_zynqmp_virt has CONFIG_LOG enabled. Switching from printf() to log() incurs size growth. Did you observe a size grows on platforms with CONFIG_LOG=n?
Best regards
Heinrich
Quoted 2 lines
Thanks.
PATCH 4/5 log: convert pr_*() to logging
Quoted 17 lines · Heinrich Schuchardt
Quoted 16 lines · Tom Rini
Quoted 13 lines · Heinrich Schuchardt
In drivers we use a family of printing functions including
pr_err()andpr_cont().CONFIG_LOGLEVELis used to control which of these lead to output viaprintf().Our logging functions allow finer grained control of output. So replace
printf()by the matching logging functions. The usage ofCONFIG_LOGLEVELremains unchanged.Signed-off-by Heinrich Schuchardt <[email protected]>--- include/linux/bitops.h | 4 ++- include/linux/printk.h | 82 +++++++++++++++++++++++------------------- 2 files changed, 48 insertions(+), 38 deletions(-)
Quoted 7 lines
Quoted 3 lines
This causes some fairly massive growth in various subsystems such as ubi and we might want to look at what, if anything, we can do, before growing some platforms by 15KiB (
xilinx_zynqmp_virt) due to strings.
xilinx_zynqmp_virthasCONFIG_LOGenabled. Switching fromprintf()tolog()incurs size growth. Did you observe a size grows on platforms withCONFIG_LOG=n?
Yes, it has logging enabled, and we're converting a large number of things that were before compile-time discarded to no longer be so. This is, in general, good and what I've asked for. But when seeing very large growth in doing so, I think we need to maybe take a step back and look at the UBI subsystem for example and see if we can't/shouldn't tweak things more.
So, I'm going to run a size test with just this patch as the change, so we can have more concrete numbers to look at.
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20210118/c297eb6e/attachment.sig>
PATCH 4/5 log: convert pr_*() to logging
Quoted 33 lines · Tom Rini
Quoted 17 lines · Heinrich Schuchardt
Quoted 16 lines · Tom Rini
Quoted 13 lines · Heinrich Schuchardt
In drivers we use a family of printing functions including
pr_err()andpr_cont().CONFIG_LOGLEVELis used to control which of these lead to output viaprintf().Our logging functions allow finer grained control of output. So replace
printf()by the matching logging functions. The usage ofCONFIG_LOGLEVELremains unchanged.Signed-off-by Heinrich Schuchardt <[email protected]>--- include/linux/bitops.h | 4 ++- include/linux/printk.h | 82 +++++++++++++++++++++++------------------- 2 files changed, 48 insertions(+), 38 deletions(-)Quoted 7 lines
Quoted 3 lines
This causes some fairly massive growth in various subsystems such as ubi and we might want to look at what, if anything, we can do, before growing some platforms by 15KiB (
xilinx_zynqmp_virt) due to strings.
xilinx_zynqmp_virthasCONFIG_LOGenabled. Switching fromprintf()tolog()incurs size growth. Did you observe a size grows on platforms withCONFIG_LOG=n?Yes, it has logging enabled, and we're converting a large number of things that were before compile-time discarded to no longer be so. This is, in general, good and what I've asked for. But when seeing very large growth in doing so, I think we need to maybe take a step back and look at the UBI subsystem for example and see if we can't/shouldn't tweak things more.
Quoted 2 lines
So, I'm going to run a size test with just this patch as the change, so we can have more concrete numbers to look at.
OK, so the build is done and interesting output starts at:
https://gist.github.com/trini/53e7da62c6c9d18c189e6baffd01ff00#file-2021-01-18-0800-txt-L239
Most of the time we're well under 1KiB, which is great. UBI has some huge growth, but it's a very few platforms, and I've added the custodians here so they can object, or not, to such size growth.
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20210118/c35d6714/attachment.sig>
PATCH 4/5 log: convert pr_*() to logging
Quoted 37 lines · Tom Rini
Quoted 33 lines · Tom Rini
Quoted 17 lines · Heinrich Schuchardt
Quoted 16 lines · Tom Rini
Quoted 13 lines · Heinrich Schuchardt
In drivers we use a family of printing functions including
pr_err()andpr_cont().CONFIG_LOGLEVELis used to control which of these lead to output viaprintf().Our logging functions allow finer grained control of output. So replace
printf()by the matching logging functions. The usage ofCONFIG_LOGLEVELremains unchanged.Signed-off-by Heinrich Schuchardt <[email protected]>--- include/linux/bitops.h | 4 ++- include/linux/printk.h | 82 +++++++++++++++++++++++------------------- 2 files changed, 48 insertions(+), 38 deletions(-)Quoted 7 lines
Quoted 3 lines
This causes some fairly massive growth in various subsystems such as ubi and we might want to look at what, if anything, we can do, before growing some platforms by 15KiB (
xilinx_zynqmp_virt) due to strings.
xilinx_zynqmp_virthasCONFIG_LOGenabled. Switching fromprintf()tolog()incurs size growth. Did you observe a size grows on platforms withCONFIG_LOG=n?Yes, it has logging enabled, and we're converting a large number of things that were before compile-time discarded to no longer be so. This is, in general, good and what I've asked for. But when seeing very large growth in doing so, I think we need to maybe take a step back and look at the UBI subsystem for example and see if we can't/shouldn't tweak things more.
Quoted 2 lines
So, I'm going to run a size test with just this patch as the change, so we can have more concrete numbers to look at.
Quoted 7 lines
OK, so the build is done and interesting output starts at:
https://gist.github.com/trini/53e7da62c6c9d18c189e6baffd01ff00#file-2021-01-18-0800-txt-L239Most of the time we're well under 1KiB, which is great. UBI has some huge growth, but it's a very few platforms, and I've added the custodians here so they can object, or not, to such size growth.
Hello Tom,
How shall we proceed?
Best regards
Heinrich
PATCH 4/5 log: convert pr_*() to logging
Quoted 41 lines · Heinrich Schuchardt
Quoted 40 lines · Tom Rini
Quoted 33 lines · Tom Rini
Quoted 17 lines · Heinrich Schuchardt
Quoted 16 lines · Tom Rini
Quoted 13 lines · Heinrich Schuchardt
In drivers we use a family of printing functions including
pr_err()andpr_cont().CONFIG_LOGLEVELis used to control which of these lead to output viaprintf().Our logging functions allow finer grained control of output. So replace
printf()by the matching logging functions. The usage ofCONFIG_LOGLEVELremains unchanged.Signed-off-by Heinrich Schuchardt <[email protected]>--- include/linux/bitops.h | 4 ++- include/linux/printk.h | 82 +++++++++++++++++++++++------------------- 2 files changed, 48 insertions(+), 38 deletions(-)Quoted 7 lines
Quoted 3 lines
This causes some fairly massive growth in various subsystems such as ubi and we might want to look at what, if anything, we can do, before growing some platforms by 15KiB (
xilinx_zynqmp_virt) due to strings.
xilinx_zynqmp_virthasCONFIG_LOGenabled. Switching fromprintf()tolog()incurs size growth. Did you observe a size grows on platforms withCONFIG_LOG=n?Yes, it has logging enabled, and we're converting a large number of things that were before compile-time discarded to no longer be so. This is, in general, good and what I've asked for. But when seeing very large growth in doing so, I think we need to maybe take a step back and look at the UBI subsystem for example and see if we can't/shouldn't tweak things more.
Quoted 2 lines
So, I'm going to run a size test with just this patch as the change, so we can have more concrete numbers to look at.
OK, so the build is done and interesting output starts at:
https://gist.github.com/trini/53e7da62c6c9d18c189e6baffd01ff00#file-2021-01-18-0800-txt-L239
Quoted 8 lines
Quoted 4 lines
Most of the time we're well under 1KiB, which is great. UBI has some huge growth, but it's a very few platforms, and I've added the custodians here so they can object, or not, to such size growth.
Hello Tom,
How shall we proceed?
Michal? Patrice or Patrick? Since this patch causes noticeable growth on your platforms I'm waiting for your input here, to be clear. Thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20210218/3498a918/attachment.sig>
PATCH 4/5 log: convert pr_*() to logging
Hi Tom
Quoted 47 lines · Tom Rini
Quoted 46 lines · Heinrich Schuchardt
Quoted 44 lines · Tom Rini
Quoted 33 lines · Tom Rini
Quoted 17 lines · Heinrich Schuchardt
Quoted 16 lines · Tom Rini
Quoted 13 lines · Heinrich Schuchardt
In drivers we use a family of printing functions including
pr_err()andpr_cont().CONFIG_LOGLEVELis used to control which of these lead to output viaprintf().Our logging functions allow finer grained control of output. So replace
printf()by the matching logging functions. The usage ofCONFIG_LOGLEVELremains unchanged.Signed-off-by Heinrich Schuchardt <[email protected]>--- include/linux/bitops.h | 4 ++- include/linux/printk.h | 82 +++++++++++++++++++++++------------------- 2 files changed, 48 insertions(+), 38 deletions(-)Quoted 7 lines
Quoted 3 lines
This causes some fairly massive growth in various subsystems such as ubi and we might want to look at what, if anything, we can do, before growing some platforms by 15KiB (
xilinx_zynqmp_virt) due to strings.
xilinx_zynqmp_virthasCONFIG_LOGenabled. Switching fromprintf()tolog()incurs size growth. Did you observe a size grows on platforms withCONFIG_LOG=n?Yes, it has logging enabled, and we're converting a large number of things that were before compile-time discarded to no longer be so. This is, in general, good and what I've asked for. But when seeing very large growth in doing so, I think we need to maybe take a step back and look at the UBI subsystem for example and see if we can't/shouldn't tweak things more.
Quoted 2 lines
So, I'm going to run a size test with just this patch as the change, so we can have more concrete numbers to look at.
OK, so the build is done and interesting output starts at:
https://gist.github.com/trini/53e7da62c6c9d18c189e6baffd01ff00#file-2021-01-18-0800-txt-L239Most of the time we're well under 1KiB, which is great. UBI has some huge growth, but it's a very few platforms, and I've added the custodians here so they can object, or not, to such size growth.
Quoted 7 lines
Quoted 3 lines
Hello Tom,
How shall we proceed?
Michal? Patrice or Patrick? Since this patch causes noticeable growth on your platforms I'm waiting for your input here, to be clear. Thanks!
No objection for stm32 platforms, ok for us ;-)
Patrice
PATCH 4/5 log: convert pr_*() to logging
In reply to Heinrich SchuchardtQuoted 49 lines · Heinrich Schuchardt
In drivers we use a family of printing functions including
pr_err()andpr_cont().CONFIG_LOGLEVELis used to control which of these lead to output viaprintf().Our logging functions allow finer grained control of output. So replace
printf()by the matching logging functions. The usage ofCONFIG_LOGLEVELremains unchanged.Signed-off-by Heinrich Schuchardt <[email protected]>--- include/linux/bitops.h | 4 ++- include/linux/printk.h | 82 +++++++++++++++++++++++------------------- 2 files changed, 48 insertions(+), 38 deletions(-)include/linux/bitops.h +3
-1@@ -6,7 +6,6 @@#include <asm/types.h> #include <asm-generic/bitsperlong.h> #include <linux/compiler.h> -#include <linux/kernel.h> #ifdef __KERNEL__#define BIT (nr) (1UL << (nr))@@ -19,6 +18,9 @@#define BITS_TO_LONGS (nr) DIV_ROUND_UP(nr, BITS_PER_BYTE * sizeof(long))#endif +/* kernel.h includes log.h which include bitops.h */ +#include <linux/kernel.h> +/* * Create a contiguous bitmask starting at bit position @l and ending at * position @h. For example include/linux/printk.h +1
-0@@ -1,6 +1,7 @@#ifndef __KERNEL_PRINTK__#define __KERNEL_PRINTK__ +#include <log.h> #include <stdio.h> #include <linux/compiler.h>
include/linux/printk.h line 33
Quoted 6 lines
include/linux/printk.h +0
-3@@ -28,49 +29,56 @@0 ; \ }) -#define __printk (level, fmt, ...) \ -({ \ - level < CONFIG_LOGLEVEL ? printk(fmt, ##__VA_ARGS__) : 0; \
Couldn't we just do
#define __printk(level, fmt, ...) log(LOG_CATEGORY, level, fmt, ##__VA_ARGS__)
Quoted 27 lines
include/linux/printk.h +0
-23-}) -#ifndef pr_fmt#define pr_fmt (fmt) fmt#endif -#define pr_emerg (fmt, ...) \ - __printk(0, pr_fmt(fmt), ##__VA_ARGS__) -#define pr_alert (fmt, ...) \ - __printk(1, pr_fmt(fmt), ##__VA_ARGS__) -#define pr_crit (fmt, ...) \ - __printk(2, pr_fmt(fmt), ##__VA_ARGS__) -#define pr_err (fmt, ...) \ - __printk(3, pr_fmt(fmt), ##__VA_ARGS__) -#define pr_warning (fmt, ...) \ - __printk(4, pr_fmt(fmt), ##__VA_ARGS__) -#define pr_warn pr_warning -#define pr_notice (fmt, ...) \ - __printk(5, pr_fmt(fmt), ##__VA_ARGS__) -#define pr_info (fmt, ...) \ - __printk(6, pr_fmt(fmt), ##__VA_ARGS__) - -#define pr_cont (fmt, ...) \ - printk(fmt, ##__VA_ARGS__) - -/* pr_devel() should produce zero code unless DEBUG is defined */ -#ifdef DEBUG
include/linux/printk.h line 39
Quoted 10 lines
include/linux/printk.h +4
-6-#define pr_devel (fmt, ...) \ - __printk(7, pr_fmt(fmt), ##__VA_ARGS__) -#else -#define pr_devel (fmt, ...) \ - no_printk(pr_fmt(fmt), ##__VA_ARGS__) -#endif +#define pr_emerg (fmt, ...) \ +({ \ + CONFIG_LOGLEVEL > 0 ? log_emerg(fmt, ##__VA_ARGS__) : 0; \ +})
There is also an off-by-one mismatch between the numbers here and the log level constants. E.g. LOGL_INFO is 6, but pr_info only gets emitted if CONFIG_LOGLEVEL is >= 7.
--Sean
Quoted 53 lines
include/linux/printk.h +40
-6+#define pr_alert (fmt, ...) \ +({ \ + CONFIG_LOGLEVEL > 1 ? log_alert(fmt, ##__VA_ARGS__) : 0; \ +}) +#define pr_crit (fmt, ...) \ +({ \ + CONFIG_LOGLEVEL > 2 ? log_crit(fmt, ##__VA_ARGS__) : 0; \ +}) +#define pr_err (fmt, ...) \ +({ \ + CONFIG_LOGLEVEL > 3 ? log_err(fmt, ##__VA_ARGS__) : 0; \ +}) +#define pr_warn (fmt, ...) \ +({ \ + CONFIG_LOGLEVEL > 4 ? log_warning(fmt, ##__VA_ARGS__) : 0; \ +}) +#define pr_notice (fmt, ...) \ +({ \ + CONFIG_LOGLEVEL > 5 ? log_notice(fmt, ##__VA_ARGS__) : 0; \ +}) +#define pr_info (fmt, ...) \ +({ \ + CONFIG_LOGLEVEL > 6 ? log_info(fmt, ##__VA_ARGS__) : 0; \ +}) +#define pr_debug (fmt, ...) \ +({ \ + CONFIG_LOGLEVEL > 7 ? log_debug(fmt, ##__VA_ARGS__) : 0; \ +}) +#define pr_devel (fmt, ...) \ +({ \ + CONFIG_LOGLEVEL > 7 ? log_debug(fmt, ##__VA_ARGS__) : 0; \ +}) -#ifdef DEBUG -#define pr_debug (fmt, ...) \ - __printk(7, pr_fmt(fmt), ##__VA_ARGS__) +#ifdef CONFIG_LOG +#define pr_cont (fmt, ...) \ +({ \ + gd->logl_prev < CONFIG_LOGLEVEL ? \ + log_cont(fmt, ##__VA_ARGS__) : 0; \ +})#else -#define pr_debug (fmt, ...) \ - no_printk(pr_fmt(fmt), ##__VA_ARGS__) +#define pr_cont (fmt, ...) \ + printk(fmt, ##__VA_ARGS__)#endif #define printk_once (fmt, ...) \ --2.29.2
PATCH 4/5 log: convert pr_*() to logging
Quoted 56 lines · Sean Anderson
Quoted 55 lines · Heinrich Schuchardt
In drivers we use a family of printing functions including
pr_err()andpr_cont().CONFIG_LOGLEVELis used to control which of these lead to output
viaprintf().Our logging functions allow finer grained control of output. So replace
printf()by the matching logging functions. The usage ofCONFIG_LOGLEVELremains unchanged.Signed-off-by Heinrich Schuchardt <[email protected]>---
?include/linux/bitops.h|? 4 ++-
?include/linux/printk.h| 82 +++++++++++++++++++++++------------------- ? 2 files changed, 48 insertions(+), 38 deletions(-)include/linux/bitops.h +0
-0@@ -6,7 +6,6 @@? #include <
asm/types.h>
? #include <asm-generic/bitsperlong.h>
? #include <linux/compiler.h>
-#include <linux/kernel.h>? #ifdef???
__KERNEL__
? #define BIT(nr)??????????? (1UL << (nr))include/linux/bitops.h +0
-0@@ -19,6 +18,9 @@? #define
BITS_TO_LONGS(nr)???DIV_ROUND_UP(nr, BITS_PER_BYTE * sizeof(long))
? #endifinclude/linux/bitops.h +3
-0+/* kernel.h includes log.h which include bitops.h */ +#include <linux/kernel.h> +? /*
?? * Create a contiguous bitmask starting at bit position @l and ending at
?? * position @h. For exampleinclude/linux/printk.h +0
-0@@ -1,6 +1,7 @@? #ifndef
__KERNEL_PRINTK__
? #define__KERNEL_PRINTK__+#include <
log.h>
? #include <stdio.h>
? #include <linux/compiler.h>include/linux/printk.h +0
-0@@ -28,49 +29,56 @@ ????? 0;??????????????????????? \ ? })
Quoted 8 lines
include/linux/printk.h line 33
Quoted 3 lines
include/linux/printk.h +0
-3-#define __printk (level, fmt, ...)??????????????????? \ -({??????????????????????????????????? \ -??? level < CONFIG_LOGLEVEL ? printk(fmt, ##__VA_ARGS__) : 0;??? \Couldn't we just do
#define
__printk(level, fmt, ...)log(LOG_CATEGORY, level, fmt, ##__VA_ARGS__)
Dear Sean,
Thanks for reviewing.
As of today log() does not print anything if CONFIG_LOG is not enabled.
A patch by Simon to change this behavior is pending. If it gets merged, we can do the suggested simplification.
log: Convert log values to printf() if not enabled
https://patchwork.ozlabs.org/project/uboot/patch/20210114033051.483560-5-sjg at chromium.org/
Quoted 34 lines
Quoted 34 lines
include/linux/printk.h +0
-2-}) -? #ifndef
pr_fmt
? #definepr_fmt(fmt)fmt
? #endifinclude/linux/printk.h +0
-27-#define pr_emerg (fmt, ...) \ -??? __printk(0, pr_fmt(fmt), ##__VA_ARGS__) -#define pr_alert (fmt, ...) \ -??? __printk(1, pr_fmt(fmt), ##__VA_ARGS__) -#define pr_crit (fmt, ...) \ -??? __printk(2, pr_fmt(fmt), ##__VA_ARGS__) -#define pr_err (fmt, ...) \ -??? __printk(3, pr_fmt(fmt), ##__VA_ARGS__) -#define pr_warning (fmt, ...) \ -??? __printk(4, pr_fmt(fmt), ##__VA_ARGS__) -#define pr_warn pr_warning -#define pr_notice (fmt, ...) \ -??? __printk(5, pr_fmt(fmt), ##__VA_ARGS__) -#define pr_info (fmt, ...) \ -??? __printk(6, pr_fmt(fmt), ##__VA_ARGS__) - -#define pr_cont (fmt, ...) \ -??? printk(fmt, ##__VA_ARGS__) - -/* pr_devel() should produce zero code unless DEBUG is defined */ -#ifdef DEBUG -#define pr_devel (fmt, ...) \ -??? __printk(7, pr_fmt(fmt), ##__VA_ARGS__) -#else -#define pr_devel (fmt, ...) \ -??? no_printk(pr_fmt(fmt), ##__VA_ARGS__) -#endif
Quoted 8 lines
include/linux/printk.h
Quoted 4 lines
include/linux/printk.h +4
-0+#define pr_emerg (fmt, ...)??????????????????????? \ +({??????????????????????????????????? \ +??? CONFIG_LOGLEVEL > 0 ? log_emerg(fmt, ##__VA_ARGS__) : 0;??? \ +})There is also an off-by-one mismatch between the numbers here and the log level constants. E.g.
LOGL_INFOis 6, butpr_infoonly gets emitted ifCONFIG_LOGLEVELis >= 7.
The Kconfig for CONFIG_LOGLEVEL description reads:
"All Messages with a loglevel *smaller than* the console loglevel will be compiled in."
I did not intend to change this definition.
Best regards
Heinrich
Quoted 57 lines
--Sean
Quoted 53 lines
include/linux/printk.h +38
-3+#define pr_alert (fmt, ...)??????????????????????? \ +({??????????????????????????????????? \ +??? CONFIG_LOGLEVEL > 1 ? log_alert(fmt, ##__VA_ARGS__) : 0;??? \ +}) +#define pr_crit (fmt, ...)??????????????????????? \ +({??????????????????????????????????? \ +??? CONFIG_LOGLEVEL > 2 ? log_crit(fmt, ##__VA_ARGS__) : 0;??????? \ +}) +#define pr_err (fmt, ...)??????????????????????? \ +({??????????????????????????????????? \ +??? CONFIG_LOGLEVEL > 3 ? log_err(fmt, ##__VA_ARGS__) : 0;??????? \ +}) +#define pr_warn (fmt, ...)??????????????????????? \ +({??????????????????????????????????? \ +??? CONFIG_LOGLEVEL > 4 ? log_warning(fmt, ##__VA_ARGS__) : 0;??? \ +}) +#define pr_notice (fmt, ...)??????????????????????? \ +({??????????????????????????????????? \ +??? CONFIG_LOGLEVEL > 5 ? log_notice(fmt, ##__VA_ARGS__) : 0;??? \ +}) +#define pr_info (fmt, ...)??????????????????????? \ +({??????????????????????????????????? \ +??? CONFIG_LOGLEVEL > 6 ? log_info(fmt, ##__VA_ARGS__) : 0;??????? \ +}) +#define pr_debug (fmt, ...)??????????????????????? \ +({??????????????????????????????????? \ +??? CONFIG_LOGLEVEL > 7 ? log_debug(fmt, ##__VA_ARGS__) : 0;??? \ +}) +#define pr_devel (fmt, ...)??????????????????????? \ +({??????????????????????????????????? \ +??? CONFIG_LOGLEVEL > 7 ? log_debug(fmt, ##__VA_ARGS__) : 0;??? \ +}) -#ifdef DEBUG -#define pr_debug (fmt, ...) \ -??? __printk(7, pr_fmt(fmt), ##__VA_ARGS__) +#ifdef CONFIG_LOG +#define pr_cont (fmt, ...)??????????????????????? \ +({??????????????????????????????????? \ +??? gd->logl_prev < CONFIG_LOGLEVEL ???????????????? \ +??????? log_cont(fmt, ##__VA_ARGS__) : 0;??????????? \ +})? #else
include/linux/printk.h +2
-2-#define pr_debug (fmt, ...) \ -??? no_printk(pr_fmt(fmt), ##__VA_ARGS__) +#define pr_cont (fmt, ...)??????????????????????? \ +??? printk(fmt, ##__VA_ARGS__)? #endif
? #define
printk_once(fmt, ...)\Signature · 1 line
2.29.2
PATCH 4/5 log: convert pr_*() to logging
Quoted 84 lines · Heinrich Schuchardt
Quoted 53 lines · Sean Anderson
Quoted 52 lines · Heinrich Schuchardt
In drivers we use a family of printing functions including
pr_err()andpr_cont().CONFIG_LOGLEVELis used to control which of these lead to output viaprintf().Our logging functions allow finer grained control of output. So replace
printf()by the matching logging functions. The usage ofCONFIG_LOGLEVELremains unchanged.Signed-off-by Heinrich Schuchardt <[email protected]>--- include/linux/bitops.h | 4 ++- include/linux/printk.h | 82 +++++++++++++++++++++++------------------- 2 files changed, 48 insertions(+), 38 deletions(-)include/linux/bitops.h +3
-1@@ -6,7 +6,6 @@#include <asm/types.h> #include <asm-generic/bitsperlong.h> #include <linux/compiler.h> -#include <linux/kernel.h> #ifdef __KERNEL__#define BIT (nr) (1UL << (nr))@@ -19,6 +18,9 @@#define BITS_TO_LONGS (nr) DIV_ROUND_UP(nr, BITS_PER_BYTE * sizeof(long))#endif +/* kernel.h includes log.h which include bitops.h */ +#include <linux/kernel.h> +/* * Create a contiguous bitmask starting at bit position @l and ending at * position @h. For example include/linux/printk.h +1
-0@@ -1,6 +1,7 @@#ifndef __KERNEL_PRINTK__#define __KERNEL_PRINTK__ +#include <log.h> #include <stdio.h> #include <linux/compiler.h> @@ -28,49 +29,56 @@0 ; \ })Quoted 7 lines
include/linux/printk.h line 33
Quoted 3 lines
include/linux/printk.h +0
-3-#define __printk (level, fmt, ...) \ -({ \ - level < CONFIG_LOGLEVEL ? printk(fmt, ##__VA_ARGS__) : 0; \Couldn't we just do
#define
__printk(level, fmt, ...)log(LOG_CATEGORY, level, fmt, ##__VA_ARGS__)Dear Sean,
Thanks for reviewing.
As of today
log()does not print anything ifCONFIG_LOGis not enabled.#if
CONFIG_IS_ENABLED(LOG)
#define_LOG_MAX_LEVELCONFIG_VAL(LOG_MAX_LEVEL)
#definelog_err(_fmt...)log(LOG_CATEGORY, LOGL_ERR, ##_fmt)
#definelog_warning(_fmt...)log(LOG_CATEGORY, LOGL_WARNING, ##_fmt)
#definelog_notice(_fmt...)log(LOG_CATEGORY, LOGL_NOTICE, ##_fmt)
#definelog_info(_fmt...)log(LOG_CATEGORY, LOGL_INFO, ##_fmt)
#definelog_debug(_fmt...)log(LOG_CATEGORY, LOGL_DEBUG, ##_fmt)
#definelog_content(_fmt...)log(LOG_CATEGORY, LOGL_DEBUG_CONTENT, ##_fmt)
#definelog_io(_fmt...)log(LOG_CATEGORY, LOGL_DEBUG_IO, ##_fmt)
#else
#define_LOG_MAX_LEVELLOGL_INFO
#definelog_err(_fmt, ...)printf(_fmt, ##__VA_ARGS__)
#definelog_warning(_fmt, ...)printf(_fmt, ##__VA_ARGS__)
#definelog_notice(_fmt, ...)printf(_fmt, ##__VA_ARGS__)
#definelog_info(_fmt, ...)printf(_fmt, ##__VA_ARGS__)
#definelog_debug(_fmt, ...)debug(_fmt, ##__VA_ARGS__)
Quoted 4 lines
#define log_content(_fmt...) log_nop(LOG_CATEGORY, \ LOGL_DEBUG_CONTENT, ##_fmt)#define
log_io(_fmt...)log_nop(LOG_CATEGORY, LOGL_DEBUG_IO, ##_fmt)
#endif
If CONFIG_LOG is not enabled, then log statements are converted to debug and printf.
Quoted 49 lines
A patch by Simon to change this behavior is pending. If it gets merged, we can do the suggested simplification.
log: Convert log values to
printf()if not enabled
https://patchwork.ozlabs.org/project/uboot/patch/20210114033051.483560-5-sjg at chromium.org/Quoted 34 lines
Quoted 34 lines
include/linux/printk.h +0
-29-}) -#ifndef pr_fmt#define pr_fmt (fmt) fmt#endif -#define pr_emerg (fmt, ...) \ - __printk(0, pr_fmt(fmt), ##__VA_ARGS__) -#define pr_alert (fmt, ...) \ - __printk(1, pr_fmt(fmt), ##__VA_ARGS__) -#define pr_crit (fmt, ...) \ - __printk(2, pr_fmt(fmt), ##__VA_ARGS__) -#define pr_err (fmt, ...) \ - __printk(3, pr_fmt(fmt), ##__VA_ARGS__) -#define pr_warning (fmt, ...) \ - __printk(4, pr_fmt(fmt), ##__VA_ARGS__) -#define pr_warn pr_warning -#define pr_notice (fmt, ...) \ - __printk(5, pr_fmt(fmt), ##__VA_ARGS__) -#define pr_info (fmt, ...) \ - __printk(6, pr_fmt(fmt), ##__VA_ARGS__) - -#define pr_cont (fmt, ...) \ - printk(fmt, ##__VA_ARGS__) - -/* pr_devel() should produce zero code unless DEBUG is defined */ -#ifdef DEBUG -#define pr_devel (fmt, ...) \ - __printk(7, pr_fmt(fmt), ##__VA_ARGS__) -#else -#define pr_devel (fmt, ...) \ - no_printk(pr_fmt(fmt), ##__VA_ARGS__) -#endif Quoted 8 lines
include/linux/printk.h line 39
Quoted 4 lines
include/linux/printk.h +4
-0+#define pr_emerg (fmt, ...) \ +({ \ + CONFIG_LOGLEVEL > 0 ? log_emerg(fmt, ##__VA_ARGS__) : 0; \ +})There is also an off-by-one mismatch between the numbers here and the log level constants. E.g.
LOGL_INFOis 6, butpr_infoonly gets emitted ifCONFIG_LOGLEVELis >= 7.
Quoted 3 lines
The
KconfigforCONFIG_LOGLEVELdescription reads:"All Messages with a loglevel *smaller than* the console loglevel will be compiled in."
Ok then, perhaps that should be rectified.
--Sean
Quoted 65 lines
I did not intend to change this definition.
Best regards
Heinrich
Quoted 57 lines
--Sean
Quoted 53 lines
include/linux/printk.h +40
-5+#define pr_alert (fmt, ...) \ +({ \ + CONFIG_LOGLEVEL > 1 ? log_alert(fmt, ##__VA_ARGS__) : 0; \ +}) +#define pr_crit (fmt, ...) \ +({ \ + CONFIG_LOGLEVEL > 2 ? log_crit(fmt, ##__VA_ARGS__) : 0; \ +}) +#define pr_err (fmt, ...) \ +({ \ + CONFIG_LOGLEVEL > 3 ? log_err(fmt, ##__VA_ARGS__) : 0; \ +}) +#define pr_warn (fmt, ...) \ +({ \ + CONFIG_LOGLEVEL > 4 ? log_warning(fmt, ##__VA_ARGS__) : 0; \ +}) +#define pr_notice (fmt, ...) \ +({ \ + CONFIG_LOGLEVEL > 5 ? log_notice(fmt, ##__VA_ARGS__) : 0; \ +}) +#define pr_info (fmt, ...) \ +({ \ + CONFIG_LOGLEVEL > 6 ? log_info(fmt, ##__VA_ARGS__) : 0; \ +}) +#define pr_debug (fmt, ...) \ +({ \ + CONFIG_LOGLEVEL > 7 ? log_debug(fmt, ##__VA_ARGS__) : 0; \ +}) +#define pr_devel (fmt, ...) \ +({ \ + CONFIG_LOGLEVEL > 7 ? log_debug(fmt, ##__VA_ARGS__) : 0; \ +}) -#ifdef DEBUG -#define pr_debug (fmt, ...) \ - __printk(7, pr_fmt(fmt), ##__VA_ARGS__) +#ifdef CONFIG_LOG +#define pr_cont (fmt, ...) \ +({ \ + gd->logl_prev < CONFIG_LOGLEVEL ? \ + log_cont(fmt, ##__VA_ARGS__) : 0; \ +})#else -#define pr_debug (fmt, ...) \ - no_printk(pr_fmt(fmt), ##__VA_ARGS__) +#define pr_cont (fmt, ...) \ + printk(fmt, ##__VA_ARGS__)#endif #define printk_once (fmt, ...) \Signature · 1 line
2.29.2
PATCH 4/5 log: convert pr_*() to logging
Quoted 98 lines · Sean Anderson
Quoted 88 lines · Heinrich Schuchardt
Quoted 58 lines · Sean Anderson
Quoted 57 lines · Heinrich Schuchardt
In drivers we use a family of printing functions including
pr_err()andpr_cont().CONFIG_LOGLEVELis used to control which of these lead to output
viaprintf().Our logging functions allow finer grained control of output. So replace
printf()by the matching logging functions. The usage ofCONFIG_LOGLEVEL
remains unchanged.Signed-off-by Heinrich Schuchardt <[email protected]>---
?include/linux/bitops.h|? 4 ++-
?include/linux/printk.h| 82
+++++++++++++++++++++++-------------------
? 2 files changed, 48 insertions(+), 38 deletions(-)include/linux/bitops.h +0
-0@@ -6,7 +6,6 @@? #include <
asm/types.h>
? #include <asm-generic/bitsperlong.h>
? #include <linux/compiler.h>
-#include <linux/kernel.h>? #ifdef???
__KERNEL__
? #define BIT(nr)??????????? (1UL << (nr))include/linux/bitops.h +0
-0@@ -19,6 +18,9 @@? #define
BITS_TO_LONGS(nr)???DIV_ROUND_UP(nr, BITS_PER_BYTE * sizeof(long))
? #endifinclude/linux/bitops.h +3
-0+/* kernel.h includes log.h which include bitops.h */ +#include <linux/kernel.h> +? /*
?? * Create a contiguous bitmask starting at bit position @l and ending at
?? * position @h. For exampleinclude/linux/printk.h +0
-0@@ -1,6 +1,7 @@? #ifndef
__KERNEL_PRINTK__
? #define__KERNEL_PRINTK__+#include <
log.h>
? #include <stdio.h>
? #include <linux/compiler.h>include/linux/printk.h +0
-0@@ -28,49 +29,56 @@ ????? 0;??????????????????????? \ ? })Quoted 8 lines
include/linux/printk.h line 33
Quoted 3 lines
include/linux/printk.h +0
-3-#define __printk (level, fmt, ...)??????????????????? \ -({??????????????????????????????????? \ -??? level < CONFIG_LOGLEVEL ? printk(fmt, ##__VA_ARGS__) : 0;??? \Couldn't we just do
#define
__printk(level, fmt, ...)log(LOG_CATEGORY, level, fmt, ##__VA_ARGS__)Dear Sean,
Thanks for reviewing.
As of today
log()does not print anything ifCONFIG_LOGis not enabled.#if
CONFIG_IS_ENABLED(LOG)
#define_LOG_MAX_LEVELCONFIG_VAL(LOG_MAX_LEVEL)
#definelog_err(_fmt...)???log(LOG_CATEGORY, LOGL_ERR, ##_fmt)#definelog_warning(_fmt...)???log(LOG_CATEGORY, LOGL_WARNING, ##_fmt)#definelog_notice(_fmt...)???log(LOG_CATEGORY, LOGL_NOTICE, ##_fmt)#definelog_info(_fmt...)???log(LOG_CATEGORY, LOGL_INFO, ##_fmt)#definelog_debug(_fmt...)???log(LOG_CATEGORY, LOGL_DEBUG, ##_fmt)#definelog_content(_fmt...)???log(LOG_CATEGORY, LOGL_DEBUG_CONTENT, ##_fmt)
#definelog_io(_fmt...)???????log(LOG_CATEGORY, LOGL_DEBUG_IO, ##_fmt)#else
#define_LOG_MAX_LEVELLOGL_INFO
#definelog_err(_fmt, ...)???printf(_fmt, ##__VA_ARGS__)#definelog_warning(_fmt, ...)???printf(_fmt, ##__VA_ARGS__)Quoted 8 lines
#define
log_notice(_fmt, ...)???printf(_fmt, ##__VA_ARGS__)#definelog_info(_fmt, ...)???printf(_fmt, ##__VA_ARGS__)#definelog_debug(_fmt, ...)???debug(_fmt, ##__VA_ARGS__)#definelog_content(_fmt...)??? log_nop(LOG_CATEGORY, \
???????????????????LOGL_DEBUG_CONTENT, ##_fmt)
#definelog_io(_fmt...)???????log_nop(LOG_CATEGORY, LOGL_DEBUG_IO, ##_fmt)
#endif
Quoted 2 lines
If
CONFIG_LOGis not enabled, then log statements are converted to debug and printf.
Only the ones you cited, not the function log() referenced in your proposal.
Quoted 52 lines
Quoted 52 lines
A patch by Simon to change this behavior is pending. If it gets merged, we can do the suggested simplification.
log: Convert log values to
printf()if not enabled
https://patchwork.ozlabs.org/project/uboot/patch/20210114033051.483560-5-sjg at chromium.org/Quoted 42 lines
Quoted 28 lines
include/linux/printk.h +0
-2-}) -? #ifndef
pr_fmt
? #definepr_fmt(fmt)fmt
? #endifinclude/linux/printk.h +0
-21-#define pr_emerg (fmt, ...) \ -??? __printk(0, pr_fmt(fmt), ##__VA_ARGS__) -#define pr_alert (fmt, ...) \ -??? __printk(1, pr_fmt(fmt), ##__VA_ARGS__) -#define pr_crit (fmt, ...) \ -??? __printk(2, pr_fmt(fmt), ##__VA_ARGS__) -#define pr_err (fmt, ...) \ -??? __printk(3, pr_fmt(fmt), ##__VA_ARGS__) -#define pr_warning (fmt, ...) \ -??? __printk(4, pr_fmt(fmt), ##__VA_ARGS__) -#define pr_warn pr_warning -#define pr_notice (fmt, ...) \ -??? __printk(5, pr_fmt(fmt), ##__VA_ARGS__) -#define pr_info (fmt, ...) \ -??? __printk(6, pr_fmt(fmt), ##__VA_ARGS__) - -#define pr_cont (fmt, ...) \ -??? printk(fmt, ##__VA_ARGS__) - -/* pr_devel() should produce zero code unless DEBUG is defined */ -#ifdef DEBUG include/linux/printk.h line 39
Quoted 10 lines
include/linux/printk.h +4
-6-#define pr_devel (fmt, ...) \ -??? __printk(7, pr_fmt(fmt), ##__VA_ARGS__) -#else -#define pr_devel (fmt, ...) \ -??? no_printk(pr_fmt(fmt), ##__VA_ARGS__) -#endif +#define pr_emerg (fmt, ...)??????????????????????? \ +({??????????????????????????????????? \ +??? CONFIG_LOGLEVEL > 0 ? log_emerg(fmt, ##__VA_ARGS__) : 0;??? \ +})There is also an off-by-one mismatch between the numbers here and the log level constants. E.g.
LOGL_INFOis 6, butpr_infoonly gets emitted ifCONFIG_LOGLEVELis >= 7.
Quoted 6 lines
Quoted 4 lines
The
KconfigforCONFIG_LOGLEVELdescription reads:"All Messages with a loglevel *smaller than* the console loglevel will be compiled in."
Ok then, perhaps that should be rectified.
The current definition allows to disable log level 0. So you better don't change it.
Best regards
Heinrich
Quoted 69 lines
--Sean
Quoted 65 lines
I did not intend to change this definition.
Best regards
Heinrich
Quoted 57 lines
--Sean
Quoted 53 lines
include/linux/printk.h +38
-3+#define pr_alert (fmt, ...)??????????????????????? \ +({??????????????????????????????????? \ +??? CONFIG_LOGLEVEL > 1 ? log_alert(fmt, ##__VA_ARGS__) : 0;??? \ +}) +#define pr_crit (fmt, ...)??????????????????????? \ +({??????????????????????????????????? \ +??? CONFIG_LOGLEVEL > 2 ? log_crit(fmt, ##__VA_ARGS__) : 0;??????? \ +}) +#define pr_err (fmt, ...)??????????????????????? \ +({??????????????????????????????????? \ +??? CONFIG_LOGLEVEL > 3 ? log_err(fmt, ##__VA_ARGS__) : 0;??????? \ +}) +#define pr_warn (fmt, ...)??????????????????????? \ +({??????????????????????????????????? \ +??? CONFIG_LOGLEVEL > 4 ? log_warning(fmt, ##__VA_ARGS__) : 0;??? \ +}) +#define pr_notice (fmt, ...)??????????????????????? \ +({??????????????????????????????????? \ +??? CONFIG_LOGLEVEL > 5 ? log_notice(fmt, ##__VA_ARGS__) : 0;??? \ +}) +#define pr_info (fmt, ...)??????????????????????? \ +({??????????????????????????????????? \ +??? CONFIG_LOGLEVEL > 6 ? log_info(fmt, ##__VA_ARGS__) : 0;??????? \ +}) +#define pr_debug (fmt, ...)??????????????????????? \ +({??????????????????????????????????? \ +??? CONFIG_LOGLEVEL > 7 ? log_debug(fmt, ##__VA_ARGS__) : 0;??? \ +}) +#define pr_devel (fmt, ...)??????????????????????? \ +({??????????????????????????????????? \ +??? CONFIG_LOGLEVEL > 7 ? log_debug(fmt, ##__VA_ARGS__) : 0;??? \ +}) -#ifdef DEBUG -#define pr_debug (fmt, ...) \ -??? __printk(7, pr_fmt(fmt), ##__VA_ARGS__) +#ifdef CONFIG_LOG +#define pr_cont (fmt, ...)??????????????????????? \ +({??????????????????????????????????? \ +??? gd->logl_prev < CONFIG_LOGLEVEL ???????????????? \ +??????? log_cont(fmt, ##__VA_ARGS__) : 0;??????????? \ +})? #else
include/linux/printk.h +2
-2-#define pr_debug (fmt, ...) \ -??? no_printk(pr_fmt(fmt), ##__VA_ARGS__) +#define pr_cont (fmt, ...)??????????????????????? \ +??? printk(fmt, ##__VA_ARGS__)? #endif
? #define
printk_once(fmt, ...)\Signature · 1 line
2.29.2
PATCH 4/5 log: convert pr_*() to logging
In reply to Heinrich SchuchardtQuoted 9 lines · Heinrich Schuchardt
In drivers we use a family of printing functions including
pr_err()andpr_cont().CONFIG_LOGLEVELis used to control which of these lead to output viaprintf().Our logging functions allow finer grained control of output. So replace
printf()by the matching logging functions. The usage ofCONFIG_LOGLEVELremains unchanged.Signed-off-by Heinrich Schuchardt <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20210301/54316570/attachment.sig>
PATCH 5/5 test: unit test for pr_err(), pr_cont()
In reply to Heinrich SchuchardtProvide a unit test for printing via pr_err() and pr_cont().
--- test/log/Makefile | 1 + test/log/pr_cont_test.c | 45 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 test/log/pr_cont_test.c
test/log/Makefile +1 -0
@@ -8,6 +8,7 @@ obj-$(CONFIG_CMD_LOG) += log_filter.o ifdef CONFIG_UT_LOG obj-y += test-main.o +obj-y += pr_cont_test.o ifdef CONFIG_SANDBOX obj-$(CONFIG_LOG_SYSLOG) += syslog_test.o
test/log/pr_cont_test.c new file +45 -0
45 lines not on this page · raw message
--
2.29.2
PATCH 5/5 test: unit test for pr_err(), pr_cont()
Quoted 10 lines · Heinrich Schuchardt
Provide a unit test for printing via
pr_err()andpr_cont().Signed-off-by Heinrich Schuchardt <[email protected]>--- test/log/Makefile | 1 + test/log/pr_cont_test.c | 45 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 test/log/pr_cont_test.c
PATCH 5/5 test: unit test for pr_err(), pr_cont()
In reply to Heinrich SchuchardtQuoted 4 lines · Heinrich Schuchardt
Provide a unit test for printing via
pr_err()andpr_cont().Signed-off-by Heinrich Schuchardt <[email protected]>Reviewed-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20210118/53107fbc/attachment.sig>