From: jim.cromie@gmail.com
To: Jason Baron <jbaron@akamai.com>,
LKML <linux-kernel@vger.kernel.org>,
akpm@linuxfoundation.org, Greg KH <gregkh@linuxfoundation.org>
Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk>,
Jonathan Corbet <corbet@lwn.net>, Will Deacon <will@kernel.org>,
Orson Zhai <orson.zhai@unisoc.com>,
Andrew Morton <akpm@linux-foundation.org>,
Petr Mladek <pmladek@suse.com>,
Linux Documentation List <linux-doc@vger.kernel.org>
Subject: Re: [PATCH v3 14/21] dyndbg: accept query terms like file=bar and module=foo
Date: Thu, 18 Jun 2020 16:25:32 -0600 [thread overview]
Message-ID: <CAJfuBxzLrV6aGmt6XwzT352c5-Qb6pN_tJFk7_f4wy8js6MJEA@mail.gmail.com> (raw)
In-Reply-To: <20200617162536.611386-15-jim.cromie@gmail.com>
oops. got 3 copies of 14/21, this is the good one. with module=foo
AND file=bar
On Wed, Jun 17, 2020 at 10:26 AM Jim Cromie <jim.cromie@gmail.com> wrote:
>
> Current code expects "keyword" "arg" as 2 space separated words.
> Change to also accept "keyword=arg" form as well, and drop !(nwords%2)
> requirement.
>
> Then in rest of function, use new keyword, arg variables instead of
> word[i], word[i+1]
>
> Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
> ---
> .../admin-guide/dynamic-debug-howto.rst | 1 +
> lib/dynamic_debug.c | 51 ++++++++++++-------
> 2 files changed, 33 insertions(+), 19 deletions(-)
>
> diff --git a/Documentation/admin-guide/dynamic-debug-howto.rst b/Documentation/admin-guide/dynamic-debug-howto.rst
> index 6c04aea8f4cd..e5a8def45f3f 100644
> --- a/Documentation/admin-guide/dynamic-debug-howto.rst
> +++ b/Documentation/admin-guide/dynamic-debug-howto.rst
> @@ -156,6 +156,7 @@ against. Possible keywords are:::
> ``line-range`` cannot contain space, e.g.
> "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:
>
> diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c
> index 7eb963b1bd11..e1dd96178f18 100644
> --- a/lib/dynamic_debug.c
> +++ b/lib/dynamic_debug.c
> @@ -351,6 +351,8 @@ static int check_set(const char **dest, char *src, char *name)
> * line <lineno>
> * line <first-lineno>-<last-lineno> // where either may be empty
> *
> + * Also accept combined keyword=value and keyword:value forms
> + *
> * Only 1 of each type is allowed.
> * Returns 0 on success, <0 on error.
> */
> @@ -360,22 +362,33 @@ static int ddebug_parse_query(char *words[], int nwords,
> unsigned int i;
> int rc = 0;
> char *fline;
> -
> - /* check we have an even number of words */
> - if (nwords % 2 != 0) {
> - pr_err("expecting pairs of match-spec <value>\n");
> - return -EINVAL;
> - }
> + char *keyword, *arg;
>
> if (modname)
> /* support $modname.dyndbg=<multiple queries> */
> query->module = modname;
>
> - for (i = 0; i < nwords; i += 2) {
> - if (!strcmp(words[i], "func")) {
> - rc = check_set(&query->function, words[i+1], "func");
> - } else if (!strcmp(words[i], "file")) {
> - if (check_set(&query->filename, words[i+1], "file"))
> + for (i = 0; i < nwords; i++) {
> + /* accept keyword=arg */
> + vpr_info("%d w:%s\n", i, words[i]);
> +
> + keyword = words[i];
> + if ((arg = strchr(keyword, '='))) {
> + *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;
>
> /* tail :$info is function or line-range */
> @@ -391,18 +404,18 @@ static int ddebug_parse_query(char *words[], int nwords,
> if (parse_linerange(query, fline))
> return -EINVAL;
> }
> - } else if (!strcmp(words[i], "module")) {
> - rc = check_set(&query->module, words[i+1], "module");
> - } else if (!strcmp(words[i], "format")) {
> - string_unescape_inplace(words[i+1], UNESCAPE_SPACE |
> + } else if (!strcmp(keyword, "module")) {
> + rc = check_set(&query->module, arg, "module");
> + } else if (!strcmp(keyword, "format")) {
> + string_unescape_inplace(arg, UNESCAPE_SPACE |
> UNESCAPE_OCTAL |
> UNESCAPE_SPECIAL);
> - rc = check_set(&query->format, words[i+1], "format");
> - } else if (!strcmp(words[i], "line")) {
> - if (parse_linerange(query, words[i+1]))
> + rc = check_set(&query->format, arg, "format");
> + } else if (!strcmp(keyword, "line")) {
> + if (parse_linerange(query, arg))
> return -EINVAL;
> } else {
> - pr_err("unknown keyword \"%s\"\n", words[i]);
> + pr_err("unknown keyword \"%s\"\n", keyword);
> return -EINVAL;
> }
> if (rc)
> --
> 2.26.2
>
next prev parent reply other threads:[~2020-06-18 22:26 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-17 16:25 [PATCH v3 00/21] dynamic_debug cleanups, query features, export Jim Cromie
2020-06-17 16:25 ` [PATCH v3 01/21] dyndbg-docs: eschew file /full/path query in docs Jim Cromie
2020-06-17 16:25 ` [PATCH v3 02/21] dyndbg-docs: initialization is done early, not arch Jim Cromie
2020-06-17 16:25 ` [PATCH v3 03/21] dyndbg: drop obsolete comment on ddebug_proc_open Jim Cromie
2020-06-17 16:25 ` [PATCH v3 04/21] dyndbg: refine debug verbosity; 1 is basic, 2 more chatty Jim Cromie
2020-06-17 16:25 ` [PATCH v3 05/21] dyndbg: rename __verbose section to __dyndbg Jim Cromie
2020-06-17 16:25 ` [PATCH v3 06/21] dyndbg: fix overcounting of ram used by dyndbg Jim Cromie
2020-06-17 16:25 ` [PATCH v3 07/21] dyndbg: fix a BUG_ON in ddebug_describe_flags Jim Cromie
2020-06-17 16:25 ` [PATCH v3 08/21] dyndbg: fix pr_err with empty string Jim Cromie
2020-06-17 16:25 ` [PATCH v3 09/21] dyndbg: prefer declarative init in caller, to memset in callee Jim Cromie
2020-06-17 16:25 ` [PATCH v3 10/21] dyndbg: make ddebug_tables list LIFO for add/remove_module Jim Cromie
2020-06-17 16:25 ` [PATCH v3 11/21] dyndbg: use gcc ?: to reduce word count Jim Cromie
2020-06-17 16:25 ` [PATCH v3 12/21] dyndbg: refactor parse_linerange out of ddebug_parse_query Jim Cromie
2020-06-17 16:25 ` [PATCH v3 13/21] dyndbg: accept 'file foo.c:func1' and 'file foo.c:10-100' Jim Cromie
2020-06-17 16:25 ` [PATCH v3 14/21] dyndbg: accept query terms like file=bar and module=foo Jim Cromie
2020-06-18 22:25 ` jim.cromie [this message]
2020-06-17 16:25 ` [PATCH v3 14/21] dyndbg: accept query terms like file=bar module=foo Jim Cromie
2020-06-17 16:25 ` [PATCH v3 14/21] dyndbg: accept query terms like module:foo and file=bar Jim Cromie
2020-06-17 16:25 ` [PATCH v3 15/21] dyndbg: export ddebug_exec_queries Jim Cromie
2020-06-17 16:25 ` [PATCH v3 16/21] dyndbg: combine flags & mask into a struct, simplify with it Jim Cromie
2020-06-17 16:25 ` [PATCH v3 17/21] dyndbg: refactor ddebug_read_flags out of ddebug_parse_flags Jim Cromie
2020-06-17 16:25 ` [PATCH v3 18/21] dyndbg: add filter channel to the internals Jim Cromie
2020-06-17 16:25 ` [PATCH v3 19/21] dyndbg: extend ddebug_parse_flags to accept optional leading filter-flags Jim Cromie
2020-06-18 12:44 ` Petr Mladek
2020-06-18 14:54 ` jim.cromie
2020-06-18 16:01 ` Petr Mladek
2020-06-17 16:25 ` [PATCH v3 20/21] dyndbg: add user-flag, negating-flags, and filtering on flags Jim Cromie
2020-06-17 22:13 ` Joe Perches
2020-06-17 22:57 ` jim.cromie
2020-06-18 16:19 ` Petr Mladek
2020-06-18 17:40 ` Petr Mladek
2020-06-18 18:17 ` Jason Baron
2020-06-18 19:11 ` jim.cromie
2020-06-18 19:40 ` Jason Baron
2020-06-18 21:31 ` jim.cromie
2020-06-18 22:34 ` Stanimir Varbanov
2020-06-18 22:48 ` jim.cromie
2020-06-19 16:07 ` Jason Baron
2020-06-19 7:45 ` Petr Mladek
2020-06-19 8:10 ` Petr Mladek
2020-06-19 8:34 ` Greg KH
2020-06-18 18:15 ` jim.cromie
2020-06-17 16:25 ` [PATCH v3 21/21] dyndbg: allow negating flag-chars in modifier flags Jim Cromie
2020-06-17 20:05 ` [PATCH v3 00/21] dynamic_debug cleanups, query features, export Rasmus Villemoes
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAJfuBxzLrV6aGmt6XwzT352c5-Qb6pN_tJFk7_f4wy8js6MJEA@mail.gmail.com \
--to=jim.cromie@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=akpm@linuxfoundation.org \
--cc=corbet@lwn.net \
--cc=gregkh@linuxfoundation.org \
--cc=jbaron@akamai.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@rasmusvillemoes.dk \
--cc=orson.zhai@unisoc.com \
--cc=pmladek@suse.com \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).