ocfs2: add last unlock times in locking_state
PATCH 1/2 ocfs2: add last unlock times in locking_state
ocfs2 file system uses locking_state file under debugfs to dump each ocfs2 file system's dlm lock resources, but the dlm lock resources in memory are becoming more and more after the files were touched by the user. it will become a bit difficult to analyze these dlm lock resource records in locking_state file by the upper scripts, though some files are not active for now, which were accessed long time ago.
Then, I'd like to add last pr/ex unlock times in locking_state file for each dlm lock resource record, the the upper scripts can use last unlock time to filter inactive dlm lock resource record.
--- fs/ocfs2/dlmglue.c | 21 +++++++++++++++++---- fs/ocfs2/ocfs2.h | 1 + 2 files changed, 18 insertions(+), 4 deletions(-)
fs/ocfs2/dlmglue.c +17 -4
@@ -448,7 +448,7 @@ static void ocfs2_update_lock_stats(struct ocfs2_lock_res *res, int level, struct ocfs2_mask_waiter *mw, int ret) {u32 usec; -ktime_t kt; +ktime_t last, kt;struct ocfs2_lock_stats *stats;if (level ==LKM_PRMODE )
@@ -458,7 +458,8 @@ static void ocfs2_update_lock_stats(struct ocfs2_lock_res *res, int level,else return ; - kt =ktime_sub (ktime_get (), mw->mw_lock_start); + last =ktime_get (); + kt =ktime_sub (last, mw->mw_lock_start); usec =ktime_to_us (kt); stats->ls_gets++;
@@ -474,6 +475,8 @@ static void ocfs2_update_lock_stats(struct ocfs2_lock_res *res, int level,if (ret) stats->ls_fail++; + + stats->ls_last =ktime_to_timespec (last).tv_sec; }static inline void ocfs2_track_lock_refresh (struct ocfs2_lock_res *lockres)
@@ -3093,8 +3096,10 @@ static void *ocfs2_dlm_seq_next(struct seq_file *m, void *v, loff_t *pos)* - Lock stats printed * New in version 3 * - Max time in lock stats is in usecs (instead of nsecs) +* New in version 4 +* - Add last pr/ex unlock times in secs */ -#define OCFS2_DLM_DEBUG_STR_VERSION 3 +#define OCFS2_DLM_DEBUG_STR_VERSION 4static int ocfs2_dlm_seq_show (struct seq_file *m,void *v) {int i;
@@ -3145,6 +3150,8 @@ static int ocfs2_dlm_seq_show(struct seq_file *m, void *v)# define lock_max_prmode (_l) ((_l)->l_lock_prmode.ls_max)# define lock_max_exmode (_l) ((_l)->l_lock_exmode.ls_max)# define lock_refresh (_l) ((_l)->l_lock_refresh) +# define lock_last_prmode (_l) ((_l)->l_lock_prmode.ls_last) +# define lock_last_exmode (_l) ((_l)->l_lock_exmode.ls_last)#else # define lock_num_prmode (_l) (0)# define lock_num_exmode (_l) (0)
@@ -3155,6 +3162,8 @@ static int ocfs2_dlm_seq_show(struct seq_file *m, void *v)# define lock_max_prmode (_l) (0)# define lock_max_exmode (_l) (0)# define lock_refresh (_l) (0) +# define lock_last_prmode (_l) (0) +# define lock_last_exmode (_l) (0)#endif /* The following seq_print was added in version 2 of this output */ seq_printf(m, "%u\t"
@@ -3165,6 +3174,8 @@ static int ocfs2_dlm_seq_show(struct seq_file *m, void *v)"%llu\t" "%u\t" "%u\t" +"%u\t" +"%u\t" "%u\t" ,lock_num_prmode (lockres), lock_num_exmode(lockres),
@@ -3174,7 +3185,9 @@ static int ocfs2_dlm_seq_show(struct seq_file *m, void *v)lock_total_exmode (lockres),lock_max_prmode (lockres),lock_max_exmode (lockres), - lock_refresh(lockres)); +lock_refresh (lockres), +lock_last_prmode (lockres), + lock_last_exmode(lockres));/* End the line */ seq_printf (m,"\n" );
fs/ocfs2/ocfs2.h +1 -0
@@ -164,6 +164,7 @@ struct ocfs2_lock_stats {/* Storing max wait in usecs saves 24 bytes per inode */ u32 ls_max;/* Max wait in USEC */ + u32 ls_last; /* Last unlock time in SEC */ };#endif
Signature · 1 line
2.21.0
PATCH 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.
--- fs/ocfs2/dlmglue.c | 33 +++++++++++++++++++++++++++++++++ fs/ocfs2/ocfs2.h | 2 ++ 2 files changed, 35 insertions(+)
fs/ocfs2/dlmglue.c +33 -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,28 @@ static int ocfs2_dlm_seq_show(struct seq_file *m, void *v) {int i;char *lvb; +u32 now, last;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 ; + now =ktime_to_timespec (ktime_get ()).tv_sec; +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; + +/* +* 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 (dlm_debug->d_filter_secs && (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 +3277,19 @@ 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" ); +debugfs_remove (dlm_debug->d_locking_state); + dlm_debug->d_locking_state =NULL ; + goto out; + } +ocfs2_get_dlm_debug (dlm_debug); out:return ret;
@@ -3269,6 +3301,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 11 lines · Gang He
ocfs2 file system uses
locking_statefile under debugfs to dump each ocfs2 file system's dlm lock resources, but the dlm lock resources in memory are becoming more and more after the files were touched by the user. it will become a bit difficult to analyze these dlm lock resource records inlocking_statefile by the upper scripts, though some files are not active for now, which were accessed long time ago.
Then, I'd like to add last pr/ex unlock times inlocking_statefile for each dlm lock resource record, the the upper scripts can use last unlock time to filter inactive dlm lock resource record.
Quoted 1 line
Signed-off-by Gang He <[email protected]>
Looks good.
Quoted 100 lines
--- fs/ocfs2/dlmglue.c | 21 +++++++++++++++++---- fs/ocfs2/ocfs2.h | 1 + 2 files changed, 18 insertions(+), 4 deletions(-)fs/ocfs2/dlmglue.c +17
-4@@ -448,7 +448,7 @@ static void ocfs2_update_lock_stats(struct ocfs2_lock_res *res, int level, struct ocfs2_mask_waiter *mw, int ret) {u32 usec; -ktime_t kt; +ktime_t last, kt;struct ocfs2_lock_stats *stats;if (level ==LKM_PRMODE )@@ -458,7 +458,8 @@ static void ocfs2_update_lock_stats(struct ocfs2_lock_res *res, int level,else return ; - kt =ktime_sub (ktime_get (), mw->mw_lock_start); + last =ktime_get (); + kt =ktime_sub (last, mw->mw_lock_start); usec =ktime_to_us (kt); stats->ls_gets++;@@ -474,6 +475,8 @@ static void ocfs2_update_lock_stats(struct ocfs2_lock_res *res, int level,if (ret) stats->ls_fail++; + + stats->ls_last =ktime_to_timespec (last).tv_sec; }static inline void ocfs2_track_lock_refresh (struct ocfs2_lock_res *lockres)@@ -3093,8 +3096,10 @@ static void *ocfs2_dlm_seq_next(struct seq_file *m, void *v, loff_t *pos)* - Lock stats printed * New in version 3 * - Max time in lock stats is in usecs (instead of nsecs) +* New in version 4 +* - Add last pr/ex unlock times in secs */ -#define OCFS2_DLM_DEBUG_STR_VERSION 3 +#define OCFS2_DLM_DEBUG_STR_VERSION 4static int ocfs2_dlm_seq_show (struct seq_file *m,void *v) {int i;@@ -3145,6 +3150,8 @@ static int ocfs2_dlm_seq_show(struct seq_file *m, void *v)# define lock_max_prmode (_l) ((_l)->l_lock_prmode.ls_max)# define lock_max_exmode (_l) ((_l)->l_lock_exmode.ls_max)# define lock_refresh (_l) ((_l)->l_lock_refresh) +# define lock_last_prmode (_l) ((_l)->l_lock_prmode.ls_last) +# define lock_last_exmode (_l) ((_l)->l_lock_exmode.ls_last)#else # define lock_num_prmode (_l) (0)# define lock_num_exmode (_l) (0)@@ -3155,6 +3162,8 @@ static int ocfs2_dlm_seq_show(struct seq_file *m, void *v)# define lock_max_prmode (_l) (0)# define lock_max_exmode (_l) (0)# define lock_refresh (_l) (0) +# define lock_last_prmode (_l) (0) +# define lock_last_exmode (_l) (0)#endif /* The following seq_print was added in version 2 of this output */ seq_printf(m, "%u\t"@@ -3165,6 +3174,8 @@ static int ocfs2_dlm_seq_show(struct seq_file *m, void *v)"%llu\t" "%u\t" "%u\t" +"%u\t" +"%u\t" "%u\t" ,lock_num_prmode (lockres), lock_num_exmode(lockres),@@ -3174,7 +3185,9 @@ static int ocfs2_dlm_seq_show(struct seq_file *m, void *v)lock_total_exmode (lockres),lock_max_prmode (lockres),lock_max_exmode (lockres), - lock_refresh(lockres)); +lock_refresh (lockres), +lock_last_prmode (lockres), + lock_last_exmode(lockres));/* End the line */ seq_printf (m,"\n" );fs/ocfs2/ocfs2.h +1
-0@@ -164,6 +164,7 @@ struct ocfs2_lock_stats {/* Storing max wait in usecs saves 24 bytes per inode */ u32 ls_max;/* Max wait in USEC */ + u32 ls_last; /* Last unlock time in SEC */ };#endif