From: Petr Mladek <pmladek@suse.com>
To: Jim Cromie <jim.cromie@gmail.com>
Cc: jbaron@akamai.com, linux-kernel@vger.kernel.org,
akpm@linuxfoundation.org, gregkh@linuxfoundation.org,
linux@rasmusvillemoes.dk, Jonathan Corbet <corbet@lwn.net>,
Will Deacon <will@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
Orson Zhai <orson.zhai@unisoc.com>,
linux-doc@vger.kernel.org
Subject: Re: [PATCH v2 11/24] dyndbg: accept 'file foo.c:func1' and 'file foo.c:10-100'
Date: Mon, 15 Jun 2020 16:46:46 +0200 [thread overview]
Message-ID: <20200615144646.GH31238@alley> (raw)
In-Reply-To: <20200613155738.2249399-12-jim.cromie@gmail.com>
On Sat 2020-06-13 09:57:25, Jim Cromie wrote:
> Accept these additional query forms:
>
> echo "file $filestr +_" > control
>
> path/to/file.c:100 # as from control, column 1
> path/to/file.c:1-100 # or any legal line-range
> path/to/file.c:func_A # as from an editor/browser
> path/to/file.c:drm_\* # wildcards still work
^
Should the backslash be there?
> path/to/file.c:*_foo # lead wildcard too
>
> 1st 2 examples are treated as line-ranges, 3,4 are treated as func's
There is also 5th example.
> Doc these changes, and sprinkle in a few extra wild-card examples and
> trailing # explanation texts.
> ---
> .../admin-guide/dynamic-debug-howto.rst | 5 +++++
> lib/dynamic_debug.c | 20 ++++++++++++++++++-
> 2 files changed, 24 insertions(+), 1 deletion(-)
>
> diff --git a/Documentation/admin-guide/dynamic-debug-howto.rst b/Documentation/admin-guide/dynamic-debug-howto.rst
> index 1423af580bed..6c04aea8f4cd 100644
> --- a/Documentation/admin-guide/dynamic-debug-howto.rst
> +++ b/Documentation/admin-guide/dynamic-debug-howto.rst
> @@ -164,6 +164,7 @@ func
> of each callsite. Example::
>
> func svc_tcp_accept
> + func *recv* # in rfcomm, bluetooth, ping, tcp
>
> file
> The given string is compared against either the src-root relative
> @@ -172,6 +173,9 @@ file
>
> file svcsock.c
> file kernel/freezer.c # ie column 1 of control file
> + file drivers/usb/* # all callsites under it
> + file inode.c:start_* # parse :tail as a func (above)
> + file inode.c:1-100 # parse :tail as a line-range (above)
>
> module
> The given string is compared against the module name
> @@ -181,6 +185,7 @@ module
>
> module sunrpc
> module nfsd
> + module drm* # both drm, drm_kms_helper
>
> format
> The given string is searched for in the dynamic debug format
> diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c
> index f87a7bef4204..784c075c7db9 100644
> --- a/lib/dynamic_debug.c
> +++ b/lib/dynamic_debug.c
> @@ -322,6 +322,8 @@ static int parse_linerange(struct ddebug_query *query, const char *first)
> } else {
> query->last_lineno = query->first_lineno;
> }
> + vpr_info("parsed line %d-%d\n", query->first_lineno,
> + query->last_lineno);
Is this supposed to be in the final code?
I do not see such messages printed for other parsed variants.
> return 0;
> }
>
> @@ -358,6 +360,7 @@ 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) {
> @@ -374,7 +377,22 @@ static int ddebug_parse_query(char *words[], int nwords,
> if (!strcmp(words[i], "func")) {
> rc = check_set(&query->function, words[i+1], "func");
> } else if (!strcmp(words[i], "file")) {
> - rc = check_set(&query->filename, words[i+1], "file");
> + if (check_set(&query->filename, words[i+1], "file"))
> + return -EINVAL;
There is no reason to hard code the error code. It should look like:
rc = check_set(&query->filename, words[i+1], "file");
if (rc)
return rc;
> +
> + /* tail :$info is function or line-range */
> + fline = strchr(query->filename, ':');
> + if (!fline)
> + break;
> + *fline++ = '\0';
> + if (isalpha(*fline) || *fline == '*' || *fline == '?') {
I would do the oposite and check whether is starts with number.
> + /* take as function name */
> + if (check_set(&query->function, fline, "func"))
> + return -EINVAL;
> + } else {
> + if (parse_linerange(query, fline))
> + return -EINVAL;
> + }
Also I would hide this into another function:
rc = parse_filenane(...);
> } else if (!strcmp(words[i], "module")) {
> rc = check_set(&query->module, words[i+1], "module");
> } else if (!strcmp(words[i], "format")) {
> --
> 2.26.2
Best Regards,
Petr
next prev parent reply other threads:[~2020-06-15 14:46 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-13 15:57 [PATCH v2 00/24] dynamic_debug cleanups, query features, WIP print-classes Jim Cromie
2020-06-13 15:57 ` [PATCH v2 01/24] dyndbg-docs: eschew file /full/path query in docs Jim Cromie
2020-06-14 6:04 ` Greg KH
2020-06-14 14:24 ` jim.cromie
2020-06-13 15:57 ` [PATCH v2 02/24] dyndbg-docs: initialization is done early, not arch Jim Cromie
2020-06-13 15:57 ` [PATCH v2 03/24] dyndbg: drop obsolete comment on ddebug_proc_open Jim Cromie
2020-06-13 15:57 ` [PATCH v2 04/24] dyndbg: refine debug verbosity; 1 is basic, 2 more chatty Jim Cromie
2020-06-13 15:57 ` [PATCH v2 05/24] dyndbg: rename __verbose section to __dyndbg Jim Cromie
2020-06-13 15:57 ` [PATCH v2 06/24] dyndbg: fix overcounting of ram used by dyndbg Jim Cromie
2020-06-13 15:57 ` [PATCH v2 07/24] dyndbg: fix a BUG_ON in ddebug_describe_flags Jim Cromie
2020-06-15 13:20 ` Petr Mladek
2020-06-15 21:53 ` jim.cromie
2020-06-13 15:57 ` [PATCH v2 08/24] dyndbg: make ddebug_tables list LIFO for add/remove_module Jim Cromie
2020-06-13 15:57 ` [PATCH v2 09/24] dyndbg: add maybe(str,"") macro to reduce code Jim Cromie
2020-06-13 16:14 ` Joe Perches
2020-06-15 20:50 ` jim.cromie
2020-06-15 13:28 ` Petr Mladek
2020-06-15 20:52 ` jim.cromie
2020-06-13 15:57 ` [PATCH v2 10/24] dyndbg: refactor parse_linerange out of ddebug_parse_query Jim Cromie
2020-06-15 13:37 ` Petr Mladek
2020-06-15 22:37 ` jim.cromie
2020-06-13 15:57 ` [PATCH v2 11/24] dyndbg: accept 'file foo.c:func1' and 'file foo.c:10-100' Jim Cromie
2020-06-15 14:46 ` Petr Mladek [this message]
2020-06-13 15:57 ` [PATCH v2 12/24] dyndbg: refactor ddebug_read_flags out of ddebug_parse_flags Jim Cromie
2020-06-13 15:57 ` [PATCH v2 13/24] dyndbg: combine flags & mask into a struct, use that Jim Cromie
2020-06-15 15:14 ` Petr Mladek
2020-06-16 5:47 ` jim.cromie
2020-06-16 11:34 ` Petr Mladek
2020-06-13 15:57 ` [PATCH v2 14/24] dyndbg: add filter parameter to ddebug_parse_flags Jim Cromie
2020-06-15 15:17 ` Petr Mladek
2020-06-13 15:57 ` [PATCH v2 15/24] dyndbg: extend ddebug_parse_flags to accept optional leading filter-flags Jim Cromie
2020-06-15 15:37 ` Petr Mladek
2020-06-13 15:57 ` [PATCH v2 16/24] dyndbg: prefer declarative init in caller, to memset in callee Jim Cromie
2020-06-13 15:57 ` [PATCH v2 17/24] dyndbg: add user-flag, negating-flags, and filtering on flags Jim Cromie
2020-06-16 11:41 ` Petr Mladek
2020-06-13 15:57 ` [PATCH v2 18/24] dyndbg: allow negating flag-chars in modflags Jim Cromie
2020-06-16 11:47 ` Petr Mladek
2020-06-13 15:57 ` [PATCH v2 19/24] dyndbg: accept query terms like module:foo and file=bar Jim Cromie
2020-06-16 11:57 ` Petr Mladek
2020-06-16 20:08 ` jim.cromie
2020-06-17 12:11 ` Petr Mladek
2020-06-17 13:32 ` jim.cromie
2020-06-17 14:01 ` Greg KH
2020-06-13 15:57 ` [PATCH v2 20/24] dyndbg: WIP towards debug-print-class based callsite controls Jim Cromie
2020-06-13 19:22 ` Joe Perches
2020-06-16 13:45 ` Petr Mladek
2020-06-16 21:05 ` Joe Perches
2020-06-17 9:31 ` Daniel Thompson
2020-06-17 9:52 ` Petr Mladek
2020-06-17 13:23 ` jim.cromie
2020-06-18 12:20 ` Petr Mladek
2020-06-16 21:13 ` jim.cromie
2020-06-16 21:25 ` jim.cromie
2020-06-13 15:57 ` [PATCH v2 21/24] dyndbg: adapt header macros to pass print-class Jim Cromie
2020-06-13 17:11 ` kernel test robot
2020-06-13 20:25 ` kernel test robot
2020-06-13 15:57 ` [PATCH v2 22/24] dyndbg: add print-class as trailing number to control output Jim Cromie
2020-06-13 15:57 ` [PATCH v2 23/24] kset-example: add pr_debug()s for easy visibility of its operation Jim Cromie
2020-06-14 6:05 ` Greg KH
2020-06-15 22:18 ` jim.cromie
2020-06-16 6:37 ` Greg KH
2020-06-13 15:57 ` [PATCH v2 24/24] kset-example: use pr_debug_n to create example print-classes Jim Cromie
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=20200615144646.GH31238@alley \
--to=pmladek@suse.com \
--cc=akpm@linux-foundation.org \
--cc=akpm@linuxfoundation.org \
--cc=corbet@lwn.net \
--cc=gregkh@linuxfoundation.org \
--cc=jbaron@akamai.com \
--cc=jim.cromie@gmail.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@rasmusvillemoes.dk \
--cc=orson.zhai@unisoc.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).