ocfs2: add locking filter debugfs file
PATCH v3 2/2 ocfs2: add locking filter debugfs file
Add locking filter debugfs file, which is used to filter lock resources dump from locking_state debugfs file.
We use d_filter_secs field to filter lock resources dump, the default d_filter_secs(0) value filters nothing, otherwise, only dump the last N seconds active lock resources. This enhancement can avoid dumping lots of old records. The d_filter_secs value can be changed via locking_filter file.
Compared with v2, ocfs2_dlm_init_debug() returns directly with error when creating locking filter debugfs file is failed, since ocfs2_dlm_shutdown_debug() will handle this failure perfectly. Compared with v1, the main change is to add CONFIG_OCFS2_FS_STATS macro definition judgment.
--- fs/ocfs2/dlmglue.c | 36 ++++++++++++++++++++++++++++++++++++ fs/ocfs2/ocfs2.h | 2 ++ 2 files changed, 38 insertions(+)
fs/ocfs2/dlmglue.c +36 -0
@@ -3006,6 +3006,8 @@ struct ocfs2_dlm_debug *ocfs2_new_dlm_debug(void)kref_init (&dlm_debug->d_refcnt);INIT_LIST_HEAD (&dlm_debug->d_lockres_tracking); dlm_debug->d_locking_state =NULL ; + dlm_debug->d_locking_filter =NULL ; + dlm_debug->d_filter_secs =0 ; out:return dlm_debug; }
@@ -3104,11 +3106,33 @@ static int ocfs2_dlm_seq_show(struct seq_file *m, void *v) {int i;char *lvb; +u32 now, last =0 ;struct ocfs2_lock_res *lockres = v; +struct ocfs2_dlm_debug *dlm_debug = + ((struct ocfs2_dlm_seq_priv *)m->private)->p_dlm_debug;if (!lockres)return -EINVAL ; +if (dlm_debug->d_filter_secs) { + now =ktime_to_timespec (ktime_get ()).tv_sec; +#ifdef CONFIG_OCFS2_FS_STATS +if (lockres->l_lock_prmode.ls_last > + lockres->l_lock_exmode.ls_last) + last = lockres->l_lock_prmode.ls_last; +else + last = lockres->l_lock_exmode.ls_last; +#endif +/* +* Use d_filter_secs field to filter lock resources dump, +* the default d_filter_secs(0) value filters nothing, +* otherwise, only dump the last N seconds active lock +* resources. +*/ +if ((now - last) > dlm_debug->d_filter_secs) +return 0 ; + } +seq_printf (m,"0x%x\t" ,OCFS2_DLM_DEBUG_STR_VERSION );if (lockres->l_type ==OCFS2_LOCK_TYPE_DENTRY )
@@ -3258,6 +3282,17 @@ static int ocfs2_dlm_init_debug(struct ocfs2_super *osb) goto out; } + dlm_debug->d_locking_filter =debugfs_create_u32 ("locking_filter" , +0600 , + osb->osb_debug_root, + &dlm_debug->d_filter_secs); +if (!dlm_debug->d_locking_filter) { + ret = -EINVAL ; +mlog (ML_ERROR , +"Unable to create locking filter debugfs file.\n" ); + goto out; + } +ocfs2_get_dlm_debug (dlm_debug); out:return ret;
@@ -3269,6 +3304,7 @@ static void ocfs2_dlm_shutdown_debug(struct ocfs2_super *osb)if (dlm_debug) {debugfs_remove (dlm_debug->d_locking_state); +debugfs_remove (dlm_debug->d_locking_filter);ocfs2_put_dlm_debug (dlm_debug); } }
fs/ocfs2/ocfs2.h +2 -0
@@ -237,6 +237,8 @@ struct ocfs2_orphan_scan {struct ocfs2_dlm_debug {struct kref d_refcnt;struct dentry *d_locking_state; +struct dentry *d_locking_filter; +u32 d_filter_secs;struct list_head d_lockres_tracking; };
Signature · 1 line
2.21.0
Quoted 8 lines · Gang He
Add locking filter debugfs file, which is used to filter lock resources dump from
locking_statedebugfs file.
We used_filter_secsfield to filter lock resources dump, the defaultd_filter_secs(0)value filters nothing, otherwise, only dump the last N seconds active lock resources. This enhancement can avoid dumping lots of old records. Thed_filter_secsvalue can be changed vialocking_filterfile.
Quoted 7 lines
Compared with v2,
ocfs2_dlm_init_debug()returns directly with error when creating locking filter debugfs file is failed, sinceocfs2_dlm_shutdown_debug()will handle this failure perfectly. Compared with v1, the main change is to addCONFIG_OCFS2_FS_STATSmacro definition judgment.Signed-off-by Gang He <[email protected]>
Quoted 92 lines
--- fs/ocfs2/dlmglue.c | 36 ++++++++++++++++++++++++++++++++++++ fs/ocfs2/ocfs2.h | 2 ++ 2 files changed, 38 insertions(+)fs/ocfs2/dlmglue.c +36
-0@@ -3006,6 +3006,8 @@ struct ocfs2_dlm_debug *ocfs2_new_dlm_debug(void)kref_init (&dlm_debug->d_refcnt);INIT_LIST_HEAD (&dlm_debug->d_lockres_tracking); dlm_debug->d_locking_state =NULL ; + dlm_debug->d_locking_filter =NULL ; + dlm_debug->d_filter_secs =0 ; out:return dlm_debug; }@@ -3104,11 +3106,33 @@ static int ocfs2_dlm_seq_show(struct seq_file *m, void *v) {int i;char *lvb; +u32 now, last =0 ;struct ocfs2_lock_res *lockres = v; +struct ocfs2_dlm_debug *dlm_debug = + ((struct ocfs2_dlm_seq_priv *)m->private)->p_dlm_debug;if (!lockres)return -EINVAL ; +if (dlm_debug->d_filter_secs) { + now =ktime_to_timespec (ktime_get ()).tv_sec; +#ifdef CONFIG_OCFS2_FS_STATS +if (lockres->l_lock_prmode.ls_last > + lockres->l_lock_exmode.ls_last) + last = lockres->l_lock_prmode.ls_last; +else + last = lockres->l_lock_exmode.ls_last; +#endif +/* +* Use d_filter_secs field to filter lock resources dump, +* the default d_filter_secs(0) value filters nothing, +* otherwise, only dump the last N seconds active lock +* resources. +*/ +if ((now - last) > dlm_debug->d_filter_secs) +return 0 ; + } +seq_printf (m,"0x%x\t" ,OCFS2_DLM_DEBUG_STR_VERSION );if (lockres->l_type ==OCFS2_LOCK_TYPE_DENTRY )@@ -3258,6 +3282,17 @@ static int ocfs2_dlm_init_debug(struct ocfs2_super *osb) goto out; } + dlm_debug->d_locking_filter =debugfs_create_u32 ("locking_filter" , +0600 , + osb->osb_debug_root, + &dlm_debug->d_filter_secs); +if (!dlm_debug->d_locking_filter) { + ret = -EINVAL ; +mlog (ML_ERROR , +"Unable to create locking filter debugfs file.\n" ); + goto out; + } +ocfs2_get_dlm_debug (dlm_debug); out:return ret;@@ -3269,6 +3304,7 @@ static void ocfs2_dlm_shutdown_debug(struct ocfs2_super *osb)if (dlm_debug) {debugfs_remove (dlm_debug->d_locking_state); +debugfs_remove (dlm_debug->d_locking_filter);ocfs2_put_dlm_debug (dlm_debug); } }fs/ocfs2/ocfs2.h +2
-0@@ -237,6 +237,8 @@ struct ocfs2_orphan_scan {struct ocfs2_dlm_debug {struct kref d_refcnt;struct dentry *d_locking_state; +struct dentry *d_locking_filter; +u32 d_filter_secs;struct list_head d_lockres_tracking; };