From: Jim Cromie <jim.cromie@gmail.com>
To: jbaron@redhat.com
Cc: bvanassche@acm.org, joe@perches.com, gregkh@suse.de,
linux-kernel@vger.kernel.org, gnb@fmeh.org,
Jim Cromie <jim.cromie@gmail.com>
Subject: [PATCH 25/25] dynamic_debug: add $DBGFS/dynamic_debug/pending
Date: Mon, 25 Jul 2011 15:42:50 -0600 [thread overview]
Message-ID: <1311630170-26057-26-git-send-email-jim.cromie@gmail.com> (raw)
In-Reply-To: <1311630170-26057-1-git-send-email-jim.cromie@gmail.com>
add pending file so user can see queries that are pending.
This needs work - it currently loops through all pending queries,
but doesnt terminate - it starts over at the beginning.
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
---
lib/dynamic_debug.c | 169 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 168 insertions(+), 1 deletions(-)
diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c
index 6dbefb7..0f0bc61 100644
--- a/lib/dynamic_debug.c
+++ b/lib/dynamic_debug.c
@@ -65,6 +65,10 @@ struct ddebug_iter {
unsigned int idx;
};
+struct pending_iter {
+ struct pending_query *elem;
+};
+
static DEFINE_MUTEX(ddebug_lock);
static LIST_HEAD(ddebug_tables);
static int verbose = 0;
@@ -948,6 +952,162 @@ static const struct file_operations ddebug_proc_fops = {
.write = ddebug_proc_write
};
+/*
+ * Set the iterator to point to the first pending_query object
+ * and return a pointer to that first object. Returns
+ * NULL if there are no pending_querys at all.
+ */
+static struct pending_query *pending_iter_first(struct pending_iter *iter)
+{
+ if (list_empty(&pending_queries))
+ return NULL;
+ iter->elem = list_entry(pending_queries.next,
+ struct pending_query, link);
+ return iter->elem;
+}
+
+/*
+ * Advance the iterator to point to the next pending_query
+ * object from the one the iterator currently points at,
+ * and returns a pointer to the new pending_query. Returns
+ * NULL if the iterator has seen all the pending_querys.
+ */
+static struct pending_query *pending_iter_next(struct pending_iter *iter)
+{
+ if (iter->elem == NULL)
+ return NULL;
+ if (list_is_last(&iter->elem->link, &pending_queries)) {
+ iter->elem = NULL;
+ return NULL;
+ }
+ iter->elem = list_entry(iter->elem->link.next,
+ struct pending_query, link);
+ return iter->elem;
+}
+
+/*
+ * Seq_ops start method. Called at the start of every
+ * read() call from userspace. Takes the pending_lock and
+ * seeks the seq_file's iterator to the given position.
+ */
+static void *pending_proc_start(struct seq_file *m, loff_t *pos)
+{
+ struct pending_iter *iter = m->private;
+ struct pending_query *pq;
+ int n = *pos;
+
+ pr_debug("called m=%p *pos=%lld\n", m, (unsigned long long)*pos);
+
+ mutex_lock(&ddebug_lock);
+
+ if (!n)
+ return SEQ_START_TOKEN;
+ if (n < 0)
+ return NULL;
+ pq = pending_iter_first(iter);
+ /*while (pq != NULL && --n > 0)
+ pq = pending_iter_next(iter);
+ */
+ return pq;
+}
+
+/*
+ * Seq_ops next method. Called several times within a read()
+ * call from userspace, with pending_lock held. Walks to the
+ * next pending_query object with a special case for the header line.
+ */
+static void *pending_proc_next(struct seq_file *m, void *p, loff_t *pos)
+{
+ struct pending_iter *iter = m->private;
+ struct pending_query *pq;
+
+ pr_debug("called m=%p p=%p *pos=%lld\n",
+ m, p, (unsigned long long)*pos);
+
+ if (p == SEQ_START_TOKEN)
+ pq = pending_iter_first(iter);
+ else
+ pq = pending_iter_next(iter);
+ ++*pos;
+ return pq;
+}
+
+/*
+ * Seq_ops show method. Called several times within a read()
+ * call from userspace, with pending_lock held. Formats the
+ * current pending_query as a single human-readable line, with a
+ * special case for the header line.
+ */
+static int pending_proc_show(struct seq_file *m, void *p)
+{
+ struct pending_iter *iter = m->private;
+ struct pending_query *pq = p;
+ char *qstr;
+
+ pr_debug("called m=%p p=%p\n", m, p);
+
+ if (p == SEQ_START_TOKEN) {
+ seq_puts(m, "# file module func line flags\n");
+ return 0;
+ }
+
+ seq_printf(m, "%s\n", qstr = show_pending_query(iter->elem));
+ kfree(qstr);
+ return 0;
+}
+
+/*
+ * Seq_ops stop method. Called at the end of each read()
+ * call from userspace. Drops pending_lock.
+ */
+static void pending_proc_stop(struct seq_file *m, void *p)
+{
+ pr_debug("called m=%p p=%p\n", m, p);
+ mutex_unlock(&ddebug_lock);
+}
+
+static const struct seq_operations pending_proc_seqops = {
+ .start = pending_proc_start,
+ .next = pending_proc_next,
+ .show = pending_proc_show,
+ .stop = pending_proc_stop
+};
+
+/*
+ * File_ops->open method for <debugfs>/dynamic_debug/control. Does the seq_file
+ * setup dance, and also creates an iterator to walk the pending_querys.
+ * Note that we create a seq_file always, even for O_WRONLY files
+ * where it's not needed, as doing so simplifies the ->release method.
+ */
+static int pending_proc_open(struct inode *inode, struct file *file)
+{
+ struct pending_iter *iter;
+ int err;
+
+ if (verbose)
+ pr_info("called\n");
+
+ iter = kzalloc(sizeof(*iter), GFP_KERNEL);
+ if (iter == NULL)
+ return -ENOMEM;
+
+ err = seq_open(file, &pending_proc_seqops);
+ if (err) {
+ kfree(iter);
+ return err;
+ }
+ ((struct seq_file *) file->private_data)->private = iter;
+ return 0;
+}
+
+static const struct file_operations pending_proc_fops = {
+ .owner = THIS_MODULE,
+ .open = pending_proc_open,
+ .read = seq_read,
+ .llseek = seq_lseek,
+ .release = seq_release_private,
+};
+
/* apply matching queries in pending-queries list. Called with lock held */
static void apply_pending_queries(struct ddebug_table *dt)
{
@@ -1051,7 +1211,7 @@ static __initdata int ddebug_init_success;
static int __init dynamic_debug_init_debugfs(void)
{
- struct dentry *dir, *file;
+ struct dentry *dir, *file, *file2;
if (!ddebug_init_success)
return -ENODEV;
@@ -1065,6 +1225,13 @@ static int __init dynamic_debug_init_debugfs(void)
debugfs_remove(dir);
return -ENOMEM;
}
+ file2 = debugfs_create_file("pending", 0444, dir, NULL,
+ &pending_proc_fops);
+ if (!file2) {
+ debugfs_remove(file);
+ debugfs_remove(dir);
+ return -ENOMEM;
+ }
return 0;
}
--
1.7.4.1
prev parent reply other threads:[~2011-07-25 21:44 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-25 21:42 [patch 00/25] dynamic_debug: multiple, pending queries in boot-arg Jim Cromie
2011-07-25 21:42 ` [PATCH 01/25] dynamic_debug: add pending flag 'a' to make pending queries explicit Jim Cromie
2011-07-25 21:42 ` [PATCH 02/25] dynamic_debug: change verbosity at runtime Jim Cromie
2011-07-25 21:42 ` [PATCH 03/25] dynamic_debug: use pr_debug instead of pr_info Jim Cromie
2011-07-26 7:08 ` Bart Van Assche
2011-07-27 21:34 ` Jim Cromie
2011-07-28 9:18 ` Bart Van Assche
2011-07-28 18:24 ` Jason Baron
2011-07-28 21:15 ` Jim Cromie
2011-08-03 18:27 ` Jason Baron
2011-08-03 19:52 ` Jim Cromie
2011-08-10 17:14 ` Jason Baron
2011-08-10 19:28 ` Jim Cromie
2011-07-25 21:42 ` [PATCH 04/25] dynamic_debug: replace strcpy with strlcpy, in ddebug_setup_query() Jim Cromie
2011-07-25 21:42 ` [PATCH 05/25] dynamic_debug: trim source-path prefix from dynamic_debug/control Jim Cromie
2011-07-25 21:42 ` [PATCH 06/25] dynamic_debug: process multiple commands on a line Jim Cromie
2011-07-25 21:42 ` [PATCH 07/25] dynamic_debug: enlarge command/query write buffer Jim Cromie
2011-07-25 21:42 ` [PATCH 08/25] dynamic_debug: warn when >1 of each type of match-spec is given Jim Cromie
2011-07-25 21:42 ` [PATCH 09/25] dynamic_debug: pr_err() call should not depend upon verbosity Jim Cromie
2011-07-25 21:42 ` [PATCH 10/25] dynamic_debug: dont kill entire facility on error parsing ddebug_query Jim Cromie
2011-07-25 21:42 ` [PATCH 11/25] dynamic_debug: factor show_ddebug_query out of ddebug_parse_query Jim Cromie
2011-07-26 7:13 ` Bart Van Assche
2011-07-26 7:15 ` Bart Van Assche
2011-07-26 16:21 ` Jim Cromie
2011-07-25 21:42 ` [PATCH 12/25] dynamic_debug: save non-matching queries to pending-list for later application Jim Cromie
2011-07-25 21:42 ` [PATCH 13/25] dynamic_debug: apply_pending_queries() from ddebug_add_module() Jim Cromie
2011-07-25 21:42 ` [PATCH 14/25] dynamic_debug: refactor query_matches_callsite out of ddebug_change Jim Cromie
2011-07-25 21:42 ` [PATCH 15/25] dynamic_debug: remove explicit foo != NULL checks Jim Cromie
2011-07-25 21:42 ` [PATCH 16/25] dynamic_debug: require 'a' flag to explicitly mark pending queries Jim Cromie
2011-07-26 7:26 ` Bart Van Assche
2011-07-27 17:27 ` Jim Cromie
2011-07-25 21:42 ` [PATCH 17/25] dynamic_debug: hoist locking in ddebug_change to callers Jim Cromie
2011-07-25 21:42 ` [PATCH 18/25] dynamic_debug: describe_flags with '=[pmflta_]*' Jim Cromie
2011-07-26 7:37 ` Bart Van Assche
2011-07-27 17:28 ` Jim Cromie
2011-07-25 21:42 ` [PATCH 19/25] dynamic_debug: add flags filtering to flags spec Jim Cromie
2011-07-25 21:42 ` [PATCH 20/25] dynamic_debug: remove pending query when flags zeroed Jim Cromie
2011-07-25 21:42 ` [PATCH 21/25] dynamic_debug: shrink struct pending query to size actually needed Jim Cromie
2011-07-26 7:32 ` Bart Van Assche
2011-07-27 18:41 ` Jim Cromie
2011-07-25 21:42 ` [PATCH 22/25] dynamic_debug: call ddebug_add_module() on dynamic_debug first Jim Cromie
2011-07-25 21:42 ` [PATCH 23/25] dynamic_debug: document pending queries, flags-filter, multiple queries Jim Cromie
2011-07-25 21:42 ` [PATCH 24/25] dynamic_debug: drop pr_fmt() from dynamic_pr_debug Jim Cromie
2011-07-26 2:23 ` Joe Perches
2011-07-26 3:45 ` Joe Perches
2011-07-26 5:54 ` Jim Cromie
2011-07-25 21:42 ` Jim Cromie [this message]
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=1311630170-26057-26-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=joe@perches.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®