GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-28 01:51:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

log: Add filter flag to deny on match

Browse source 
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.

Signed-off-by: Sean Anderson <seanga2@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Sean Anderson 2020-10-27 19:55:26 -04:00 • committed by Tom Rini
parent a02f84ee9c
commit fe3b1a2d21
2 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
common/log.c
View file

@ -170,7 +170,11 @@ static bool log_passes_filters(struct log_device *ldev, struct log_rec *rec)
if (filt->file_list && if (filt->file_list &&
!log_has_file(filt->file_list, rec->file)) !log_has_file(filt->file_list, rec->file))
continue; continue;
return true;
if (filt->flags & LOGFF_DENY)
return false;
else
return true;
} }
return false; return false;
@ -284,7 +288,11 @@ int log_add_filter_flags(const char *drv_name, enum log_category_t cat_list[],
} }
} }
filt->filter_num = ldev->next_filter_num++; 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; return filt->filter_num;

11
include/log.h
View file

@ -361,13 +361,22 @@ enum {
LOGF_MAX_CATEGORIES = 5, /* maximum categories per filter */ LOGF_MAX_CATEGORIES = 5, /* maximum categories per filter */
}; };
/**
* enum log_filter_flags - Flags which modify a filter
*/
enum log_filter_flags { 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 * 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 * @filter_num: Sequence number of this filter. This is returned when adding a
* new filter, and must be provided when removing a previously added * new filter, and must be provided when removing a previously added
* filter. * filter.