log: Add commands for manipulating filters
v2 cover log: Add commands for manipulating filters
This series adds several commands for adding, listing, and removing log filters. It also adds getopt, since the filter-add command needs to have several optional arguments to be complete, and positional specification of those arguments would have been difficult.
Changes in v2:
- Add % before constants in kerneldocs
- Add compiletime assert on size of log_cat_name
- Add const qualifier to log_*_name
- Add option to remove all filters to filter-remove
- Clarify filter-* help text
- Clarify wording of filter documentation
- Converted log filter-* tests to C from python
- Document log_level_t and log_category_t members
- Expand documentation of getopt() to include examples
- Expose log_has_cat and log_has_file for filter tests
- Include enum definitions instead of re-documenting them
- Print an error message if the log level is invalid.
- Remove opt prefix from getopt_state members
- Reorganize log documentation; related sections should now be more proximate
Sean Anderson (22):
log: Fix missing negation of ENOMEM
log: Fix incorrect documentation of log_filter.cat_list
log: Add additional const qualifier to arrays
log: Add new category names to log_cat_name
log: Use CONFIG_IS_ENABLED() for LOG_TEST
log: Expose some helper functions
log: Add function to create a filter with flags
log: Add filter flag to deny on match
test: Add tests for LOGFF_DENY
log: Add filter flag to match greater than a log level
test: Add test for LOGFF_MIN
cmd: log: Use sub-commands for log
cmd: log: Split off log level parsing
cmd: log: Move log test to end of help string
cmd: log: Add commands to list categories and drivers
cmd: log: Make "log level" print all log levels
lib: Add getopt
test: Add a test for getopt
cmd: log: Add commands to manipulate filters
test: Add a test for log filter-*
doc: Add log kerneldocs to documentation
doc: Update logging documentation
MAINTAINERS | 1 + cmd/Kconfig | 1 + cmd/log.c | 360 +++++++++++++++++++++++++++++++++----- common/log.c | 65 ++++--- doc/api/getopt.rst | 8 + doc/api/index.rst | 1 + doc/develop/logging.rst | 238 ++++++++++++------------- include/getopt.h | 130 ++++++++++++++ include/log.h | 205 ++++++++++++++++------ include/test/log.h | 1 + lib/Kconfig | 5 + lib/Makefile | 1 + lib/getopt.c | 125 +++++++++++++ test/lib/Makefile | 1 + test/lib/getopt.c | 123 +++++++++++++ test/log/Makefile | 1 + test/log/log_filter.c | 111 ++++++++++++ test/log/log_test.c | 94 +++++++++- test/py/tests/test_log.py | 26 ++- 19 files changed, 1253 insertions(+), 244 deletions(-) create mode 100644 doc/api/getopt.rst create mode 100644 include/getopt.h create mode 100644 lib/getopt.c create mode 100644 test/lib/getopt.c create mode 100644 test/log/log_filter.c
Signature · 1 line
2.28.0
PATCH v2 1/22 log: Fix missing negation of ENOMEM
Errors returned should be negative.
---
(no changes since v1)
common/log.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
common/log.c +1 -1
@@ -268,7 +268,7 @@ int log_add_filter(const char *drv_name, enum log_category_t cat_list[],if (file_list) { filt->file_list =strdup (file_list);if (!filt->file_list) { - ret =ENOMEM ; + ret = -ENOMEM ; goto err; } }
Signature · 1 line
2.28.0
PATCH v2 2/22 log: Fix incorrect documentation of log_filter.cat_list
In reply to Sean AndersonLogging category lists are terminated by LOGC_END, not LOGC_NONE.
---
Changes in v2:
- Also fix misdocumentation of for log_add_filter()
include/log.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/log.h +2 -2
@@ -349,7 +349,7 @@ enum log_filter_flags {* new filter, and must be provided when removing a previously added * filter. * @flags: Flags for this filter (LOGFF_...) -* @cat_list: List of categories to allow (terminated by LOGC_none). If empty +* @cat_list: List of categories to allow (terminated by %LOGC_END). If empty * then all categories are permitted. Up to LOGF_MAX_CATEGORIES entries * can be provided * @max_level: Maximum log level to allow
@@ -423,7 +423,7 @@ int do_log_test(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]);* * @drv_name: Driver name to add the filter to (since each driver only has a * single device) -* @cat_list: List of categories to allow (terminated by LOGC_none). If empty +* @cat_list: List of categories to allow (terminated by %LOGC_END). If empty * then all categories are permitted. Up to LOGF_MAX_CATEGORIES entries * can be provided * @max_level: Maximum log level to allow
Signature · 1 line
2.28.0
PATCH v2 3/22 log: Add additional const qualifier to arrays
In reply to Sean AndersonBoth these arrays and their members are const. Fixes checkpatch complaint.
---
Changes in v2:
- New
common/log.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
common/log.c +2 -2
@@ -13,7 +13,7 @@DECLARE_GLOBAL_DATA_PTR ; -static const char *log_cat_name[LOGC_COUNT -LOGC_NONE ] = { +static const char *const log_cat_name[LOGC_COUNT -LOGC_NONE ] = {"none" ,"arch" ,"board" ,
@@ -23,7 +23,7 @@ static const char *log_cat_name[LOGC_COUNT - LOGC_NONE] = { "efi", }; -static const char *log_level_name[LOGL_COUNT ] = { +static const char *const log_level_name[LOGL_COUNT ] = {"EMERG" ,"ALERT" ,"CRIT" ,
Signature · 1 line
2.28.0
PATCH v2 4/22 log: Add new category names to log_cat_name
In reply to Sean AndersonWithout every category between LOGC_NONE and LOGC_COUNT present in log_cat_name, log_get_cat_by_name will dereference NULL pointers if it doesn't find a name early enough.
---
Changes in v2:
- Add compiletime assert on size of log_cat_name
common/log.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
common/log.c +9 -1
@@ -13,7 +13,7 @@DECLARE_GLOBAL_DATA_PTR ; -static const char *const log_cat_name[LOGC_COUNT -LOGC_NONE ] = { +static const char *const log_cat_name[] = {"none" ,"arch" ,"board" ,
@@ -21,6 +21,11 @@ static const char *const log_cat_name[LOGC_COUNT - LOGC_NONE] = {"driver-model" ,"device-tree" ,"efi" , +"alloc" , +"sandbox" , +"bloblist" , +"devres" , + "acpi", }; static const char *const log_level_name[LOGL_COUNT] = {
@@ -40,6 +45,9 @@ const char *log_get_cat_name(enum log_category_t cat) {const char *name; +compiletime_assert (ARRAY_SIZE (log_cat_name) ==LOGC_COUNT -LOGC_NONE , +"missing logging category name" ); +if (cat <0 || cat >=LOGC_COUNT )return "<invalid>" ;if (cat >=LOGC_NONE )
Signature · 1 line
2.28.0
PATCH v2 5/22 log: Use CONFIG_IS_ENABLED() for LOG_TEST
In reply to Sean AndersonCheckpatch complains about using #ifdef for CONFIG variables.
---
(no changes since v1)
cmd/log.c | 4 ++-- test/log/log_test.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
cmd/log.c +2 -2
@@ -105,7 +105,7 @@ static int do_log_rec(struct cmd_tbl *cmdtp, int flag, int argc,static struct cmd_tbl log_sub[] = {U_BOOT_CMD_MKENT (level,CONFIG_SYS_MAXARGS ,1 , do_log_level,"" ,"" ), -#ifdef CONFIG_LOG_TEST +#if CONFIG_IS_ENABLED(LOG_TEST)U_BOOT_CMD_MKENT (test,2 ,1 , do_log_test,"" ,"" ), #endifU_BOOT_CMD_MKENT (format,CONFIG_SYS_MAXARGS ,1 , do_log_format,"" ,"" ),
@@ -133,7 +133,7 @@ static int do_log(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])#ifdef CONFIG_SYS_LONGHELP static char log_help_text[] = "level - get/set log level\n" -#ifdef CONFIG_LOG_TEST +#if CONFIG_IS_ENABLED (LOG_TEST ) "log test - run log tests\n"#endif "log format <fmt> - set log output format. <fmt> is a string where\n"
test/log/log_test.c +1 -1
@@ -201,7 +201,7 @@ static int log_test(int testnum)return 0 ; } -#ifdef CONFIG_LOG_TEST +#if CONFIG_IS_ENABLED (LOG_TEST )int do_log_test (struct cmd_tbl *cmdtp,int flag,int argc,char *const argv[]) {int testnum =0 ;
Signature · 1 line
2.28.0
PATCH v2 6/22 log: Expose some helper functions
In reply to Sean AndersonThese functions are required by "cmd: log: Add commands to manipulate filters" and "test: Add a test for log filter-*".
---
Changes in v2:
- Expose log_has_cat and log_has_file for filter tests
common/log.c | 23 +++-------------------- include/log.h | 31 +++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 20 deletions(-)
common/log.c +3 -20
@@ -96,7 +96,7 @@ enum log_level_t log_get_level_by_name(const char *name)return LOGL_NONE ; } -static struct log_device *log_device_find_by_name (const char *drv_name) +struct log_device *log_device_find_by_name (const char *drv_name) {struct log_device *ldev;
@@ -108,15 +108,7 @@ static struct log_device *log_device_find_by_name(const char *drv_name)return NULL ; } -/** -* log_has_cat() - check if a log category exists within a list -* -* @cat_list: List of categories to check, at most LOGF_MAX_CATEGORIES entries -* long, terminated by LC_END if fewer -* @cat: Category to search for -* @return true if @cat is in @cat_list, else false -*/ -static bool log_has_cat (enum log_category_t cat_list[],enum log_category_t cat) +bool log_has_cat (enum log_category_t cat_list[],enum log_category_t cat) {int i;
@@ -128,16 +120,7 @@ static bool log_has_cat(enum log_category_t cat_list[], enum log_category_t cat)return false; } -/** -* log_has_file() - check if a file is with a list -* -* @file_list: List of files to check, separated by comma -* @file: File to check for. This string is matched against the end of each -* file in the list, i.e. ignoring any preceding path. The list is -* intended to consist of relative pathnames, e.g. common/main.c,cmd/log.c -* @return true if @file is in @file_list, else false -*/ -static bool log_has_file (const char *file_list,const char *file) +bool log_has_file (const char *file_list,const char *file) {int file_len =strlen (file);const char *s, *p;
include/log.h +31 -0
@@ -402,6 +402,37 @@ const char *log_get_level_name(enum log_level_t level);*/ enum log_level_t log_get_level_by_name (const char *name); +/** +* log_device_find_by_name() - Look up a log device by its driver's name +* +* @drv_name: Name of the driver +* @return the log device, or NULL if not found +*/ +struct log_device *log_device_find_by_name (const char *drv_name); + +/** +* log_has_cat() - check if a log category exists within a list +* +* @cat_list: List of categories to check, at most %LOGF_MAX_CATEGORIES entries +* long, terminated by %LC_END if fewer +* @cat: Category to search for +* +* Return: ``true`` if @cat is in @cat_list, else ``false`` +*/ +bool log_has_cat (enum log_category_t cat_list[],enum log_category_t cat); + +/** +* log_has_file() - check if a file is with a list +* +* @file_list: List of files to check, separated by comma +* @file: File to check for. This string is matched against the end of each +* file in the list, i.e. ignoring any preceding path. The list is +* intended to consist of relative pathnames, e.g. common/main.c,cmd/log.c +* +* Return: ``true`` if @file is in @file_list, else ``false`` +*/ +bool log_has_file (const char *file_list,const char *file); +/* Log format flags (bit numbers) for gd->log_fmt. See log_fmt_chars */ enum log_fmt {LOGF_CAT =0 ,
Signature · 1 line
2.28.0
PATCH v2 7/22 log: Add function to create a filter with flags
In reply to Sean AndersonThis function exposes a way to specify flags when creating a filter.
---
(no changes since v1)
common/log.c | 6 ++++-- include/log.h | 29 +++++++++++++++++++++++++++-- 2 files changed, 31 insertions(+), 4 deletions(-)
common/log.c +4 -2
@@ -228,8 +228,9 @@ int _log(enum log_category_t cat, enum log_level_t level, const char *file,return 0 ; } -int log_add_filter (const char *drv_name,enum log_category_t cat_list[], -enum log_level_t max_level,const char *file_list) +int log_add_filter_flags (const char *drv_name,enum log_category_t cat_list[], +enum log_level_t max_level,const char *file_list, +int flags) {struct log_filter *filt;struct log_device *ldev;
@@ -243,6 +244,7 @@ int log_add_filter(const char *drv_name, enum log_category_t cat_list[],if (!filt)return -ENOMEM ; + filt->flags = flags;if (cat_list) { filt->flags |=LOGFF_HAS_CAT ;for (i =0 ; ; i++) {
include/log.h +27 -2
@@ -449,6 +449,25 @@ enum log_fmt {/* Handle the 'log test' command */ int do_log_test (struct cmd_tbl *cmdtp,int flag,int argc,char *const argv[]); +/** +* log_add_filter_flags() - Add a new filter to a log device, specifying flags +* +* @drv_name: Driver name to add the filter to (since each driver only has a +* single device) +* @flags: Flags for this filter (LOGFF_...) +* @cat_list: List of categories to allow (terminated by %LOGC_END). If empty +* then all categories are permitted. Up to LOGF_MAX_CATEGORIES entries +* can be provided +* @max_level: Maximum log level to allow +* @file_list: List of files to allow, separated by comma. If NULL then all +* files are permitted +* @return the sequence number of the new filter (>=0) if the filter was added, +* or a -ve value on error +*/ +int log_add_filter_flags (const char *drv_name,enum log_category_t cat_list[], +enum log_level_t max_level,const char *file_list, +int flags); +/** * log_add_filter() - Add a new filter to a log device *
@@ -463,8 +482,14 @@ int do_log_test(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]);* @return the sequence number of the new filter (>=0) if the filter was added, * or a -ve value on error */ -int log_add_filter (const char *drv_name,enum log_category_t cat_list[], -enum log_level_t max_level,const char *file_list); +static inline int log_add_filter (const char *drv_name, +enum log_category_t cat_list[], +enum log_level_t max_level, +const char *file_list) +{ +return log_add_filter_flags (drv_name, cat_list, max_level, file_list, +0 ); +}/** * log_remove_filter() - Remove a filter from a log device
Signature · 1 line
2.28.0
PATCH v2 8/22 log: Add filter flag to deny on match
In reply to Sean AndersonWithout this flag, log filters can only explicitly accept messages. Allowing denial makes it easier to filter certain subsystems. Unlike allow-ing filters, deny-ing filters are added to the beginning of the filter list. This should do the Right Thing most of the time, but it's less-universal than allowing filters to be inserted anywhere. If this becomes a problem, then perhaps log_filter_add* should take a filter number to insert before/after.
---
(no changes since v1)
common/log.c | 12 ++++++++++-- include/log.h | 11 ++++++++++- 2 files changed, 20 insertions(+), 3 deletions(-)
common/log.c +10 -2
@@ -164,7 +164,11 @@ static bool log_passes_filters(struct log_device *ldev, struct log_rec *rec)if (filt->file_list && !log_has_file (filt->file_list, rec->file))continue ; -return true; + +if (filt->flags &LOGFF_DENY ) +return false; +else +return true; }return false;
@@ -266,7 +270,11 @@ int log_add_filter_flags(const char *drv_name, enum log_category_t cat_list[], } } filt->filter_num = ldev->next_filter_num++; -list_add_tail (&filt->sibling_node, &ldev->filter_head); +/* Add deny filters to the beginning of the list */ +if (flags &LOGFF_DENY ) +list_add (&filt->sibling_node, &ldev->filter_head); +else +list_add_tail (&filt->sibling_node, &ldev->filter_head);return filt->filter_num;
include/log.h +10 -1
@@ -338,13 +338,22 @@ enum { LOGF_MAX_CATEGORIES = 5, /* maximum categories per filter */ }; +/** +* enum log_filter_flags - Flags which modify a filter +*/ enum log_filter_flags { -LOGFF_HAS_CAT =1 <<0 ,/* Filter has a category list */ +/** @LOGFF_HAS_CAT: Filter has a category list */ +LOGFF_HAS_CAT =1 <<0 , +/** @LOGFF_DENY: Filter denies matching messages */ +LOGFF_DENY =1 <<1 , };/** * struct log_filter - criterial to filter out log messages * +* If a message matches all criteria, then it is allowed. If LOGFF_DENY is set, +* then it is denied instead. +* * @filter_num: Sequence number of this filter. This is returned when adding a * new filter, and must be provided when removing a previously added * filter.
Signature · 1 line
2.28.0
PATCH v2 9/22 test: Add tests for LOGFF_DENY
In reply to Sean AndersonThis adds some tests for log filters which deny if they match.
---
(no changes since v1)
test/log/log_test.c | 69 +++++++++++++++++++++++++++++++++++++++ test/py/tests/test_log.py | 21 ++++++++++-- 2 files changed, 88 insertions(+), 2 deletions(-)
test/log/log_test.c +69 -0
@@ -196,6 +196,75 @@ static int log_test(int testnum)log_io ("level %d\n" ,LOGL_DEBUG_IO );break ; } +case 11 : { +/* Check denying based on category */ +int filt1, filt2; +enum log_category_t cat_list[] = { +log_uc_cat (UCLASS_SPI ),LOGC_END + }; + + ret =log_add_filter ("console" , cat_list,LOGL_MAX ,NULL ); +if (ret <0 ) +return ret; + filt1 = ret; + ret =log_add_filter_flags ("console" , cat_list,LOGL_MAX ,NULL , +LOGFF_DENY ); +if (ret <0 ) +return ret; + filt2 = ret; +log_run (UCLASS_SPI ,"file" ); + ret =log_remove_filter ("console" , filt1); +if (ret <0 ) +return ret; + ret =log_remove_filter ("console" , filt2); +if (ret <0 ) +return ret; +break ; + } +case 12 : { +/* Check denying based on file */ +int filt1, filt2; + + ret =log_add_filter ("console" ,NULL ,LOGL_MAX ,"file" ); +if (ret <0 ) +return ret; + filt1 = ret; + ret =log_add_filter_flags ("console" ,NULL ,LOGL_MAX ,"file" , +LOGFF_DENY ); +if (ret <0 ) +return ret; + filt2 = ret; +log_run (UCLASS_SPI ,"file" ); + ret =log_remove_filter ("console" , filt1); +if (ret <0 ) +return ret; + ret =log_remove_filter ("console" , filt2); +if (ret <0 ) +return ret; +break ; + } +case 13 : { +/* Check denying based on level */ +int filt1, filt2; + + ret =log_add_filter ("console" ,NULL ,LOGL_INFO ,NULL ); +if (ret <0 ) +return ret; + filt1 = ret; + ret =log_add_filter_flags ("console" ,NULL ,LOGL_WARNING ,NULL , +LOGFF_DENY ); +if (ret <0 ) +return ret; + filt2 = ret; +log_run (UCLASS_SPI ,"file" ); + ret =log_remove_filter ("console" , filt1); +if (ret <0 ) +return ret; + ret =log_remove_filter ("console" , filt2); +if (ret <0 ) +return ret; +break ; + } }return 0 ;
test/py/tests/test_log.py +19 -2
@@ -15,7 +15,8 @@ LOGL_FIRST, LOGL_WARNING, LOGL_INFO = (0, 4, 6) @pytest.mark.buildconfigspec('cmd_log') def test_log(u_boot_console): """Test that U-Boot logging works correctly.""" - def check_log_entries(lines, mask, max_level=LOGL_INFO): + def check_log_entries(lines, mask, max_level=LOGL_INFO, + min_level=LOGL_FIRST): """Check that the expected log records appear in the output Args:
@@ -24,8 +25,9 @@ def test_log(u_boot_console): bit 0: standard log line bit 1: _log line max_level: maximum log level to expect in the output + min_level: minimum log level to expect in the output """ - for i in range(max_level): + for i in range(min_level, max_level + 1): if mask & 1: assert 'log_run() log %d' % i == next(lines) if mask & 3:
@@ -92,6 +94,18 @@ def test_log(u_boot_console): for i in range(7): assert 'log_test() level %d' % i == next(lines) + def test11(): + lines = run_test(11) + assert next(lines, None) == None + + def test12(): + lines = run_test(12) + assert next(lines, None) == None + + def test13(): + lines = run_test(13) + check_log_entries(lines, 1, LOGL_INFO, LOGL_WARNING + 1) + # TODO([email protected]): Consider structuring this as separate tests cons = u_boot_console test0()
@@ -105,6 +119,9 @@ def test_log(u_boot_console): test8() test9() test10() + test11() + test12() + test13() @pytest.mark.buildconfigspec('cmd_log') def test_log_format(u_boot_console):
Signature · 1 line
2.28.0
PATCH v2 10/22 log: Add filter flag to match greater than a log level
In reply to Sean AndersonThis is the compliment of the existing behavior to match only messages with a log level less than a threshold. This is primarily useful in conjunction with LOGFF_DENY.
---
(no changes since v1)
common/log.c | 12 +++++++++--- include/log.h | 10 ++++++---- 2 files changed, 15 insertions(+), 7 deletions(-)
common/log.c +9 -3
@@ -156,11 +156,17 @@ static bool log_passes_filters(struct log_device *ldev, struct log_rec *rec) }list_for_each_entry (filt, &ldev->filter_head, sibling_node) { -if (rec->level > filt->max_level) +if (filt->flags &LOGFF_LEVEL_MIN ) { +if (rec->level < filt->level) +continue ; + }else if (rec->level > filt->level) {continue ; + } +if ((filt->flags &LOGFF_HAS_CAT ) && !log_has_cat (filt->cat_list, rec->cat))continue ; +if (filt->file_list && !log_has_file (filt->file_list, rec->file))continue ;
@@ -233,7 +239,7 @@ int _log(enum log_category_t cat, enum log_level_t level, const char *file, }int log_add_filter_flags (const char *drv_name,enum log_category_t cat_list[], -enum log_level_t max_level,const char *file_list, +enum log_level_t level,const char *file_list,int flags) {struct log_filter *filt;
@@ -261,7 +267,7 @@ int log_add_filter_flags(const char *drv_name, enum log_category_t cat_list[],break ; } } - filt->max_level = max_level; + filt->level = level;if (file_list) { filt->file_list =strdup (file_list);if (!filt->file_list) {
include/log.h +6 -4
@@ -346,6 +346,8 @@ enum log_filter_flags {LOGFF_HAS_CAT =1 <<0 ,/** @LOGFF_DENY: Filter denies matching messages */ LOGFF_DENY =1 <<1 , +/** @LOGFF_LEVEL_MIN: Filter's level is a minimum, not a maximum */ + LOGFF_LEVEL_MIN = 1 << 2, };/**
@@ -361,7 +363,7 @@ enum log_filter_flags {* @cat_list: List of categories to allow (terminated by %LOGC_END). If empty * then all categories are permitted. Up to LOGF_MAX_CATEGORIES entries * can be provided -* @max_level: Maximum log level to allow +* @level: Maximum (or minimum, if LOGFF_MIN_LEVEL) log level to allow * @file_list: List of files to allow, separated by comma. If NULL then all * files are permitted * @sibling_node: Next filter in the list of filters for this log device
@@ -370,7 +372,7 @@ struct log_filter {int filter_num;int flags;enum log_category_t cat_list[LOGF_MAX_CATEGORIES ]; -enum log_level_t max_level; +enum log_level_t level;const char *file_list;struct list_head sibling_node; };
@@ -467,14 +469,14 @@ int do_log_test(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]);* @cat_list: List of categories to allow (terminated by %LOGC_END). If empty * then all categories are permitted. Up to LOGF_MAX_CATEGORIES entries * can be provided -* @max_level: Maximum log level to allow +* @level: Maximum (or minimum, if LOGFF_LEVEL_MIN) log level to allow * @file_list: List of files to allow, separated by comma. If NULL then all * files are permitted * @return the sequence number of the new filter (>=0) if the filter was added, * or a -ve value on error */ int log_add_filter_flags (const char *drv_name,enum log_category_t cat_list[], -enum log_level_t max_level,const char *file_list, +enum log_level_t level,const char *file_list,int flags);/**
Signature · 1 line
2.28.0
PATCH v2 11/22 test: Add test for LOGFF_MIN
In reply to Sean AndersonThis tests log filters matching on a minimum level.
---
(no changes since v1)
test/log/log_test.c | 23 +++++++++++++++++++++++ test/py/tests/test_log.py | 5 +++++ 2 files changed, 28 insertions(+)
test/log/log_test.c +23 -0
@@ -265,6 +265,29 @@ static int log_test(int testnum)return ret;break ; } +case 14 : { +/* Check matching based on minimum level */ +int filt1, filt2; + + ret =log_add_filter_flags ("console" ,NULL ,LOGL_WARNING ,NULL , +LOGFF_LEVEL_MIN ); +if (ret <0 ) +return ret; + filt1 = ret; + ret =log_add_filter_flags ("console" ,NULL ,LOGL_INFO ,NULL , +LOGFF_DENY |LOGFF_LEVEL_MIN ); +if (ret <0 ) +return ret; + filt2 = ret; +log_run (UCLASS_SPI ,"file" ); + ret =log_remove_filter ("console" , filt1); +if (ret <0 ) +return ret; + ret =log_remove_filter ("console" , filt2); +if (ret <0 ) +return ret; +break ; + } }return 0 ;
test/py/tests/test_log.py +5 -0
@@ -106,6 +106,10 @@ def test_log(u_boot_console): lines = run_test(13) check_log_entries(lines, 1, LOGL_INFO, LOGL_WARNING + 1) + def test14(): + lines = run_test(14) + check_log_entries(lines, 1, LOGL_INFO - 1, LOGL_WARNING) + # TODO([email protected]): Consider structuring this as separate tests cons = u_boot_console test0()
@@ -122,6 +126,7 @@ def test_log(u_boot_console): test11() test12() test13() + test14() @pytest.mark.buildconfigspec('cmd_log') def test_log_format(u_boot_console):
Signature · 1 line
2.28.0
PATCH v2 12/22 cmd: log: Use sub-commands for log
In reply to Sean AndersonThis reduces duplicate code, and makes adding new sub-commands easier.
---
(no changes since v1)
cmd/log.c | 37 +++++++------------------------------ 1 file changed, 7 insertions(+), 30 deletions(-)
cmd/log.c +7 -30
@@ -103,33 +103,6 @@ static int do_log_rec(struct cmd_tbl *cmdtp, int flag, int argc,return 0 ; } -static struct cmd_tbl log_sub[] = { -U_BOOT_CMD_MKENT (level,CONFIG_SYS_MAXARGS ,1 , do_log_level,"" ,"" ), -#if CONFIG_IS_ENABLED(LOG_TEST) -U_BOOT_CMD_MKENT (test,2 ,1 , do_log_test,"" ,"" ), -#endif -U_BOOT_CMD_MKENT (format,CONFIG_SYS_MAXARGS ,1 , do_log_format,"" ,"" ), -U_BOOT_CMD_MKENT (rec,CONFIG_SYS_MAXARGS ,1 , do_log_rec,"" ,"" ), -}; - -static int do_log (struct cmd_tbl *cmdtp,int flag,int argc,char *const argv[]) -{ -struct cmd_tbl *cp; - -if (argc <2 ) -return CMD_RET_USAGE ; - -/* drop initial "log" arg */ - argc--; - argv++; - - cp =find_cmd_tbl (argv[0 ], log_sub,ARRAY_SIZE (log_sub)); -if (cp) -return cp->cmd (cmdtp, flag, argc, argv); - -return CMD_RET_USAGE ; -} -#ifdef CONFIG_SYS_LONGHELP static char log_help_text[] ="level - get/set log level\n"
@@ -145,7 +118,11 @@ static char log_help_text[] = ;#endif -U_BOOT_CMD ( - log,CONFIG_SYS_MAXARGS ,1 , do_log, -"log system" , log_help_text +U_BOOT_CMD_WITH_SUBCMDS (log,"log system" , log_help_text, +U_BOOT_SUBCMD_MKENT (level,2 ,1 , do_log_level), +#if CONFIG_IS_ENABLED(LOG_TEST) +U_BOOT_SUBCMD_MKENT (test,2 ,1 , do_log_test), +#endif +U_BOOT_SUBCMD_MKENT (format,2 ,1 , do_log_format), + U_BOOT_SUBCMD_MKENT(rec, 7, 1, do_log_rec), );
Signature · 1 line
2.28.0
PATCH v2 13/22 cmd: log: Split off log level parsing
In reply to Sean AndersonMove parsing of log level into its own function so it can be re-used. This also adds support for using log level names instead of just the integer equivalent.
---
Changes in v2:
- Print an error message if the log level is invalid.
cmd/log.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-)
cmd/log.c +23 -6
@@ -11,23 +11,40 @@static char log_fmt_chars[LOGF_COUNT ] ="clFLfm" ; +static enum log_level_t parse_log_level (char *const arg) +{ +enum log_level_t ret; +ulong level; + +if (!strict_strtoul (arg,10 , &level)) { +if (level > _LOG_MAX_LEVEL) { +printf ("Only log levels <= %d are supported\n" , + _LOG_MAX_LEVEL); +return LOGL_NONE ; + } +return level; + } + + ret =log_get_level_by_name (arg); +if (ret ==LOGL_NONE ) +printf ("Unknown log level \"%s\"\n" , arg); +return ret; +} +static int do_log_level (struct cmd_tbl *cmdtp,int flag,int argc,char *const argv[]) {if (argc >1 ) { -long log_level =simple_strtol (argv[1 ],NULL ,10 ); +enum log_level_t log_level =parse_log_level (argv[1 ]); -if (log_level <0 || log_level > _LOG_MAX_LEVEL) { -printf ("Only log levels <= %d are supported\n" , - _LOG_MAX_LEVEL); +if (log_level ==LOGL_NONE )return CMD_RET_FAILURE ; - } gd->default_log_level = log_level; }else {printf ("Default log level: %d\n" , gd->default_log_level); } -return 0 ; +return CMD_RET_SUCCESS ; } static int do_log_format(struct cmd_tbl *cmdtp, int flag, int argc,
Signature · 1 line
2.28.0
PATCH v2 14/22 cmd: log: Move log test to end of help string
In reply to Sean AndersonThis is probably what a typical user is least interested in. Move it to the end of the description.
---
(no changes since v1)
cmd/log.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
cmd/log.c +5 -5
@@ -123,23 +123,23 @@ static int do_log_rec(struct cmd_tbl *cmdtp, int flag, int argc,#ifdef CONFIG_SYS_LONGHELP static char log_help_text[] ="level - get/set log level\n" -#if CONFIG_IS_ENABLED (LOG_TEST ) -"log test - run log tests\n" -#endif"log format <fmt> - set log output format. <fmt> is a string where\n" "\teach letter indicates something that should be displayed:\n" "\tc=category, l=level, F=file, L=line number, f=function, m=msg\n" "\tor 'default', or 'all' for all\n" "log rec <category> <level> <file> <line> <func> <message> - " "output a log record" +#if CONFIG_IS_ENABLED (LOG_TEST ) +"\nlog test - run log tests" +#endif ;#endif U_BOOT_CMD_WITH_SUBCMDS (log,"log system" , log_help_text,U_BOOT_SUBCMD_MKENT (level,2 ,1 , do_log_level), +U_BOOT_SUBCMD_MKENT (format,2 ,1 , do_log_format), +U_BOOT_SUBCMD_MKENT (rec,7 ,1 , do_log_rec), #if CONFIG_IS_ENABLED(LOG_TEST) U_BOOT_SUBCMD_MKENT(test, 2, 1, do_log_test), #endif -U_BOOT_SUBCMD_MKENT (format,2 ,1 , do_log_format), - U_BOOT_SUBCMD_MKENT(rec, 7, 1, do_log_rec), );
Signature · 1 line
2.28.0
PATCH v2 15/22 cmd: log: Add commands to list categories and drivers
In reply to Sean AndersonThis allows users to query which categories and drivers are available on their system. This allows them to construct filter-add commands without (e.g.) adjusting the log format to show categories and drivers.
---
Changes in v2:
- New
cmd/log.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+)
cmd/log.c +36 -0
@@ -47,6 +47,38 @@ static int do_log_level(struct cmd_tbl *cmdtp, int flag, int argc,return CMD_RET_SUCCESS ; } +static int do_log_categories (struct cmd_tbl *cmdtp,int flag,int argc, +char *const argv[]) +{ +enum log_category_t cat; +const char *name; + +for (cat =LOGC_FIRST ; cat <LOGC_COUNT ; cat++) { + name =log_get_cat_name (cat); +/* +* Invalid category names (e.g. <invalid> or <missing>) begin +* with '<'. TODO: perhaps change the interface of +* log_get_cat_name to return an error code? +*/ +if (name[0 ] =='<' ) +continue ; +printf ("%s\n" , name); + } + +return CMD_RET_SUCCESS ; +} + +static int do_log_drivers (struct cmd_tbl *cmdtp,int flag,int argc, +char *const argv[]) +{ +struct log_device *ldev; + +list_for_each_entry (ldev, &gd->log_head, sibling_node) +printf ("%s\n" , ldev->drv->name); + +return CMD_RET_SUCCESS ; +} +static int do_log_format (struct cmd_tbl *cmdtp,int flag,int argc,char *const argv[]) {
@@ -123,6 +155,8 @@ static int do_log_rec(struct cmd_tbl *cmdtp, int flag, int argc,#ifdef CONFIG_SYS_LONGHELP static char log_help_text[] ="level - get/set log level\n" +"categories - list log categories\n" +"drivers - list log drivers\n" "log format <fmt> - set log output format. <fmt> is a string where\n" "\teach letter indicates something that should be displayed:\n" "\tc=category, l=level, F=file, L=line number, f=function, m=msg\n"
@@ -137,6 +171,8 @@ static char log_help_text[] =U_BOOT_CMD_WITH_SUBCMDS (log,"log system" , log_help_text,U_BOOT_SUBCMD_MKENT (level,2 ,1 , do_log_level), +U_BOOT_SUBCMD_MKENT (categories,1 ,1 , do_log_categories), +U_BOOT_SUBCMD_MKENT (drivers,1 ,1 , do_log_drivers),U_BOOT_SUBCMD_MKENT (format,2 ,1 , do_log_format),U_BOOT_SUBCMD_MKENT (rec,7 ,1 , do_log_rec), #if CONFIG_IS_ENABLED(LOG_TEST)
Signature · 1 line
2.28.0
PATCH v2 16/22 cmd: log: Make "log level" print all log levels
In reply to Sean AndersonThis makes the log level command print all valid log levels. The default log level is annotated. This provides an easy way to see which log levels are compiled-in.
---
Changes in v2:
- New
cmd/log.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
cmd/log.c +9 -3
@@ -34,14 +34,20 @@ static enum log_level_t parse_log_level(char *const arg)static int do_log_level (struct cmd_tbl *cmdtp,int flag,int argc,char *const argv[]) { +enum log_level_t log_level; +if (argc >1 ) { -enum log_level_t log_level =parse_log_level (argv[1 ]); + log_level =parse_log_level (argv[1 ]);if (log_level ==LOGL_NONE )return CMD_RET_FAILURE ; gd->default_log_level = log_level; }else { -printf ("Default log level: %d\n" , gd->default_log_level); +for (log_level =LOGL_FIRST ; log_level <= _LOG_MAX_LEVEL; + log_level++) +printf ("%s%s\n" ,log_get_level_name (log_level), + log_level == gd->default_log_level ? +" (default)" :"" ); }return CMD_RET_SUCCESS ;
@@ -154,7 +160,7 @@ static int do_log_rec(struct cmd_tbl *cmdtp, int flag, int argc,#ifdef CONFIG_SYS_LONGHELP static char log_help_text[] = -"level - get/set log level\n" +"level [<level>] - get/set log level\n" "categories - list log categories\n" "drivers - list log drivers\n" "log format <fmt> - set log output format. <fmt> is a string where\n"
Signature · 1 line
2.28.0
PATCH v2 17/22 lib: Add getopt
In reply to Sean AndersonSome commands can get very unweildy if they have too many positional arguments. Adding options makes them easier to read, remember, and understand.
This implementation of getopt has been taken from barebox, which has had option support for quite a while. I have made a few modifications to their version, such as the removal of opterr in favor of a separate getopt_silent function. In addition, I have moved all global variables into struct getopt_context.
The getopt from barebox also re-orders the arguments passed to it so that non-options are placed last. This allows users to specify options anywhere. For example, ls -l foo/ -R would be re-ordered to ls -l -R foo/ as getopt parsed the options. However, this feature conflicts with the const argv in cmd_tbl->cmd. This was originally added in 54841ab50c ("Make sure that argv[] argument pointers are not modified."). The reason stated in that commit is that hush requires argv to stay unmodified. Has this situation changed? Barebox also uses hush, and does not have this problem. Perhaps we could use their fix?
I have assigned maintenance of getopt to Simon Glass, as it is currently only used by the log command. I would also be fine maintaining it.
---
Changes in v2:
- Expand documentation of getopt() to include examples
- Remove opt prefix from getopt_state members
MAINTAINERS | 1 + doc/api/getopt.rst | 8 +++ doc/api/index.rst | 1 + include/getopt.h | 130 +++++++++++++++++++++++++++++++++++++++++++++ lib/Kconfig | 5 ++ lib/Makefile | 1 + lib/getopt.c | 125 +++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 271 insertions(+) create mode 100644 doc/api/getopt.rst create mode 100644 include/getopt.h create mode 100644 lib/getopt.c
MAINTAINERS +1 -0
@@ -747,6 +747,7 @@ T: git https://gitlab.denx.de/u-boot/u-boot.git F: common/log* F: cmd/log.c F: doc/develop/logging.rst +F: lib/getopt.c F: test/log/ F: test/py/tests/test_log.py
doc/api/getopt.rst new file +8 -0
@@ -0,0 +1,8 @@ +.. SPDX-License-Identifier: GPL-2.0+ +.. Copyright (C) 2020 Sean Anderson <[email protected]> + +Option Parsing +============== + +.. kernel-doc:: include/getopt.h + :internal:
doc/api/index.rst +1 -0
@@ -8,6 +8,7 @@ U-Boot API documentation dfu efi + getopt linker_lists pinctrl rng
include/getopt.h new file +130 -0
130 lines not on this page · raw message
lib/Kconfig +5 -0
@@ -542,6 +542,11 @@ config HEXDUMP help This enables functions for printing dumps of binary data. +config GETOPT + bool "Enable getopt" + help + This enables functions for parsing command-line options. + config OF_LIBFDT bool "Enable the FDT library" default y if OF_CONTROL
lib/Makefile +1 -0
@@ -106,6 +106,7 @@ obj-y += string.o obj-y += tables_csum.o obj-y += time.o obj-y += hexdump.o +obj-$(CONFIG_GETOPT) += getopt.o obj-$(CONFIG_TRACE) += trace.o obj-$(CONFIG_LIB_UUID) += uuid.o obj-$(CONFIG_LIB_RAND) += rand.o
lib/getopt.c new file +125 -0
125 lines not on this page · raw message
Signature · 1 line
2.28.0
PATCH v2 18/22 test: Add a test for getopt
In reply to Sean AndersonA few of these tests were inspired by those in glibc. The syntax for invoking test_getopt is a bit funky, but it's necessary so that the CPP can parse the arguments correctly.
---
(no changes since v1)
test/lib/Makefile | 1 + test/lib/getopt.c | 123 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 124 insertions(+) create mode 100644 test/lib/getopt.c
test/lib/Makefile +1 -0
@@ -13,3 +13,4 @@ obj-$(CONFIG_ERRNO_STR) += test_errno_str.o obj-$(CONFIG_UT_LIB_ASN1) += asn1.o obj-$(CONFIG_UT_LIB_RSA) += rsa.o obj-$(CONFIG_AES) += test_aes.o +obj-$(CONFIG_GETOPT) += getopt.o
test/lib/getopt.c new file +123 -0
123 lines not on this page · raw message
Signature · 1 line
2.28.0
PATCH v2 19/22 cmd: log: Add commands to manipulate filters
In reply to Sean AndersonThis adds several commands to add, list, and remove log filters. Due to the complexity of adding a filter, log filter-list uses options instead of positional arguments.
These commands have been added as subcommands to log by using a dash to join the subcommand and subsubcommand. This is stylistic, and they could be converted to proper subsubcommands if it is wished.
---
Changes in v2:
- Add option to remove all filters to filter-remove
- Clarify filter-* help text
cmd/Kconfig | 1 + cmd/log.c | 240 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 241 insertions(+)
cmd/Kconfig +1 -0
@@ -2147,6 +2147,7 @@ config CMD_KGDB config CMD_LOG bool "log - Generation, control and access to logging" select LOG + select GETOPT help This provides access to logging features. It allows the output of log data to be controlled to a limited extent (setting up the default
cmd/log.c +240 -0
265 lines not on this page · raw message
Signature · 1 line
2.28.0
PATCH v2 20/22 test: Add a test for log filter-*
In reply to Sean AndersonThis exercises a few success and failure modes of the log filter-* commands. log filter-list is not tested because it's purely informational. I don't think there's a good way to test it except by testing if the output of the command exactly matches a sample run.
---
Changes in v2:
- Converted log filter-* tests to C from python
include/test/log.h | 1 + test/log/Makefile | 1 + test/log/log_filter.c | 111 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 113 insertions(+) create mode 100644 test/log/log_filter.c
include/test/log.h +1 -0
@@ -12,5 +12,6 @@/* Declare a new logging test */ #define LOG_TEST (_name) UNIT_TEST(_name, 0, log_test) +#define LOG_TEST_FLAGS (_name, _flags) UNIT_TEST(_name, _flags, log_test)#endif /* __TEST_LOG_H__ */
test/log/Makefile +1 -0
@@ -3,6 +3,7 @@ # Copyright (c) 2017 Google, Inc obj-$(CONFIG_LOG_TEST) += log_test.o +obj-$(CONFIG_CMD_LOG) += log_filter.o ifdef CONFIG_UT_LOG
test/log/log_filter.c new file +111 -0
111 lines not on this page · raw message
Signature · 1 line
2.28.0
PATCH v2 21/22 doc: Add log kerneldocs to documentation
In reply to Sean AndersonThe functions in log.h are already mostly documented, so add them to the generated documentation.
---
Changes in v2:
- Add % before constants in kerneldocs
- Document log_level_t and log_category_t members
doc/develop/logging.rst | 5 ++ include/log.h | 138 +++++++++++++++++++++++++--------------- 2 files changed, 92 insertions(+), 51 deletions(-)
doc/develop/logging.rst +5 -0
@@ -288,3 +288,8 @@ information Add a command to add new log records and delete existing records. Provide additional log() functions - e.g. logc() to specify the category + +Logging API +----------- +.. kernel-doc:: include/log.h + :internal:
include/log.h +87 -51
255 lines not on this page · raw message
Signature · 1 line
2.28.0
PATCH v2 22/22 doc: Update logging documentation
In reply to Sean AndersonThis updates logging documentation with some examples of the new commands added in the previous commits. It also removes some items from the to-do list which have been implemented.
---
Changes in v2:
- Clarify wording of filter documentation
- Include enum definitions instead of re-documenting them
- Reorganize log documentation; related sections should now be more proximate
doc/develop/logging.rst | 233 ++++++++++++++++++++-------------------- 1 file changed, 114 insertions(+), 119 deletions(-)
doc/develop/logging.rst +114 -119
@@ -21,23 +21,13 @@ is visible from the basic console output. U-Boot's logging feature aims to satisfy this goal for both users and developers. - Logging levels -------------- -There are a number logging levels available, in increasing order of verbosity: - -* LOGL_EMERG - Printed before U-Boot halts -* LOGL_ALERT - Indicates action must be taken immediate or U-Boot will crash -* LOGL_CRIT - Indicates a critical error that will cause boot failure -* LOGL_ERR - Indicates an error that may cause boot failure -* LOGL_WARNING - Warning about an unexpected condition -* LOGL_NOTE - Important information about progress -* LOGL_INFO - Information about normal boot progress -* LOGL_DEBUG - Debug information (useful for debugging a driver or subsystem) -* LOGL_DEBUG_CONTENT - Debug message showing full message content -* LOGL_DEBUG_IO - Debug message showing hardware I/O access +There are a number logging levels available. +.. kernel-doc:: include/log.h + :identifiers: log_level_t Logging category ----------------
@@ -46,16 +36,8 @@ Logging can come from a wide variety of places within U-Boot. Each log message has a category which is intended to allow messages to be filtered according to their source. -The following main categories are defined: - -* LOGC_NONE - Unknown category (e.g. a debug() statement) -* UCLASS\_... - Related to a particular uclass (e.g. UCLASS_USB) -* LOGC_ARCH - Related to architecture-specific code -* LOGC_BOARD - Related to board-specific code -* LOGC_CORE - Related to core driver-model support -* LOGC_DT - Related to device tree control -* LOGC_EFI - Related to EFI implementation - +.. kernel-doc:: include/log.h + :identifiers: log_category_t Enabling logging ----------------
@@ -72,7 +54,6 @@ If CONFIG_LOG is not set, then no logging will be available. The above have SPL and TPL versions also, e.g. CONFIG_SPL_LOG_MAX_LEVEL and CONFIG_TPL_LOG_MAX_LEVEL. - Temporary logging within a single file --------------------------------------
@@ -86,46 +67,8 @@ to enable building in of all logging statements in a single file. Put it at the top of the file, before any #includes. To actually get U-Boot to output this you need to also set the default logging -level - e.g. set CONFIG_LOG_DEFAULT_LEVEL to 7 (LOGL_DEBUG) or more. Otherwise -debug output is suppressed and will not be generated. - - -Convenience functions ---------------------- - -A number of convenience functions are available to shorten the code needed -for logging: - -* log_err(_fmt...) -* log_warning(_fmt...) -* log_notice(_fmt...) -* log_info(_fmt...) -* log_debug(_fmt...) -* log_content(_fmt...) -* log_io(_fmt...) - -With these the log level is implicit in the name. The category is set by -LOG_CATEGORY, which you can only define once per file, above all #includes, e.g. - -.. code-block:: c - - #define LOG_CATEGORY LOGC_ALLOC - -Remember that all uclasses IDs are log categories too. - - -Log command ------------ - -The 'log' command provides access to several features: - -* level - access the default log level -* format - access the console log format -* rec - output a log record -* test - run tests - -Type 'help log' for details. - +level - e.g. set CONFIG_LOG_DEFAULT_LEVEL to 7 (:c:type:`LOGL_DEBUG`) or more. +Otherwise debug output is suppressed and will not be generated. Using DEBUG -----------
@@ -142,51 +85,6 @@ at the top of a file, then it takes precedence. This means that debug() statements will result in output to the console and this output will not be logged. - -Logging destinations --------------------- - -If logging information goes nowhere then it serves no purpose. U-Boot provides -several possible determinations for logging information, all of which can be -enabled or disabled independently: - -* console - goes to stdout -* syslog - broadcast RFC 3164 messages to syslog servers on UDP port 514 - -The syslog driver sends the value of environmental variable 'log_hostname' as -HOSTNAME if available. - - -Log format ----------- - -You can control the log format using the 'log format' command. The basic -format is:: - - LEVEL.category,file.c:123-func() message - -In the above, file.c:123 is the filename where the log record was generated and -func() is the function name. By default ('log format default') only the -function name and message are displayed on the console. You can control which -fields are present, but not the field order. - - -Filters -------- - -Filters are attached to log drivers to control what those drivers emit. Only -records that pass through the filter make it to the driver. - -Filters can be based on several criteria: - -* maximum log level -* in a set of categories -* in a set of files - -If no filters are attached to a driver then a default filter is used, which -limits output to records with a level less than CONFIG_MAX_LOG_LEVEL. - - Logging statements ------------------
@@ -210,6 +108,113 @@ can be used whenever your function returns an error value: This will write a log record when an error code is detected (a value < 0). This can make it easier to trace errors that are generated deep in the call stack. +Convenience functions +~~~~~~~~~~~~~~~~~~~~~ + +A number of convenience functions are available to shorten the code needed +for logging: + +* log_err(_fmt...) +* log_warning(_fmt...) +* log_notice(_fmt...) +* log_info(_fmt...) +* log_debug(_fmt...) +* log_content(_fmt...) +* log_io(_fmt...) + +With these the log level is implicit in the name. The category is set by +LOG_CATEGORY, which you can only define once per file, above all #includes, e.g. + +.. code-block:: c + + #define LOG_CATEGORY LOGC_ALLOC + +Remember that all uclasses IDs are log categories too. + +Logging destinations +-------------------- + +If logging information goes nowhere then it serves no purpose. U-Boot provides +several possible determinations for logging information, all of which can be +enabled or disabled independently: + +* console - goes to stdout +* syslog - broadcast RFC 3164 messages to syslog servers on UDP port 514 + +The syslog driver sends the value of environmental variable 'log_hostname' as +HOSTNAME if available. + +Filters +~~~~~~~ + +Filters are attached to log drivers to control what those drivers emit. FIlters +can either allow or deny a log message when they match it. Only records which +are allowed by a filter make it to the driver. + +Filters can be based on several criteria: + +* minimum or maximum log level +* in a set of categories +* in a set of files + +If no filters are attached to a driver then a default filter is used, which +limits output to records with a level less than CONFIG_MAX_LOG_LEVEL. + +Log command +----------- + +The 'log' command provides access to several features: + +* level - get/set the log level +* categories - list log categories +* drivers - list log drivers +* filter-list - list filters +* filter-add - add a new filter +* filter-remove - remove filters +* format - access the console log format +* rec - output a log record +* test - run tests + +Type 'help log' for details. + +Log format +~~~~~~~~~~ + +You can control the log format using the 'log format' command. The basic +format is:: + + LEVEL.category,file.c:123-func() message + +In the above, file.c:123 is the filename where the log record was generated and +func() is the function name. By default ('log format default') only the message +is displayed on the console. You can control which fields are present, but not +the field order. + +Adding Filters +~~~~~~~~~~~~~~ + +To add new filters@runtime, use the 'log filter-add' command. For example, to +suppress messages from the SPI subsystem, run:: + + log filter-add -D -c spi + +You will also need to add another filter to allow other messages (because the +default filter no longer applies):: + + log filter-add -A -l debug + +To view active filters, use the 'log filter-list' command. Some example output +is:: + + => log filter-list + num policy level categories files + 0 deny <=IO spi + 1 allow <=DEBUG + +Note that filters are processed in-order from top to bottom, not in the order of +their filter number. Filters are added to the top of the list if they deny when +they match, and to the bottom if they allow when they match. For more +information, consult the usage of the 'log' command, by running 'help log'. Code size ---------
@@ -226,7 +231,6 @@ The last option turns every debug() statement into a logging call, which bloats the code hugely. The advantage is that it is then possible to enable all logging within U-Boot. - To Do -----
@@ -259,8 +263,6 @@ Add a way to browse log records Add a way to record log records for browsing using an external tool -Add commands to add and remove filters - Add commands to add and remove log devices Allow sharing of printf format strings in log records to reduce storage size
@@ -268,10 +270,6 @@ for large numbers of log records Add a command-line option to sandbox to set the default logging level -Convert core driver model code to use logging - -Convert uclasses to use logging with the correct category - Consider making log() calls emit an automatic newline, perhaps with a logn() function to avoid that
@@ -282,9 +280,6 @@ number dropped due to them being generated before the log system was ready. Add a printf() format string pragma so that log statements are checked properly -Enhance the log console driver to show level / category / file / line -information - Add a command to add new log records and delete existing records. Provide additional log() functions - e.g. logc() to specify the category
Signature · 1 line
2.28.0
PATCH v2 3/22 log: Add additional const qualifier to arrays
In reply to Sean AndersonQuoted 11 lines · Sean Anderson
Both these arrays and their members are const. Fixes checkpatch complaint.
Signed-off-by Sean Anderson <[email protected]>---
Changes in v2:
- Newcommon/log.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
PATCH v2 4/22 log: Add new category names to log_cat_name
In reply to Sean AndersonQuoted 11 lines · Sean Anderson
Without every category between
LOGC_NONEandLOGC_COUNTpresent inlog_cat_name,log_get_cat_by_namewill dereference NULL pointers if it doesn't find a name early enough.Fixes c3aed5db59 ("sandbox: spi: Add more logging")Fixes a5c13b68e7 ("sandbox: log: Add a category for sandbox")Fixes 9f407d4ef0 ("Add core support for a bloblist to convey data from SPL")Fixes cce61fc428 ("dm: devres: Convert to use logging")Fixes 7ca2850cbc ("dm: core: Add basic ACPI support")
Quoted 8 lines
Signed-off-by Sean Anderson <[email protected]>---
Changes in v2:
- Add compiletime assert on size oflog_cat_namecommon/log.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
PATCH v2 5/22 log: Use CONFIG_IS_ENABLED() for LOG_TEST
In reply to Sean AndersonQuoted 12 lines · Sean Anderson
Checkpatch complains about using #ifdef for CONFIG variables.
Signed-off-by Sean Anderson <[email protected]>---
(no changes since v1)
cmd/log.c | 4 ++-- test/log/log_test.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
You can ignore this warning.
PATCH v2 6/22 log: Expose some helper functions
In reply to Sean AndersonQuoted 5 lines · Sean Anderson
These functions are required by "cmd: log: Add commands to manipulate filters" and "test: Add a test for log filter-*".
Signed-off-by Sean Anderson <[email protected]>
Quoted 9 lines
---
Changes in v2:
- Exposelog_has_catandlog_has_filefor filter testscommon/log.c | 23 +++-------------------- include/log.h | 31 +++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 20 deletions(-)
PATCH v2 7/22 log: Add function to create a filter with flags
In reply to Sean AndersonQuoted 11 lines · Sean Anderson
This function exposes a way to specify flags when creating a filter.
Signed-off-by Sean Anderson <[email protected]>---
(no changes since v1)
common/log.c | 6 ++++-- include/log.h | 29 +++++++++++++++++++++++++++-- 2 files changed, 31 insertions(+), 4 deletions(-)
PATCH v2 8/22 log: Add filter flag to deny on match
In reply to Sean AndersonQuoted 9 lines · Sean Anderson
Without this flag, log filters can only explicitly accept messages. Allowing denial makes it easier to filter certain subsystems. Unlike allow-ing filters, deny-ing filters are added to the beginning of the filter list. This should do the Right Thing most of the time, but it's less-universal than allowing filters to be inserted anywhere. If this becomes a problem, then perhaps log_filter_add* should take a filter number to insert before/after.
Quoted 9 lines
Signed-off-by Sean Anderson <[email protected]>---
(no changes since v1)
common/log.c | 12 ++++++++++-- include/log.h | 11 ++++++++++- 2 files changed, 20 insertions(+), 3 deletions(-)
PATCH v2 9/22 test: Add tests for LOGFF_DENY
In reply to Sean AndersonQuoted 12 lines · Sean Anderson
This adds some tests for log filters which deny if they match.
Signed-off-by Sean Anderson <[email protected]>---
(no changes since v1)
test/log/log_test.c | 69 +++++++++++++++++++++++++++++++++++++++ test/py/tests/test_log.py | 21 ++++++++++-- 2 files changed, 88 insertions(+), 2 deletions(-)
PATCH v2 10/22 log: Add filter flag to match greater than a log level
In reply to Sean AndersonQuoted 2 lines · Sean Anderson
This is the compliment of the existing behavior to match only messages with
complement
Quoted 11 lines
a log level less than a threshold. This is primarily useful in conjunction with
LOGFF_DENY.Signed-off-by Sean Anderson <[email protected]>---
(no changes since v1)
common/log.c | 12 +++++++++--- include/log.h | 10 ++++++---- 2 files changed, 15 insertions(+), 7 deletions(-)
PATCH v2 11/22 test: Add test for LOGFF_MIN
In reply to Sean AndersonQuoted 12 lines · Sean Anderson
This tests log filters matching on a minimum level.
Signed-off-by Sean Anderson <[email protected]>---
(no changes since v1)
test/log/log_test.c | 23 +++++++++++++++++++++++ test/py/tests/test_log.py | 5 +++++ 2 files changed, 28 insertions(+)
PATCH v2 12/22 cmd: log: Use sub-commands for log
In reply to Sean AndersonQuoted 11 lines · Sean Anderson
This reduces duplicate code, and makes adding new sub-commands easier.
Signed-off-by Sean Anderson <[email protected]>---
(no changes since v1)
cmd/log.c | 37 +++++++------------------------------ 1 file changed, 7 insertions(+), 30 deletions(-)
PATCH v2 13/22 cmd: log: Split off log level parsing
In reply to Sean AndersonQuoted 5 lines · Sean Anderson
Move parsing of log level into its own function so it can be re-used. This also adds support for using log level names instead of just the integer equivalent.
Quoted 8 lines
Signed-off-by Sean Anderson <[email protected]>---
Changes in v2:
- Print an error message if the log level is invalid.cmd/log.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-)
PATCH v2 14/22 cmd: log: Move log test to end of help string
In reply to Sean AndersonQuoted 11 lines · Sean Anderson
This is probably what a typical user is least interested in. Move it to the end of the description.
Signed-off-by Sean Anderson <[email protected]>---
(no changes since v1)
cmd/log.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
PATCH v2 15/22 cmd: log: Add commands to list categories and drivers
In reply to Sean AndersonQuoted 5 lines · Sean Anderson
This allows users to query which categories and drivers are available on their system. This allows them to construct filter-add commands without (e.g.) adjusting the log format to show categories and drivers.
Quoted 8 lines
Signed-off-by Sean Anderson <[email protected]>---
Changes in v2:
- Newcmd/log.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+)
Quoted 12 lines
cmd/log.c +3
-0@@ -47,6 +47,38 @@ static int do_log_level(struct cmd_tbl *cmdtp, int flag, int argc,return CMD_RET_SUCCESS ; } +static int do_log_categories (struct cmd_tbl *cmdtp,int flag,int argc, +char *const argv[]) +{
cmd/log.c static int do_log_level(struct cmd_tbl *cmdtp, int flag, int argc, · line 62
Quoted 10 lines
cmd/log.c +10
-0+enum log_category_t cat; +const char *name; + +for (cat =LOGC_FIRST ; cat <LOGC_COUNT ; cat++) { + name =log_get_cat_name (cat); +/* +* Invalid category names (e.g. <invalid> or <missing>) begin +* with '<'. TODO: perhaps change the interface of +* log_get_cat_name to return an error code? +*/
I think that might be cleaner, but this is OK so long as you document the function return value accordingly.
Quoted 43 lines
cmd/log.c +23
-1+if (name[0 ] =='<' ) +continue ; +printf ("%s\n" , name); + } + +return CMD_RET_SUCCESS ; +} + +static int do_log_drivers (struct cmd_tbl *cmdtp,int flag,int argc, +char *const argv[]) +{ +struct log_device *ldev; + +list_for_each_entry (ldev, &gd->log_head, sibling_node) +printf ("%s\n" , ldev->drv->name); + +return CMD_RET_SUCCESS ; +} +static int do_log_format (struct cmd_tbl *cmdtp,int flag,int argc,char *const argv[]) {@@ -123,6 +155,8 @@ static int do_log_rec(struct cmd_tbl *cmdtp, int flag, int argc,#ifdef CONFIG_SYS_LONGHELP static char log_help_text[] ="level - get/set log level\n" +"categories - list log categories\n" +"drivers - list log drivers\n" "log format <fmt> - set log output format. <fmt> is a string where\n" "\teach letter indicates something that should be displayed:\n" "\tc=category, l=level, F=file, L=line number, f=function, m=msg\n" @@ -137,6 +171,8 @@ static char log_help_text[] =U_BOOT_CMD_WITH_SUBCMDS (log,"log system" , log_help_text,U_BOOT_SUBCMD_MKENT (level,2 ,1 , do_log_level), +U_BOOT_SUBCMD_MKENT (categories,1 ,1 , do_log_categories), +U_BOOT_SUBCMD_MKENT (drivers,1 ,1 , do_log_drivers),U_BOOT_SUBCMD_MKENT (format,2 ,1 , do_log_format),U_BOOT_SUBCMD_MKENT (rec,7 ,1 , do_log_rec), #if CONFIG_IS_ENABLED(LOG_TEST) --2.28.0
PATCH v2 16/22 cmd: log: Make "log level" print all log levels
In reply to Sean AndersonQuoted 5 lines · Sean Anderson
This makes the log level command print all valid log levels. The default log level is annotated. This provides an easy way to see which log levels are compiled-in.
Quoted 8 lines
Signed-off-by Sean Anderson <[email protected]>---
Changes in v2:
- Newcmd/log.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
PATCH v2 19/22 cmd: log: Add commands to manipulate filters
In reply to Sean AndersonQuoted 12 lines · Sean Anderson
This adds several commands to add, list, and remove log filters. Due to the complexity of adding a filter,
log filter-listuses options instead of positional arguments.These commands have been added as subcommands to log by using a dash to join the subcommand and subsubcommand. This is stylistic, and they could be converted to proper subsubcommands if it is wished.
Signed-off-by Sean Anderson <[email protected]>---
Quoted 7 lines
Changes in v2:
- Add option to remove all filters to filter-remove
- Clarify filter-* help textcmd/Kconfig | 1 + cmd/log.c | 240 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 241 insertions(+)
PATCH v2 20/22 test: Add a test for log filter-*
In reply to Sean AndersonQuoted 9 lines · Sean Anderson
This exercises a few success and failure modes of the log filter-* commands. log filter-list is not tested because it's purely informational. I don't think there's a good way to test it except by testing if the output of the command exactly matches a sample run.
Signed-off-by Sean Anderson <[email protected]>---
Quoted 9 lines
Changes in v2:
- Converted log filter-* tests to C from pythoninclude/test/log.h | 1 + test/log/Makefile | 1 + test/log/log_filter.c | 111 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 113 insertions(+) create mode 100644 test/log/log_filter.c
PATCH v2 21/22 doc: Add log kerneldocs to documentation
In reply to Sean AndersonQuoted 7 lines · Sean Anderson
The functions in
log.hare already mostly documented, so add them to the generated documentation.Signed-off-by Sean Anderson <[email protected]>---
Quoted 8 lines
Changes in v2:
- Add % before constants in kerneldocs
- Documentlog_level_tandlog_category_tmembersdoc/develop/logging.rst | 5 ++ include/log.h | 138 +++++++++++++++++++++++++--------------- 2 files changed, 92 insertions(+), 51 deletions(-)
PATCH v2 22/22 doc: Update logging documentation
In reply to Sean AndersonQuoted 8 lines · Sean Anderson
This updates logging documentation with some examples of the new commands added in the previous commits. It also removes some items from the to-do list which have been implemented.
Signed-off-by Sean Anderson <[email protected]>---
Quoted 8 lines
Changes in v2:
- Clarify wording of filter documentation
- Include enum definitions instead of re-documenting them
- Reorganize log documentation; related sections should now be more proximatedoc/develop/logging.rst | 233 ++++++++++++++++++++-------------------- 1 file changed, 114 insertions(+), 119 deletions(-)
PATCH v2 5/22 log: Use CONFIG_IS_ENABLED() for LOG_TEST
In reply to Simon GlassQuoted 7 lines · Simon Glass
Quoted 6 lines · Sean Anderson
Checkpatch complains about using #ifdef for CONFIG variables.
Signed-off-by Sean Anderson <[email protected]>---
Quoted 9 lines
Quoted 6 lines
(no changes since v1)
cmd/log.c | 4 ++-- test/log/log_test.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)You can ignore this warning.
Perhaps it should be downgraded to a check instead of a warning?
--Sean
PATCH v2 5/22 log: Use CONFIG_IS_ENABLED() for LOG_TEST
Hi Sean,
Quoted 16 lines · Sean Anderson
Quoted 14 lines · Simon Glass
Quoted 12 lines · Sean Anderson
Checkpatch complains about using #ifdef for CONFIG variables.
Signed-off-by Sean Anderson <[email protected]>---
(no changes since v1)
cmd/log.c | 4 ++-- test/log/log_test.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
Quoted 5 lines
Quoted 2 lines
You can ignore this warning.
Perhaps it should be downgraded to a check instead of a warning?
That sounds like a good idea. There are quite a few places where #if is needed, despite this useful exhortation.
Regards,
Simon