dyndbg: combine flags & mask into a struct, use that
Subsystems (2)
Jim Cromie
maintainerPATCH 11/16 dyndbg: combine flags & mask into a struct, use that
combine flags & mask into a struct, and replace those 2 parameters in 3 functions: ddebug_change, ddebug_parse_flags, ddebug_read_flags, altering the derefs in them accordingly.
This simplifies the 3 function sigs, preparing for more changes. We dont yet need mask from ddebug_read_flags, but will soon.
Signed-off-by Jim Cromie <[email protected]>
--- lib/dynamic_debug.c | 46 +++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 22 deletions(-)
lib/dynamic_debug.c +24 -22
@@ -62,6 +62,11 @@ struct ddebug_iter {struct flagsbuf {char buf[10 ]; }; +struct flagsettings { +unsigned int flags; +unsigned int mask; +}; +static DEFINE_MUTEX (ddebug_lock);static LIST_HEAD (ddebug_tables);static int verbose;
@@ -129,7 +134,7 @@ static void vpr_info_dq(const struct ddebug_query *query, const char *msg)* logs the changes. Takes ddebug_lock. */ static int ddebug_change (const struct ddebug_query *query, -unsigned int flags,unsigned int mask) +struct flagsettings *mods) {int i;struct ddebug_table *dt;
@@ -176,14 +181,14 @@ static int ddebug_change(const struct ddebug_query *query, nfound++; - newflags = (dp->flags & mask) | flags; + newflags = (dp->flags & mods->mask) | mods->flags;if (newflags == dp->flags)continue ;#ifdef CONFIG_JUMP_LABEL if (dp->flags & _DPRINTK_FLAGS_PRINT) { -if (!(flags & _DPRINTK_FLAGS_PRINT)) +if (!(mods->flags & _DPRINTK_FLAGS_PRINT))static_branch_disable (&dp->key.dd_key_true); - }else if (flags & _DPRINTK_FLAGS_PRINT) + }else if (mods->flags & _DPRINTK_FLAGS_PRINT)static_branch_enable (&dp->key.dd_key_true);#endif dp->flags = newflags;
@@ -399,14 +404,14 @@ static int ddebug_parse_query(char *words[], int nwords,return 0 ; } -static int ddebug_read_flags (const char *str,unsigned int *flags) +static int ddebug_read_flags (const char *str,struct flagsettings *f) {int i;for (; *str ; ++str) {for (i =ARRAY_SIZE (opt_array) -1 ; i >=0 ; i--) {if (*str == opt_array[i].opt_char) { - *flags |= opt_array[i].flag; + f->flags |= opt_array[i].flag;break ; } }
@@ -415,7 +420,7 @@ static int ddebug_read_flags(const char *str, unsigned int *flags)return -EINVAL ; } } -vpr_info ("flags=0x%x\n" , *flags); +vpr_info ("flags=0x%x mask=0x%x\n" , f->flags, f->mask);return 0 ; }
@@ -425,10 +430,8 @@ static int ddebug_read_flags(const char *str, unsigned int *flags)* flags fields of matched _ddebug's. Returns 0 on success * or <0 on error. */ -static int ddebug_parse_flags (const char *str,unsigned int *flagsp, -unsigned int *maskp) +static int ddebug_parse_flags (const char *str,struct flagsettings *mods) { -unsigned flags =0 ;int op;switch (*str) {
@@ -443,31 +446,30 @@ static int ddebug_parse_flags(const char *str, unsigned int *flagsp, }vpr_info ("op='%c'\n" , op); -if (ddebug_read_flags (str, &flags)) +if (ddebug_read_flags (str, mods))return -EINVAL ; -/* calculate final *flagsp, *maskp according to mask and op */ +/* calculate final flags, mask based upon op */ switch (op) {case '=' : - *maskp =0 ; - *flagsp = flags; + mods->mask =0 ;break ;case '+' : - *maskp = ~0U ; - *flagsp = flags; + mods->mask = ~0U ;break ;case '-' : - *maskp = ~flags; - *flagsp =0 ; + mods->mask = ~mods->flags; + mods->flags =0 ;break ; } -vpr_info ("*flagsp=0x%x *maskp=0x%x\n" , *flagsp, *maskp); +vpr_info ("*flagsp=0x%x *maskp=0x%x\n" , mods->flags, mods->mask); +return 0 ; }static int ddebug_exec_query (char *query_string,const char *modname) { -unsigned int flags =0 , mask =0 ; +struct flagsettings mods = {};struct ddebug_query query;#define MAXWORDS 9int nwords, nfound;
@@ -482,12 +484,12 @@ static int ddebug_exec_query(char *query_string, const char *modname)pr_err ("query parse failed\n" );return -EINVAL ; } -if (ddebug_parse_flags (words[nwords-1 ], &flags, &mask)) { +if (ddebug_parse_flags (words[nwords-1 ], &mods)) {pr_err ("flags parse failed\n" );return -EINVAL ; }/* actually go and implement the change */ - nfound =ddebug_change (&query, flags, mask); + nfound =ddebug_change (&query, &mods);vpr_info_dq (&query, nfound ?"applied" :"no-match" );return nfound;
Signature · 1 line
2.21.0