This patch dumps the dlm state (dlm_ctxt) into a debugfs file.
Useful for debugging.
Signed-off-by: Sunil Mushran <[EMAIL PROTECTED]>
---
fs/ocfs2/dlm/dlmcommon.h | 1 +
fs/ocfs2/dlm/dlmdebug.c | 280 +++++++++++++++++++++++++++++++++++++++++++++-
fs/ocfs2/dlm/dlmdebug.h | 14 +++
fs/ocfs2/dlm/dlmdomain.c | 8 ++
4 files changed, 302 insertions(+), 1 deletions(-)
diff --git a/fs/ocfs2/dlm/dlmcommon.h b/fs/ocfs2/dlm/dlmcommon.h
index 74ee372..9828722 100644
--- a/fs/ocfs2/dlm/dlmcommon.h
+++ b/fs/ocfs2/dlm/dlmcommon.h
@@ -125,6 +125,7 @@ struct dlm_ctxt
atomic_t remote_resources;
atomic_t unknown_resources;
+ struct dlm_debug_ctxt *dlm_debug_ctxt;
struct dentry *dlm_debugfs_subroot;
/* NOTE: Next three are protected by dlm_domain_lock */
diff --git a/fs/ocfs2/dlm/dlmdebug.c b/fs/ocfs2/dlm/dlmdebug.c
index fe327be..124856b 100644
--- a/fs/ocfs2/dlm/dlmdebug.c
+++ b/fs/ocfs2/dlm/dlmdebug.c
@@ -699,7 +699,278 @@ const char *dlm_errname(enum dlm_status err)
}
EXPORT_SYMBOL_GPL(dlm_errname);
-/* subroot - domain dir */
+/* begin - utils funcs */
+static void dlm_debug_free(struct kref *kref)
+{
+ struct dlm_debug_ctxt *dc;
+
+ dc = container_of(kref, struct dlm_debug_ctxt, debug_refcnt);
+
+ kfree(dc);
+}
+
+void dlm_debug_put(struct dlm_debug_ctxt *dc)
+{
+ if (dc)
+ kref_put(&dc->debug_refcnt, dlm_debug_free);
+}
+
+static void dlm_debug_get(struct dlm_debug_ctxt *dc)
+{
+ kref_get(&dc->debug_refcnt);
+}
+
+static int stringify_nodemap(unsigned long *nodemap, int maxnodes,
+ char *buf, int len)
+{
+ int out = 0;
+ int i = -1;
+
+ while ((i = find_next_bit(nodemap, maxnodes, i + 1)) < maxnodes)
+ out += snprintf(buf + out, len - out, "%d,", i);
+
+ return out;
+}
+
+static struct debug_buffer *debug_buffer_allocate(void)
+{
+ struct debug_buffer *db = NULL;
+
+ db = kzalloc(sizeof(struct debug_buffer), GFP_KERNEL);
+ if (!db)
+ goto bail;
+
+ db->len = PAGE_SIZE;
+ db->buf = kmalloc(db->len, GFP_KERNEL);
+ if (!db->buf)
+ goto bail;
+
+ return db;
+bail:
+ if (db)
+ kfree(db);
+ return NULL;
+}
+
+static ssize_t debug_buffer_read(struct file *file, char __user *buf,
+ size_t nbytes, loff_t *ppos)
+{
+ struct debug_buffer *db = file->private_data;
+
+ return simple_read_from_buffer(buf, nbytes, ppos, db->buf, db->len);
+}
+
+static loff_t debug_buffer_llseek(struct file *file, loff_t off, int whence)
+{
+ struct debug_buffer *db = file->private_data;
+ loff_t new = -1;
+
+ switch (whence) {
+ case 0:
+ new = off;
+ break;
+ case 1:
+ new = file->f_pos + off;
+ break;
+ }
+
+ if (new < 0 || new > db->len)
+ return -EINVAL;
+
+ return (file->f_pos = new);
+}
+
+static int debug_buffer_release(struct inode *inode, struct file *file)
+{
+ struct debug_buffer *db = (struct debug_buffer *)file->private_data;
+
+ if (db && db->buf)
+ kfree(db->buf);
+ if (db)
+ kfree(db);
+
+ return 0;
+}
+
+/* end - util funcs */
+
+/* begin - debug state funcs */
+static int debug_state_print(struct dlm_ctxt *dlm, struct debug_buffer *db)
+{
+ int out = 0;
+ struct dlm_reco_node_data *node;
+ char *state;
+ int lres, rres, ures, tres;
+
+ lres = atomic_read(&dlm->local_resources);
+ rres = atomic_read(&dlm->remote_resources);
+ ures = atomic_read(&dlm->unknown_resources);
+ tres = lres + rres + ures;
+
+ spin_lock(&dlm->spinlock);
+
+ switch (dlm->dlm_state) {
+ case DLM_CTXT_NEW:
+ state = "New"; break;
+ case DLM_CTXT_JOINED:
+ state = "Joined"; break;
+ case DLM_CTXT_IN_SHUTDOWN:
+ state = "Shutdown"; break;
+ case DLM_CTXT_LEAVING:
+ state = "Leaving"; break;
+ default:
+ state = "Unknown"; break;
+ }
+
+ out += snprintf(db->buf + out, db->len - out,
+ "Domain=%s, key=0x%08x, node=%d, state=%s\n",
+ dlm->name, dlm->key, dlm->node_num, state);
+
+ out += snprintf(db->buf + out, db->len - out,
+ "Joining=%d, numjoins=%d, purgecnt=%d, refs=%d\n",
+ dlm->joining_node, dlm->num_joins, dlm->purge_count,
+ atomic_read(&dlm->dlm_refs.refcount));
+
+ out += snprintf(db->buf + out, db->len - out,
+ "Resources total=%d, local=%d, remote=%d, unknown=%d\n",
+ tres, lres, rres, ures);
+
+ out += snprintf(db->buf + out, db->len - out,
+ "Lists dirty=%d, purge=%d, asts=%d, basts=%d, mle=%d\n",
+ !list_empty(&dlm->dirty_list),
+ !list_empty(&dlm->purge_list),
+ !list_empty(&dlm->pending_asts),
+ !list_empty(&dlm->pending_basts),
+ !list_empty(&dlm->master_list));
+
+ /* live map */
+ out += snprintf(db->buf + out, db->len - out, "Live map=");
+ out += stringify_nodemap(dlm->live_nodes_map, O2NM_MAX_NODES,
+ db->buf + out, db->len - out);
+ out += snprintf(db->buf + out, db->len - out, "\n");
+
+ /* domain map */
+ out += snprintf(db->buf + out, db->len - out, "Domain map=");
+ out += stringify_nodemap(dlm->domain_map, O2NM_MAX_NODES,
+ db->buf + out, db->len - out);
+ out += snprintf(db->buf + out, db->len - out, "\n");
+
+ /* recovery map */
+ out += snprintf(db->buf + out, db->len - out, "Recovery map=");
+ out += stringify_nodemap(dlm->recovery_map, O2NM_MAX_NODES,
+ db->buf + out, db->len - out);
+ out += snprintf(db->buf + out, db->len - out, "\n");
+
+ /* recovery state */
+ /* What about DLM_RECO_STATE_FINALIZE? */
+ if (dlm->reco.state == DLM_RECO_STATE_ACTIVE)
+ state = "Active";
+ else
+ state = "Inactive";
+
+ out += snprintf(db->buf + out, db->len - out,
+ "Recovery pid=%d, state=%s, dead=%d, master=%d\n",
+ dlm->dlm_reco_thread_task->pid, state,
+ dlm->reco.dead_node, dlm->reco.new_master);
+
+ out += snprintf(db->buf + out, db->len - out, "Recovery node state= ");
+ list_for_each_entry(node, &dlm->reco.node_data, list) {
+ switch (node->state) {
+ case DLM_RECO_NODE_DATA_INIT:
+ state = "init";
+ break;
+ case DLM_RECO_NODE_DATA_REQUESTING:
+ state = "requesting";
+ break;
+ case DLM_RECO_NODE_DATA_DEAD:
+ state = "dead";
+ break;
+ case DLM_RECO_NODE_DATA_RECEIVING:
+ state = "receiving";
+ break;
+ case DLM_RECO_NODE_DATA_REQUESTED:
+ state = "requested";
+ break;
+ case DLM_RECO_NODE_DATA_DONE:
+ state = "done";
+ break;
+ case DLM_RECO_NODE_DATA_FINALIZE_SENT:
+ state = "finalize-sent";
+ break;
+ default:
+ state = "bad";
+ break;
+ }
+ out += snprintf(db->buf + out, db->len - out, "%u %s, ",
+ node->node_num, state);
+ }
+ out += snprintf(db->buf + out, db->len - out, "\n");
+
+ spin_unlock(&dlm->spinlock);
+
+ return out;
+}
+
+static int debug_state_open(struct inode *inode, struct file *file)
+{
+ struct dlm_ctxt *dlm = inode->i_private;
+ struct debug_buffer *db = NULL;
+
+ db = debug_buffer_allocate();
+ if (!db)
+ goto bail;
+
+ db->len = debug_state_print(dlm, db);
+
+ file->private_data = db;
+
+ return 0;
+bail:
+ return -ENOMEM;
+}
+
+static struct file_operations debug_state_fops = {
+ .open = debug_state_open,
+ .release = debug_buffer_release,
+ .read = debug_buffer_read,
+ .llseek = debug_buffer_llseek,
+};
+/* end - debug state funcs */
+
+/* files in subroot */
+int dlm_debug_init(struct dlm_ctxt *dlm)
+{
+ struct dlm_debug_ctxt *dc = dlm->dlm_debug_ctxt;
+
+ /* for dumping dlm_ctxt */
+ dc->debug_state_dentry = debugfs_create_file("state", S_IFREG|S_IRUSR,
+ dlm->dlm_debugfs_subroot,
+ dlm, &debug_state_fops);
+ if (!dc->debug_state_dentry) {
+ mlog_errno(-ENOMEM);
+ goto bail;
+ }
+
+ dlm_debug_get(dc);
+ return 0;
+
+bail:
+ dlm_debug_shutdown(dlm);
+ return -ENOMEM;
+}
+
+void dlm_debug_shutdown(struct dlm_ctxt *dlm)
+{
+ struct dlm_debug_ctxt *dc = dlm->dlm_debug_ctxt;
+
+ if (dc) {
+ if (dc->debug_state_dentry)
+ debugfs_remove(dc->debug_state_dentry);
+ dlm_debug_put(dc);
+ }
+}
+
+/* debugfs subroot - domain dir */
int dlm_create_debugfs_subroot(struct dlm_ctxt *dlm)
{
dlm->dlm_debugfs_subroot = debugfs_create_dir(dlm->name,
dlm_debugfs_root);
@@ -708,6 +979,13 @@ int dlm_create_debugfs_subroot(struct dlm_ctxt *dlm)
goto bail;
}
+ dlm->dlm_debug_ctxt = kzalloc(sizeof(struct dlm_debug_ctxt),
GFP_KERNEL);
+ if (!dlm->dlm_debug_ctxt) {
+ mlog_errno(-ENOMEM);
+ goto bail;
+ }
+ kref_init(&dlm->dlm_debug_ctxt->debug_refcnt);
+
return 0;
bail:
dlm_destroy_debugfs_subroot(dlm);
diff --git a/fs/ocfs2/dlm/dlmdebug.h b/fs/ocfs2/dlm/dlmdebug.h
index e701499..50cb10f 100644
--- a/fs/ocfs2/dlm/dlmdebug.h
+++ b/fs/ocfs2/dlm/dlmdebug.h
@@ -25,6 +25,17 @@
#ifndef DLMDEBUG_H
#define DLMDEBUG_H
+struct dlm_debug_ctxt {
+ struct kref debug_refcnt;
+ struct dentry *debug_state_dentry;
+};
+
+struct debug_buffer
+{
+ int len;
+ char *buf;
+};
+
void dlm_remove_proc(void);
void dlm_init_proc(void);
void dlm_dump_lock_resources(struct dlm_ctxt *dlm);
@@ -32,6 +43,9 @@ void dlm_proc_add_domain(struct dlm_ctxt *dlm);
void dlm_proc_del_domain(struct dlm_ctxt *dlm);
void dlm_dump_work_queue(struct dlm_ctxt *dlm);
+int dlm_debug_init(struct dlm_ctxt *dlm);
+void dlm_debug_shutdown(struct dlm_ctxt *dlm);
+
int dlm_create_debugfs_subroot(struct dlm_ctxt *dlm);
void dlm_destroy_debugfs_subroot(struct dlm_ctxt *dlm);
diff --git a/fs/ocfs2/dlm/dlmdomain.c b/fs/ocfs2/dlm/dlmdomain.c
index 7b2c967..b06151e 100644
--- a/fs/ocfs2/dlm/dlmdomain.c
+++ b/fs/ocfs2/dlm/dlmdomain.c
@@ -389,6 +389,7 @@ static void dlm_destroy_dlm_worker(struct dlm_ctxt *dlm)
static void dlm_complete_dlm_shutdown(struct dlm_ctxt *dlm)
{
dlm_unregister_domain_handlers(dlm);
+ dlm_debug_shutdown(dlm);
dlm_complete_thread(dlm);
dlm_complete_recovery_thread(dlm);
dlm_destroy_dlm_worker(dlm);
@@ -1287,6 +1288,12 @@ static int dlm_join_domain(struct dlm_ctxt *dlm)
goto bail;
}
+ status = dlm_debug_init(dlm);
+ if (status < 0) {
+ mlog_errno(status);
+ goto bail;
+ }
+
status = dlm_launch_thread(dlm);
if (status < 0) {
mlog_errno(status);
@@ -1354,6 +1361,7 @@ bail:
if (status) {
dlm_unregister_domain_handlers(dlm);
+ dlm_debug_shutdown(dlm);
dlm_complete_thread(dlm);
dlm_complete_recovery_thread(dlm);
dlm_destroy_dlm_worker(dlm);
--
1.5.2.5
_______________________________________________
Ocfs2-devel mailing list
[email protected]
http://oss.oracle.com/mailman/listinfo/ocfs2-devel
