xfs: stats in sysfs
v8 cover xfs: stats in sysfs
Hello-
Following is the next iteration of the series to add xfs stats to sysfs. This iteration adds patches 6 and 7 to complete the incorporation of sysfs/kobject into xfsstats, including working global and per-fs stats.
----------history---------------
v8: (add patches 6 and 7)
-patch 6: per-filesystem stats in sysfs.
Implement per-filesystem stats objects in sysfs. Stats objects are instantiated when an xfs filesystem is mounted and deleted on unmount. With this patch, the stats directory is created and populated with the familiar stats and stats_clear files.
Example:
/sys/fs/xfs/sda9/stats/stats /sys/fs/xfs/sda9/stats/stats_clear
With this patch, the individual counts within the new per-fs stats file(s) remain at zero. Functions that use the the macros to increment, decrement, and add-to the per-fs stats counts will be covered in the next patch (7).
Also, this patch includes some minor fixups for style issues in patch 5.
-patch 7: per-filesystem stats counter implementation Modify the stats counting macros and the callers to those macros to properly increment, decrement, and add-to the xfs stats counts. The counts for global and per-fs stats are correctly advanced, and cleared by writing a "1" to the corresponding clear file.
global counts: /sys/fs/xfs/stats/stats
per-fs counts: /sys/fs/xfs/sda*/stats/stats
global clear: /sys/fs/xfs/stats/stats_clear per-fs clear: /sys/fs/xfs/sda*/stats/stats_clear
v7:
add patch 5/5: incorporate sysfs/kobject in xfsstats: handlers take kobjects. Allocate & deallocate per-fs stats structures and set up the sysfs entries for them. Add kobject and a pointer to a per-cpu struct xfsstats. Modify the macros that manipulate the stats accordingly.
v6:
-add patch 4/4: move to_xlog(kobject) to the relevant show/store operations. This keeps the xfs_sysfs_object_show/store functions generic. Also, with the change, there can be some cleanup of the show/store function arguments.
v5:
-optimization of sysfs_ops function.
-style fixups
v4:
-whitespace fixup of patch 1
-add patch 4 (sysfs ops consolidation - dbg, stats, log)
v3:
-style fixups and removal of extraneous printk.
v2:
-style fixups.
v1:
--------------------------------
We already have per-fs information in /sys, so it makes sense to have per-fs stats there too. The series moves existing global stats infrastructure to /sys and reuses that code to create per-fs stats in /sys.
Patch 1 handles the bring-up and tear down of xfs/stats directory structure in sysfs when an fs is mounted. The directory contains the stats file and the stats_clear file. The stats file contents mimic those of /proc/fs/xfs/stat. The stats_clear file is empty, and much like the current stat_clear command, handles the zeroing of the stats file when a "1" is echoed to the stats_clear file.
Patch 2 creates the symlink for stats from procfs to sysfs.
Patch 3 removes the now unused portions of procfs for stat.
Patch 4 consolidates the sysfs ops for dbg, stats, log.
Patch 5 allocates and deallocates per-fs stats structures and sets up the sysfs entries for them. Add kobject and a pointer to a per-cpu struct xfsstats. Modify the macros that manipulate the stats accordingly.
Patch 6 implements per-filesystem stats objects in sysfs. Stats objects are instantiated when an xfs filesystem is mounted and deleted on unmount.
Patch 7 modifies the stats counting macros and the callers to those macros to properly increment, decrement, and add-to the xfs stats counts. The counts for global and per-fs stats are correctly advanced, and cleared by writing a "1" to the corresponding clear file.
Once again, comments and questions are welcome.
Thanks-
Bill
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
PATCH v8 1/7 xfs: create global stats and stats_clear in sysfs
Currently, xfs global stats are in procfs. This patch introduces (replicates) the global stats in sysfs. Additionally a stats_clear file is introduced in sysfs.
--- fs/xfs/xfs_stats.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++ fs/xfs/xfs_stats.h | 2 ++ fs/xfs/xfs_super.c | 20 +++++++++---- fs/xfs/xfs_sysctl.c | 15 ++-------- fs/xfs/xfs_sysfs.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++ fs/xfs/xfs_sysfs.h | 1 + 6 files changed, 179 insertions(+), 17 deletions(-)
fs/xfs/xfs_stats.c +83 -0
@@ -29,6 +29,89 @@ static int counter_val(int idx)return val; } +int xfs_stats_format (char *buf) +{ +int i, j; +int len =0 ; +__uint64_t xs_xstrat_bytes =0 ; +__uint64_t xs_write_bytes =0 ; +__uint64_t xs_read_bytes =0 ; + +static const struct xstats_entry { +char *desc; +int endpoint; + } xstats[] = { + {"extent_alloc" ,XFSSTAT_END_EXTENT_ALLOC }, + {"abt" ,XFSSTAT_END_ALLOC_BTREE }, + {"blk_map" ,XFSSTAT_END_BLOCK_MAPPING }, + {"bmbt" ,XFSSTAT_END_BLOCK_MAP_BTREE }, + {"dir" ,XFSSTAT_END_DIRECTORY_OPS }, + {"trans" ,XFSSTAT_END_TRANSACTIONS }, + {"ig" ,XFSSTAT_END_INODE_OPS }, + {"log" ,XFSSTAT_END_LOG_OPS }, + {"push_ail" ,XFSSTAT_END_TAIL_PUSHING }, + {"xstrat" ,XFSSTAT_END_WRITE_CONVERT }, + {"rw" ,XFSSTAT_END_READ_WRITE_OPS }, + {"attr" ,XFSSTAT_END_ATTRIBUTE_OPS }, + {"icluster" ,XFSSTAT_END_INODE_CLUSTER }, + {"vnodes" ,XFSSTAT_END_VNODE_OPS }, + {"buf" ,XFSSTAT_END_BUF }, + {"abtb2" ,XFSSTAT_END_ABTB_V2 }, + {"abtc2" ,XFSSTAT_END_ABTC_V2 }, + {"bmbt2" ,XFSSTAT_END_BMBT_V2 }, + {"ibt2" ,XFSSTAT_END_IBT_V2 }, + {"fibt2" ,XFSSTAT_END_FIBT_V2 }, +/* we print both series of quota information together */ + {"qm" ,XFSSTAT_END_QM }, + }; + +/* Loop over all stats groups */ + +for (i = j =0 ; i <ARRAY_SIZE (xstats); i++) { + len +=snprintf (buf + len,PATH_MAX - len,"%s" , + xstats[i].desc); +/* inner loop does each group */ +for (; j < xstats[i].endpoint; j++) + len +=snprintf (buf + len,PATH_MAX - len," %u" , +counter_val (j)); + len +=snprintf (buf + len,PATH_MAX - len,"\n" ); + } +/* extra precision counters */ +for_each_possible_cpu (i) { + xs_xstrat_bytes +=per_cpu (xfsstats, i).xs_xstrat_bytes; + xs_write_bytes +=per_cpu (xfsstats, i).xs_write_bytes; + xs_read_bytes +=per_cpu (xfsstats, i).xs_read_bytes; + } + + len +=snprintf (buf+len,PATH_MAX -len,"xpc %Lu %Lu %Lu\n" , + xs_xstrat_bytes, xs_write_bytes, xs_read_bytes); + len +=snprintf (buf+len,PATH_MAX -len,"debug %u\n" , +#if defined(DEBUG) + 1); +#else + 0); +#endif + +return len; +} + +void xfs_stats_clearall (void ) +{ +int c; +__uint32_t vn_active; + +xfs_notice (NULL ,"Clearing xfsstats" ); +for_each_possible_cpu (c) { +preempt_disable (); +/* save vn_active, it's a universal truth! */ + vn_active =per_cpu (xfsstats, c).vn_active; +memset (&per_cpu (xfsstats, c),0 , +sizeof (struct xfsstats )); +per_cpu (xfsstats, c).vn_active = vn_active; +preempt_enable (); + } +} +static int xfs_stat_proc_show (struct seq_file *m,void *v) {int i, j;
fs/xfs/xfs_stats.h +2 -0
@@ -18,6 +18,8 @@#ifndef __XFS_STATS_H__#define __XFS_STATS_H__ +int xfs_stats_format (char *buf); +void xfs_stats_clearall (void );#if defined(CONFIG_PROC_FS ) && !defined(XFS_STATS_OFF )
fs/xfs/xfs_super.c +15 -5
@@ -61,6 +61,7 @@ static kmem_zone_t *xfs_ioend_zone;mempool_t *xfs_ioend_pool;static struct kset *xfs_kset;/* top-level xfs sysfs dir */ +static struct xfs_kobj xfs_stats_kobj;/* global stats sysfs attrs */ #ifdef DEBUG static struct xfs_kobj xfs_dbg_kobj;/* global debug sysfs attrs */ #endif
@@ -1838,19 +1839,25 @@ init_xfs_fs(void) xfs_kset =kset_create_and_add ("xfs" ,NULL , fs_kobj);if (!xfs_kset) { error = -ENOMEM ; - goto out_sysctl_unregister;; + goto out_sysctl_unregister; } + xfs_stats_kobj.kobject.kset = xfs_kset; + error =xfs_sysfs_init (&xfs_stats_kobj, &xfs_stats_ktype,NULL , +"stats" ); +if (error) + goto out_kset_unregister; +#ifdef DEBUG xfs_dbg_kobj.kobject.kset = xfs_kset; error =xfs_sysfs_init (&xfs_dbg_kobj, &xfs_dbg_ktype,NULL ,"debug" );if (error) - goto out_kset_unregister; + goto out_remove_stats_kobj;#endif error =xfs_qm_init ();if (error) - goto out_remove_kobj; + goto out_remove_dbg_kobj; error =register_filesystem (&xfs_fs_type);if (error)
@@ -1859,11 +1866,13 @@ init_xfs_fs(void) out_qm_exit:xfs_qm_exit (); - out_remove_kobj: + out_remove_dbg_kobj:#ifdef DEBUG xfs_sysfs_del (&xfs_dbg_kobj); - out_kset_unregister: + out_remove_stats_kobj:#endif +xfs_sysfs_del (&xfs_stats_kobj); + out_kset_unregister:kset_unregister (xfs_kset); out_sysctl_unregister:xfs_sysctl_unregister ();
@@ -1889,6 +1898,7 @@ exit_xfs_fs(void)#ifdef DEBUG xfs_sysfs_del (&xfs_dbg_kobj);#endif +xfs_sysfs_del (&xfs_stats_kobj);kset_unregister (xfs_kset);xfs_sysctl_unregister ();xfs_cleanup_procfs ();
fs/xfs/xfs_sysctl.c +3 -12
@@ -19,6 +19,7 @@#include <linux/sysctl.h> #include <linux/proc_fs.h> #include "xfs_error.h" +#include "xfs_stats.h" static struct ctl_table_header *xfs_table_header;
@@ -31,22 +32,12 @@ xfs_stats_clear_proc_handler(size_t *lenp, loff_t *ppos) { - int c, ret, *valp = ctl->data; -__uint32_t vn_active; + int ret, *valp = ctl->data; ret =proc_dointvec_minmax (ctl, write, buffer, lenp, ppos);if (!ret && write && *valp) { -xfs_notice (NULL ,"Clearing xfsstats" ); -for_each_possible_cpu (c) { -preempt_disable (); -/* save vn_active, it's a universal truth! */ - vn_active =per_cpu (xfsstats, c).vn_active; -memset (&per_cpu (xfsstats, c),0 , -sizeof (struct xfsstats )); -per_cpu (xfsstats, c).vn_active = vn_active; -preempt_enable (); - } +xfs_stats_clearall (); xfs_stats_clear =0 ; }
fs/xfs/xfs_sysfs.c +75 -0
93 lines not on this page · raw message
fs/xfs/xfs_sysfs.h +1 -0
@@ -22,6 +22,7 @@extern struct kobj_type xfs_mp_ktype;/* xfs_mount */ extern struct kobj_type xfs_dbg_ktype;/* debug */ extern struct kobj_type xfs_log_ktype;/* xlog */ +extern struct kobj_type xfs_stats_ktype;/* stats */ static inline struct xfs_kobj *to_kobj (struct kobject *kobject)
Signature · 6 lines
2.4.3 _______________________________________________ xfs mailing list [email protected] http://oss.sgi.com/mailman/listinfo/xfs
PATCH v8 2/7 xfs: create symlink proc/fs/xfs/stat to sys/fs/xfs/stats
In reply to Bill O'DonnellAs a part of the work to move xfs global stats from procfs to sysfs, this patch creates the symlink from proc/fs/xfs/stat to sys/fs/xfs/stats.
--- fs/xfs/xfs_stats.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
fs/xfs/xfs_stats.c +3 -2
@@ -244,9 +244,10 @@ xfs_init_procfs(void)if (!proc_mkdir ("fs/xfs" ,NULL )) goto out; -if (!proc_create ("fs/xfs/stat" ,0 ,NULL , - &xfs_stat_proc_fops)) +if (!proc_symlink ("fs/xfs/stat" ,NULL , +"/sys/fs/xfs/stats/stats" )) goto out_remove_xfs_dir; +#ifdef CONFIG_XFS_QUOTA if (!proc_create ("fs/xfs/xqmstat" ,0 ,NULL , &xqmstat_proc_fops))
Signature · 6 lines
2.4.3 _______________________________________________ xfs mailing list [email protected] http://oss.sgi.com/mailman/listinfo/xfs
PATCH v8 3/7 xfs: remove unused procfs code
In reply to Bill O'DonnellAs a part of the work to move xfs global stats from procfs to sysfs, this patch removes the now unused procfs code that was xfs stat specific.
--- fs/xfs/xfs_stats.c | 74 ------------------------------------------------------ 1 file changed, 74 deletions(-)
fs/xfs/xfs_stats.c +0 -74
@@ -112,80 +112,6 @@ void xfs_stats_clearall(void) } } -static int xfs_stat_proc_show (struct seq_file *m,void *v) -{ -int i, j; -__uint64_t xs_xstrat_bytes =0 ; -__uint64_t xs_write_bytes =0 ; -__uint64_t xs_read_bytes =0 ; - -static const struct xstats_entry { -char *desc; -int endpoint; - } xstats[] = { - {"extent_alloc" ,XFSSTAT_END_EXTENT_ALLOC }, - {"abt" ,XFSSTAT_END_ALLOC_BTREE }, - {"blk_map" ,XFSSTAT_END_BLOCK_MAPPING }, - {"bmbt" ,XFSSTAT_END_BLOCK_MAP_BTREE }, - {"dir" ,XFSSTAT_END_DIRECTORY_OPS }, - {"trans" ,XFSSTAT_END_TRANSACTIONS }, - {"ig" ,XFSSTAT_END_INODE_OPS }, - {"log" ,XFSSTAT_END_LOG_OPS }, - {"push_ail" ,XFSSTAT_END_TAIL_PUSHING }, - {"xstrat" ,XFSSTAT_END_WRITE_CONVERT }, - {"rw" ,XFSSTAT_END_READ_WRITE_OPS }, - {"attr" ,XFSSTAT_END_ATTRIBUTE_OPS }, - {"icluster" ,XFSSTAT_END_INODE_CLUSTER }, - {"vnodes" ,XFSSTAT_END_VNODE_OPS }, - {"buf" ,XFSSTAT_END_BUF }, - {"abtb2" ,XFSSTAT_END_ABTB_V2 }, - {"abtc2" ,XFSSTAT_END_ABTC_V2 }, - {"bmbt2" ,XFSSTAT_END_BMBT_V2 }, - {"ibt2" ,XFSSTAT_END_IBT_V2 }, - {"fibt2" ,XFSSTAT_END_FIBT_V2 }, -/* we print both series of quota information together */ - {"qm" ,XFSSTAT_END_QM }, - }; - -/* Loop over all stats groups */ -for (i = j =0 ; i <ARRAY_SIZE (xstats); i++) { -seq_printf (m,"%s" , xstats[i].desc); -/* inner loop does each group */ -for (; j < xstats[i].endpoint; j++) -seq_printf (m," %u" ,counter_val (j)); -seq_putc (m,'\n' ); - } -/* extra precision counters */ -for_each_possible_cpu (i) { - xs_xstrat_bytes +=per_cpu (xfsstats, i).xs_xstrat_bytes; - xs_write_bytes +=per_cpu (xfsstats, i).xs_write_bytes; - xs_read_bytes +=per_cpu (xfsstats, i).xs_read_bytes; - } - -seq_printf (m,"xpc %Lu %Lu %Lu\n" , - xs_xstrat_bytes, xs_write_bytes, xs_read_bytes); -seq_printf (m,"debug %u\n" , -#if defined(DEBUG) - 1); -#else - 0); -#endif -return 0 ; -} - -static int xfs_stat_proc_open (struct inode *inode,struct file *file) -{ -return single_open (file, xfs_stat_proc_show,NULL ); -} - -static const struct file_operations xfs_stat_proc_fops = { - .owner =THIS_MODULE , - .open = xfs_stat_proc_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, -}; -/* legacy quota interfaces */ #ifdef CONFIG_XFS_QUOTA static int xqm_proc_show (struct seq_file *m,void *v)
Signature · 6 lines
2.4.3 _______________________________________________ xfs mailing list [email protected] http://oss.sgi.com/mailman/listinfo/xfs
PATCH v8 4/7 xfs: consolidate sysfs ops (dbg, stats, log)
In reply to Bill O'DonnellAs a part of the series to move xfs global stats from procfs to sysfs, this patch consolidates the sysfs ops functions and removes redundancy.
--- fs/xfs/xfs_stats.c | 2 +- fs/xfs/xfs_sysfs.c | 182 +++++++++++++++++++---------------------------------- 2 files changed, 64 insertions(+), 120 deletions(-)
fs/xfs/xfs_stats.c +1 -1
@@ -92,7 +92,7 @@ int xfs_stats_format(char *buf) 0);#endif -return len; +return len; }void xfs_stats_clearall (void )
fs/xfs/xfs_sysfs.c +63 -119
282 lines not on this page · raw message
Signature · 6 lines
2.4.3 _______________________________________________ xfs mailing list [email protected] http://oss.sgi.com/mailman/listinfo/xfs
PATCH v8 5/7 xfs: incorporate sysfs/kobject in xfsstats: handlers take kobjects.
In reply to Bill O'DonnellThis patch is the next step toward per-fs xfs stats. Allocate & deallocate per-fs stats structures and set up the sysfs entries for them.
Instead of a single global xfsstats structure, add kobject and a pointer to a per-cpu struct xfsstats. Modify the macros that manipulate the stats
accordingly: XFS_STATS_INC, XFS_STATS_DEC, and XFS_STATS_ADD now access xfsstats->xs_stats.
The sysfs functions need to get from the kobject back to the xfsstats structure which contains it, and pass the pointer to the ->xs_stats percpu structure into the show & clear routines.
--- fs/xfs/xfs_linux.h | 7 +++++++ fs/xfs/xfs_stats.c | 47 ++++++++++++++++++++++++----------------------- fs/xfs/xfs_stats.h | 13 ++++++------- fs/xfs/xfs_super.c | 15 ++++++++------- fs/xfs/xfs_sysctl.c | 2 +- fs/xfs/xfs_sysfs.c | 17 +++++++++++++++-- 6 files changed, 61 insertions(+), 40 deletions(-)
fs/xfs/xfs_linux.h +7 -0
@@ -171,6 +171,13 @@ struct xfs_kobj {struct completion complete; }; +struct xstats { +struct xfsstats __percpu *xs_stats; +struct xfs_kobj xs_kobj; +}; + +extern struct xstats xfsstats; +/* Kernel uid/gid conversion. These are used to convert to/from the on disk * uid_t/gid_t types to the kuid_t/kgid_t types that the kernel uses internally. * The conversion here is type only, the value will remain the same since we
fs/xfs/xfs_stats.c +24 -23
117 lines not on this page · raw message
fs/xfs/xfs_stats.h +6 -7
@@ -18,9 +18,6 @@#ifndef __XFS_STATS_H__#define __XFS_STATS_H__ -int xfs_stats_format (char *buf); -void xfs_stats_clearall (void ); -#if defined(CONFIG_PROC_FS ) && !defined(XFS_STATS_OFF )#include <linux/percpu.h>
@@ -217,15 +214,17 @@ struct xfsstats {__uint64_t xs_read_bytes; }; -DECLARE_PER_CPU(struct xfsstats, xfsstats); +int xfs_stats_format (struct xfsstats __percpu *stats,char *buf); +void xfs_stats_clearall (struct xfsstats __percpu *stats); +extern struct xstats xfsstats;/* * We don't disable preempt, not too worried about poking the * wrong CPU's stat for now (also aggregated before reporting). */ -#define XFS_STATS_INC (v) (per_cpu(xfsstats, current_cpu()).v++) -#define XFS_STATS_DEC (v) (per_cpu(xfsstats, current_cpu()).v--) -#define XFS_STATS_ADD (v, inc) (per_cpu(xfsstats, current_cpu()).v += (inc)) +#define XFS_STATS_INC (v) (per_cpu(*xfsstats.xs_stats, current_cpu()).v++) +#define XFS_STATS_DEC (v) (per_cpu(*xfsstats.xs_stats, current_cpu()).v--) +#define XFS_STATS_ADD (v, inc) (per_cpu(*xfsstats.xs_stats, current_cpu()).v += (inc))extern int xfs_init_procfs (void );extern void xfs_cleanup_procfs (void );
fs/xfs/xfs_super.c +8 -7
@@ -61,7 +61,6 @@ static kmem_zone_t *xfs_ioend_zone;mempool_t *xfs_ioend_pool;static struct kset *xfs_kset;/* top-level xfs sysfs dir */ -static struct xfs_kobj xfs_stats_kobj;/* global stats sysfs attrs */ #ifdef DEBUG static struct xfs_kobj xfs_dbg_kobj;/* global debug sysfs attrs */ #endif
@@ -1802,6 +1801,7 @@ xfs_destroy_workqueues(void)destroy_workqueue (xfs_alloc_wq); } + STATIC int __initinit_xfs_fs (void ) {
@@ -1842,8 +1842,9 @@ init_xfs_fs(void) goto out_sysctl_unregister; } - xfs_stats_kobj.kobject.kset = xfs_kset; - error =xfs_sysfs_init (&xfs_stats_kobj, &xfs_stats_ktype,NULL , + xfsstats.xs_stats = alloc_percpu(struct xfsstats); + xfsstats.xs_kobj.kobject.kset = xfs_kset; + error =xfs_sysfs_init (&xfsstats.xs_kobj, &xfs_stats_ktype,NULL ,"stats" );if (error) goto out_kset_unregister;
@@ -1852,7 +1853,7 @@ init_xfs_fs(void) xfs_dbg_kobj.kobject.kset = xfs_kset; error =xfs_sysfs_init (&xfs_dbg_kobj, &xfs_dbg_ktype,NULL ,"debug" );if (error) - goto out_remove_stats_kobj; + goto out_remove_stats;#endif error =xfs_qm_init ();
@@ -1869,9 +1870,9 @@ init_xfs_fs(void) out_remove_dbg_kobj:#ifdef DEBUG xfs_sysfs_del (&xfs_dbg_kobj); - out_remove_stats_kobj: + out_remove_stats:#endif -xfs_sysfs_del (&xfs_stats_kobj); +free_percpu (xfsstats.xs_stats); out_kset_unregister:kset_unregister (xfs_kset); out_sysctl_unregister:
@@ -1898,7 +1899,7 @@ exit_xfs_fs(void)#ifdef DEBUG xfs_sysfs_del (&xfs_dbg_kobj);#endif -xfs_sysfs_del (&xfs_stats_kobj); +free_percpu (xfsstats.xs_stats);kset_unregister (xfs_kset);xfs_sysctl_unregister ();xfs_cleanup_procfs ();
fs/xfs/xfs_sysctl.c +1 -1
@@ -37,7 +37,7 @@ xfs_stats_clear_proc_handler( ret =proc_dointvec_minmax (ctl, write, buffer, lenp, ppos);if (!ret && write && *valp) { -xfs_stats_clearall (); +xfs_stats_clearall (xfsstats.xs_stats); xfs_stats_clear =0 ; }
fs/xfs/xfs_sysfs.c +15 -2
@@ -131,12 +131,23 @@ struct kobj_type xfs_dbg_ktype = {/* stats */ +static inline struct xstats * +to_xstats (struct kobject *kobject) +{ +struct xfs_kobj *kobj =to_kobj (kobject); + + return container_of(kobj, struct xstats, xs_kobj); +} + + STATIC ssize_tstats_show (struct kobject *kobject,char *buf) { -return xfs_stats_format (buf); +struct xstats *stats =to_xstats (kobject); + +return xfs_stats_format (stats->xs_stats, buf); }XFS_SYSFS_ATTR_RO (stats);
@@ -148,6 +159,7 @@ stats_clear_store( {int ret;int val; +struct xstats *stats =to_xstats (kobject); ret =kstrtoint (buf,0 , &val);if (ret)
@@ -155,7 +167,8 @@ stats_clear_store(if (val !=1 )return -EINVAL ; -xfs_stats_clearall (); + +xfs_stats_clearall (stats->xs_stats);return count; }XFS_SYSFS_ATTR_WO (stats_clear);
Signature · 6 lines
2.4.3 _______________________________________________ xfs mailing list [email protected] http://oss.sgi.com/mailman/listinfo/xfs
Re: [PATCH 5/7] xfs: incorporate sysfs/kobject in xfsstats: handlers take kobjects.
Quoted 14 lines · Bill O'Donnell
This patch is the next step toward per-fs xfs stats. Allocate & deallocate per-fs stats structures and set up the sysfs entries for them.
Instead of a single global xfsstats structure, add kobject and a pointer to a per-cpu struct xfsstats. Modify the macros that manipulate the stats
accordingly:XFS_STATS_INC,XFS_STATS_DEC, andXFS_STATS_ADDnow accessxfsstats->xs_stats.The sysfs functions need to get from the kobject back to the xfsstats structure which contains it, and pass the pointer to the ->xs_stats percpu structure into the show & clear routines.
Signed-off-by Bill O'Donnell <[email protected]>
<snip>
Quoted 21 lines
fs/xfs/xfs_super.c +1
-1@@ -61,7 +61,6 @@ static kmem_zone_t *xfs_ioend_zone;mempool_t *xfs_ioend_pool;static struct kset *xfs_kset;/* top-level xfs sysfs dir */ -static struct xfs_kobj xfs_stats_kobj;/* global stats sysfs attrs */ #ifdef DEBUG static struct xfs_kobj xfs_dbg_kobj;/* global debug sysfs attrs */ #endif @@ -1802,6 +1801,7 @@ xfs_destroy_workqueues(void)destroy_workqueue (xfs_alloc_wq); } + STATIC int __initinit_xfs_fs (void ) {
fs/xfs/xfs_super.c init_xfs_fs(void) · line 1845
Quoted 6 lines
fs/xfs/xfs_super.c +1
-2@@ -1842,8 +1842,9 @@ init_xfs_fs(void) goto out_sysctl_unregister; } - xfs_stats_kobj.kobject.kset = xfs_kset; - error = xfs_sysfs_init(&xfs_stats_kobj, &xfs_stats_ktype, NULL, + xfsstats.xs_stats = alloc_percpu(struct xfsstats);
alloc_percpu can fail, so:
if (!xfsstats.xs_stats) {
error = -ENOMEM;
goto out_kset_unregister ...
}fs/xfs/xfs_super.c init_xfs_fs(void) · line 1850
Quoted 5 lines
fs/xfs/xfs_super.c +2
-0+ xfsstats.xs_kobj.kobject.kset = xfs_kset; + error =xfs_sysfs_init (&xfsstats.xs_kobj, &xfs_stats_ktype,NULL ,"stats" );if (error) goto out_kset_unregister;
If this fails, you need to free the percpu allocation, so this would be "goto out_free_stats" I think
fs/xfs/xfs_super.c init_xfs_fs(void) · line 1856
Quoted 6 lines
fs/xfs/xfs_super.c +1
-1@@ -1852,7 +1853,7 @@ init_xfs_fs(void) xfs_dbg_kobj.kobject.kset = xfs_kset; error =xfs_sysfs_init (&xfs_dbg_kobj, &xfs_dbg_ktype,NULL ,"debug" );if (error) - goto out_remove_stats_kobj; + goto out_remove_stats;
And this remains as out_remove_stats_kobj, I think.
fs/xfs/xfs_super.c init_xfs_fs(void) · line 1875
Quoted 12 lines
fs/xfs/xfs_super.c +2
-2#endif error =xfs_qm_init ();@@ -1869,9 +1870,9 @@ init_xfs_fs(void) out_remove_dbg_kobj:#ifdef DEBUG xfs_sysfs_del (&xfs_dbg_kobj); - out_remove_stats_kobj: + out_remove_stats:#endif -xfs_sysfs_del (&xfs_stats_kobj); +free_percpu (xfsstats.xs_stats);
hm, now nothing deletes the stats kobject?
xfs_sysfs_del(&xfsstats.xs_kobj);
but there should be another goto target ...
there's one more thing to unwind (the percpu allocation) so you should end up with more unwind goto target (i.e. out_free_stats), but you still need the unwind target for the stats kobject sysfs deletion.
something like:
out_remove_dbg_kobj:
#ifdef DEBUG xfs_sysfs_del(&xfs_dbg_kobj); out_remove_stats_kobj: #endif xfs_sysfs_del(&xfs_stats_kobj); out_free_stats: free_percpu(xfsstats.xs_stats); out_kset_unregister: kset_unregister(xfs_kset);
out_sysctl_unregister:
but double-check me ;)
fs/xfs/xfs_super.c exit_xfs_fs(void) · line 1902
Quoted 9 lines
fs/xfs/xfs_super.c +1
-1out_kset_unregister:kset_unregister (xfs_kset); out_sysctl_unregister:@@ -1898,7 +1899,7 @@ exit_xfs_fs(void)#ifdef DEBUG xfs_sysfs_del (&xfs_dbg_kobj);#endif -xfs_sysfs_del (&xfs_stats_kobj); +free_percpu (xfsstats.xs_stats);
here as well, you still need to delete the stats kobject:
xfs_sysfs_del(&xfsstats.xs_kobj);
fs/xfs/xfs_super.c exit_xfs_fs(void) · line 1905
Quoted 3 lines
fs/xfs/xfs_super.c +0
-0kset_unregister (xfs_kset);xfs_sysctl_unregister ();xfs_cleanup_procfs ();
-Eric
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
PATCH v8 6/7 xfs: per-filesystem stats in sysfs.
In reply to Bill O'DonnellThis patch implements per-filesystem stats objects in sysfs. It depends on the application of the previous patch series that develops the infrastructure to support both xfs global stats and xfs per-fs stats in sysfs.
Stats objects are instantiated when an xfs filesystem is mounted and deleted on unmount. With this patch, the stats directory is created and populated with the familiar stats and stats_clear files. Example:
/sys/fs/xfs/sda9/stats/stats /sys/fs/xfs/sda9/stats/stats_clear
With this patch, the individual counts within the new per-fs stats file(s) remain at zero. Functions that use the the macros to increment, decrement, and add-to the per-fs stats counts will be covered in a separate new patch to follow this one. Note that the counts within the global stats file (/sys/fs/xfs/stats/stats) advance normally and can be cleared as it was prior to this patch.
--- fs/xfs/xfs_linux.h | 4 ++-- fs/xfs/xfs_mount.c | 24 +++++++++++++++++++++++- fs/xfs/xfs_mount.h | 1 + fs/xfs/xfs_stats.c | 34 +++++++++++++++++++--------------- fs/xfs/xfs_stats.h | 5 ++++- fs/xfs/xfs_super.c | 21 ++++++++++++++++----- fs/xfs/xfs_sysfs.c | 6 +++--- 7 files changed, 68 insertions(+), 27 deletions(-)
fs/xfs/xfs_linux.h +2 -2
@@ -172,8 +172,8 @@ struct xfs_kobj { };struct xstats { -struct xfsstats __percpu *xs_stats; -struct xfs_kobj xs_kobj; +struct xfsstats __percpu *xs_stats; +struct xfs_kobj xs_kobj; };extern struct xstats xfsstats;
fs/xfs/xfs_mount.c +23 -1
@@ -791,11 +791,25 @@ xfs_mountfs( goto out_free_dir; } +/* +* Allocate stats memory and create stats sysfs object. +*/ + mp->m_stats.xs_stats = alloc_percpu(struct xfsstats); +if (IS_ERR (mp->m_stats.xs_stats)) { + error =PTR_ERR (mp->m_stats.xs_stats); + goto out_free_perag; + } + error =xfs_sysfs_init (&mp->m_stats.xs_kobj, &xfs_stats_ktype, + &mp->m_kobj, +"stats" ); +if (error) + goto out_free_stats; +if (!sbp->sb_logblocks) {xfs_warn (mp,"no log defined" );XFS_ERROR_REPORT ("xfs_mountfs" ,XFS_ERRLEVEL_LOW , mp); error = -EFSCORRUPTED ; - goto out_free_perag; + goto out_del_stats; }/*
@@ -965,6 +979,10 @@ xfs_mountfs(if (mp->m_logdev_targp && mp->m_logdev_targp != mp->m_ddev_targp)xfs_wait_buftarg (mp->m_logdev_targp);xfs_wait_buftarg (mp->m_ddev_targp); + out_del_stats: +xfs_sysfs_del (&mp->m_stats.xs_kobj); + out_free_stats: +free_percpu (mp->m_stats.xs_stats); out_free_perag:xfs_free_perag (mp); out_free_dir:
@@ -1047,6 +1065,10 @@ xfs_unmountfs(xfs_warn (mp,"Unable to update superblock counters. " "Freespace may not be correct on next mount." ); +/* remove the stats kobject and free stats memory */ +xfs_sysfs_del (&mp->m_stats.xs_kobj); +free_percpu (mp->m_stats.xs_stats); +xfs_log_unmount (mp);xfs_da_unmount (mp);xfs_uuid_unmount (mp);
fs/xfs/xfs_mount.h +1 -0
@@ -127,6 +127,7 @@ typedef struct xfs_mount {int64_t m_low_space[XFS_LOWSP_MAX ];/* low free space thresholds */ struct xfs_kobj m_kobj; +struct xstats m_stats;/* per-fs stats */ struct workqueue_struct *m_buf_workqueue;struct workqueue_struct *m_data_workqueue;
fs/xfs/xfs_stats.c +19 -15
@@ -18,6 +18,11 @@#include "xfs.h" #include <linux/proc_fs.h> +#include "xfs_format.h" +#include "xfs_trans_resv.h" +#include "xfs_mount.h" +#include "xfs_sysfs.h" +struct xstats xfsstats;static int counter_val (struct xfsstats __percpu *stats,int idx)
@@ -25,7 +30,7 @@ static int counter_val(struct xfsstats __percpu *stats, int idx)int val =0 , cpu;for_each_possible_cpu (cpu) - val += *(((__u32 *)&per_cpu (*stats, cpu) + idx)); + val += *(((__u32 *)per_cpu_ptr (stats, cpu) + idx));return val; }
@@ -78,9 +83,9 @@ int xfs_stats_format(struct xfsstats __percpu *stats, char *buf) }/* extra precision counters */ for_each_possible_cpu (i) { - xs_xstrat_bytes +=per_cpu (*stats, i).xs_xstrat_bytes; - xs_write_bytes +=per_cpu (*stats, i).xs_write_bytes; - xs_read_bytes +=per_cpu (*stats, i).xs_read_bytes; + xs_xstrat_bytes +=per_cpu_ptr (stats, i)->xs_xstrat_bytes; + xs_write_bytes +=per_cpu_ptr (stats, i)->xs_write_bytes; + xs_read_bytes +=per_cpu_ptr (stats, i)->xs_read_bytes; } len += snprintf(buf+len, PATH_MAX-len, "xpc %Lu %Lu %Lu\n",
@@ -104,10 +109,9 @@ void xfs_stats_clearall(struct xfsstats __percpu *stats)for_each_possible_cpu (c) {preempt_disable ();/* save vn_active, it's a universal truth! */ - vn_active =per_cpu (*stats, c).vn_active; -memset (&per_cpu (*stats, c),0 , -sizeof (*stats)); -per_cpu (*stats, c).vn_active = vn_active; + vn_active =per_cpu_ptr (stats, c)->vn_active; +memset (per_cpu_ptr (stats, c),0 ,sizeof (*stats)); +per_cpu_ptr (stats, c)->vn_active = vn_active;preempt_enable (); } }
@@ -172,28 +176,28 @@ xfs_init_procfs(void) goto out;if (!proc_symlink ("fs/xfs/stat" ,NULL , -"/sys/fs/xfs/stats/stats" )) +"/sys/fs/xfs/stats/stats" )) goto out_remove_xfs_dir;#ifdef CONFIG_XFS_QUOTA if (!proc_create ("fs/xfs/xqmstat" ,0 ,NULL , - &xqmstat_proc_fops)) + &xqmstat_proc_fops)) goto out_remove_stat_file;if (!proc_create ("fs/xfs/xqm" ,0 ,NULL , - &xqm_proc_fops)) + &xqm_proc_fops)) goto out_remove_xqmstat_file;#endif return 0 ;#ifdef CONFIG_XFS_QUOTA -out_remove_xqmstat_file: + out_remove_xqmstat_file:remove_proc_entry ("fs/xfs/xqmstat" ,NULL ); -out_remove_stat_file: + out_remove_stat_file:remove_proc_entry ("fs/xfs/stat" ,NULL );#endif -out_remove_xfs_dir: + out_remove_xfs_dir:remove_proc_entry ("fs/xfs" ,NULL ); -out: + out:return -ENOMEM ; }
fs/xfs/xfs_stats.h +4 -1
@@ -218,13 +218,16 @@ int xfs_stats_format(struct xfsstats __percpu *stats, char *buf);void xfs_stats_clearall (struct xfsstats __percpu *stats);extern struct xstats xfsstats; +struct xfs_mount ; +/* * We don't disable preempt, not too worried about poking the * wrong CPU's stat for now (also aggregated before reporting). */ #define XFS_STATS_INC (v) (per_cpu(*xfsstats.xs_stats, current_cpu()).v++)#define XFS_STATS_DEC (v) (per_cpu(*xfsstats.xs_stats, current_cpu()).v--) -#define XFS_STATS_ADD (v, inc) (per_cpu(*xfsstats.xs_stats, current_cpu()).v += (inc)) +#define XFS_STATS_ADD (v, inc) (per_cpu(*xfsstats.xs_stats, current_cpu()).v \ + += (inc))extern int xfs_init_procfs (void );extern void xfs_cleanup_procfs (void );
fs/xfs/xfs_super.c +16 -5
@@ -1801,7 +1801,6 @@ xfs_destroy_workqueues(void)destroy_workqueue (xfs_alloc_wq); } - STATIC int __initinit_xfs_fs (void ) {
@@ -1843,17 +1842,26 @@ init_xfs_fs(void) } xfsstats.xs_stats = alloc_percpu(struct xfsstats); +if (!xfsstats.xs_stats) { + error = -ENOMEM ; + goto out_kset_unregister; + } xfsstats.xs_kobj.kobject.kset = xfs_kset; +if (!xfsstats.xs_kobj.kobject.kset) { + error = -ENOMEM ; + goto out_free_stats; + } + error =xfs_sysfs_init (&xfsstats.xs_kobj, &xfs_stats_ktype,NULL , -"stats" ); +"stats" );if (error) - goto out_kset_unregister; + goto out_free_stats;#ifdef DEBUG xfs_dbg_kobj.kobject.kset = xfs_kset; error =xfs_sysfs_init (&xfs_dbg_kobj, &xfs_dbg_ktype,NULL ,"debug" );if (error) - goto out_remove_stats; + goto out_del_stats;#endif error =xfs_qm_init ();
@@ -1870,8 +1878,10 @@ init_xfs_fs(void) out_remove_dbg_kobj:#ifdef DEBUG xfs_sysfs_del (&xfs_dbg_kobj); - out_remove_stats: + out_del_stats:#endif +xfs_sysfs_del (&xfsstats.xs_kobj); + out_free_stats:free_percpu (xfsstats.xs_stats); out_kset_unregister:kset_unregister (xfs_kset);
@@ -1899,6 +1909,7 @@ exit_xfs_fs(void)#ifdef DEBUG xfs_sysfs_del (&xfs_dbg_kobj);#endif +xfs_sysfs_del (&xfsstats.xs_kobj);free_percpu (xfsstats.xs_stats);kset_unregister (xfs_kset);xfs_sysctl_unregister ();
fs/xfs/xfs_sysfs.c +3 -3
@@ -143,9 +143,9 @@ to_xstats(struct kobject *kobject) STATIC ssize_tstats_show (struct kobject *kobject, -char *buf) +char *buf) { -struct xstats *stats =to_xstats (kobject); +struct xstats *stats =to_xstats (kobject);return xfs_stats_format (stats->xs_stats, buf); }
@@ -159,7 +159,7 @@ stats_clear_store( {int ret;int val; -struct xstats *stats =to_xstats (kobject); +struct xstats *stats =to_xstats (kobject); ret =kstrtoint (buf,0 , &val);if (ret)
Signature · 6 lines
2.4.3 _______________________________________________ xfs mailing list [email protected] http://oss.sgi.com/mailman/listinfo/xfs
Re: [PATCH 6/7] xfs: per-filesystem stats in sysfs.
Quoted 36 lines · Bill O'Donnell
This patch implements per-filesystem stats objects in sysfs. It depends on the application of the previous patch series that develops the infrastructure to support both xfs global stats and xfs per-fs stats in sysfs.
Stats objects are instantiated when an xfs filesystem is mounted and deleted on unmount. With this patch, the stats directory is created and populated with the familiar stats and
stats_clearfiles. Example:
/sys/fs/xfs/sda9/stats/stats/sys/fs/xfs/sda9/stats/stats_clearWith this patch, the individual counts within the new per-fs stats file(s) remain at zero. Functions that use the the macros to increment, decrement, and add-to the per-fs stats counts will be covered in a separate new patch to follow this one. Note that the counts within the global stats file (
/sys/fs/xfs/stats/stats) advance normally and can be cleared as it was prior to this patch.Signed-off-by Bill O'Donnell <[email protected]>--- fs/xfs/xfs_linux.h | 4 ++-- fs/xfs/xfs_mount.c | 24 +++++++++++++++++++++++- fs/xfs/xfs_mount.h | 1 + fs/xfs/xfs_stats.c | 34 +++++++++++++++++++--------------- fs/xfs/xfs_stats.h | 5 ++++- fs/xfs/xfs_super.c | 21 ++++++++++++++++----- fs/xfs/xfs_sysfs.c | 6 +++--- 7 files changed, 68 insertions(+), 27 deletions(-)fs/xfs/xfs_mount.c +0
-0@@ -791,11 +791,25 @@ xfs_mountfs( goto out_free_dir;
fs/xfs/xfs_mount.c xfs_mountfs( · line 801
Quoted 10 lines
fs/xfs/xfs_mount.c +8
-0} +/* +* Allocate stats memory and create stats sysfs object. +*/ + mp->m_stats.xs_stats = alloc_percpu(struct xfsstats); +if (IS_ERR (mp->m_stats.xs_stats)) { + error =PTR_ERR (mp->m_stats.xs_stats); + goto out_free_perag; + }
alloc_percpu simply returns NULL on failure AFAIK, so looking for IS_ERR doesn't seem right.
Also, I think the placement of this in the routine is a little odd; I'd move it up right under where we create the per-fs sysfs entry, i.e.:
error = xfs_sysfs_init(&mp->m_kobj, &xfs_mp_ktype, NULL, mp->m_fsname);
if (error)
goto out;+ /*
+ * Allocate stats memory and create stats sysfs object.
+ */
+ mp->m_stats.xs_stats = alloc_percpu(struct xfsstats);
+ if (!mp->m_stats.xs_stats) {
+ error = -ENOMEM;
+ goto out_free_perag;
+ }
... etc ...
so that all the sysfs gunk is in the same area.
Quoted 54 lines
fs/xfs/xfs_mount.c +15
-1+ error =xfs_sysfs_init (&mp->m_stats.xs_kobj, &xfs_stats_ktype, + &mp->m_kobj, +"stats" ); +if (error) + goto out_free_stats; +if (!sbp->sb_logblocks) {xfs_warn (mp,"no log defined" );XFS_ERROR_REPORT ("xfs_mountfs" ,XFS_ERRLEVEL_LOW , mp); error = -EFSCORRUPTED ; - goto out_free_perag; + goto out_del_stats; }/* @@ -965,6 +979,10 @@ xfs_mountfs(if (mp->m_logdev_targp && mp->m_logdev_targp != mp->m_ddev_targp)xfs_wait_buftarg (mp->m_logdev_targp);xfs_wait_buftarg (mp->m_ddev_targp); + out_del_stats: +xfs_sysfs_del (&mp->m_stats.xs_kobj); + out_free_stats: +free_percpu (mp->m_stats.xs_stats); out_free_perag:xfs_free_perag (mp); out_free_dir:@@ -1047,6 +1065,10 @@ xfs_unmountfs(xfs_warn (mp,"Unable to update superblock counters. " "Freespace may not be correct on next mount." ); +/* remove the stats kobject and free stats memory */ +xfs_sysfs_del (&mp->m_stats.xs_kobj); +free_percpu (mp->m_stats.xs_stats); +xfs_log_unmount (mp);xfs_da_unmount (mp);xfs_uuid_unmount (mp);fs/xfs/xfs_mount.h +1
-0@@ -127,6 +127,7 @@ typedef struct xfs_mount {int64_t m_low_space[XFS_LOWSP_MAX ];/* low free space thresholds */ struct xfs_kobj m_kobj; +struct xstats m_stats;/* per-fs stats */ struct workqueue_struct *m_buf_workqueue;struct workqueue_struct *m_data_workqueue;fs/xfs/xfs_stats.c +0
-0
fs/xfs/xfs_stats.c line 24
Quoted 7 lines
fs/xfs/xfs_stats.c +4
-0@@ -18,6 +18,11 @@#include "xfs.h" #include <linux/proc_fs.h> +#include "xfs_format.h" +#include "xfs_trans_resv.h" +#include "xfs_mount.h" +#include "xfs_sysfs.h"
AFAICT, none of these includes are needed
...
fs/xfs/xfs_stats.c init_xfs_fs(void) · line 1848
Quoted 8 lines
fs/xfs/xfs_stats.c +4
-0@@ -1843,17 +1842,26 @@ init_xfs_fs(void) } xfsstats.xs_stats = alloc_percpu(struct xfsstats); +if (!xfsstats.xs_stats) { + error = -ENOMEM ; + goto out_kset_unregister; + }
This error checking should be added when xs_stats is introduced in patch 5.
fs/xfs/xfs_stats.c init_xfs_fs(void) · line 1854
Quoted 6 lines
fs/xfs/xfs_stats.c +5
-0xfsstats.xs_kobj.kobject.kset = xfs_kset; +if (!xfsstats.xs_kobj.kobject.kset) { + error = -ENOMEM ; + goto out_free_stats; + } +
this can't fail, you're just assigning one thing to another, no need for this test. We already tested for failure to allocate xfs_kset.
fs/xfs/xfs_stats.c init_xfs_fs(void) · line 1856
Quoted 3 lines
fs/xfs/xfs_stats.c +1
-1error =xfs_sysfs_init (&xfsstats.xs_kobj, &xfs_stats_ktype,NULL , -"stats" ); +"stats" );
if this is the alignment you want, do it in the patch that introduced it...
Quoted 14 lines
fs/xfs/xfs_stats.c +2
-2if (error) - goto out_kset_unregister; + goto out_free_stats;#ifdef DEBUG xfs_dbg_kobj.kobject.kset = xfs_kset; error =xfs_sysfs_init (&xfs_dbg_kobj, &xfs_dbg_ktype,NULL ,"debug" );if (error) - goto out_remove_stats; + goto out_del_stats;#endif error =xfs_qm_init ();
fs/xfs/xfs_stats.c init_xfs_fs(void) · line 1881
Quoted 5 lines
fs/xfs/xfs_stats.c +1
-1@@ -1870,8 +1878,10 @@ init_xfs_fs(void) out_remove_dbg_kobj:#ifdef DEBUG xfs_sysfs_del (&xfs_dbg_kobj); - out_remove_stats: + out_del_stats:
hm, why that name? If we have:
out_remove_dbg_kobj:
xfs_sysfs_del(&xfs_dbg_kobj);
then we should have:
out_remove_stats_kobj:
xfs_sysfs_del(&xfsstats.xs_kobj);
for consistency, I think.
fs/xfs/xfs_stats.h int xfs_stats_format(struct xfsstats __percpu *stats, char *buf); · line 221
Quoted 9 lines
fs/xfs/xfs_stats.h +1
-0@@ -218,13 +218,16 @@ int xfs_stats_format(struct xfsstats __percpu *stats, char *buf);void xfs_stats_clearall (struct xfsstats __percpu *stats);extern struct xstats xfsstats; +struct xfs_mount ;
I don't think that's needed.
-Eric
fs/xfs/xfs_stats.h int xfs_stats_format(struct xfsstats __percpu *stats, char *buf); · line 226
Quoted 5 lines
fs/xfs/xfs_stats.h +1
-0+/* * We don't disable preempt, not too worried about poking the * wrong CPU's stat for now (also aggregated before reporting). */
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
PATCH v8 7/7 xfs: per-filesystem stats counter implementation
In reply to Bill O'DonnellThis patch modifies the stats counting macros and the callers to those macros to properly increment, decrement, and add-to the xfs stats counts. The counts for global and per-fs stats are correctly advanced, and cleared by writing a "1" to the corresponding clear file.
global counts: /sys/fs/xfs/stats/stats
per-fs counts: /sys/fs/xfs/sda*/stats/stats
global clear: /sys/fs/xfs/stats/stats_clear per-fs clear: /sys/fs/xfs/sda*/stats/stats_clear
--- fs/xfs/libxfs/xfs_alloc.c | 8 ++++---- fs/xfs/libxfs/xfs_attr.c | 6 +++--- fs/xfs/libxfs/xfs_bmap.c | 20 ++++++++++---------- fs/xfs/libxfs/xfs_btree.h | 21 +++++++++++---------- fs/xfs/libxfs/xfs_dir2.c | 6 +++--- fs/xfs/xfs_attr_list.c | 2 +- fs/xfs/xfs_buf.c | 18 +++++++++--------- fs/xfs/xfs_dir2_readdir.c | 2 +- fs/xfs/xfs_dquot.c | 12 ++++++------ fs/xfs/xfs_file.c | 12 ++++++------ fs/xfs/xfs_icache.c | 18 +++++++++--------- fs/xfs/xfs_inode.c | 6 +++--- fs/xfs/xfs_ioctl.c | 2 +- fs/xfs/xfs_iomap.c | 4 ++-- fs/xfs/xfs_iops.c | 4 ++-- fs/xfs/xfs_log.c | 22 +++++++++++----------- fs/xfs/xfs_qm.c | 14 +++++++------- fs/xfs/xfs_stats.c | 8 +++----- fs/xfs/xfs_stats.h | 23 +++++++++++++++++++---- fs/xfs/xfs_super.c | 6 +++--- fs/xfs/xfs_trans.c | 6 +++--- fs/xfs/xfs_trans_ail.c | 12 ++++++------ 22 files changed, 123 insertions(+), 109 deletions(-)
fs/xfs/libxfs/xfs_alloc.c +4 -4
@@ -651,8 +651,8 @@ xfs_alloc_ag_vextent( -((long)(args->len))); } -XFS_STATS_INC (xs_allocx); -XFS_STATS_ADD (xs_allocb, args->len); +XFS_STATS_INC (args->mp, xs_allocx); +XFS_STATS_ADD (args->mp, xs_allocb, args->len);return error; }
@@ -1808,8 +1808,8 @@ xfs_free_ag_extent(if (!isfl)xfs_trans_mod_sb (tp,XFS_TRANS_SB_FDBLOCKS , (long )len); -XFS_STATS_INC (xs_freex); -XFS_STATS_ADD (xs_freeb, len); +XFS_STATS_INC (mp, xs_freex); +XFS_STATS_ADD (mp, xs_freeb, len);trace_xfs_free_extent (mp, agno, bno, len, isfl, haveleft, haveright);
fs/xfs/libxfs/xfs_attr.c +3 -3
@@ -125,7 +125,7 @@ xfs_attr_get(uint lock_mode;int error; -XFS_STATS_INC (xs_attr_get); +XFS_STATS_INC (ip->i_mount, xs_attr_get);if (XFS_FORCED_SHUTDOWN (ip->i_mount))return -EIO ;
@@ -209,7 +209,7 @@ xfs_attr_set(int rsvd = (flags &ATTR_ROOT ) !=0 ;int error, err2, committed, local; -XFS_STATS_INC (xs_attr_set); +XFS_STATS_INC (mp, xs_attr_set);if (XFS_FORCED_SHUTDOWN (dp->i_mount))return -EIO ;
@@ -412,7 +412,7 @@ xfs_attr_remove(xfs_fsblock_t firstblock;int error; -XFS_STATS_INC (xs_attr_remove); +XFS_STATS_INC (mp, xs_attr_remove);if (XFS_FORCED_SHUTDOWN (dp->i_mount))return -EIO ;
fs/xfs/libxfs/xfs_bmap.c +10 -10
@@ -1435,7 +1435,7 @@ xfs_bmap_search_extents(xfs_ifork_t *ifp;/* inode fork pointer */ xfs_bmbt_rec_host_t *ep;/* extent record pointer */ -XFS_STATS_INC (xs_look_exlist); +XFS_STATS_INC (ip->i_mount, xs_look_exlist); ifp =XFS_IFORK_PTR (ip, fork); ep =xfs_bmap_search_multi_extents (ifp, bno, eofp, lastxp, gotp, prevp);
@@ -1732,7 +1732,7 @@ xfs_bmap_add_extent_delay_real(ASSERT (!bma->cur || (bma->cur->bc_private.b.flags &XFS_BTCUR_BPRV_WASDEL )); -XFS_STATS_INC (xs_add_exlist); +XFS_STATS_INC (mp, xs_add_exlist);#define LEFT r[0]#define RIGHT r[1]
@@ -2286,7 +2286,7 @@ xfs_bmap_add_extent_unwritten_real(ASSERT (*idx <= ifp->if_bytes /sizeof (struct xfs_bmbt_rec ));ASSERT (!isnullstartblock (new->br_startblock)); -XFS_STATS_INC (xs_add_exlist); +XFS_STATS_INC (mp, xs_add_exlist);#define LEFT r[0]#define RIGHT r[1]
@@ -2946,7 +2946,7 @@ xfs_bmap_add_extent_hole_real(ASSERT (!bma->cur || !(bma->cur->bc_private.b.flags &XFS_BTCUR_BPRV_WASDEL )); -XFS_STATS_INC (xs_add_exlist); +XFS_STATS_INC (mp, xs_add_exlist); state =0 ;if (whichfork ==XFS_ATTR_FORK )
@@ -4036,7 +4036,7 @@ xfs_bmapi_read(if (XFS_FORCED_SHUTDOWN (mp))return -EIO ; -XFS_STATS_INC (xs_blk_mapr); +XFS_STATS_INC (mp, xs_blk_mapr); ifp =XFS_IFORK_PTR (ip, whichfork);
@@ -4221,7 +4221,7 @@ xfs_bmapi_delay(if (XFS_FORCED_SHUTDOWN (mp))return -EIO ; -XFS_STATS_INC (xs_blk_mapw); +XFS_STATS_INC (mp, xs_blk_mapw);if (!(ifp->if_flags &XFS_IFEXTENTS )) { error =xfs_iread_extents (NULL , ip,XFS_DATA_FORK );
@@ -4525,7 +4525,7 @@ xfs_bmapi_write( ifp =XFS_IFORK_PTR (ip, whichfork); -XFS_STATS_INC (xs_blk_mapw); +XFS_STATS_INC (mp, xs_blk_mapw);if (*firstblock ==NULLFSBLOCK ) {if (XFS_IFORK_FORMAT (ip, whichfork) ==XFS_DINODE_FMT_BTREE )
@@ -4718,12 +4718,12 @@ xfs_bmap_del_extent(xfs_filblks_t temp2;/* for indirect length calculations */ int state =0 ; -XFS_STATS_INC (xs_del_exlist); + mp = ip->i_mount; +XFS_STATS_INC (mp, xs_del_exlist);if (whichfork ==XFS_ATTR_FORK ) state |=BMAP_ATTRFORK ; - mp = ip->i_mount; ifp =XFS_IFORK_PTR (ip, whichfork);ASSERT ((*idx >=0 ) && (*idx < ifp->if_bytes / (uint )sizeof (xfs_bmbt_rec_t)));
@@ -5070,7 +5070,7 @@ xfs_bunmapi( *done =1 ;return 0 ; } -XFS_STATS_INC (xs_blk_unmap); +XFS_STATS_INC (mp, xs_blk_unmap); isrt = (whichfork ==XFS_DATA_FORK ) &&XFS_IS_REALTIME_INODE (ip); start = bno; bno = start + len -1 ;
fs/xfs/libxfs/xfs_btree.h +11 -10
@@ -84,22 +84,23 @@ union xfs_btree_rec {/* * Generic stats interface */ -#define __XFS_BTREE_STATS_INC (type, stat) \ - XFS_STATS_INC(xs_ ## type ## _2_ ## stat) -#define XFS_BTREE_STATS_INC (cur, stat) \ +#define __XFS_BTREE_STATS_INC (mp, type, stat) \ + XFS_STATS_INC(mp, xs_ ## type ## _2_ ## stat) +#define XFS_BTREE_STATS_INC (cur, stat) \ do { \ + struct xfs_mount *mp = cur->bc_mp; \ switch (cur->bc_btnum) { \ - case XFS_BTNUM_BNO: __XFS_BTREE_STATS_INC(abtb, stat); break; \ - case XFS_BTNUM_CNT: __XFS_BTREE_STATS_INC(abtc, stat); break; \ - case XFS_BTNUM_BMAP: __XFS_BTREE_STATS_INC(bmbt, stat); break; \ - case XFS_BTNUM_INO: __XFS_BTREE_STATS_INC(ibt, stat); break; \ - case XFS_BTNUM_FINO: __XFS_BTREE_STATS_INC(fibt, stat); break; \ + case XFS_BTNUM_BNO: __XFS_BTREE_STATS_INC(mp, abtb, stat); break; \ + case XFS_BTNUM_CNT: __XFS_BTREE_STATS_INC(mp, abtc, stat); break; \ + case XFS_BTNUM_BMAP: __XFS_BTREE_STATS_INC(mp, bmbt, stat); break; \ + case XFS_BTNUM_INO: __XFS_BTREE_STATS_INC(mp, ibt, stat); break; \ + case XFS_BTNUM_FINO: __XFS_BTREE_STATS_INC(mp, fibt, stat); break; \ case XFS_BTNUM_MAX: ASSERT(0);/* fucking gcc */ ;break ; \ } \ } while (0)#define __XFS_BTREE_STATS_ADD (type, stat, val) \ - XFS_STATS_ADD(xs_ ## type ## _2_ ## stat, val) + XFS_STATS_ADD(cur->bc_mp, xs_ ## type ## _2_ ## stat, val)#define XFS_BTREE_STATS_ADD (cur, stat, val) \ do { \ switch (cur->bc_btnum) { \
@@ -108,7 +109,7 @@ do { \case XFS_BTNUM_BMAP :__XFS_BTREE_STATS_ADD (bmbt, stat, val);break ; \case XFS_BTNUM_INO :__XFS_BTREE_STATS_ADD (ibt, stat, val);break ; \case XFS_BTNUM_FINO :__XFS_BTREE_STATS_ADD (fibt, stat, val);break ; \ -case XFS_BTNUM_MAX :ASSERT (0 );/* fucking gcc */ ;break ; \ +case XFS_BTNUM_MAX :ASSERT (0 );/* fucking gcc */ ;break ; \ } \ }while (0 )
fs/xfs/libxfs/xfs_dir2.c +3 -3
@@ -271,7 +271,7 @@ xfs_dir_createname( rval =xfs_dir_ino_validate (tp->t_mountp, inum);if (rval)return rval; -XFS_STATS_INC (xs_dir_create); +XFS_STATS_INC (dp->i_mount, xs_dir_create); } args =kmem_zalloc (sizeof (*args),KM_SLEEP |KM_NOFS );
@@ -365,7 +365,7 @@ xfs_dir_lookup(int lock_mode;ASSERT (S_ISDIR (dp->i_d.di_mode)); -XFS_STATS_INC (xs_dir_lookup); +XFS_STATS_INC (dp->i_mount, xs_dir_lookup);/* * We need to use KM_NOFS here so that lockdep will not throw false
@@ -444,7 +444,7 @@ xfs_dir_removename(int v;/* type-checking value */ ASSERT (S_ISDIR (dp->i_d.di_mode)); -XFS_STATS_INC (xs_dir_remove); +XFS_STATS_INC (dp->i_mount, xs_dir_remove); args =kmem_zalloc (sizeof (*args),KM_SLEEP |KM_NOFS );if (!args)
fs/xfs/xfs_attr_list.c +1 -1
@@ -511,7 +511,7 @@ xfs_attr_list_int(xfs_inode_t *dp = context->dp;uint lock_mode; -XFS_STATS_INC (xs_attr_list); +XFS_STATS_INC (dp->i_mount, xs_attr_list);if (XFS_FORCED_SHUTDOWN (dp->i_mount))return -EIO ;
fs/xfs/xfs_buf.c +9 -9
@@ -201,7 +201,7 @@ _xfs_buf_alloc(atomic_set (&bp->b_pin_count,0 );init_waitqueue_head (&bp->b_waiters); -XFS_STATS_INC (xb_create); +XFS_STATS_INC (target->bt_mount, xb_create);trace_xfs_buf_init (bp, _RET_IP_);return bp;
@@ -357,12 +357,12 @@ retry:"possible memory allocation deadlock in %s (mode:0x%x)" , __func__, gfp_mask); -XFS_STATS_INC (xb_page_retries); +XFS_STATS_INC (bp->b_target->bt_mount, xb_page_retries);congestion_wait (BLK_RW_ASYNC ,HZ /50 ); goto retry; } -XFS_STATS_INC (xb_page_found); +XFS_STATS_INC (bp->b_target->bt_mount, xb_page_found); nbytes =min_t (size_t, size,PAGE_SIZE - offset); size -= nbytes;
@@ -516,7 +516,7 @@ _xfs_buf_find( new_bp->b_pag = pag;spin_unlock (&pag->pag_buf_lock); }else { -XFS_STATS_INC (xb_miss_locked); +XFS_STATS_INC (btp->bt_mount, xb_miss_locked);spin_unlock (&pag->pag_buf_lock);xfs_perag_put (pag); }
@@ -529,11 +529,11 @@ found:if (!xfs_buf_trylock (bp)) {if (flags &XBF_TRYLOCK ) {xfs_buf_rele (bp); -XFS_STATS_INC (xb_busy_locked); +XFS_STATS_INC (btp->bt_mount, xb_busy_locked);return NULL ; }xfs_buf_lock (bp); -XFS_STATS_INC (xb_get_locked_waited); +XFS_STATS_INC (btp->bt_mount, xb_get_locked_waited); }/*
@@ -549,7 +549,7 @@ found: }trace_xfs_buf_find (bp, flags, _RET_IP_); -XFS_STATS_INC (xb_get_locked); +XFS_STATS_INC (btp->bt_mount, xb_get_locked);return bp; }
@@ -603,7 +603,7 @@ found: } } -XFS_STATS_INC (xb_get); +XFS_STATS_INC (target->bt_mount, xb_get);trace_xfs_buf_get (bp, flags, _RET_IP_);return bp; }
@@ -643,7 +643,7 @@ xfs_buf_read_map(trace_xfs_buf_read (bp, flags, _RET_IP_);if (!XFS_BUF_ISDONE (bp)) { -XFS_STATS_INC (xb_get_read); +XFS_STATS_INC (target->bt_mount, xb_get_read); bp->b_ops = ops;_xfs_buf_read (bp, flags); }else if (flags &XBF_ASYNC ) {
fs/xfs/xfs_dir2_readdir.c +1 -1
@@ -666,7 +666,7 @@ xfs_readdir(return -EIO ;ASSERT (S_ISDIR (dp->i_d.di_mode)); -XFS_STATS_INC (xs_dir_getdents); +XFS_STATS_INC (dp->i_mount, xs_dir_getdents); args.dp = dp; args.geo = dp->i_mount->m_dir_geo;
fs/xfs/xfs_dquot.c +6 -6
@@ -77,7 +77,7 @@ xfs_qm_dqdestroy(mutex_destroy (&dqp->q_qlock);kmem_zone_free (xfs_qm_dqzone, dqp); -XFS_STATS_DEC (xs_qm_dquot); +XFS_STATS_DEC (dqp->q_mount, xs_qm_dquot); }/*
@@ -605,7 +605,7 @@ xfs_qm_dqread(break ; } -XFS_STATS_INC (xs_qm_dquot); +XFS_STATS_INC (dqp->q_mount, xs_qm_dquot);trace_xfs_dqread (dqp);
@@ -747,12 +747,12 @@ restart:mutex_unlock (&qi->qi_tree_lock);trace_xfs_dqget_hit (dqp); -XFS_STATS_INC (xs_qm_dqcachehits); +XFS_STATS_INC (dqp->q_mount, xs_qm_dqcachehits); *O_dqpp = dqp;return 0 ; }mutex_unlock (&qi->qi_tree_lock); -XFS_STATS_INC (xs_qm_dqcachemisses); +XFS_STATS_INC (dqp->q_mount, xs_qm_dqcachemisses);/* * Dquot cache miss. We don't want to keep the inode lock across
@@ -806,7 +806,7 @@ restart:mutex_unlock (&qi->qi_tree_lock);trace_xfs_dqget_dup (dqp);xfs_qm_dqdestroy (dqp); -XFS_STATS_INC (xs_qm_dquot_dups); +XFS_STATS_INC (dqp->q_mount, xs_qm_dquot_dups); goto restart; }
@@ -846,7 +846,7 @@ xfs_qm_dqput(trace_xfs_dqput_free (dqp);if (list_lru_add (&qi->qi_lru, &dqp->q_lru)) -XFS_STATS_INC (xs_qm_dquot_unused); +XFS_STATS_INC (dqp->q_mount, xs_qm_dquot_unused); }xfs_dqunlock (dqp); }
fs/xfs/xfs_file.c +6 -6
@@ -287,7 +287,7 @@ xfs_file_read_iter(xfs_fsize_t n;loff_t pos = iocb->ki_pos; -XFS_STATS_INC (xs_read_calls); +XFS_STATS_INC (mp, xs_read_calls);if (unlikely (iocb->ki_flags &IOCB_DIRECT )) ioflags |=XFS_IO_ISDIRECT ;
@@ -365,7 +365,7 @@ xfs_file_read_iter( ret =generic_file_read_iter (iocb, to);if (ret >0 ) -XFS_STATS_ADD (xs_read_bytes, ret); +XFS_STATS_ADD (mp, xs_read_bytes, ret);xfs_rw_iunlock (ip,XFS_IOLOCK_SHARED );return ret;
@@ -383,7 +383,7 @@ xfs_file_splice_read(int ioflags =0 ;ssize_t ret; -XFS_STATS_INC (xs_read_calls); +XFS_STATS_INC (ip->i_mount, xs_read_calls);if (infilp->f_mode &FMODE_NOCMTIME ) ioflags |=XFS_IO_INVIS ;
@@ -401,7 +401,7 @@ xfs_file_splice_read(else ret =generic_file_splice_read (infilp, ppos, pipe, count, flags);if (ret >0 ) -XFS_STATS_ADD (xs_read_bytes, ret); +XFS_STATS_ADD (ip->i_mount, xs_read_bytes, ret);xfs_rw_iunlock (ip,XFS_IOLOCK_SHARED );return ret;
@@ -867,7 +867,7 @@ xfs_file_write_iter(ssize_t ret;size_t ocount =iov_iter_count (from); -XFS_STATS_INC (xs_write_calls); +XFS_STATS_INC (ip->i_mount, xs_write_calls);if (ocount ==0 )return 0 ;
@@ -883,7 +883,7 @@ xfs_file_write_iter(if (ret >0 ) {ssize_t err; -XFS_STATS_ADD (xs_write_bytes, ret); +XFS_STATS_ADD (ip->i_mount, xs_write_bytes, ret);/* Handle various SYNC-type writes */ err =generic_write_sync (file, iocb->ki_pos - ret, ret);
fs/xfs/xfs_icache.c +9 -9
@@ -63,7 +63,7 @@ xfs_inode_alloc(return NULL ; } -XFS_STATS_INC (vn_active); +XFS_STATS_INC (mp, vn_active);ASSERT (atomic_read (&ip->i_pincount) ==0 );ASSERT (!spin_is_locked (&ip->i_flags_lock));ASSERT (!xfs_isiflocked (ip));
@@ -129,7 +129,7 @@ xfs_inode_free(/* asserts to verify all state is correct here */ ASSERT (atomic_read (&ip->i_pincount) ==0 );ASSERT (!xfs_isiflocked (ip)); -XFS_STATS_DEC (vn_active); +XFS_STATS_DEC (ip->i_mount, vn_active);call_rcu (&VFS_I (ip)->i_rcu, xfs_inode_free_callback); }
@@ -159,7 +159,7 @@ xfs_iget_cache_hit(spin_lock (&ip->i_flags_lock);if (ip->i_ino != ino) {trace_xfs_iget_skip (ip); -XFS_STATS_INC (xs_ig_frecycle); +XFS_STATS_INC (mp, xs_ig_frecycle); error = -EAGAIN ; goto out_error; }
@@ -177,7 +177,7 @@ xfs_iget_cache_hit(*/ if (ip->i_flags & (XFS_INEW |XFS_IRECLAIM )) {trace_xfs_iget_skip (ip); -XFS_STATS_INC (xs_ig_frecycle); +XFS_STATS_INC (mp, xs_ig_frecycle); error = -EAGAIN ; goto out_error; }
@@ -259,7 +259,7 @@ xfs_iget_cache_hit(xfs_ilock (ip, lock_flags);xfs_iflags_clear (ip,XFS_ISTALE |XFS_IDONTCACHE ); -XFS_STATS_INC (xs_ig_found); +XFS_STATS_INC (mp, xs_ig_found);return 0 ;
@@ -342,7 +342,7 @@ xfs_iget_cache_miss( error =radix_tree_insert (&pag->pag_ici_root, agino, ip);if (unlikely (error)) {WARN_ON (error != -EEXIST ); -XFS_STATS_INC (xs_ig_dup); +XFS_STATS_INC (mp, xs_ig_dup); error = -EAGAIN ; goto out_preload_end; }
@@ -412,7 +412,7 @@ xfs_iget(if (!ino ||XFS_INO_TO_AGNO (mp, ino) >= mp->m_sb.sb_agcount)return -EINVAL ; -XFS_STATS_INC (xs_ig_attempts); +XFS_STATS_INC (mp, xs_ig_attempts);/* get the perag structure and ensure that it's inode capable */ pag =xfs_perag_get (mp,XFS_INO_TO_AGNO (mp, ino));
@@ -429,7 +429,7 @@ again: goto out_error_or_again; }else {rcu_read_unlock (); -XFS_STATS_INC (xs_ig_missed); +XFS_STATS_INC (mp, xs_ig_missed); error =xfs_iget_cache_miss (mp, pag, tp, ino, &ip, flags, lock_flags);
@@ -965,7 +965,7 @@ reclaim:xfs_ifunlock (ip);xfs_iunlock (ip,XFS_ILOCK_EXCL ); -XFS_STATS_INC (xs_ig_reclaims); +XFS_STATS_INC (ip->i_mount, xs_ig_reclaims);/* * Remove the inode from the per-AG radix tree. *
fs/xfs/xfs_inode.c +3 -3
@@ -3271,8 +3271,8 @@ xfs_iflush_cluster( }if (clcount) { -XFS_STATS_INC (xs_icluster_flushcnt); -XFS_STATS_ADD (xs_icluster_flushinode, clcount); +XFS_STATS_INC (mp, xs_icluster_flushcnt); +XFS_STATS_ADD (mp, xs_icluster_flushinode, clcount); } out_free:
@@ -3345,7 +3345,7 @@ xfs_iflush(struct xfs_dinode *dip;int error; -XFS_STATS_INC (xs_iflush_count); +XFS_STATS_INC (mp, xs_iflush_count);ASSERT (xfs_isilocked (ip,XFS_ILOCK_EXCL |XFS_ILOCK_SHARED ));ASSERT (xfs_isiflocked (ip));
fs/xfs/xfs_ioctl.c +1 -1
@@ -1028,7 +1028,7 @@ xfs_ioctl_setattr_xflags(xfs_diflags_to_linux (ip);xfs_trans_ichgtime (tp, ip,XFS_ICHGTIME_CHG );xfs_trans_log_inode (tp, ip,XFS_ILOG_CORE ); -XFS_STATS_INC (xs_ig_attrchg); +XFS_STATS_INC (mp, xs_ig_attrchg);return 0 ; }
fs/xfs/xfs_iomap.c +2 -2
@@ -670,7 +670,7 @@ xfs_iomap_write_allocate( count_fsb = imap->br_blockcount; map_start_fsb = imap->br_startoff; -XFS_STATS_ADD (xs_xstrat_bytes,XFS_FSB_TO_B (mp, count_fsb)); +XFS_STATS_ADD (mp, xs_xstrat_bytes,XFS_FSB_TO_B (mp, count_fsb));while (count_fsb !=0 ) {/*
@@ -777,7 +777,7 @@ xfs_iomap_write_allocate(if ((offset_fsb >= imap->br_startoff) && (offset_fsb < (imap->br_startoff + imap->br_blockcount))) { -XFS_STATS_INC (xs_xstrat_quick); +XFS_STATS_INC (mp, xs_xstrat_quick);return 0 ; }
fs/xfs/xfs_iops.c +2 -2
@@ -695,7 +695,7 @@ xfs_setattr_nonsize(xfs_trans_log_inode (tp, ip,XFS_ILOG_CORE ); -XFS_STATS_INC (xs_ig_attrchg); +XFS_STATS_INC (mp, xs_ig_attrchg);if (mp->m_flags &XFS_MOUNT_WSYNC )xfs_trans_set_sync (tp);
@@ -922,7 +922,7 @@ xfs_setattr_size(xfs_trans_log_inode (tp, ip,XFS_ILOG_CORE ); -XFS_STATS_INC (xs_ig_attrchg); +XFS_STATS_INC (mp, xs_ig_attrchg);if (mp->m_flags &XFS_MOUNT_WSYNC )xfs_trans_set_sync (tp);
fs/xfs/xfs_log.c +11 -11
@@ -268,7 +268,7 @@ xlog_grant_head_wait(__set_current_state (TASK_UNINTERRUPTIBLE );spin_unlock (&head->lock); -XFS_STATS_INC (xs_sleep_logspace); +XFS_STATS_INC (log->l_mp, xs_sleep_logspace);trace_xfs_log_grant_sleep (log, tic);schedule ();
@@ -379,7 +379,7 @@ xfs_log_regrant(if (XLOG_FORCED_SHUTDOWN (log))return -EIO ; -XFS_STATS_INC (xs_try_logspace); +XFS_STATS_INC (mp, xs_try_logspace);/* * This is a new transaction on the ticket, so we need to change the
@@ -448,7 +448,7 @@ xfs_log_reserve(if (XLOG_FORCED_SHUTDOWN (log))return -EIO ; -XFS_STATS_INC (xs_try_logspace); +XFS_STATS_INC (mp, xs_try_logspace);ASSERT (*ticp ==NULL ); tic = xlog_ticket_alloc(log, unit_bytes, cnt, client, permanent,
@@ -1768,7 +1768,7 @@ xlog_sync(int v2 =xfs_sb_version_haslogv2 (&log->l_mp->m_sb);int size; -XFS_STATS_INC (xs_log_writes); +XFS_STATS_INC (log->l_mp, xs_log_writes);ASSERT (atomic_read (&iclog->ic_refcnt) ==0 );/* Add for LR header */
@@ -1805,7 +1805,7 @@ xlog_sync( bp = iclog->ic_bp;XFS_BUF_SET_ADDR (bp,BLOCK_LSN (be64_to_cpu (iclog->ic_header.h_lsn))); -XFS_STATS_ADD (xs_log_blocks,BTOBB (count)); +XFS_STATS_ADD (log->l_mp, xs_log_blocks,BTOBB (count));/* Do we need to split this write into 2 parts? */ if (XFS_BUF_ADDR (bp) +BTOBB (count) > log->l_logBBsize) {
@@ -2913,7 +2913,7 @@ restart: iclog = log->l_iclog;if (iclog->ic_state !=XLOG_STATE_ACTIVE ) { -XFS_STATS_INC (xs_log_noiclogs); +XFS_STATS_INC (log->l_mp, xs_log_noiclogs);/* Wait for log writes to have flushed */ xlog_wait (&log->l_flush_wait, &log->l_icloglock);
@@ -3212,7 +3212,7 @@ _xfs_log_force(struct xlog_in_core *iclog;xfs_lsn_t lsn; -XFS_STATS_INC (xs_log_force); +XFS_STATS_INC (mp, xs_log_force);xlog_cil_force (log);
@@ -3297,7 +3297,7 @@ maybe_sleep:spin_unlock (&log->l_icloglock);return -EIO ; } -XFS_STATS_INC (xs_log_force_sleep); +XFS_STATS_INC (mp, xs_log_force_sleep);xlog_wait (&iclog->ic_force_wait, &log->l_icloglock);/* * No need to grab the log lock here since we're
@@ -3362,7 +3362,7 @@ _xfs_log_force_lsn(ASSERT (lsn !=0 ); -XFS_STATS_INC (xs_log_force); +XFS_STATS_INC (mp, xs_log_force); lsn =xlog_cil_force_lsn (log, lsn);if (lsn ==NULLCOMMITLSN )
@@ -3411,7 +3411,7 @@ try_again: (XLOG_STATE_WANT_SYNC | XLOG_STATE_SYNCING))) {ASSERT (!(iclog->ic_state &XLOG_STATE_IOERROR )); -XFS_STATS_INC (xs_log_force_sleep); +XFS_STATS_INC (mp, xs_log_force_sleep);xlog_wait (&iclog->ic_prev->ic_write_wait, &log->l_icloglock);
@@ -3441,7 +3441,7 @@ try_again:spin_unlock (&log->l_icloglock);return -EIO ; } -XFS_STATS_INC (xs_log_force_sleep); +XFS_STATS_INC (mp, xs_log_force_sleep);xlog_wait (&iclog->ic_force_wait, &log->l_icloglock);/* * No need to grab the log lock here since we're
fs/xfs/xfs_qm.c +7 -7
@@ -184,7 +184,7 @@ xfs_qm_dqpurge(*/ ASSERT (!list_empty (&dqp->q_lru));list_lru_del (&qi->qi_lru, &dqp->q_lru); -XFS_STATS_DEC (xs_qm_dquot_unused); +XFS_STATS_DEC (mp, xs_qm_dquot_unused);xfs_qm_dqdestroy (dqp);return 0 ;
@@ -448,11 +448,11 @@ xfs_qm_dquot_isolate(*/ if (dqp->q_nrefs) {xfs_dqunlock (dqp); -XFS_STATS_INC (xs_qm_dqwants); +XFS_STATS_INC (dqp->q_mount, xs_qm_dqwants);trace_xfs_dqreclaim_want (dqp);list_lru_isolate (lru, &dqp->q_lru); -XFS_STATS_DEC (xs_qm_dquot_unused); +XFS_STATS_DEC (dqp->q_mount, xs_qm_dquot_unused);return LRU_REMOVED ; }
@@ -496,19 +496,19 @@ xfs_qm_dquot_isolate(ASSERT (dqp->q_nrefs ==0 );list_lru_isolate_move (lru, &dqp->q_lru, &isol->dispose); -XFS_STATS_DEC (xs_qm_dquot_unused); +XFS_STATS_DEC (dqp->q_mount, xs_qm_dquot_unused);trace_xfs_dqreclaim_done (dqp); -XFS_STATS_INC (xs_qm_dqreclaims); +XFS_STATS_INC (dqp->q_mount, xs_qm_dqreclaims);return LRU_REMOVED ; out_miss_busy:trace_xfs_dqreclaim_busy (dqp); -XFS_STATS_INC (xs_qm_dqreclaim_misses); +XFS_STATS_INC (dqp->q_mount, xs_qm_dqreclaim_misses);return LRU_SKIP ; out_unlock_dirty:trace_xfs_dqreclaim_busy (dqp); -XFS_STATS_INC (xs_qm_dqreclaim_misses); +XFS_STATS_INC (dqp->q_mount, xs_qm_dqreclaim_misses);xfs_dqunlock (dqp);spin_lock (lru_lock);return LRU_RETRY ;
fs/xfs/xfs_stats.c +3 -5
@@ -122,11 +122,9 @@ static int xqm_proc_show(struct seq_file *m, void *v) {/* maximum; incore; ratio free to inuse; freelist */ seq_printf (m,"%d\t%d\t%d\t%u\n" , -0 , -counter_val (xfsstats.xs_stats,XFSSTAT_END_XQMSTAT ), -0 , -counter_val (xfsstats.xs_stats, -XFSSTAT_END_XQMSTAT +1 )); +0 ,counter_val (xfsstats.xs_stats,XFSSTAT_END_XQMSTAT ), +0 ,counter_val (xfsstats.xs_stats, +XFSSTAT_END_XQMSTAT +1 ));return 0 ; }
fs/xfs/xfs_stats.h +19 -4
@@ -224,10 +224,25 @@ struct xfs_mount;* We don't disable preempt, not too worried about poking the * wrong CPU's stat for now (also aggregated before reporting). */ -#define XFS_STATS_INC (v) (per_cpu(*xfsstats.xs_stats, current_cpu()).v++) -#define XFS_STATS_DEC (v) (per_cpu(*xfsstats.xs_stats, current_cpu()).v--) -#define XFS_STATS_ADD (v, inc) (per_cpu(*xfsstats.xs_stats, current_cpu()).v \ - += (inc)) +#define XFS_STATS_INC (mp, v) { per_cpu_ptr(xfsstats.xs_stats, \ + current_cpu())->v++; \ + per_cpu_ptr( \ + mp->m_stats.xs_stats, \ + current_cpu())->v++; } + +#define XFS_STATS_DEC (mp, v) { per_cpu_ptr(xfsstats.xs_stats, \ + current_cpu())->v++; \ + per_cpu_ptr( \ + mp->m_stats.xs_stats, \ + current_cpu())->v--; } + +#define XFS_STATS_ADD (mp, v, inc) { per_cpu_ptr(xfsstats.xs_stats, \ + current_cpu())->v \ + += (inc); \ + per_cpu_ptr( \ + mp->m_stats.xs_stats, \ + current_cpu())->v \ + += (inc); }extern int xfs_init_procfs (void );extern void xfs_cleanup_procfs (void );
fs/xfs/xfs_super.c +3 -3
@@ -922,7 +922,7 @@ xfs_fs_destroy_inode(trace_xfs_destroy_inode (ip); -XFS_STATS_INC (vn_reclaim); +XFS_STATS_INC (ip->i_mount, vn_reclaim);ASSERT (XFS_FORCED_SHUTDOWN (ip->i_mount) || ip->i_delayed_blks ==0 );
@@ -983,8 +983,8 @@ xfs_fs_evict_inode(truncate_inode_pages_final (&inode->i_data);clear_inode (inode); -XFS_STATS_INC (vn_rele); -XFS_STATS_INC (vn_remove); +XFS_STATS_INC (ip->i_mount, vn_rele); +XFS_STATS_INC (ip->i_mount, vn_remove);xfs_inactive (ip); }
fs/xfs/xfs_trans.c +3 -3
@@ -930,9 +930,9 @@ __xfs_trans_commit(*/ if (sync) { error =_xfs_log_force_lsn (mp, commit_lsn,XFS_LOG_SYNC ,NULL ); -XFS_STATS_INC (xs_trans_sync); +XFS_STATS_INC (mp, xs_trans_sync); }else { -XFS_STATS_INC (xs_trans_async); +XFS_STATS_INC (mp, xs_trans_async); }return error;
@@ -955,7 +955,7 @@ out_unreserve:xfs_trans_free_items (tp,NULLCOMMITLSN , !!error);xfs_trans_free (tp); -XFS_STATS_INC (xs_trans_empty); +XFS_STATS_INC (mp, xs_trans_empty);return error; }
fs/xfs/xfs_trans_ail.c +6 -6
@@ -349,7 +349,7 @@ xfsaild_push( xfs_ail_min_lsn(ailp))) { ailp->xa_log_flush =0 ; -XFS_STATS_INC (xs_push_ail_flush); +XFS_STATS_INC (mp, xs_push_ail_flush);xfs_log_force (mp,XFS_LOG_SYNC ); }
@@ -371,7 +371,7 @@ xfsaild_push( goto out_done; } -XFS_STATS_INC (xs_push_ail); +XFS_STATS_INC (mp, xs_push_ail); lsn = lip->li_lsn;while ((XFS_LSN_CMP (lip->li_lsn, target) <=0 )) {
@@ -385,7 +385,7 @@ xfsaild_push( lock_result = lip->li_ops->iop_push (lip, &ailp->xa_buf_list);switch (lock_result) {case XFS_ITEM_SUCCESS : -XFS_STATS_INC (xs_push_ail_success); +XFS_STATS_INC (mp, xs_push_ail_success);trace_xfs_ail_push (lip); ailp->xa_last_pushed_lsn = lsn;
@@ -403,7 +403,7 @@ xfsaild_push(* re-try the flushing relatively soon if most of the * AIL is beeing flushed. */ -XFS_STATS_INC (xs_push_ail_flushing); +XFS_STATS_INC (mp, xs_push_ail_flushing);trace_xfs_ail_flushing (lip); flushing++;
@@ -411,14 +411,14 @@ xfsaild_push(break ;case XFS_ITEM_PINNED : -XFS_STATS_INC (xs_push_ail_pinned); +XFS_STATS_INC (mp, xs_push_ail_pinned);trace_xfs_ail_pinned (lip); stuck++; ailp->xa_log_flush++;break ;case XFS_ITEM_LOCKED : -XFS_STATS_INC (xs_push_ail_locked); +XFS_STATS_INC (mp, xs_push_ail_locked);trace_xfs_ail_locked (lip); stuck++;
Signature · 6 lines
2.4.3 _______________________________________________ xfs mailing list [email protected] http://oss.sgi.com/mailman/listinfo/xfs
Re: [PATCH 7/7] xfs: per-filesystem stats counter implementation
Quoted 6 lines · Bill O'Donnell
This patch modifies the stats counting macros and the callers to those macros to properly increment, decrement, and add-to the xfs stats counts. The counts for global and per-fs stats are correctly advanced, and cleared by writing a "1" to the corresponding clear file.
Quoted 8 lines
global counts:
/sys/fs/xfs/stats/stats
per-fs counts:/sys/fs/xfs/sda*/stats/statsglobal clear: /sys/fs/xfs/stats/stats_clear per-fs clear: /sys/fs/xfs/sda*/stats/stats_clearSigned-off-by Bill O'Donnell <[email protected]>---
<big snip>
Quoted 24 lines
fs/xfs/libxfs/xfs_btree.h +6
-8@@ -84,22 +84,23 @@ union xfs_btree_rec {/* * Generic stats interface */ -#define __XFS_BTREE_STATS_INC (type, stat) \ - XFS_STATS_INC(xs_ ## type ## _2_ ## stat) -#define XFS_BTREE_STATS_INC (cur, stat) \ +#define __XFS_BTREE_STATS_INC (mp, type, stat) \ + XFS_STATS_INC(mp, xs_ ## type ## _2_ ## stat) +#define XFS_BTREE_STATS_INC (cur, stat) \ do { \ + struct xfs_mount *mp = cur->bc_mp; \ switch (cur->bc_btnum) { \ - case XFS_BTNUM_BNO: __XFS_BTREE_STATS_INC(abtb, stat); break; \ - case XFS_BTNUM_CNT: __XFS_BTREE_STATS_INC(abtc, stat); break; \ - case XFS_BTNUM_BMAP: __XFS_BTREE_STATS_INC(bmbt, stat); break; \ - case XFS_BTNUM_INO: __XFS_BTREE_STATS_INC(ibt, stat); break; \ - case XFS_BTNUM_FINO: __XFS_BTREE_STATS_INC(fibt, stat); break; \ + case XFS_BTNUM_BNO: __XFS_BTREE_STATS_INC(mp, abtb, stat); break; \ + case XFS_BTNUM_CNT: __XFS_BTREE_STATS_INC(mp, abtc, stat); break; \
fs/xfs/libxfs/xfs_btree.h union xfs_btree_rec { · line 103
Quoted 10 lines
fs/xfs/libxfs/xfs_btree.h +4
-1+case XFS_BTNUM_BMAP :__XFS_BTREE_STATS_INC (mp, bmbt, stat);break ; \ +case XFS_BTNUM_INO :__XFS_BTREE_STATS_INC (mp, ibt, stat);break ; \ +case XFS_BTNUM_FINO :__XFS_BTREE_STATS_INC (mp, fibt, stat);break ; \case XFS_BTNUM_MAX :ASSERT (0 );/* fucking gcc */ ;break ; \ } \ } while (0)#define __XFS_BTREE_STATS_ADD (type, stat, val) \ - XFS_STATS_ADD(xs_ ## type ## _2_ ## stat, val) + XFS_STATS_ADD(cur->bc_mp, xs_ ## type ## _2_ ## stat, val)
Where does "cur" come from? XFS_BTREE_STATS_ADD should grab mp from cur & pass it to __XFS_BTREE_STATS_ADD like XFS_BTREE_STATS_INC did, otherwise you're relying on the macro being called from somewhere with a local variable named "cur" - macros referencing local vars @ the callpoint are a bad idea.
Quoted 12 lines
fs/xfs/libxfs/xfs_btree.h +1
-1#define XFS_BTREE_STATS_ADD (cur, stat, val) \ do { \ switch (cur->bc_btnum) { \@@ -108,7 +109,7 @@ do { \case XFS_BTNUM_BMAP :__XFS_BTREE_STATS_ADD (bmbt, stat, val);break ; \case XFS_BTNUM_INO :__XFS_BTREE_STATS_ADD (ibt, stat, val);break ; \case XFS_BTNUM_FINO :__XFS_BTREE_STATS_ADD (fibt, stat, val);break ; \ -case XFS_BTNUM_MAX :ASSERT (0 );/* fucking gcc */ ;break ; \ +case XFS_BTNUM_MAX :ASSERT (0 );/* fucking gcc */ ;break ; \ } \ }while (0 )
<snip>
Quoted 6 lines
fs/xfs/xfs_stats.c +0
-0@@ -122,11 +122,9 @@ static int xqm_proc_show(struct seq_file *m, void *v) {
fs/xfs/xfs_stats.c static int xqm_proc_show(struct seq_file *m, void *v) · line 127
Quoted 10 lines
fs/xfs/xfs_stats.c +3
-5/* maximum; incore; ratio free to inuse; freelist */ seq_printf (m,"%d\t%d\t%d\t%u\n" , -0 , -counter_val (xfsstats.xs_stats,XFSSTAT_END_XQMSTAT ), -0 , -counter_val (xfsstats.xs_stats, -XFSSTAT_END_XQMSTAT +1 )); +0 ,counter_val (xfsstats.xs_stats,XFSSTAT_END_XQMSTAT ), +0 ,counter_val (xfsstats.xs_stats, +XFSSTAT_END_XQMSTAT +1 ));
unrelated whitespace stuff; if it needs to be reformatted, do it in the patch that introduced the formatting you don't like.
Quoted 11 lines
fs/xfs/xfs_stats.c +0
-0return 0 ; }fs/xfs/xfs_stats.h +0
-0@@ -224,10 +224,25 @@ struct xfs_mount;* We don't disable preempt, not too worried about poking the * wrong CPU's stat for now (also aggregated before reporting). */
fs/xfs/xfs_stats.h struct xfs_mount; · line 232
Quoted 10 lines
fs/xfs/xfs_stats.h +6
-4-#define XFS_STATS_INC (v) (per_cpu(*xfsstats.xs_stats, current_cpu()).v++) -#define XFS_STATS_DEC (v) (per_cpu(*xfsstats.xs_stats, current_cpu()).v--) -#define XFS_STATS_ADD (v, inc) (per_cpu(*xfsstats.xs_stats, current_cpu()).v \ - += (inc)) +#define XFS_STATS_INC (mp, v) { per_cpu_ptr(xfsstats.xs_stats, \ + current_cpu())->v++; \ + per_cpu_ptr( \ + mp->m_stats.xs_stats, \ + current_cpu())->v++; } +
kind of odd style here; I'd do:
+#define XFS_STATS_INC(mp, v) \
+do { \
+ per_cpu_ptr(xfsstats.xs_stats, current_cpu())->v++; \
+ per_cpu_ptr(mp->m_stats.xs_stats, current_cpu())->v++; \
+} while (0)
(that do { } while (0) idiom is odd, and I think it has fallen out of favor, but it's how the other multiline stats macros work - see XFS_BTREE_STATS_ADD for example)
But honestly, maybe this should turn into a static inline. I guess we have plenty of multiline macros already...
and really, those per_cpu()'s should have been made per_cpu_ptr's in the patch which introduced the xfsstats.xs_stats usage.
fs/xfs/xfs_stats.h struct xfs_mount; · line 245
Quoted 13 lines
fs/xfs/xfs_stats.h +13
-0+#define XFS_STATS_DEC (mp, v) { per_cpu_ptr(xfsstats.xs_stats, \ + current_cpu())->v++; \ + per_cpu_ptr( \ + mp->m_stats.xs_stats, \ + current_cpu())->v--; } + +#define XFS_STATS_ADD (mp, v, inc) { per_cpu_ptr(xfsstats.xs_stats, \ + current_cpu())->v \ + += (inc); \ + per_cpu_ptr( \ + mp->m_stats.xs_stats, \ + current_cpu())->v \ + += (inc); }
(here too of course)
-Eric
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Quoted 6 lines · Bill O'Donnell
Hello-
Following is the next iteration of the series to add xfs stats to sysfs. This iteration adds patches 6 and 7 to complete the incorporation of sysfs/kobject into xfsstats, including working global and per-fs stats.
Hi Bill - as I mentioned on IRC, it looks like a lot of the patches in this series fix up review comments for *prior* patches; i.e. Patch X implements a change X, and got review comments when originally submitted.
Then Patch Y introduces change Y, but also fixes up comments in Patch X.
When you get review comments, they really need to be fixed up in that patch, not later in the patch series. This is for two reasons; for one, we really want each committed patch to be correct stylistically and functionally. And two, it simplifies review of the series; one doesn't need to look forward in the series to find fixes for prior patches, and each patch contains only its own functional changes, not unrelated fixups for prior patches.
So for example, if you have a patch which is fixing whitespace on code introduced in a previous patch, it's in the wrong patch.
Or for a more concrete example, in patch 5 you do:
for_each_possible_cpu(cpu)
- val += *(((__u32 *)&per_cpu(xfsstats, cpu) + idx));
+ val += *(((__u32 *)&per_cpu(*stats, cpu) + idx));
return val;
and then in patch 6 you do:
for_each_possible_cpu(cpu)
- val += *(((__u32 *)&per_cpu(*stats, cpu) + idx));
return val;
But this is unrelated to the purpose of patch 6; it should just be fixed up in a modified patch 5, i.e.
for_each_possible_cpu(cpu)
- val += *(((__u32 *)&per_cpu(xfsstats, cpu) + idx));
+ val += *(((__u32 *)per_cpu_ptr(stats, cpu) + idx)); return val;
So I'll restrict review comments to the actual end product, rather than patch by patch, because it's tough to review patch X when it has issues whichi are fixed up by patch X+1 or X+2 or ... :)
If you have any questions about all this, please let me know.
Thanks,
-Eric
Quoted 98 lines
----------history---------------
v8: (add patches 6 and 7)
-patch 6: per-filesystem stats in sysfs.
Implement per-filesystem stats objects in sysfs. Stats objects are instantiated when an xfs filesystem is mounted and deleted on unmount. With this patch, the stats directory is created and populated with the familiar stats andstats_clearfiles.
Example:
/sys/fs/xfs/sda9/stats/stats/sys/fs/xfs/sda9/stats/stats_clearWith this patch, the individual counts within the new per-fs stats file(s) remain at zero. Functions that use the the macros to increment, decrement, and add-to the per-fs stats counts will be covered in the next patch (7).
Also, this patch includes some minor fixups for style issues in patch 5.
-patch 7: per-filesystem stats counter implementation Modify the stats counting macros and the callers to those macros to properly increment, decrement, and add-to the xfs stats counts. The counts for global and per-fs stats are correctly advanced, and cleared by writing a "1" to the corresponding clear file.
global counts:
/sys/fs/xfs/stats/stats
per-fs counts:/sys/fs/xfs/sda*/stats/statsglobal clear: /sys/fs/xfs/stats/stats_clear per-fs clear: /sys/fs/xfs/sda*/stats/stats_clearv7:
add patch 5/5: incorporate sysfs/kobject in xfsstats: handlers take kobjects. Allocate & deallocate per-fs stats structures and set up the sysfs entries for them. Add kobject and a pointer to a per-cpu struct xfsstats. Modify the macros that manipulate the stats accordingly.v6:
-add patch 4/4: moveto_xlog(kobject)to the relevant show/store operations. This keeps the xfs_sysfs_object_show/store functions generic. Also, with the change, there can be some cleanup of the show/store function arguments.v5:
(quoted diff) +0
-2-optimization of sysfs_ops function. -style fixupsv4:
(quoted diff) +0
-2-whitespace fixup of patch 1 -add patch 4 (sysfs ops consolidation - dbg, stats, log)v3:
-style fixups and removal of extraneous printk.v2:
-style fixups.
v1:
--------------------------------We already have per-fs information in /sys, so it makes sense to have per-fs stats there too. The series moves existing global stats infrastructure to /sys and reuses that code to create per-fs stats in /sys.
Patch 1 handles the bring-up and tear down of xfs/stats directory structure in sysfs when an fs is mounted. The directory contains the stats file and the
stats_clearfile. The stats file contents mimic those of/proc/fs/xfs/stat. Thestats_clearfile is empty, and much like the currentstat_clearcommand, handles the zeroing of the stats file when a "1" is echoed to thestats_clearfile.Patch 2 creates the symlink for stats from procfs to sysfs.
Patch 3 removes the now unused portions of procfs for stat.
Patch 4 consolidates the sysfs ops for dbg, stats, log.
Patch 5 allocates and deallocates per-fs stats structures and sets up the sysfs entries for them. Add kobject and a pointer to a per-cpu struct xfsstats. Modify the macros that manipulate the stats accordingly.
Patch 6 implements per-filesystem stats objects in sysfs. Stats objects are instantiated when an xfs filesystem is mounted and deleted on unmount.
Patch 7 modifies the stats counting macros and the callers to those macros to properly increment, decrement, and add-to the xfs stats counts. The counts for global and per-fs stats are correctly advanced, and cleared by writing a "1" to the corresponding clear file.
Once again, comments and questions are welcome.
Quoted 8 lines
Thanks-
Bill_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
oops, lost a line, should have been:
Quoted 20 lines · Eric Sandeen
Or for a more concrete example, in patch 5 you do:
for_each_possible_cpu(cpu)(quoted diff) +1
-1- val += *(((__u32 *)&per_cpu(xfsstats, cpu) + idx)); + val += *(((__u32 *)&per_cpu(*stats, cpu) + idx)); return val;and then in patch 6 you do:
(quoted diff) +1
-1for_each_possible_cpu(cpu) - val += *(((__u32 *)&per_cpu(*stats, cpu) + idx)); + val += *(((__u32 *)per_cpu_ptr(stats, cpu) + idx)); return val;But this is unrelated to the purpose of patch 6; it should just be fixed up in a modified patch 5, i.e.
(quoted diff) +1
-1for_each_possible_cpu(cpu) - val += *(((__u32 *)&per_cpu(xfsstats, cpu) + idx)); + val += *(((__u32 *)per_cpu_ptr(stats, cpu) + idx));
Quoted 1 line
return val;
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Quoted 47 lines · Eric Sandeen
Quoted 6 lines · Bill O'Donnell
Hello-
Following is the next iteration of the series to add xfs stats to sysfs. This iteration adds patches 6 and 7 to complete the incorporation of sysfs/kobject into xfsstats, including working global and per-fs stats.
Hi Bill - as I mentioned on IRC, it looks like a lot of the patches in this series fix up review comments for *prior* patches; i.e. Patch X implements a change X, and got review comments when originally submitted.
Then Patch Y introduces change Y, but also fixes up comments in Patch X.
When you get review comments, they really need to be fixed up in that patch, not later in the patch series. This is for two reasons; for one, we really want each committed patch to be correct stylistically and functionally. And two, it simplifies review of the series; one doesn't need to look forward in the series to find fixes for prior patches, and each patch contains only its own functional changes, not unrelated fixups for prior patches.
So for example, if you have a patch which is fixing whitespace on code introduced in a previous patch, it's in the wrong patch.
Or for a more concrete example, in patch 5 you do:
for_each_possible_cpu(cpu)(quoted diff) +1
-1- val += *(((__u32 *)&per_cpu(xfsstats, cpu) + idx)); + val += *(((__u32 *)&per_cpu(*stats, cpu) + idx)); return val;and then in patch 6 you do:
(quoted diff) +0
-1for_each_possible_cpu(cpu) - val += *(((__u32 *)&per_cpu(*stats, cpu) + idx)); return val;But this is unrelated to the purpose of patch 6; it should just be fixed up in a modified patch 5, i.e.
(quoted diff) +1
-1for_each_possible_cpu(cpu) - val += *(((__u32 *)&per_cpu(xfsstats, cpu) + idx)); + val += *(((__u32 *)per_cpu_ptr(stats, cpu) + idx));return val;
Quoted 5 lines
So I'll restrict review comments to the actual end product, rather than patch by patch, because it's tough to review patch X when it has issues whichi are fixed up by patch X+1 or X+2 or ... :)
If you have any questions about all this, please let me know.
I'm doing another iteration of the series, and it will reflect your comments and advice.
Thanks-
Bill
Quoted 107 lines
Thanks,
-EricQuoted 101 lines
----------history---------------
v8: (add patches 6 and 7)
-patch 6: per-filesystem stats in sysfs.
Implement per-filesystem stats objects in sysfs. Stats objects are instantiated when an xfs filesystem is mounted and deleted on unmount. With this patch, the stats directory is created and populated with the familiar stats andstats_clearfiles.
Example:
/sys/fs/xfs/sda9/stats/stats/sys/fs/xfs/sda9/stats/stats_clearWith this patch, the individual counts within the new per-fs stats file(s) remain at zero. Functions that use the the macros to increment, decrement, and add-to the per-fs stats counts will be covered in the next patch (7).
Also, this patch includes some minor fixups for style issues in patch 5.
-patch 7: per-filesystem stats counter implementation Modify the stats counting macros and the callers to those macros to properly increment, decrement, and add-to the xfs stats counts. The counts for global and per-fs stats are correctly advanced, and cleared by writing a "1" to the corresponding clear file.
global counts:
/sys/fs/xfs/stats/stats
per-fs counts:/sys/fs/xfs/sda*/stats/statsglobal clear: /sys/fs/xfs/stats/stats_clear per-fs clear: /sys/fs/xfs/sda*/stats/stats_clearv7:
add patch 5/5: incorporate sysfs/kobject in xfsstats: handlers take kobjects. Allocate & deallocate per-fs stats structures and set up the sysfs entries for them. Add kobject and a pointer to a per-cpu struct xfsstats. Modify the macros that manipulate the stats accordingly.v6:
-add patch 4/4: moveto_xlog(kobject)to the relevant show/store operations. This keeps the xfs_sysfs_object_show/store functions generic. Also, with the change, there can be some cleanup of the show/store function arguments.v5:
(quoted diff) +0
-2-optimization of sysfs_ops function. -style fixupsv4:
(quoted diff) +0
-2-whitespace fixup of patch 1 -add patch 4 (sysfs ops consolidation - dbg, stats, log)v3:
-style fixups and removal of extraneous printk.v2:
-style fixups.
v1:
--------------------------------We already have per-fs information in /sys, so it makes sense to have per-fs stats there too. The series moves existing global stats infrastructure to /sys and reuses that code to create per-fs stats in /sys.
Patch 1 handles the bring-up and tear down of xfs/stats directory structure in sysfs when an fs is mounted. The directory contains the stats file and the
stats_clearfile. The stats file contents mimic those of/proc/fs/xfs/stat. Thestats_clearfile is empty, and much like the currentstat_clearcommand, handles the zeroing of the stats file when a "1" is echoed to thestats_clearfile.Patch 2 creates the symlink for stats from procfs to sysfs.
Patch 3 removes the now unused portions of procfs for stat.
Patch 4 consolidates the sysfs ops for dbg, stats, log.
Patch 5 allocates and deallocates per-fs stats structures and sets up the sysfs entries for them. Add kobject and a pointer to a per-cpu struct xfsstats. Modify the macros that manipulate the stats accordingly.
Patch 6 implements per-filesystem stats objects in sysfs. Stats objects are instantiated when an xfs filesystem is mounted and deleted on unmount.
Patch 7 modifies the stats counting macros and the callers to those macros to properly increment, decrement, and add-to the xfs stats counts. The counts for global and per-fs stats are correctly advanced, and cleared by writing a "1" to the corresponding clear file.
Once again, comments and questions are welcome.
Thanks-
Bill
Quoted 10 lines
Quoted 5 lines
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs