From: Jim Cromie <jim.cromie@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: gnb@fmeh.org, jbaron@redhat.com, bvanassche@acm.org,
gregkh@suse.de, Jim Cromie <jim.cromie@gmail.com>
Subject: [PATCH 09/11] dynamic_debug: add_to_pending() saves non-matching queries for later.
Date: Tue, 28 Jun 2011 01:09:50 -0600 [thread overview]
Message-ID: <1309244992-2305-10-git-send-email-jim.cromie@gmail.com> (raw)
In-Reply-To: <1309244992-2305-1-git-send-email-jim.cromie@gmail.com>
When a query/rule doesnt match, call add_to_pending(new function)
to copy the query off the stack, into a (new) struct pending_query,
and add to pending_queries (new) list.
Patch adds: /sys/module/dynamic_debug/parameters/
verbose - rw, added previously, here for completeness
pending_ct - ro, shows current count of pending queries
pending_max - rw, set max pending, further pending queries are rejected
With this and previous patches, queries added on the boot-line which
do not match (because module is not built-in, and thus not present yet)
are added to pending_queries.
IE, with these boot-line additions:
dynamic_debug.verbose=1 ddebug_query="module scx200_hrt +p"
Kernel will log the following:
ddebug_exec_queries: query 0: "module scx200_hrt +p"
ddebug_tokenize: split into words: "module" "scx200_hrt" "+p"
ddebug_parse_query: parsed q->function="(null)" q->filename="(null)" q->module="scx200_hrt" q->format="(null)" q->lineno=0-0
ddebug_parse_flags: op='+'
ddebug_parse_flags: flags=0x1
ddebug_parse_flags: *flagsp=0x1 *maskp=0xffffffff
ddebug_exec_query: nfound 0 on q->function="(null)" q->filename="(null)" q->module="scx200_hrt" q->format="(null)" q->lineno=0-0
ddebug_add_to_pending: add to pending: q->function="(null)" q->filename="(null)" q->module="scx200_hrt" q->format="(null)" q->lineno=0-0
ddebug_add_to_pending: ddebug: query saved as pending 1
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
---
lib/dynamic_debug.c | 78 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 72 insertions(+), 6 deletions(-)
diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c
index 9b8b1e8..37d0275 100644
--- a/lib/dynamic_debug.c
+++ b/lib/dynamic_debug.c
@@ -53,6 +53,16 @@ struct ddebug_query {
unsigned int first_lineno, last_lineno;
};
+struct pending_query {
+ struct list_head link;
+ struct ddebug_query query;
+ char filename[100];
+ char module[30];
+ char function[50];
+ char format[200];
+ unsigned int flags, mask;
+};
+
struct ddebug_iter {
struct ddebug_table *table;
unsigned int idx;
@@ -61,7 +71,13 @@ struct ddebug_iter {
static DEFINE_MUTEX(ddebug_lock);
static LIST_HEAD(ddebug_tables);
static int verbose = 0;
-module_param(verbose, int, 0744);
+module_param(verbose, int, 0644);
+
+/* legal but inapplicable queries, save and test against new modules */
+static LIST_HEAD(pending_queries);
+static int pending_ct, pending_max = 100;
+module_param(pending_ct, int, 0444);
+module_param(pending_max, int, 0644);
/* Return the last part of a pathname */
static inline const char *basename(const char *path)
@@ -96,6 +112,56 @@ static char *ddebug_describe_flags(struct _ddebug *dp, char *buf,
return buf;
}
+static char prbuf_query[300];
+
+static char *show_ddebug_query(const struct ddebug_query *q)
+{
+ sprintf(prbuf_query,
+ "q->function=\"%s\" q->filename=\"%s\" "
+ "q->module=\"%s\" q->format=\"%s\" q->lineno=%u-%u",
+ q->function, q->filename, q->module, q->format,
+ q->first_lineno, q->last_lineno);
+
+ return prbuf_query;
+}
+
+/* copy query off stack, save flags & mask, and store in pending-list */
+static void add_to_pending(const struct ddebug_query *query,
+ unsigned int flags, unsigned int mask)
+{
+ struct pending_query *pq;
+
+ if (pending_ct >= pending_max) {
+ pr_warn("ddebug: no matches for query, pending is full\n");
+ return;
+ }
+ if (verbose)
+ pr_info("add to pending: %s\n", show_ddebug_query(query));
+
+ pending_ct++;
+ pq = kzalloc(sizeof(struct pending_query), GFP_KERNEL);
+
+ /* copy non-null match-specs into allocd mem, update pointers */
+ if (query->module)
+ pq->query.module = strcpy(pq->module, query->module);
+ if (query->function)
+ pq->query.function = strcpy(pq->function, query->function);
+ if (query->filename)
+ pq->query.filename = strcpy(pq->filename, query->filename);
+ if (query->format)
+ pq->query.format = strcpy(pq->format, query->format);
+
+ pq->flags = flags;
+ pq->mask = mask;
+
+ mutex_lock(&ddebug_lock);
+ list_add(&pq->link, &pending_queries);
+ mutex_unlock(&ddebug_lock);
+
+ if (verbose)
+ pr_info("ddebug: query saved as pending %d\n", pending_ct);
+}
+
/*
* Search the tables for _ddebug's which match the given
* `query' and apply the `flags' and `mask' to them. Tells
@@ -348,11 +414,7 @@ static int ddebug_parse_query(char *words[], int nwords,
}
if (verbose)
- pr_info("q->function=\"%s\" q->filename=\"%s\" "
- "q->module=\"%s\" q->format=\"%s\" q->lineno=%u-%u\n",
- query->function, query->filename,
- query->module, query->format, query->first_lineno,
- query->last_lineno);
+ pr_info("parsed %s\n", show_ddebug_query(query));
return 0;
}
@@ -437,6 +499,10 @@ static int ddebug_exec_query(char *query_string)
/* actually go and implement the change */
nfound = ddebug_change(&query, flags, mask);
+ pr_info("nfound %d on %s\n", nfound, show_ddebug_query(&query));
+ if (!nfound)
+ ddebug_add_to_pending(&query, flags, mask);
+
return 0;
}
--
1.7.4.1
next prev parent reply other threads:[~2011-06-28 7:12 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-28 7:09 [PATCH 0/11] dynamic_debug: allow multiple pending queries on boot-line Jim Cromie
2011-06-28 7:09 ` [PATCH 01/11] dynamic_debug: allow changing of dynamic_debug verbosity any time Jim Cromie
2011-06-29 10:41 ` Bart Van Assche
2011-07-01 21:57 ` Greg KH
2011-07-02 8:39 ` Jim Cromie
2011-06-28 7:09 ` [PATCH 02/11] dynamic_debug: trim source-path prefix from dynamic_debug/control Jim Cromie
2011-06-28 10:08 ` Bart Van Assche
2011-06-28 18:29 ` Jim Cromie
2011-06-28 7:09 ` [PATCH 03/11] dynamic_debug: process multiple commands on a line Jim Cromie
2011-06-29 10:50 ` Bart Van Assche
2011-07-05 16:12 ` Jim Cromie
2011-06-28 7:09 ` [PATCH 04/11] dynamic_debug: warn when >1 of each type of match-spec is given Jim Cromie
2011-06-28 10:17 ` Bart Van Assche
2011-06-28 15:21 ` Jim Cromie
2011-06-28 7:09 ` [PATCH 05/11] dynamic_debug: use pr_info instead of printk(KERN_INFO Jim Cromie
2011-06-28 7:09 ` [PATCH 06/11] dynamic_debug: KERN_ERR should not depend upon verbosity Jim Cromie
2011-06-28 7:09 ` [PATCH 07/11] dynamic_debug: dont kill entire facility on error parsing ddebug_query Jim Cromie
2011-06-28 7:09 ` [PATCH 08/11] dynamic_debug: return int from ddebug_change Jim Cromie
2011-06-28 10:24 ` Bart Van Assche
2011-06-28 14:54 ` Jason Baron
2011-06-28 17:48 ` Bart Van Assche
2011-06-28 18:24 ` Jim Cromie
2011-06-28 7:09 ` Jim Cromie [this message]
2011-06-28 14:48 ` [PATCH 09/11] dynamic_debug: add_to_pending() saves non-matching queries for later Jason Baron
2011-07-03 8:27 ` Bart Van Assche
2011-06-28 19:17 ` Jim Cromie
2011-07-03 8:24 ` Bart Van Assche
2011-07-03 8:32 ` Bart Van Assche
2011-06-28 7:09 ` [PATCH 10/11] dynamic_debug: call apply_pending_queries from ddebug_add_module Jim Cromie
2011-07-03 8:37 ` Bart Van Assche
2011-06-28 7:09 ` [PATCH 11/11] dynamic_debug: document use of pendinq queries at boot-time Jim Cromie
2011-07-03 8:19 ` [PATCH 0/11] dynamic_debug: allow multiple pending queries on boot-line Bart Van Assche
2011-07-11 7:46 ` Jim Cromie
2011-07-11 7:46 ` [PATCH 01/21] dynamic_debug: add pending flag 'a' to make pending queries explicit Jim Cromie
2011-07-11 7:46 ` [PATCH 02/21] dynamic_debug: allow changing of dynamic_debug verbosity any time Jim Cromie
2011-07-11 7:46 ` [PATCH 03/21] dynamic_debug: process multiple commands on a line Jim Cromie
2011-07-12 5:54 ` Bart Van Assche
2011-07-13 7:25 ` Jim Cromie
2011-07-13 17:44 ` Bart Van Assche
2011-07-11 7:46 ` [PATCH 04/21] dynamic_debug: warn when >1 of each type of match-spec is given Jim Cromie
2011-07-11 7:46 ` [PATCH 05/21] dynamic_debug: pr_err() call should not depend upon verbosity Jim Cromie
2011-07-11 7:46 ` [PATCH 06/21] dynamic_debug: dont kill entire facility on error parsing ddebug_query Jim Cromie
2011-07-11 7:46 ` [PATCH 07/21] dynamic_debug: return int from ddebug_change Jim Cromie
2011-07-11 18:39 ` Bart Van Assche
2011-07-11 7:46 ` [PATCH 08/21] dynamic_debug: factor show_ddebug_query out of ddebug_parse_query Jim Cromie
2011-07-11 18:36 ` Bart Van Assche
2011-07-16 21:32 ` Jim Cromie
2011-07-25 11:10 ` Bart Van Assche
2011-07-25 13:56 ` Jim Cromie
2011-07-11 7:46 ` [PATCH 09/21] dynamic_debug: save_pending() saves non-matching queries for later Jim Cromie
2011-07-11 18:32 ` Bart Van Assche
2011-07-12 5:55 ` Bart Van Assche
2011-07-11 7:46 ` [PATCH 10/21] dynamic_debug: call apply_pending_queries from ddebug_add_module Jim Cromie
2011-07-11 7:46 ` [PATCH 11/21] dynamic_debug: refactor query_matches_callsite out of ddebug_change Jim Cromie
2011-07-11 7:46 ` [PATCH 12/21] dynamic_debug: document use of pending queries at boot-time Jim Cromie
2011-07-11 7:46 ` [PATCH 13/21] dynamic_debug: require 'a' flag to explicitly mark pending queries Jim Cromie
2011-07-12 9:20 ` Bart Van Assche
2011-07-11 7:46 ` [PATCH 14/21] dynamic_debug: hoist locking in ddebug_change to callers Jim Cromie
2011-07-11 7:46 ` [PATCH 15/21] dynamic_debug: describe_flags with '=[ptmfl]*' Jim Cromie
2011-07-11 7:46 ` [PATCH 16/21] dynamic_debug: define several levels of verbosity Jim Cromie
2011-07-11 7:46 ` [PATCH 17/21] dynamic_debug: non-optimization - remove != NULL Jim Cromie
2011-07-11 7:46 ` [PATCH 18/21] dynamic_debug: trim source-path prefix from dynamic_debug/control Jim Cromie
2011-07-11 7:46 ` [PATCH 19/21] dynamic_debug: add flags filtering to flags spec handling Jim Cromie
2011-07-11 7:46 ` [PATCH 20/21] dynamic_debug: clear pending_queries list in remove_all_tables Jim Cromie
2011-07-11 7:46 ` [PATCH 21/21] dynamic_debug: delete pending queries Jim Cromie
2011-07-11 10:49 ` Bart Van Assche
2011-07-11 13:43 ` Jim Cromie
2011-07-12 0:25 ` Joe Perches
2011-07-12 20:50 ` Jason Baron
2011-07-20 5:39 ` Jim Cromie
2011-07-20 17:43 ` Jim Cromie
2011-07-20 22:08 ` Joe Perches
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=1309244992-2305-10-git-send-email-jim.cromie@gmail.com \
--to=jim.cromie@gmail.com \
--cc=bvanassche@acm.org \
--cc=gnb@fmeh.org \
--cc=gregkh@suse.de \
--cc=jbaron@redhat.com \
--cc=linux-kernel@vger.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
all inboxes | Powered by JetHome®