thr3ads.net - Ocfs2 devel - [Ocfs2-devel] Much needed changes to o2dlm [Feb 2008]

If this information is useful, please help other people find it:
Share via:

Sunil Mushran

2008-Feb-01 16:49 UTC

[Ocfs2-devel] [PATCH 03/12] ocfs2_dlm: lockres/lock refcounting fixed

Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com>
---
 fs/ocfs2/dlm/dlmmaster.c   |    1 +
 fs/ocfs2/dlm/dlmrecovery.c |    3 +++
 2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c
index 939b863..e469e49 100644
--- a/fs/ocfs2/dlm/dlmmaster.c
+++ b/fs/ocfs2/dlm/dlmmaster.c
@@ -2973,6 +2973,7 @@ static void dlm_remove_nonlocal_locks(struct dlm_ctxt
*dlm,
 				dlm_lockres_clear_refmap_bit(lock->ml.node, res);
 				list_del_init(&lock->list);
 				dlm_lock_put(lock);
+				dlm_lock_put(lock);
 			}
 		}
 		queue++;
diff --git a/fs/ocfs2/dlm/dlmrecovery.c b/fs/ocfs2/dlm/dlmrecovery.c
index 4294d76..ae2b2b6 100644
--- a/fs/ocfs2/dlm/dlmrecovery.c
+++ b/fs/ocfs2/dlm/dlmrecovery.c
@@ -1515,6 +1515,8 @@ again:
 	}
 
 leave:
+	if (res)
+		dlm_lockres_put(res);
 	kfree(data);
 	mlog_exit(ret);
 }
@@ -1919,6 +1921,7 @@ void dlm_move_lockres_to_recovery_list(struct dlm_ctxt
*dlm,
 		     "Recovering res %s:%.*s, is already on recovery list!\n",
 		     dlm->name, res->lockname.len, res->lockname.name);
 		list_del_init(&res->recovering);
+		dlm_lockres_put(res);
 	}
 	/* We need to hold a reference while on the recovery list */
 	dlm_lockres_get(res);
-- 
1.5.2.5

Sunil Mushran

2008-Feb-01 16:49 UTC

head link

[Ocfs2-devel] [PATCH 10/12] ocfs2_dlm: Dumps the purgelist into a debugfs file

This patch dumps all the lockres' on the purgelist it can fit in one page
into a debugfs file. Useful for debugging.

Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com>
---
 fs/ocfs2/dlm/dlmdebug.c |   65 +++++++++++++++++++++++++++++++++++++++++++++++
 fs/ocfs2/dlm/dlmdebug.h |    1 +
 2 files changed, 66 insertions(+), 0 deletions(-)

diff --git a/fs/ocfs2/dlm/dlmdebug.c b/fs/ocfs2/dlm/dlmdebug.c
index aad35cc..25334a4 100644
--- a/fs/ocfs2/dlm/dlmdebug.c
+++ b/fs/ocfs2/dlm/dlmdebug.c
@@ -794,6 +794,59 @@ static int debug_buffer_release(struct inode *inode, struct
file *file)
 
 /* end - util funcs */
 
+/* begin - purge list funcs */
+static int debug_purgelist_print(struct dlm_ctxt *dlm, struct debug_buffer *db)
+{
+	struct dlm_lock_resource *res;
+	int out = 0;
+	unsigned long total = 0;
+
+	spin_lock(&dlm->spinlock);
+	list_for_each_entry(res, &dlm->purge_list, purge) {
+		++total;
+		if (db->len - out < 100)
+			continue;
+		spin_lock(&res->spinlock);
+		out += snprintf(db->buf + out, db->len - out,
+				"%.*s\t%ld\n",
+				res->lockname.len, res->lockname.name,
+				(jiffies - res->last_used)/HZ);
+		spin_unlock(&res->spinlock);
+	}
+	spin_unlock(&dlm->spinlock);
+
+	out += snprintf(db->buf + out, db->len - out,
+			"Total on list: %ld\n", total);
+
+	return out;
+}
+
+static int debug_purgelist_open(struct inode *inode, struct file *file)
+{
+	struct dlm_ctxt *dlm = inode->i_private;
+	struct debug_buffer *db;
+
+	db = debug_buffer_allocate();
+	if (!db)
+		goto bail;
+
+	db->len = debug_purgelist_print(dlm, db);
+
+	file->private_data = db;
+
+	return 0;
+bail:
+	return -ENOMEM;
+}
+
+static struct file_operations debug_purgelist_fops = {
+	.open =		debug_purgelist_open,
+	.release =	debug_buffer_release,
+	.read =		debug_buffer_read,
+	.llseek =	debug_buffer_llseek,
+};
+/* end - purge list funcs */
+
 /* begin - debug mle funcs */
 static int dump_mle(struct dlm_master_list_entry *mle, char *buf, int len)
 {
@@ -1286,6 +1339,16 @@ int dlm_debug_init(struct dlm_ctxt *dlm)
 		goto bail;
 	}
 
+	/* for dumping lockres on the purge list */
+	dc->debug_purgelist_dentry +			debugfs_create_file("purgelist",
S_IFREG|S_IRUSR,
+					    dlm->dlm_debugfs_subroot,
+					    dlm, &debug_purgelist_fops);
+	if (!dc->debug_purgelist_dentry) {
+		mlog_errno(-ENOMEM);
+		goto bail;
+	}
+
 	dlm_debug_get(dc);
 	return 0;
 
@@ -1299,6 +1362,8 @@ void dlm_debug_shutdown(struct dlm_ctxt *dlm)
 	struct dlm_debug_ctxt *dc = dlm->dlm_debug_ctxt;
 
 	if (dc) {
+		if (dc->debug_purgelist_dentry)
+			debugfs_remove(dc->debug_purgelist_dentry);
 		if (dc->debug_mle_dentry)
 			debugfs_remove(dc->debug_mle_dentry);
 		if (dc->debug_lockres_dentry)
diff --git a/fs/ocfs2/dlm/dlmdebug.h b/fs/ocfs2/dlm/dlmdebug.h
index c6b240f..ca7bc32 100644
--- a/fs/ocfs2/dlm/dlmdebug.h
+++ b/fs/ocfs2/dlm/dlmdebug.h
@@ -30,6 +30,7 @@ struct dlm_debug_ctxt {
 	struct dentry *debug_state_dentry;
 	struct dentry *debug_lockres_dentry;
 	struct dentry *debug_mle_dentry;
+	struct dentry *debug_purgelist_dentry;
 };
 
 struct debug_buffer
-- 
1.5.2.5

Sunil Mushran

2008-Feb-01 16:49 UTC

head link

[Ocfs2-devel] [PATCH 06/12] ocfs2_dlm: Dump the dlm state in a debugfs file

This patch dumps the dlm state (dlm_ctxt) into a debugfs file.
Useful for debugging.

Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com>
---
 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

Sunil Mushran

2008-Feb-01 16:50 UTC

head link

[Ocfs2-devel] [PATCH 01/12] ocfs2_dlm: Rename slabcache dlm_mle_cache to o2dlm_mle

This patch renames dlm_mle_slabcache to prevent namespace
clashes with fs/dlm.

Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com>
---
 fs/ocfs2/dlm/dlmdomain.c |    4 +++-
 fs/ocfs2/dlm/dlmmaster.c |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/fs/ocfs2/dlm/dlmdomain.c b/fs/ocfs2/dlm/dlmdomain.c
index 1d854d5..502712b 100644
--- a/fs/ocfs2/dlm/dlmdomain.c
+++ b/fs/ocfs2/dlm/dlmdomain.c
@@ -1648,8 +1648,10 @@ static int __init dlm_init(void)
 	dlm_print_version();
 
 	status = dlm_init_mle_cache();
-	if (status)
+	if (status) {
+		mlog(ML_ERROR, "Could not create o2dlm_mle slabcache\n");
 		return -1;
+	}
 
 	status = dlm_register_net_handlers();
 	if (status) {
diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c
index 42ea5af..cc4e624 100644
--- a/fs/ocfs2/dlm/dlmmaster.c
+++ b/fs/ocfs2/dlm/dlmmaster.c
@@ -506,7 +506,7 @@ static void dlm_mle_node_up(struct dlm_ctxt *dlm,
 
 int dlm_init_mle_cache(void)
 {
-	dlm_mle_cache = kapi_kmem_cache_create("dlm_mle_cache",
+	dlm_mle_cache = kapi_kmem_cache_create("o2dlm_mle",
 					  sizeof(struct dlm_master_list_entry),
 					  0, SLAB_HWCACHE_ALIGN,
 					  NULL);
-- 
1.5.2.5

Sunil Mushran

2008-Feb-01 16:50 UTC

head link

[Ocfs2-devel] Much needed changes to o2dlm

1. Moved some dlm structures to their own slab cache.
2. Fixed memleaks uncovered by the above move.
3. Added debugfs support in o2dlm to allow dumpig of dlm state,
lockres, purgelist, etc.
4. Removed o2dlm's proc interface.

Sunil

Sunil Mushran

2008-Feb-01 16:50 UTC

head link

[Ocfs2-devel] [PATCH 09/12] ocfs2_dlm: Dumps the mles into a debugfs file

This patch dumps all mles it can fit in one page into a debugfs file.
Useful for debugging.

Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com>
---
 fs/ocfs2/dlm/dlmdebug.c |  114 +++++++++++++++++++++++++++++++++++++++++++++++
 fs/ocfs2/dlm/dlmdebug.h |    1 +
 2 files changed, 115 insertions(+), 0 deletions(-)

diff --git a/fs/ocfs2/dlm/dlmdebug.c b/fs/ocfs2/dlm/dlmdebug.c
index a89bfe7..aad35cc 100644
--- a/fs/ocfs2/dlm/dlmdebug.c
+++ b/fs/ocfs2/dlm/dlmdebug.c
@@ -794,6 +794,109 @@ static int debug_buffer_release(struct inode *inode,
struct file *file)
 
 /* end - util funcs */
 
+/* begin - debug mle funcs */
+static int dump_mle(struct dlm_master_list_entry *mle, char *buf, int len)
+{
+	int out = 0;
+	unsigned int namelen;
+	const char *name;
+	char *mle_type;
+
+	if (mle->type != DLM_MLE_MASTER) {
+		namelen = mle->u.name.len;
+		name = mle->u.name.name;
+	} else {
+		namelen = mle->u.res->lockname.len;
+		name = mle->u.res->lockname.name;
+	}
+
+	if (mle->type == DLM_MLE_BLOCK)
+		mle_type = "BLK";
+	else if (mle->type == DLM_MLE_MASTER)
+		mle_type = "MAS";
+	else
+		mle_type = "MIG";
+
+	out += snprintf(buf + out, len - out,
+			"%.*s\t%3s\tmas=%3u\tnew=%3u\tevt=%1d\tuse=%1d\tref=%3d\n",
+		  	namelen, name,
+			mle_type, mle->master, mle->new_master,
+			!list_empty(&mle->hb_events),
+			!!mle->inuse,
+			atomic_read(&mle->mle_refs.refcount));
+
+	out += snprintf(buf + out, len - out, "Maybe=");
+	out += stringify_nodemap(mle->maybe_map, O2NM_MAX_NODES,
+				 buf + out, len - out);
+	out += snprintf(buf + out, len - out, "\n");
+
+	out += snprintf(buf + out, len - out, "Vote=");
+	out += stringify_nodemap(mle->vote_map, O2NM_MAX_NODES,
+				 buf + out, len - out);
+	out += snprintf(buf + out, len - out, "\n");
+
+	out += snprintf(buf + out, len - out, "Response=");
+	out += stringify_nodemap(mle->response_map, O2NM_MAX_NODES,
+				 buf + out, len - out);
+	out += snprintf(buf + out, len - out, "\n");
+
+	out += snprintf(buf + out, len - out, "Node=");
+	out += stringify_nodemap(mle->node_map, O2NM_MAX_NODES,
+				 buf + out, len - out);
+	out += snprintf(buf + out, len - out, "\n");
+
+	out += snprintf(buf + out, len - out, "\n");
+
+	return out;
+}
+
+static int debug_mle_print(struct dlm_ctxt *dlm, struct debug_buffer *db)
+{
+	struct dlm_master_list_entry *mle;
+	int out = 0;
+	unsigned long total = 0;
+
+	spin_lock(&dlm->master_lock);
+	list_for_each_entry(mle, &dlm->master_list, list) {
+		++total;
+		if (db->len - out < 200)
+			continue;
+		out += dump_mle(mle, db->buf + out, db->len - out);
+	}
+	spin_unlock(&dlm->master_lock);
+
+	out += snprintf(db->buf + out, db->len - out,
+			"Total on list: %ld\n", total);
+	return out;
+}
+
+static int debug_mle_open(struct inode *inode, struct file *file)
+{
+	struct dlm_ctxt *dlm = inode->i_private;
+	struct debug_buffer *db;
+
+	db = debug_buffer_allocate();
+	if (!db)
+		goto bail;
+
+	db->len = debug_mle_print(dlm, db);
+
+	file->private_data = db;
+
+	return 0;
+bail:
+	return -ENOMEM;
+}
+
+static struct file_operations debug_mle_fops = {
+	.open =		debug_mle_open,
+	.release =	debug_buffer_release,
+	.read =		debug_buffer_read,
+	.llseek =	debug_buffer_llseek,
+};
+
+/* end - debug mle funcs */
+
 /* begin - debug lockres funcs */
 static int dump_lock(char *buf, int len, int list_type, struct dlm_lock *lock)
 {
@@ -1174,6 +1277,15 @@ int dlm_debug_init(struct dlm_ctxt *dlm)
 		goto bail;
 	}
 
+	/* for dumping mles */
+	dc->debug_mle_dentry = debugfs_create_file("mle",
S_IFREG|S_IRUSR,
+						   dlm->dlm_debugfs_subroot,
+						   dlm, &debug_mle_fops);
+	if (!dc->debug_mle_dentry) {
+		mlog_errno(-ENOMEM);
+		goto bail;
+	}
+
 	dlm_debug_get(dc);
 	return 0;
 
@@ -1187,6 +1299,8 @@ void dlm_debug_shutdown(struct dlm_ctxt *dlm)
 	struct dlm_debug_ctxt *dc = dlm->dlm_debug_ctxt;
 
 	if (dc) {
+		if (dc->debug_mle_dentry)
+			debugfs_remove(dc->debug_mle_dentry);
 		if (dc->debug_lockres_dentry)
 			debugfs_remove(dc->debug_lockres_dentry);
 		if (dc->debug_state_dentry)
diff --git a/fs/ocfs2/dlm/dlmdebug.h b/fs/ocfs2/dlm/dlmdebug.h
index 86d02f4..c6b240f 100644
--- a/fs/ocfs2/dlm/dlmdebug.h
+++ b/fs/ocfs2/dlm/dlmdebug.h
@@ -29,6 +29,7 @@ struct dlm_debug_ctxt {
 	struct kref debug_refcnt;
 	struct dentry *debug_state_dentry;
 	struct dentry *debug_lockres_dentry;
+	struct dentry *debug_mle_dentry;
 };
 
 struct debug_buffer
-- 
1.5.2.5

Sunil Mushran

2008-Feb-01 16:50 UTC

head link

[Ocfs2-devel] [PATCH 08/12] ocfs2_dlm: Moves struct dlm_master_list_entry to dlmcommon.h

This patch moves some mle related definitions from dlmmaster.c
to dlmcommon.h.

Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com>
---
 fs/ocfs2/dlm/dlmcommon.h |   37 +++++++++++++++++++++++++++++++++++++
 fs/ocfs2/dlm/dlmmaster.c |   37 -------------------------------------
 2 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/fs/ocfs2/dlm/dlmcommon.h b/fs/ocfs2/dlm/dlmcommon.h
index 9828722..fb71a32 100644
--- a/fs/ocfs2/dlm/dlmcommon.h
+++ b/fs/ocfs2/dlm/dlmcommon.h
@@ -49,6 +49,43 @@
 /* Intended to make it easier for us to switch out hash functions */
 #define dlm_lockid_hash(_n, _l) full_name_hash(_n, _l)
 
+enum dlm_mle_type {
+	DLM_MLE_BLOCK,
+	DLM_MLE_MASTER,
+	DLM_MLE_MIGRATION
+};
+
+struct dlm_lock_name
+{
+	u8 len;
+	u8 name[DLM_LOCKID_NAME_MAX];
+};
+
+struct dlm_master_list_entry
+{
+	struct list_head list;
+	struct list_head hb_events;
+	struct dlm_ctxt *dlm;
+	spinlock_t spinlock;
+	wait_queue_head_t wq;
+	atomic_t woken;
+	struct kref mle_refs;
+	int inuse;
+	unsigned long maybe_map[BITS_TO_LONGS(O2NM_MAX_NODES)];
+	unsigned long vote_map[BITS_TO_LONGS(O2NM_MAX_NODES)];
+	unsigned long response_map[BITS_TO_LONGS(O2NM_MAX_NODES)];
+	unsigned long node_map[BITS_TO_LONGS(O2NM_MAX_NODES)];
+	u8 master;
+	u8 new_master;
+	enum dlm_mle_type type;
+	struct o2hb_callback_func mle_hb_up;
+	struct o2hb_callback_func mle_hb_down;
+	union {
+		struct dlm_lock_resource *res;
+		struct dlm_lock_name name;
+	} u;
+};
+
 enum dlm_ast_type {
 	DLM_AST = 0,
 	DLM_BAST,
diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c
index 4f2bf7c..05c86f2 100644
--- a/fs/ocfs2/dlm/dlmmaster.c
+++ b/fs/ocfs2/dlm/dlmmaster.c
@@ -52,43 +52,6 @@
 #define MLOG_MASK_PREFIX (ML_DLM|ML_DLM_MASTER)
 #include "cluster/masklog.h"
 
-enum dlm_mle_type {
-	DLM_MLE_BLOCK,
-	DLM_MLE_MASTER,
-	DLM_MLE_MIGRATION
-};
-
-struct dlm_lock_name
-{
-	u8 len;
-	u8 name[DLM_LOCKID_NAME_MAX];
-};
-
-struct dlm_master_list_entry
-{
-	struct list_head list;
-	struct list_head hb_events;
-	struct dlm_ctxt *dlm;
-	spinlock_t spinlock;
-	wait_queue_head_t wq;
-	atomic_t woken;
-	struct kref mle_refs;
-	int inuse;
-	unsigned long maybe_map[BITS_TO_LONGS(O2NM_MAX_NODES)];
-	unsigned long vote_map[BITS_TO_LONGS(O2NM_MAX_NODES)];
-	unsigned long response_map[BITS_TO_LONGS(O2NM_MAX_NODES)];
-	unsigned long node_map[BITS_TO_LONGS(O2NM_MAX_NODES)];
-	u8 master;
-	u8 new_master;
-	enum dlm_mle_type type;
-	struct o2hb_callback_func mle_hb_up;
-	struct o2hb_callback_func mle_hb_down;
-	union {
-		struct dlm_lock_resource *res;
-		struct dlm_lock_name name;
-	} u;
-};
-
 static void dlm_mle_node_down(struct dlm_ctxt *dlm,
 			      struct dlm_master_list_entry *mle,
 			      struct o2nm_node *node,
-- 
1.5.2.5

Sunil Mushran

2008-Feb-01 16:50 UTC

head link

[Ocfs2-devel] [PATCH 11/12] ocfs2_dlm: Dumps the workqueue into a debugfs file

This patch dumps all the tasks on the workqueue it can fit in one page
into a debugfs file. Useful for debugging.

Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com>
---
 fs/ocfs2/dlm/dlmdebug.c |   85 +++++++++++++++++++++++++++++++++++++++++++++++
 fs/ocfs2/dlm/dlmdebug.h |    1 +
 2 files changed, 86 insertions(+), 0 deletions(-)

diff --git a/fs/ocfs2/dlm/dlmdebug.c b/fs/ocfs2/dlm/dlmdebug.c
index 25334a4..a05077b 100644
--- a/fs/ocfs2/dlm/dlmdebug.c
+++ b/fs/ocfs2/dlm/dlmdebug.c
@@ -794,6 +794,79 @@ static int debug_buffer_release(struct inode *inode, struct
file *file)
 
 /* end - util funcs */
 
+/* begin - work queue funcs */
+static int debug_workqueue_print(struct dlm_ctxt *dlm, struct debug_buffer *db)
+{
+	struct dlm_work_item *wi;
+	int out = 0;
+	unsigned long total = 0;
+
+	spin_lock(&dlm->work_lock);
+
+	list_for_each_entry(wi, &dlm->work_list, list) {
+		++total;
+		if (db->len - out < 100)
+			continue;
+		if (wi->func == dlm_request_all_locks_worker) {
+			out += snprintf(db->buf + out, db->len - out,
+					"RequestAllLocks, "
+					"recomaster=%d, deadnode=%d\n",
+					wi->u.ral.reco_master,
+					wi->u.ral.dead_node);
+		} else if (wi->func == dlm_mig_lockres_worker) {
+			out += snprintf(db->buf + out, db->len - out,
+					"MigrateLockres, %.*s, master=%d\n",
+					wi->u.ml.lockres->lockname.len,
+					wi->u.ml.lockres->lockname.name,
+					wi->u.ml.real_master);
+		} else if (wi->func == dlm_assert_master_worker) {
+			out += snprintf(db->buf + out, db->len - out,
+					"AssertMaster, %.*s, "
+					"from=%d, flags=0x%X, ignore=%d\n",
+					wi->u.am.lockres->lockname.len,
+					wi->u.am.lockres->lockname.name,
+					wi->u.am.request_from,
+					wi->u.am.flags,
+					wi->u.am.ignore_higher);
+		} else {
+			out += snprintf(db->buf + out, db->len - out,
+					"Unknown, 0x%p\n", wi->func);
+		}
+	}
+	spin_unlock(&dlm->work_lock);
+
+	out += snprintf(db->buf + out, db->len - out,
+			"Total on list: %ld\n", total);
+
+	return out;
+}
+
+static int debug_workqueue_open(struct inode *inode, struct file *file)
+{
+	struct dlm_ctxt *dlm = inode->i_private;
+	struct debug_buffer *db;
+
+	db = debug_buffer_allocate();
+	if (!db)
+		goto bail;
+
+	db->len = debug_workqueue_print(dlm, db);
+
+	file->private_data = db;
+
+	return 0;
+bail:
+	return -ENOMEM;
+}
+
+static struct file_operations debug_workqueue_fops = {
+	.open =		debug_workqueue_open,
+	.release =	debug_buffer_release,
+	.read =		debug_buffer_read,
+	.llseek =	debug_buffer_llseek,
+};
+/* end - work queue funcs */
+
 /* begin - purge list funcs */
 static int debug_purgelist_print(struct dlm_ctxt *dlm, struct debug_buffer *db)
 {
@@ -1349,6 +1422,16 @@ int dlm_debug_init(struct dlm_ctxt *dlm)
 		goto bail;
 	}
 
+	/* for dumping the dlm work queue */
+	dc->debug_workqueue_dentry +			debugfs_create_file("workqueue",
S_IFREG|S_IRUSR,
+					    dlm->dlm_debugfs_subroot,
+					    dlm, &debug_workqueue_fops);
+	if (!dc->debug_workqueue_dentry) {
+		mlog_errno(-ENOMEM);
+		goto bail;
+	}
+
 	dlm_debug_get(dc);
 	return 0;
 
@@ -1362,6 +1445,8 @@ void dlm_debug_shutdown(struct dlm_ctxt *dlm)
 	struct dlm_debug_ctxt *dc = dlm->dlm_debug_ctxt;
 
 	if (dc) {
+		if (dc->debug_workqueue_dentry)
+			debugfs_remove(dc->debug_workqueue_dentry);
 		if (dc->debug_purgelist_dentry)
 			debugfs_remove(dc->debug_purgelist_dentry);
 		if (dc->debug_mle_dentry)
diff --git a/fs/ocfs2/dlm/dlmdebug.h b/fs/ocfs2/dlm/dlmdebug.h
index ca7bc32..fcc19c8 100644
--- a/fs/ocfs2/dlm/dlmdebug.h
+++ b/fs/ocfs2/dlm/dlmdebug.h
@@ -31,6 +31,7 @@ struct dlm_debug_ctxt {
 	struct dentry *debug_lockres_dentry;
 	struct dentry *debug_mle_dentry;
 	struct dentry *debug_purgelist_dentry;
+	struct dentry *debug_workqueue_dentry;
 };
 
 struct debug_buffer
-- 
1.5.2.5

Sunil Mushran

2008-Feb-01 16:50 UTC

head link

[Ocfs2-devel] [PATCH 02/12] ocfs2_dlm: Creates slabcaches for the lockres' and the locks

This patch makes the o2dlm allocate memory for lockres, lockname and lock
structures from slabcaches rather than kmalloc. This allows us to not only
make these allocs more efficient but also allows us to track the memory being
consumed by these structures.

Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com>
---
 fs/ocfs2/dlm/dlmcommon.h |   10 +++++++
 fs/ocfs2/dlm/dlmdomain.c |   33 ++++++++++++++++++++---
 fs/ocfs2/dlm/dlmlock.c   |   23 +++++++++++++++-
 fs/ocfs2/dlm/dlmmaster.c |   65 +++++++++++++++++++++++++++++++++++++--------
 4 files changed, 113 insertions(+), 18 deletions(-)

diff --git a/fs/ocfs2/dlm/dlmcommon.h b/fs/ocfs2/dlm/dlmcommon.h
index f3afb15..041ec68 100644
--- a/fs/ocfs2/dlm/dlmcommon.h
+++ b/fs/ocfs2/dlm/dlmcommon.h
@@ -944,9 +944,19 @@ static inline void __dlm_wait_on_lockres(struct
dlm_lock_resource *res)
 					  DLM_LOCK_RES_MIGRATING));
 }
 
+/* create/destroy slab caches */
+int dlm_init_lockres_cache(void);
+void dlm_destroy_lockres_cache(void);
+
+int dlm_init_lockname_cache(void);
+void dlm_destroy_lockname_cache(void);
+
+int dlm_init_lock_cache(void);
+void dlm_destroy_lock_cache(void);
 
 int dlm_init_mle_cache(void);
 void dlm_destroy_mle_cache(void);
+
 void dlm_hb_event_notify_attached(struct dlm_ctxt *dlm, int idx, int node_up);
 int dlm_drop_lockres_ref(struct dlm_ctxt *dlm,
 			 struct dlm_lock_resource *res);
diff --git a/fs/ocfs2/dlm/dlmdomain.c b/fs/ocfs2/dlm/dlmdomain.c
index 502712b..6d02ef5 100644
--- a/fs/ocfs2/dlm/dlmdomain.c
+++ b/fs/ocfs2/dlm/dlmdomain.c
@@ -1650,24 +1650,49 @@ static int __init dlm_init(void)
 	status = dlm_init_mle_cache();
 	if (status) {
 		mlog(ML_ERROR, "Could not create o2dlm_mle slabcache\n");
-		return -1;
+		goto error;
 	}
 
-	status = dlm_register_net_handlers();
+	status = dlm_init_lockres_cache();
+	if (status) {
+		mlog(ML_ERROR, "Could not create o2dlm_lockres slabcache\n");
+		goto error;
+	}
+
+	status = dlm_init_lockname_cache();
 	if (status) {
-		dlm_destroy_mle_cache();
-		return -1;
+		mlog(ML_ERROR, "Could not create o2dlm_lockname slabcache\n");
+		goto error;
 	}
 
+	status = dlm_init_lock_cache();
+	if (status) {
+		mlog(ML_ERROR, "Could not create o2dlm_lock slabcache\n");
+		goto error;
+	}
+
+	status = dlm_register_net_handlers();
+	if (status)
+		goto error;
+
 	dlm_init_proc();
 
 	return 0;
+error:
+	dlm_destroy_lock_cache();
+	dlm_destroy_lockname_cache();
+	dlm_destroy_lockres_cache();
+	dlm_destroy_mle_cache();
+	return -1;
 }
 
 static void __exit dlm_exit (void)
 {
 	dlm_remove_proc();
 	dlm_unregister_net_handlers();
+	dlm_destroy_lock_cache();
+	dlm_destroy_lockname_cache();
+	dlm_destroy_lockres_cache();
 	dlm_destroy_mle_cache();
 }
 
diff --git a/fs/ocfs2/dlm/dlmlock.c b/fs/ocfs2/dlm/dlmlock.c
index 52578d9..ea393b6 100644
--- a/fs/ocfs2/dlm/dlmlock.c
+++ b/fs/ocfs2/dlm/dlmlock.c
@@ -53,6 +53,8 @@
 #define MLOG_MASK_PREFIX ML_DLM
 #include "cluster/masklog.h"
 
+static struct kmem_cache *dlm_lock_cache = NULL;
+
 static DEFINE_SPINLOCK(dlm_cookie_lock);
 static u64 dlm_next_cookie = 1;
 
@@ -64,6 +66,22 @@ static void dlm_init_lock(struct dlm_lock *newlock, int type,
 static void dlm_lock_release(struct kref *kref);
 static void dlm_lock_detach_lockres(struct dlm_lock *lock);
 
+int dlm_init_lock_cache(void)
+{
+	dlm_lock_cache = kapi_kmem_cache_create("o2dlm_lock",
+						sizeof(struct dlm_lock),
+						0, SLAB_HWCACHE_ALIGN, NULL);
+	if (dlm_lock_cache == NULL)
+		return -ENOMEM;
+	return 0;
+}
+
+void dlm_destroy_lock_cache(void)
+{
+	if (dlm_lock_cache)
+		kmem_cache_destroy(dlm_lock_cache);
+}
+
 /* Tell us whether we can grant a new lock request.
  * locking:
  *   caller needs:  res->spinlock
@@ -353,7 +371,7 @@ static void dlm_lock_release(struct kref *kref)
 		mlog(0, "freeing kernel-allocated lksb\n");
 		kfree(lock->lksb);
 	}
-	kfree(lock);
+	kmem_cache_free(dlm_lock_cache, lock);
 }
 
 /* associate a lock with it's lockres, getting a ref on the lockres */
@@ -412,9 +430,10 @@ struct dlm_lock * dlm_new_lock(int type, u8 node, u64
cookie,
 	struct dlm_lock *lock;
 	int kernel_allocated = 0;
 
-	lock = kzalloc(sizeof(*lock), GFP_NOFS);
+	lock = (struct dlm_lock *) kmem_cache_alloc(dlm_lock_cache, GFP_NOFS);
 	if (!lock)
 		return NULL;
+	memset(lock, 0, sizeof(struct dlm_lock));
 
 	if (!lksb) {
 		/* zero memory only if kernel-allocated */
diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c
index cc4e624..939b863 100644
--- a/fs/ocfs2/dlm/dlmmaster.c
+++ b/fs/ocfs2/dlm/dlmmaster.c
@@ -214,8 +214,9 @@ int dlm_dump_all_mles(const char __user *data, unsigned int
len)
 EXPORT_SYMBOL_GPL(dlm_dump_all_mles);
 
 
-
-
+/* dlm slab caches */
+static struct kmem_cache *dlm_lockres_cache = NULL;
+static struct kmem_cache *dlm_lockname_cache = NULL;
 static struct kmem_cache *dlm_mle_cache = NULL;
 
 
@@ -559,6 +560,38 @@ static void dlm_mle_release(struct kref *kref)
  * LOCK RESOURCE FUNCTIONS
  */
 
+int dlm_init_lockres_cache(void)
+{
+	dlm_lockres_cache = kapi_kmem_cache_create("o2dlm_lockres",
+					sizeof(struct dlm_lock_resource), 0,
+					SLAB_HWCACHE_ALIGN, NULL);
+	if (dlm_lockres_cache == NULL)
+		return -ENOMEM;
+	return 0;
+}
+
+void dlm_destroy_lockres_cache(void)
+{
+	if (dlm_lockres_cache)
+		kmem_cache_destroy(dlm_lockres_cache);
+}
+
+int dlm_init_lockname_cache(void)
+{
+	dlm_lockname_cache = kapi_kmem_cache_create("o2dlm_lockname",
+						    DLM_LOCKID_NAME_MAX, 0,
+						    SLAB_HWCACHE_ALIGN, NULL);
+	if (dlm_lockname_cache == NULL)
+		return -ENOMEM;
+	return 0;
+}
+
+void dlm_destroy_lockname_cache(void)
+{
+	if (dlm_lockname_cache)
+		kmem_cache_destroy(dlm_lockname_cache);
+}
+
 static void dlm_set_lockres_owner(struct dlm_ctxt *dlm,
 				  struct dlm_lock_resource *res,
 				  u8 owner)
@@ -641,9 +674,9 @@ static void dlm_lockres_release(struct kref *kref)
 	BUG_ON(!list_empty(&res->recovering));
 	BUG_ON(!list_empty(&res->purge));
 
-	kfree(res->lockname.name);
+	kmem_cache_free(dlm_lockname_cache, (void *)res->lockname.name);
 
-	kfree(res);
+	kmem_cache_free(dlm_lockres_cache, res);
 }
 
 void dlm_lockres_put(struct dlm_lock_resource *res)
@@ -699,20 +732,28 @@ struct dlm_lock_resource *dlm_new_lockres(struct dlm_ctxt
*dlm,
 				   const char *name,
 				   unsigned int namelen)
 {
-	struct dlm_lock_resource *res;
+	struct dlm_lock_resource *res = NULL;
 
-	res = kmalloc(sizeof(struct dlm_lock_resource), GFP_NOFS);
+	res = (struct dlm_lock_resource *)
+				kmem_cache_alloc(dlm_lockres_cache, GFP_NOFS);
 	if (!res)
-		return NULL;
+		goto error;
 
-	res->lockname.name = kmalloc(namelen, GFP_NOFS);
-	if (!res->lockname.name) {
-		kfree(res);
-		return NULL;
-	}
+	res->lockname.name = (char *)
+				kmem_cache_alloc(dlm_lockname_cache, GFP_NOFS);
+	if (!res->lockname.name)
+		goto error;
 
 	dlm_init_lockres(dlm, res, name, namelen);
 	return res;
+
+error:
+	if (res && res->lockname.name)
+		kmem_cache_free(dlm_lockname_cache, (void *)res->lockname.name);
+
+	if (res)
+		kmem_cache_free(dlm_lockres_cache, res);
+	return NULL;
 }
 
 void __dlm_lockres_grab_inflight_ref(struct dlm_ctxt *dlm,
-- 
1.5.2.5

Sunil Mushran

2008-Feb-01 16:50 UTC

head link

[Ocfs2-devel] [PATCH 04/12] ocfs2_dlm: Link all lockres' to a tracking list

This patch links all the lockres' to a tracking list in dlm_ctxt.
We will use this in the upcoming patch that will walk the entire
list and to dump the lockres states to a debugfs file.

Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com>
---
 fs/ocfs2/dlm/dlmcommon.h |    6 ++++--
 fs/ocfs2/dlm/dlmdomain.c |    1 +
 fs/ocfs2/dlm/dlmmaster.c |   12 +++++++++---
 fs/ocfs2/dlm/dlmthread.c |    5 +++++
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/fs/ocfs2/dlm/dlmcommon.h b/fs/ocfs2/dlm/dlmcommon.h
index 041ec68..d782b41 100644
--- a/fs/ocfs2/dlm/dlmcommon.h
+++ b/fs/ocfs2/dlm/dlmcommon.h
@@ -101,6 +101,7 @@ struct dlm_ctxt
 	struct list_head purge_list;
 	struct list_head pending_asts;
 	struct list_head pending_basts;
+	struct list_head tracking_list;
 	unsigned int purge_count;
 	spinlock_t spinlock;
 	spinlock_t ast_lock;
@@ -259,11 +260,12 @@ struct dlm_lock_resource
 	struct list_head purge;
 
 	/*
-	 * These two lists require you to hold an additional reference
+	 * These three lists require you to hold an additional reference
 	 * while they are on the list.
 	 */
 	struct list_head dirty;
-	struct list_head recovering; // dlm_recovery_ctxt.resources list
+	struct list_head recovering;	/* dlm->dlm_recovery_ctxt.resources */
+	struct list_head tracking;	/* dlm->tracking_list */
 
 	/* unused lock resources have their last_used stamped and are
 	 * put on a list for the dlm thread to run. */
diff --git a/fs/ocfs2/dlm/dlmdomain.c b/fs/ocfs2/dlm/dlmdomain.c
index 6d02ef5..71d3946 100644
--- a/fs/ocfs2/dlm/dlmdomain.c
+++ b/fs/ocfs2/dlm/dlmdomain.c
@@ -1404,6 +1404,7 @@ static struct dlm_ctxt *dlm_alloc_ctxt(const char *domain,
 	INIT_LIST_HEAD(&dlm->reco.node_data);
 	INIT_LIST_HEAD(&dlm->purge_list);
 	INIT_LIST_HEAD(&dlm->dlm_domain_handlers);
+	INIT_LIST_HEAD(&dlm->tracking_list);
 	dlm->reco.state = 0;
 
 	INIT_LIST_HEAD(&dlm->pending_asts);
diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c
index e469e49..4f2bf7c 100644
--- a/fs/ocfs2/dlm/dlmmaster.c
+++ b/fs/ocfs2/dlm/dlmmaster.c
@@ -648,10 +648,11 @@ static void dlm_lockres_release(struct kref *kref)
 	    !list_empty(&res->blocked) ||
 	    !list_empty(&res->dirty) ||
 	    !list_empty(&res->recovering) ||
-	    !list_empty(&res->purge)) {
+	    !list_empty(&res->purge) ||
+	    !list_empty(&res->tracking)) {
 		mlog(ML_ERROR,
 		     "Going to BUG for resource %.*s."
-		     "  We're on a list! [%c%c%c%c%c%c%c]\n",
+		     "  We're on a list! [%c%c%c%c%c%c%c%c]\n",
 		     res->lockname.len, res->lockname.name,
 		     !hlist_unhashed(&res->hash_node) ? 'H' : ' ',
 		     !list_empty(&res->granted) ? 'G' : ' ',
@@ -659,7 +660,8 @@ static void dlm_lockres_release(struct kref *kref)
 		     !list_empty(&res->blocked) ? 'B' : ' ',
 		     !list_empty(&res->dirty) ? 'D' : ' ',
 		     !list_empty(&res->recovering) ? 'R' : ' ',
-		     !list_empty(&res->purge) ? 'P' : ' ');
+		     !list_empty(&res->purge) ? 'P' : ' ',
+		     !list_empty(&res->tracking) ? 'T' : ' ');
 
 		dlm_print_one_lock_resource(res);
 	}
@@ -709,6 +711,7 @@ static void dlm_init_lockres(struct dlm_ctxt *dlm,
 	INIT_LIST_HEAD(&res->dirty);
 	INIT_LIST_HEAD(&res->recovering);
 	INIT_LIST_HEAD(&res->purge);
+	INIT_LIST_HEAD(&res->tracking);
 	atomic_set(&res->asts_reserved, 0);
 	res->migration_pending = 0;
 	res->inflight_locks = 0;
@@ -724,6 +727,9 @@ static void dlm_init_lockres(struct dlm_ctxt *dlm,
 
 	res->last_used = 0;
 
+	dlm_lockres_get(res);
+	list_add_tail(&res->tracking, &dlm->tracking_list);
+
 	memset(res->lvb, 0, DLM_LVB_LEN);
 	memset(res->refmap, 0, sizeof(res->refmap));
 }
diff --git a/fs/ocfs2/dlm/dlmthread.c b/fs/ocfs2/dlm/dlmthread.c
index cebd089..620d6a3 100644
--- a/fs/ocfs2/dlm/dlmthread.c
+++ b/fs/ocfs2/dlm/dlmthread.c
@@ -204,6 +204,11 @@ static int dlm_purge_lockres(struct dlm_ctxt *dlm,
 	}
 	__dlm_unhash_lockres(res);
 
+	if (!list_empty(&res->tracking)) {
+		list_del_init(&res->tracking);
+		dlm_lockres_put(res);
+	}
+
 	/* lockres is not in the hash now.  drop the flag and wake up
 	 * any processes waiting in dlm_get_lock_resource. */
 	if (!master) {
-- 
1.5.2.5

Sunil Mushran

2008-Feb-01 16:50 UTC

head link

[Ocfs2-devel] [PATCH 05/12] ocfs2_dlm: Create debugfs dirs

This patch creates the debugfs directories that will hold the
files to be used to dump the dlm state.

Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com>
---
 fs/ocfs2/dlm/dlmcommon.h |    2 ++
 fs/ocfs2/dlm/dlmdebug.c  |   42 ++++++++++++++++++++++++++++++++++++++++++
 fs/ocfs2/dlm/dlmdebug.h  |    7 +++++++
 fs/ocfs2/dlm/dlmdomain.c |   20 ++++++++++++++++++++
 4 files changed, 71 insertions(+), 0 deletions(-)

diff --git a/fs/ocfs2/dlm/dlmcommon.h b/fs/ocfs2/dlm/dlmcommon.h
index d782b41..74ee372 100644
--- a/fs/ocfs2/dlm/dlmcommon.h
+++ b/fs/ocfs2/dlm/dlmcommon.h
@@ -125,6 +125,8 @@ struct dlm_ctxt
 	atomic_t remote_resources;
 	atomic_t unknown_resources;
 
+	struct dentry *dlm_debugfs_subroot;
+
 	/* NOTE: Next three are protected by dlm_domain_lock */
 	struct kref dlm_refs;
 	enum dlm_ctxt_state dlm_state;
diff --git a/fs/ocfs2/dlm/dlmdebug.c b/fs/ocfs2/dlm/dlmdebug.c
index 068dd98..fe327be 100644
--- a/fs/ocfs2/dlm/dlmdebug.c
+++ b/fs/ocfs2/dlm/dlmdebug.c
@@ -31,6 +31,7 @@
 #include <linux/sysctl.h>
 #include <linux/spinlock.h>
 #include <linux/proc_fs.h>
+#include <linux/debugfs.h>
 
 #include "cluster/heartbeat.h"
 #include "cluster/nodemanager.h"
@@ -46,6 +47,8 @@
 #define MLOG_MASK_PREFIX ML_DLM
 #include "cluster/masklog.h"
 
+static struct dentry *dlm_debugfs_root = NULL;
+
 static int dlm_dump_all_lock_resources(const char __user *data,
 					unsigned int len);
 static void dlm_dump_purge_list(struct dlm_ctxt *dlm);
@@ -695,3 +698,42 @@ const char *dlm_errname(enum dlm_status err)
 	return dlm_errnames[err];
 }
 EXPORT_SYMBOL_GPL(dlm_errname);
+
+/* subroot - domain dir */
+int dlm_create_debugfs_subroot(struct dlm_ctxt *dlm)
+{
+	dlm->dlm_debugfs_subroot = debugfs_create_dir(dlm->name,
dlm_debugfs_root);
+	if (!dlm->dlm_debugfs_subroot) {
+		mlog_errno(-ENOMEM);
+		goto bail;
+	}
+
+	return 0;
+bail:
+	dlm_destroy_debugfs_subroot(dlm);
+	return -ENOMEM;
+}
+
+void dlm_destroy_debugfs_subroot(struct dlm_ctxt *dlm)
+{
+	if (dlm->dlm_debugfs_subroot)
+		debugfs_remove(dlm->dlm_debugfs_subroot);
+}
+
+/* debugfs root */
+int dlm_create_debugfs_root(void)
+{
+	dlm_debugfs_root = debugfs_create_dir("o2dlm", NULL);
+	if (!dlm_debugfs_root) {
+		mlog_errno(-ENOMEM);
+		return -ENOMEM;
+	}
+
+	return 0;
+}
+
+void dlm_destroy_debugfs_root(void)
+{
+	if (dlm_debugfs_root)
+		debugfs_remove(dlm_debugfs_root);
+}
diff --git a/fs/ocfs2/dlm/dlmdebug.h b/fs/ocfs2/dlm/dlmdebug.h
index dbe3a3d..e701499 100644
--- a/fs/ocfs2/dlm/dlmdebug.h
+++ b/fs/ocfs2/dlm/dlmdebug.h
@@ -31,4 +31,11 @@ void dlm_dump_lock_resources(struct dlm_ctxt *dlm);
 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_create_debugfs_subroot(struct dlm_ctxt *dlm);
+void dlm_destroy_debugfs_subroot(struct dlm_ctxt *dlm);
+
+int dlm_create_debugfs_root(void);
+void dlm_destroy_debugfs_root(void);
+
 #endif
diff --git a/fs/ocfs2/dlm/dlmdomain.c b/fs/ocfs2/dlm/dlmdomain.c
index 71d3946..7b2c967 100644
--- a/fs/ocfs2/dlm/dlmdomain.c
+++ b/fs/ocfs2/dlm/dlmdomain.c
@@ -33,6 +33,7 @@
 #include <linux/spinlock.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/debugfs.h>
 
 #include "cluster/heartbeat.h"
 #include "cluster/nodemanager.h"
@@ -43,6 +44,7 @@
 
 #include "dlmdebug.h"
 #include "dlmdomain.h"
+#include "dlmdebug.h"
 
 #include "dlmver.h"
 
@@ -288,6 +290,8 @@ static void dlm_free_ctxt_mem(struct dlm_ctxt *dlm)
 {
 	dlm_proc_del_domain(dlm);
 
+	dlm_destroy_debugfs_subroot(dlm);
+
 	if (dlm->lockres_hash)
 		dlm_free_pagevec((void **)dlm->lockres_hash, DLM_HASH_PAGES);
 
@@ -1362,6 +1366,7 @@ static struct dlm_ctxt *dlm_alloc_ctxt(const char *domain,
 				u32 key)
 {
 	int i;
+	int ret;
 	struct dlm_ctxt *dlm = NULL;
 
 	dlm = kzalloc(sizeof(*dlm), GFP_KERNEL);
@@ -1394,6 +1399,15 @@ static struct dlm_ctxt *dlm_alloc_ctxt(const char
*domain,
 	dlm->key = key;
 	dlm->node_num = o2nm_this_node();
 
+	ret = dlm_create_debugfs_subroot(dlm);
+	if (ret < 0) {
+		dlm_free_pagevec((void **)dlm->lockres_hash, DLM_HASH_PAGES);
+		kfree(dlm->name);
+		kfree(dlm);
+		dlm = NULL;
+		goto leave;
+	}
+
 	spin_lock_init(&dlm->spinlock);
 	spin_lock_init(&dlm->master_lock);
 	spin_lock_init(&dlm->ast_lock);
@@ -1678,8 +1692,13 @@ static int __init dlm_init(void)
 
 	dlm_init_proc();
 
+	status = dlm_create_debugfs_root();
+	if (status)
+		goto error;
+
 	return 0;
 error:
+	dlm_unregister_net_handlers();
 	dlm_destroy_lock_cache();
 	dlm_destroy_lockname_cache();
 	dlm_destroy_lockres_cache();
@@ -1689,6 +1708,7 @@ error:
 
 static void __exit dlm_exit (void)
 {
+	dlm_destroy_debugfs_root();
 	dlm_remove_proc();
 	dlm_unregister_net_handlers();
 	dlm_destroy_lock_cache();
-- 
1.5.2.5

Sunil Mushran

2008-Feb-01 16:50 UTC

head link

[Ocfs2-devel] [PATCH 12/12] ocfs2_dlm: Remove the proc interface

The proc debug interface is no longer needed as all the functionality
it provided has been moved to the debugfs interface.

Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com>
---
 fs/ocfs2/dlm/dlmcommon.h |    2 -
 fs/ocfs2/dlm/dlmdebug.c  |  454 ----------------------------------------------
 fs/ocfs2/dlm/dlmdebug.h  |    7 -
 fs/ocfs2/dlm/dlmdomain.c |    8 -
 4 files changed, 0 insertions(+), 471 deletions(-)

diff --git a/fs/ocfs2/dlm/dlmcommon.h b/fs/ocfs2/dlm/dlmcommon.h
index fb71a32..4587876 100644
--- a/fs/ocfs2/dlm/dlmcommon.h
+++ b/fs/ocfs2/dlm/dlmcommon.h
@@ -155,8 +155,6 @@ struct dlm_ctxt
 	struct list_head master_list;
 	struct list_head mle_hb_events;
 
-	struct proc_dir_entry *dlm_proc;
-
 	/* these give a really vague idea of the system load */
 	atomic_t local_resources;
 	atomic_t remote_resources;
diff --git a/fs/ocfs2/dlm/dlmdebug.c b/fs/ocfs2/dlm/dlmdebug.c
index a05077b..df45a39 100644
--- a/fs/ocfs2/dlm/dlmdebug.c
+++ b/fs/ocfs2/dlm/dlmdebug.c
@@ -30,7 +30,6 @@
 #include <linux/utsname.h>
 #include <linux/sysctl.h>
 #include <linux/spinlock.h>
-#include <linux/proc_fs.h>
 #include <linux/debugfs.h>
 
 #include "cluster/heartbeat.h"
@@ -39,8 +38,6 @@
 
 #include "dlmapi.h"
 #include "dlmcommon.h"
-#include "dlmdebug.h"
-
 #include "dlmdomain.h"
 #include "dlmdebug.h"
 
@@ -49,229 +46,6 @@
 
 static struct dentry *dlm_debugfs_root = NULL;
 
-static int dlm_dump_all_lock_resources(const char __user *data,
-					unsigned int len);
-static void dlm_dump_purge_list(struct dlm_ctxt *dlm);
-static int dlm_dump_all_purge_lists(const char __user *data, unsigned int len);
-static int dlm_trigger_migration(const char __user *data, unsigned int len);
-static int dlm_dump_one_lock_resource(const char __user *data,
-				       unsigned int len);
-static int dlm_dump_work_queues(const char __user *data, unsigned int len);
-
-static int dlm_parse_domain_and_lockres(char *buf, unsigned int len,
-					struct dlm_ctxt **dlm,
-					struct dlm_lock_resource **res);
-
-static int dlm_proc_stats(char *page, char **start, off_t off,
-			  int count, int *eof, void *data);
-
-typedef int (dlm_debug_func_t)(const char __user *data, unsigned int len);
-
-struct dlm_debug_funcs
-{
-	char key;
-	dlm_debug_func_t *func;
-};
-
-static struct dlm_debug_funcs dlm_debug_map[] = {
-	{ 'r', dlm_dump_all_lock_resources },
-	{ 'R', dlm_dump_one_lock_resource },
-	{ 'm', dlm_dump_all_mles },
-	{ 'p', dlm_dump_all_purge_lists  },
-	{ 'M', dlm_trigger_migration },
-	{ 'w', dlm_dump_work_queues }
-};
-static int dlm_debug_map_sz = (sizeof(dlm_debug_map) /
-			       sizeof(struct dlm_debug_funcs));
-
-static ssize_t write_dlm_debug(struct file *file, const char __user *buf,
-			       size_t count, loff_t *ppos)
-{
-	int i;
-	char c;
-	dlm_debug_func_t *fn;
-	int ret;
-
-	mlog(0, "(%p, %p, %u, %lld)\n",
-		  file, buf, (unsigned int)count, (long long)*ppos);
-	ret = 0;
-	if (count<=0)
-		goto done;
-
-	ret = -EFAULT;
-	if (get_user(c, buf))
-		goto done;
-
-	ret = count;
-	for (i=0; i < dlm_debug_map_sz; i++) {
-		struct dlm_debug_funcs *d = &dlm_debug_map[i];
-		if (c == d->key) {
-			fn = d->func;
-			if (fn)
-				ret = (fn)(buf, count);
-			goto done;
-		}
-	}
-done:
-	return ret;
-}
-
-static struct file_operations dlm_debug_operations = {
-	.write          = write_dlm_debug,
-};
-
-#define OCFS2_DLM_PROC_PATH "fs/ocfs2_dlm"
-#define DLM_DEBUG_PROC_NAME "debug"
-#define DLM_STAT_PROC_NAME  "stat"
-
-static struct proc_dir_entry *ocfs2_dlm_proc;
-
-void dlm_remove_proc(void)
-{
-	if (ocfs2_dlm_proc) {
-		remove_proc_entry(DLM_DEBUG_PROC_NAME, ocfs2_dlm_proc);
-		remove_proc_entry(OCFS2_DLM_PROC_PATH, NULL);
-	}
-}
-
-void dlm_init_proc(void)
-{
-	struct proc_dir_entry *entry;
-
-	ocfs2_dlm_proc = proc_mkdir(OCFS2_DLM_PROC_PATH, NULL);
-	if (!ocfs2_dlm_proc) {
-		mlog_errno(-ENOMEM);
-		return;
-	}
-
-	entry = create_proc_entry(DLM_DEBUG_PROC_NAME, S_IWUSR,
-				  ocfs2_dlm_proc);
-	if (entry)
-		entry->proc_fops = &dlm_debug_operations;
-}
-
-static int dlm_proc_stats(char *page, char **start, off_t off,
-			  int count, int *eof, void *data)
-{
-	int len;
-	struct dlm_ctxt *dlm = data;
-
-	len = sprintf(page, "local=%d, remote=%d, unknown=%d, key=0x%08x\n",
-		      atomic_read(&dlm->local_resources),
-		      atomic_read(&dlm->remote_resources),
-		      atomic_read(&dlm->unknown_resources),
-		      dlm->key);
-
-	if (len <= off + count)
-		*eof = 1;
-
-	*start = page + off;
-	len -= off;
-	if (len > count)
-		len = count;
-	if (len < 0)
-		len = 0;
-
-	return len;
-}
-
-void dlm_proc_add_domain(struct dlm_ctxt *dlm)
-{
-	struct proc_dir_entry *entry;
-
-	dlm->dlm_proc = proc_mkdir(dlm->name, ocfs2_dlm_proc);
-	if (dlm->dlm_proc) {
-		entry = create_proc_read_entry(DLM_STAT_PROC_NAME,
-					       S_IFREG | S_IRUGO, dlm->dlm_proc,
-					       dlm_proc_stats, (char *)dlm);
-		if (entry)
-			entry->owner = THIS_MODULE;
-	}
-}
-
-void dlm_proc_del_domain(struct dlm_ctxt *dlm)
-{
-	if (dlm->dlm_proc) {
-		remove_proc_entry(DLM_STAT_PROC_NAME, dlm->dlm_proc);
-		remove_proc_entry(dlm->name, ocfs2_dlm_proc);
-	}
-}
-
-/* lock resource printing is usually very important (printed
- * right before a BUG in some cases), but we'd like to be
- * able to shut it off if needed, hence the KERN_NOTICE level */
-static int dlm_dump_all_lock_resources(const char __user *data,
-				       unsigned int len)
-{
-	struct dlm_ctxt *dlm;
-	struct list_head *iter;
-
-	mlog(ML_NOTICE, "dumping ALL dlm state for node %s\n",
-	     system_utsname.nodename);
-	spin_lock(&dlm_domain_lock);
-	list_for_each(iter, &dlm_domains) {
-		dlm = list_entry (iter, struct dlm_ctxt, list);
-		dlm_dump_lock_resources(dlm);
-	}
-	spin_unlock(&dlm_domain_lock);
-	return len;
-}
-
-static int dlm_dump_one_lock_resource(const char __user *data,
-				       unsigned int len)
-{
-	struct dlm_ctxt *dlm;
-	struct dlm_lock_resource *res;
-	char *buf = NULL;
-	int ret = -EINVAL;
-	int tmpret;
-
-	if (len >= PAGE_SIZE-1) {
-		mlog(ML_ERROR, "user passed too much data: %d bytes\n", len);
-		goto leave;
-	}
-	if (len < 5) {
-		mlog(ML_ERROR, "user passed too little data: %d bytes\n", len);
-		goto leave;
-	}
-	buf = kmalloc(len+1, GFP_NOFS);
-	if (!buf) {
-		mlog(ML_ERROR, "could not alloc %d bytes\n", len+1);
-		ret = -ENOMEM;
-		goto leave;
-	}
-	if (strncpy_from_user(buf, data, len) < len) {
-		mlog(ML_ERROR, "failed to get all user data.  done.\n");
-		goto leave;
-	}
-	buf[len]='\0';
-	mlog(0, "got this data from user: %s\n", buf);
-
-	if (*buf != 'R') {
-		mlog(0, "bad data\n");
-		goto leave;
-	}
-
-	tmpret = dlm_parse_domain_and_lockres(buf, len, &dlm, &res);
-	if (tmpret < 0) {
-		mlog(0, "bad data\n");
-		goto leave;
-	}
-
-	mlog(ML_NOTICE, "struct dlm_ctxt: %s, node=%u, key=%u\n",
-		dlm->name, dlm->node_num, dlm->key);
-
-	dlm_print_one_lock_resource(res);
-	dlm_lockres_put(res);
-	dlm_put(dlm);
-	ret = len;
-
-leave:
-	if (buf)
-		kfree(buf);
-	return ret;
-}
-
 static void dlm_print_lockres_refmap(struct dlm_lock_resource *res)
 {
 	int bit;
@@ -365,234 +139,6 @@ void dlm_print_one_lock(struct dlm_lock *lockid)
 }
 EXPORT_SYMBOL_GPL(dlm_print_one_lock);
 
-void dlm_dump_lock_resources(struct dlm_ctxt *dlm)
-{
-	struct dlm_lock_resource *res;
-	struct hlist_node *iter;
-	struct hlist_head *bucket;
-	int i;
-
-	mlog(ML_NOTICE, "struct dlm_ctxt: %s, node=%u, key=%u\n",
-		  dlm->name, dlm->node_num, dlm->key);
-	if (!dlm || !dlm->name) {
-		mlog(ML_ERROR, "dlm=%p\n", dlm);
-		return;
-	}
-
-	spin_lock(&dlm->spinlock);
-	for (i=0; i<DLM_HASH_BUCKETS; i++) {
-		bucket = dlm_lockres_hash(dlm, i);
-		hlist_for_each_entry(res, iter, bucket, hash_node)
-			dlm_print_one_lock_resource(res);
-	}
-	spin_unlock(&dlm->spinlock);
-}
-static void dlm_dump_purge_list(struct dlm_ctxt *dlm)
-{
-	struct list_head *iter;
-	struct dlm_lock_resource *lockres;
-
-	mlog(ML_NOTICE, "Purge list for DLM Domain \"%s\"\n",
dlm->name);
-	mlog(ML_NOTICE, "Last_used\tName\n");
-
-	spin_lock(&dlm->spinlock);
-	list_for_each(iter, &dlm->purge_list) {
-		lockres = list_entry(iter, struct dlm_lock_resource, purge);
-
-		spin_lock(&lockres->spinlock);
-		mlog(ML_NOTICE, "%lu\t%.*s\n", lockres->last_used,
-		       lockres->lockname.len, lockres->lockname.name);
-		spin_unlock(&lockres->spinlock);
-	}
-	spin_unlock(&dlm->spinlock);
-}
-
-void dlm_dump_work_queue(struct dlm_ctxt *dlm)
-{
-	struct list_head *iter;
-	struct dlm_work_item *item;
-
-	spin_lock(&dlm->work_lock);
-	list_for_each(iter, &dlm->work_list) {
-		item = list_entry(iter, struct dlm_work_item, list);
-		if (item->func == dlm_request_all_locks_worker) {
-			printk("%s: found requestalllocks, mas=%u, dead=%u\n",
-			       dlm->name, item->u.ral.reco_master,
-			       item->u.ral.dead_node);
-		} else if (item->func == dlm_mig_lockres_worker) {
-			printk("%s:%.*s: found assert_master, realmaster=%u\n",
-			       dlm->name, item->u.ml.lockres->lockname.len,
-			       item->u.ml.lockres->lockname.name,
-			       item->u.ml.real_master);
-		} else if (item->func == dlm_assert_master_worker) {
-			printk("%s:%.*s: found assert_master, from=%u, "
-			       "flags=%u, ignore=%d\n",
-			       dlm->name, item->u.am.lockres->lockname.len,
-			       item->u.am.lockres->lockname.name,
-			       item->u.am.request_from, item->u.am.flags,
-			       item->u.am.ignore_higher);
-		} else {
-			printk("%s: found INVALID work item, func=%p\n",
-			       dlm->name, item->func);
-		}
-	}
-	spin_unlock(&dlm->work_lock);
-}
-
-static int dlm_dump_work_queues(const char __user *data, unsigned int len)
-{
-	struct dlm_ctxt *dlm;
-	struct list_head *iter;
-
-	spin_lock(&dlm_domain_lock);
-	list_for_each(iter, &dlm_domains) {
-		dlm = list_entry (iter, struct dlm_ctxt, list);
-		dlm_dump_work_queue(dlm);
-	}
-	spin_unlock(&dlm_domain_lock);
-	return len;
-
-}
-
-static int dlm_dump_all_purge_lists(const char __user *data, unsigned int len)
-{
-	struct dlm_ctxt *dlm;
-	struct list_head *iter;
-
-	spin_lock(&dlm_domain_lock);
-	list_for_each(iter, &dlm_domains) {
-		dlm = list_entry (iter, struct dlm_ctxt, list);
-		dlm_dump_purge_list(dlm);
-	}
-	spin_unlock(&dlm_domain_lock);
-	return len;
-}
-
-static int dlm_parse_domain_and_lockres(char *buf, unsigned int len,
-					struct dlm_ctxt **dlm,
-					struct dlm_lock_resource **res)
-{
-	char *resname;
-	char *domainname;
-	char *tmp;
-	int ret = -EINVAL;
-
-	*dlm = NULL;
-	*res = NULL;
-
-	tmp = buf;
-	tmp++;
-	if (*tmp != ' ') {
-		mlog(0, "bad data\n");
-		goto leave;
-	}
-	tmp++;
-	domainname = tmp;
-
-	while (*tmp) {
-		if (*tmp == ' ')
-			break;
-		tmp++;
-	}
-	if (!*tmp || !*(tmp+1)) {
-		mlog(0, "bad data\n");
-		goto leave;
-	}
-
-	*tmp = '\0';  // null term the domainname
-	tmp++;
-	resname = tmp;
-	while (*tmp) {
-		if (*tmp == '\n' ||
-		    *tmp == ' ' ||
-		    *tmp == '\r') {
-			*tmp = '\0';
-			break;
-		}
-		tmp++;
-	}
-
-	mlog(0, "now looking up domain %s, lockres %s\n",
-	       domainname, resname);
-	spin_lock(&dlm_domain_lock);
-	*dlm = __dlm_lookup_domain(domainname);
-	spin_unlock(&dlm_domain_lock);
-
-	if (!dlm_grab(*dlm)) {
-		mlog(ML_ERROR, "bad dlm!\n");
-		*dlm = NULL;
-		goto leave;
-	}
-
-	*res = dlm_lookup_lockres(*dlm, resname, strlen(resname));
-	if (!*res) {
-		mlog(ML_ERROR, "bad lockres!\n");
-		dlm_put(*dlm);
-		*dlm = NULL;
-		goto leave;
-	}
-
-	mlog(0, "found dlm=%p, lockres=%p\n", *dlm, *res);
-	ret = 0;
-
-leave:
-	return ret;
-}
-
-static int dlm_trigger_migration(const char __user *data, unsigned int len)
-{
-	struct dlm_lock_resource *res;
-	struct dlm_ctxt *dlm;
-	char *buf = NULL;
-	int ret = -EINVAL;
-	int tmpret;
-
-	if (len >= PAGE_SIZE-1) {
-		mlog(ML_ERROR, "user passed too much data: %d bytes\n", len);
-		goto leave;
-	}
-	if (len < 5) {
-		mlog(ML_ERROR, "user passed too little data: %d bytes\n", len);
-		goto leave;
-	}
-	buf = kmalloc(len+1, GFP_NOFS);
-	if (!buf) {
-		mlog(ML_ERROR, "could not alloc %d bytes\n", len+1);
-		ret = -ENOMEM;
-		goto leave;
-	}
-	if (strncpy_from_user(buf, data, len) < len) {
-		mlog(ML_ERROR, "failed to get all user data.  done.\n");
-		goto leave;
-	}
-	buf[len]='\0';
-	mlog(0, "got this data from user: %s\n", buf);
-
-	if (*buf != 'M') {
-		mlog(0, "bad data\n");
-		goto leave;
-	}
-
-	tmpret = dlm_parse_domain_and_lockres(buf, len, &dlm, &res);
-	if (tmpret < 0) {
-		mlog(0, "bad data\n");
-		goto leave;
-	}
-	tmpret = dlm_migrate_lockres(dlm, res, O2NM_MAX_NODES);
-	mlog(0, "dlm_migrate_lockres returned %d\n", tmpret);
-	if (tmpret < 0)
-		mlog(ML_ERROR, "failed to migrate %.*s: %d\n",
-		     res->lockname.len, res->lockname.name, tmpret);
-	dlm_lockres_put(res);
-	dlm_put(dlm);
-	ret = len;
-
-leave:
-	if (buf)
-		kfree(buf);
-	return ret;
-}
-
 static const char *dlm_errnames[] = {
 	[DLM_NORMAL] =			"DLM_NORMAL",
 	[DLM_GRANTED] =			"DLM_GRANTED",
diff --git a/fs/ocfs2/dlm/dlmdebug.h b/fs/ocfs2/dlm/dlmdebug.h
index fcc19c8..f6537ac 100644
--- a/fs/ocfs2/dlm/dlmdebug.h
+++ b/fs/ocfs2/dlm/dlmdebug.h
@@ -48,13 +48,6 @@ struct debug_lockres
 	struct dlm_lock_resource *dl_res;
 };
 
-void dlm_remove_proc(void);
-void dlm_init_proc(void);
-void dlm_dump_lock_resources(struct dlm_ctxt *dlm);
-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);
 
diff --git a/fs/ocfs2/dlm/dlmdomain.c b/fs/ocfs2/dlm/dlmdomain.c
index b06151e..1cad023 100644
--- a/fs/ocfs2/dlm/dlmdomain.c
+++ b/fs/ocfs2/dlm/dlmdomain.c
@@ -41,8 +41,6 @@
 
 #include "dlmapi.h"
 #include "dlmcommon.h"
-
-#include "dlmdebug.h"
 #include "dlmdomain.h"
 #include "dlmdebug.h"
 
@@ -288,8 +286,6 @@ static int dlm_wait_on_domain_helper(const char *domain)
 
 static void dlm_free_ctxt_mem(struct dlm_ctxt *dlm)
 {
-	dlm_proc_del_domain(dlm);
-
 	dlm_destroy_debugfs_subroot(dlm);
 
 	if (dlm->lockres_hash)
@@ -1467,7 +1463,6 @@ static struct dlm_ctxt *dlm_alloc_ctxt(const char *domain,
 	dlm->dlm_state = DLM_CTXT_NEW;
 
 	INIT_LIST_HEAD(&dlm->dlm_eviction_callbacks);
-	dlm_proc_add_domain(dlm);
 
 	mlog(0, "context init: refcount %u\n",
 		  atomic_read(&dlm->dlm_refs.refcount));
@@ -1698,8 +1693,6 @@ static int __init dlm_init(void)
 	if (status)
 		goto error;
 
-	dlm_init_proc();
-
 	status = dlm_create_debugfs_root();
 	if (status)
 		goto error;
@@ -1717,7 +1710,6 @@ error:
 static void __exit dlm_exit (void)
 {
 	dlm_destroy_debugfs_root();
-	dlm_remove_proc();
 	dlm_unregister_net_handlers();
 	dlm_destroy_lock_cache();
 	dlm_destroy_lockname_cache();
-- 
1.5.2.5

Sunil Mushran

2008-Feb-01 16:50 UTC

head link

[Ocfs2-devel] [PATCH 07/12] ocfs2_dlm: Dumps the lockres' into a debugfs file

This patch dumps all the lockres' alongwith all the locks into
a debugfs file. Useful for debugging.

Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com>
---
 fs/ocfs2/dlm/dlmdebug.c |  225 +++++++++++++++++++++++++++++++++++++++++++++++
 fs/ocfs2/dlm/dlmdebug.h |    9 ++
 2 files changed, 234 insertions(+), 0 deletions(-)

diff --git a/fs/ocfs2/dlm/dlmdebug.c b/fs/ocfs2/dlm/dlmdebug.c
index 124856b..a89bfe7 100644
--- a/fs/ocfs2/dlm/dlmdebug.c
+++ b/fs/ocfs2/dlm/dlmdebug.c
@@ -794,6 +794,219 @@ static int debug_buffer_release(struct inode *inode,
struct file *file)
 
 /* end - util funcs */
 
+/* begin - debug lockres funcs */
+static int dump_lock(char *buf, int len, int list_type, struct dlm_lock *lock)
+{
+	int out;
+
+#define DEBUG_LOCK_VERSION	1
+	spin_lock(&lock->spinlock);
+	out = snprintf(buf, len,
"LOCK:%d,%d,%d,%d,%d,%d:%lld,%d,%d,%d,%d\n",
+		       DEBUG_LOCK_VERSION,
+		       list_type, lock->ml.type, lock->ml.convert_type,
+		       lock->ml.node,
+		       dlm_get_lock_cookie_node(be64_to_cpu(lock->ml.cookie)),
+		       dlm_get_lock_cookie_seq(be64_to_cpu(lock->ml.cookie)),
+		       !list_empty(&lock->ast_list), lock->ast_pending,
+		       !list_empty(&lock->bast_list), lock->bast_pending);
+	spin_unlock(&lock->spinlock);
+
+	return out;
+}
+
+static int dump_lockres(struct debug_lockres *dl)
+{
+	struct dlm_ctxt *dlm;
+	struct dlm_lock_resource *res;
+	struct dlm_lock *lock;
+	int i;
+	int out = 0;
+
+	if (!dl)
+		return 0;
+
+	dlm = dl->dl_ctxt;
+	res = dl->dl_res;
+
+	assert_spin_locked(&dlm->spinlock);
+	spin_lock(&res->spinlock);
+
+	out += snprintf(dl->dl_buf + out, dl->dl_len - out,
+			"%.*s\n",
+			res->lockname.len, res->lockname.name);
+
+#define DEBUG_LRES_VERSION	1
+	out += snprintf(dl->dl_buf + out, dl->dl_len - out,
+			"LRES:%d,%d,%d,%ld,%d,%d,%d,%d,%d\n",
+			DEBUG_LRES_VERSION,
+			res->owner, res->state, res->last_used,
+			!list_empty(&res->purge), res->inflight_locks,
+			atomic_read(&res->refs.refcount),
+			res->migration_pending,
+			atomic_read(&res->asts_reserved));
+
+	/* refmap */
+	out += snprintf(dl->dl_buf + out, dl->dl_len - out,
"REFMAP:");
+	out += stringify_nodemap(res->refmap, O2NM_MAX_NODES,
+				 dl->dl_buf + out, dl->dl_len - out);
+	out += snprintf(dl->dl_buf + out, dl->dl_len - out, "\n");
+
+	/* lvb */
+	out += snprintf(dl->dl_buf + out, dl->dl_len - out, "LVB:");
+	for (i = 0; i < DLM_LVB_LEN; i++)
+		out += snprintf(dl->dl_buf + out, dl->dl_len - out,
+					"%02X", (unsigned char)res->lvb[i]);
+	out += snprintf(dl->dl_buf + out, dl->dl_len - out, "\n");
+
+	/* granted */
+	list_for_each_entry(lock, &res->granted, list)
+		out += dump_lock(dl->dl_buf + out, dl->dl_len - out, 0, lock);
+
+	/* converting */
+	list_for_each_entry(lock, &res->converting, list)
+		out += dump_lock(dl->dl_buf + out, dl->dl_len - out, 1, lock);
+
+	/* blocked */
+	list_for_each_entry(lock, &res->blocked, list)
+		out += dump_lock(dl->dl_buf + out, dl->dl_len - out, 2, lock);
+
+	out += snprintf(dl->dl_buf + out, dl->dl_len - out, "\n");
+
+	spin_unlock(&res->spinlock);
+
+	return out;
+}
+
+static void *lockres_seq_start(struct seq_file *m, loff_t *pos)
+{
+	struct debug_lockres *dl = m->private;
+	struct dlm_ctxt *dlm = dl->dl_ctxt;
+	struct dlm_lock_resource *res = NULL;
+
+	spin_lock(&dlm->spinlock);
+
+	if (dl->dl_res) {
+		list_for_each_entry(res, &dl->dl_res->tracking, tracking) {
+			if (dl->dl_res) {
+				dlm_lockres_put(dl->dl_res);
+				dl->dl_res = NULL;
+			}
+			if (&res->tracking == &dlm->tracking_list) {
+				mlog(0, "End of list found, %p\n", res);
+				dl = NULL;
+				break;
+			}
+			mlog(0, "res=%p, name=%.*s\n", res,
+			     res->lockname.len, res->lockname.name);
+			dlm_lockres_get(res);
+			dl->dl_res = res;
+			break;
+		}
+	} else {
+		if (!list_empty(&dlm->tracking_list)) {
+			list_for_each_entry(res, &dlm->tracking_list, tracking)
+				break;
+			mlog(0, "res=%p, name=%.*s\n", res,
+			     res->lockname.len, res->lockname.name);
+			dlm_lockres_get(res);
+			dl->dl_res = res;
+		} else
+			dl = NULL;
+	}
+
+	dump_lockres(dl);
+
+	spin_unlock(&dlm->spinlock);
+
+	return dl;
+}
+
+static void lockres_seq_stop(struct seq_file *m, void *v)
+{
+}
+
+static void *lockres_seq_next(struct seq_file *m, void *v, loff_t *pos)
+{
+	return NULL;
+}
+
+static int lockres_seq_show(struct seq_file *s, void *v)
+{
+	struct debug_lockres *dl = (struct debug_lockres *)v;
+
+	seq_printf(s, "%s", dl->dl_buf);
+
+	return 0;
+}
+
+static struct seq_operations debug_lockres_ops = {
+	.start =	lockres_seq_start,
+	.stop =		lockres_seq_stop,
+	.next =		lockres_seq_next,
+	.show =		lockres_seq_show,
+};
+
+static int debug_lockres_open(struct inode *inode, struct file *file)
+{
+	struct dlm_ctxt *dlm = inode->i_private;
+	int ret = -ENOMEM;
+	struct seq_file *seq;
+	struct debug_lockres *dl = NULL;
+
+	dl = kzalloc(sizeof(struct debug_lockres), GFP_KERNEL);
+	if (!dl) {
+		mlog_errno(ret);
+		goto bail;
+	}
+
+	dl->dl_len = PAGE_SIZE;
+	dl->dl_buf = kmalloc(dl->dl_len, GFP_KERNEL);
+	if (!dl->dl_buf) {
+		mlog_errno(ret);
+		goto bail;
+	}
+
+	ret = seq_open(file, &debug_lockres_ops);
+	if (ret) {
+		mlog_errno(ret);
+		goto bail;
+	}
+
+	seq = (struct seq_file *) file->private_data;
+	seq->private = dl;
+
+	dlm_grab(dlm);
+	dl->dl_ctxt = dlm;
+
+	return 0;
+bail:
+	if (dl && dl->dl_buf)
+		kfree(dl->dl_buf);
+	if (dl)
+		kfree(dl);
+	return ret;
+}
+
+static int debug_lockres_release(struct inode *inode, struct file *file)
+{
+	struct seq_file *seq = (struct seq_file *)file->private_data;
+	struct debug_lockres *dl = (struct debug_lockres *)seq->private;
+
+	if (dl->dl_res)
+		dlm_lockres_put(dl->dl_res);
+	dlm_put(dl->dl_ctxt);
+	kfree(dl->dl_buf);
+	return seq_release_private(inode, file);
+}
+
+static struct file_operations debug_lockres_fops = {
+	.open =		debug_lockres_open,
+	.release =	debug_lockres_release,
+	.read =		seq_read,
+	.llseek =	seq_lseek,
+};
+/* end - debug lockres funcs */
+
 /* begin - debug state funcs */
 static int debug_state_print(struct dlm_ctxt *dlm, struct debug_buffer *db)
 {
@@ -951,6 +1164,16 @@ int dlm_debug_init(struct dlm_ctxt *dlm)
 		goto bail;
 	}
 
+	/* for dumping lockres */
+	dc->debug_lockres_dentry +			debugfs_create_file("lockres",
S_IFREG|S_IRUSR,
+					    dlm->dlm_debugfs_subroot,
+					    dlm, &debug_lockres_fops);
+	if (!dc->debug_lockres_dentry) {
+		mlog_errno(-ENOMEM);
+		goto bail;
+	}
+
 	dlm_debug_get(dc);
 	return 0;
 
@@ -964,6 +1187,8 @@ void dlm_debug_shutdown(struct dlm_ctxt *dlm)
 	struct dlm_debug_ctxt *dc = dlm->dlm_debug_ctxt;
 
 	if (dc) {
+		if (dc->debug_lockres_dentry)
+			debugfs_remove(dc->debug_lockres_dentry);
 		if (dc->debug_state_dentry)
 			debugfs_remove(dc->debug_state_dentry);
 		dlm_debug_put(dc);
diff --git a/fs/ocfs2/dlm/dlmdebug.h b/fs/ocfs2/dlm/dlmdebug.h
index 50cb10f..86d02f4 100644
--- a/fs/ocfs2/dlm/dlmdebug.h
+++ b/fs/ocfs2/dlm/dlmdebug.h
@@ -28,6 +28,7 @@
 struct dlm_debug_ctxt {
 	struct kref debug_refcnt;
 	struct dentry *debug_state_dentry;
+	struct dentry *debug_lockres_dentry;
 };
 
 struct debug_buffer
@@ -36,6 +37,14 @@ struct debug_buffer
 	char *buf;
 };
 
+struct debug_lockres
+{
+	int dl_len;
+	char *dl_buf;
+	struct dlm_ctxt *dl_ctxt;
+	struct dlm_lock_resource *dl_res;
+};
+
 void dlm_remove_proc(void);
 void dlm_init_proc(void);
 void dlm_dump_lock_resources(struct dlm_ctxt *dlm);
-- 
1.5.2.5

Mark Fasheh

2008-Feb-07 16:01 UTC

head link

[Ocfs2-devel] [PATCH 03/12] ocfs2_dlm: lockres/lock refcounting fixed

On Fri, Feb 01, 2008 at 04:49:22PM -0800, Sunil Mushran
wrote:> Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com>
Can we get a better description of how it was broken before and what this
fix does?
	--Mark

--
Mark Fasheh
Principal Software Developer, Oracle
mark.fasheh@oracle.com

Ocfs2 devel - Feb 2008 - Much needed changes to o2dlm

[Ocfs2-devel] [PATCH 03/12] ocfs2_dlm: lockres/lock refcounting fixed

[Ocfs2-devel] [PATCH 10/12] ocfs2_dlm: Dumps the purgelist into a debugfs file

[Ocfs2-devel] [PATCH 06/12] ocfs2_dlm: Dump the dlm state in a debugfs file

[Ocfs2-devel] [PATCH 01/12] ocfs2_dlm: Rename slabcache dlm_mle_cache to o2dlm_mle

[Ocfs2-devel] Much needed changes to o2dlm

[Ocfs2-devel] [PATCH 09/12] ocfs2_dlm: Dumps the mles into a debugfs file

[Ocfs2-devel] [PATCH 08/12] ocfs2_dlm: Moves struct dlm_master_list_entry to dlmcommon.h

[Ocfs2-devel] [PATCH 11/12] ocfs2_dlm: Dumps the workqueue into a debugfs file

[Ocfs2-devel] [PATCH 02/12] ocfs2_dlm: Creates slabcaches for the lockres' and the locks

[Ocfs2-devel] [PATCH 04/12] ocfs2_dlm: Link all lockres' to a tracking list

[Ocfs2-devel] [PATCH 05/12] ocfs2_dlm: Create debugfs dirs

[Ocfs2-devel] [PATCH 12/12] ocfs2_dlm: Remove the proc interface

[Ocfs2-devel] [PATCH 07/12] ocfs2_dlm: Dumps the lockres' into a debugfs file

[Ocfs2-devel] [PATCH 03/12] ocfs2_dlm: lockres/lock refcounting fixed