p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "dyndbg: accept query terms like file=bar and module=foo" 

This reverts commit 14775b0496 as there
were still some parsing problems with it, and the follow-on patch for
it.

Let's revisit it later, just drop it for now.

Cc: <jbaron@akamai.com>
Cc: Jim Cromie <jim.cromie@gmail.com>
Reported-by: Naresh Kamboju <naresh.kamboju@linaro.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Fixes: 14775b0496 ("dyndbg: accept query terms like file=bar and module=foo")
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2020-09-10 18:45:03 +02:00
parent 7f6e1f3072
commit 952e934d7f
2 changed files with 20 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation/admin-guide/dynamic-debug-howto.rst
View File

@ -156,7 +156,6 @@ against. Possible keywords are:::
``line-range`` cannot contain space, e.g. ``line-range`` cannot contain space, e.g.
"1-30" is valid range but "1 - 30" is not. "1-30" is valid range but "1 - 30" is not.
``module=foo`` combined keyword=value form is interchangably accepted
The meanings of each keyword are: The meanings of each keyword are:

53
lib/dynamic_debug.c
View File

@ -353,8 +353,7 @@ static int check_set(const char **dest, char *src, char *name)
/* /*
* Parse words[] as a ddebug query specification, which is a series * Parse words[] as a ddebug query specification, which is a series
* of (keyword, value) pairs or combined keyword=value terms, * of (keyword, value) pairs chosen from these possibilities:
* chosen from these possibilities:
* *
* func <function-name> * func <function-name>
* file <full-pathname> * file <full-pathname>
@ -373,34 +372,22 @@ static int ddebug_parse_query(char *words[], int nwords,
unsigned int i; unsigned int i;
int rc = 0; int rc = 0;
char *fline; char *fline;
char *keyword, *arg;
/* check we have an even number of words */
if (nwords % 2 != 0) {
pr_err("expecting pairs of match-spec <value>\n");
return -EINVAL;
}
if (modname) if (modname)
/* support $modname.dyndbg=<multiple queries> */ /* support $modname.dyndbg=<multiple queries> */
query->module = modname; query->module = modname;
for (i = 0; i < nwords; i++) { for (i = 0; i < nwords; i += 2) {
/* accept keyword=arg */ if (!strcmp(words[i], "func")) {
vpr_info("%d w:%s\n", i, words[i]); rc = check_set(&query->function, words[i+1], "func");
} else if (!strcmp(words[i], "file")) {
keyword = words[i]; if (check_set(&query->filename, words[i+1], "file"))
arg = strchr(keyword, '=');
if (arg) {
*arg++ = '\0';
} else {
i++; /* next word is arg */
if (!(i < nwords)) {
pr_err("missing arg to keyword: %s\n", keyword);
return -EINVAL;
}
arg = words[i];
}
vpr_info("%d key:%s arg:%s\n", i, keyword, arg);
if (!strcmp(keyword, "func")) {
rc = check_set(&query->function, arg, "func");
} else if (!strcmp(keyword, "file")) {
if (check_set(&query->filename, arg, "file"))
return -EINVAL; return -EINVAL;
/* tail :$info is function or line-range */ /* tail :$info is function or line-range */
@ -416,18 +403,18 @@ static int ddebug_parse_query(char *words[], int nwords,
if (parse_linerange(query, fline)) if (parse_linerange(query, fline))
return -EINVAL; return -EINVAL;
} }
} else if (!strcmp(keyword, "module")) { } else if (!strcmp(words[i], "module")) {
rc = check_set(&query->module, arg, "module"); rc = check_set(&query->module, words[i+1], "module");
} else if (!strcmp(keyword, "format")) { } else if (!strcmp(words[i], "format")) {
string_unescape_inplace(arg, UNESCAPE_SPACE | string_unescape_inplace(words[i+1], UNESCAPE_SPACE |
UNESCAPE_OCTAL | UNESCAPE_OCTAL |
UNESCAPE_SPECIAL); UNESCAPE_SPECIAL);
rc = check_set(&query->format, arg, "format"); rc = check_set(&query->format, words[i+1], "format");
} else if (!strcmp(keyword, "line")) { } else if (!strcmp(words[i], "line")) {
if (parse_linerange(query, arg)) if (parse_linerange(query, words[i+1]))
return -EINVAL; return -EINVAL;
} else { } else {
pr_err("unknown keyword \"%s\"\n", keyword); pr_err("unknown keyword \"%s\"\n", words[i]);
return -EINVAL; return -EINVAL;
} }
if (rc) if (rc)