[PATCH v2 14/24] dyndbg: add filter parameter to ddebug_parse_flags

[Jim Cromie]

Add a new local *filter variable to ddebug_exec_query(), pass it into
ddebug_parse_flags(), which fills it, communicating optional filter
flags back to its caller.  Then caller passes same to ddebug_change()
to effect the changes.

Also, ddebug_change doesn't alter any of its arguments, including its 2
new ones; mods, filter.  Say so by adding const modifier to them.
---
 lib/dynamic_debug.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c
index 8dc073a6e8a4..0f393a930fdc 100644
--- a/lib/dynamic_debug.c
+++ b/lib/dynamic_debug.c
@@ -147,7 +147,8 @@ 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,
-                        struct flagsettings *mods)
+                        const struct flagsettings *mods,
+                        const struct flagsettings *filter)
 {
        int i;
        struct ddebug_table *dt;
@@ -445,7 +446,10 @@ static int ddebug_read_flags(const char *str, struct 
flagsettings *f)
  * flags fields of matched _ddebug's.  Returns 0 on success
  * or <0 on error.
  */
-static int ddebug_parse_flags(const char *str, struct flagsettings *mods)
+
+static int ddebug_parse_flags(const char *str,
+                             struct flagsettings *mods,
+                             struct flagsettings *filter)
 {
        int op;
 
@@ -477,7 +481,9 @@ static int ddebug_parse_flags(const char *str, struct 
flagsettings *mods)
                mods->flags = 0;
                break;
        }
-       vpr_info("*flagsp=0x%x *maskp=0x%x\n", mods->flags, mods->mask);
+
+       vpr_info("mods:flags=0x%x,mask=0x%x filter:flags=0x%x,mask=0x%x\n",
+                mods->flags, mods->mask, filter->flags, filter->mask);
 
        return 0;
 }
@@ -485,6 +491,7 @@ static int ddebug_parse_flags(const char *str, struct 
flagsettings *mods)
 static int ddebug_exec_query(char *query_string, const char *modname)
 {
        struct flagsettings mods = {};
+       struct flagsettings filter = {};
        struct ddebug_query query;
 #define MAXWORDS 9
        int nwords, nfound;
@@ -496,7 +503,7 @@ static int ddebug_exec_query(char *query_string, const char 
*modname)
                return -EINVAL;
        }
        /* check flags 1st (last arg) so query is pairs of spec,val */
-       if (ddebug_parse_flags(words[nwords-1], &mods)) {
+       if (ddebug_parse_flags(words[nwords-1], &mods, &filter)) {
                pr_err("flags parse failed\n");
                return -EINVAL;
        }
@@ -505,7 +512,7 @@ static int ddebug_exec_query(char *query_string, const char 
*modname)
                return -EINVAL;
        }
        /* actually go and implement the change */
-       nfound = ddebug_change(&query, &mods);
+       nfound = ddebug_change(&query, &mods, &filter);
        vpr_info_dq(&query, nfound ? "applied" : "no-match");
 
        return nfound;
-- 
2.26.2