ceph: add perf metrics support
Subsystems (2)
v13 cover ceph: add perf metrics support
From: Xiubo Li <[email protected]>
# cat /sys/kernel/debug/ceph/9a972bfc-68cb-4d52-a610-7cd9a9adbbdd.client52904/metrics item total avg_lat(us) min_lat(us) max_lat(us) stdev(us) ----------------------------------------------------------------------------------- read 21979 2093 765 248778 2771 write 1129 45184 30252 368629 20437 metadata 3 6462 1674 14260 6811
item total miss hit
-------------------------------------------------
d_lease 2 0 1 caps 2 4 24248
Chnaged in V13:
- [3/4] and [4/4] switch jiffies to ktime_t for the start/end time stamp, which will make it much preciser, such as when the IO latency(end - start) < 1ms and if the HZ==1000, then we will always get end == start in jiffies, and the min will always be 0, actually it should be in range (0, 1000)us.
- [3/4] since by using ktime helpers we are calculating the stdev in nanosecond, then switch to us, so to compute the reminder make no sense any more, remove it from stdev.
Changed in V12:
- [3/4] and [4/4] switch atomic64_t type to u64 for lat sum and total numbers
Changed in V11:
- [3/4] and [4/4] fold the min/max/stdev factors
Changed in V10:
- rebase to the latest testing branch
- merge all the metric related patches into one
- [1/6] move metric helpers into a new file metric.c
- [2/6] move metric helpers into metric.c
- [3/6] merge the read/write patches into a signal patch and move metric helpers to metric.c
- [4/6] move metric helpers to metric.c
- [5/6] min/max latency support
- [6/6] standard deviation support
Changed in V9:
- add an r_ended field to the mds request struct and use that to calculate the metric
- fix some commit comments
Xiubo Li (4):
ceph: add dentry lease metric support
ceph: add caps perf metric for each superblock
ceph: add read/write latency metric support
ceph: add metadata perf metric support
fs/ceph/Makefile | 2 +- fs/ceph/acl.c | 2 +- fs/ceph/addr.c | 20 ++++++ fs/ceph/caps.c | 19 ++++++ fs/ceph/debugfs.c | 100 +++++++++++++++++++++++++-- fs/ceph/dir.c | 17 ++++- fs/ceph/file.c | 30 ++++++++ fs/ceph/inode.c | 4 +- fs/ceph/mds_client.c | 23 ++++++- fs/ceph/mds_client.h | 7 ++ fs/ceph/metric.c | 148 ++++++++++++++++++++++++++++++++++++++++ fs/ceph/metric.h | 62 +++++++++++++++++ fs/ceph/super.h | 9 ++- fs/ceph/xattr.c | 4 +- include/linux/ceph/osd_client.h | 3 + net/ceph/osd_client.c | 3 + 16 files changed, 436 insertions(+), 17 deletions(-) create mode 100644 fs/ceph/metric.c create mode 100644 fs/ceph/metric.h
Signature · 1 line
1.8.3.1
PATCH v13 1/4 ceph: add dentry lease metric support
From: Xiubo Li <[email protected]>
For dentry leases, only count the hit/miss info triggered from the vfs calls. For the cases like request reply handling and ceph_trim_dentries, ignore them.
For now, these are only viewable using debugfs. Future patches will allow the client to send the stats to the MDS.
The output looks like:
item total miss hit
-------------------------------------------------d_lease 11 7 141
URL: https://tracker.ceph.com/issues/43215
--- fs/ceph/Makefile | 2 +- fs/ceph/debugfs.c | 33 +++++++++++++++++++++++++++++---- fs/ceph/dir.c | 12 ++++++++++++ fs/ceph/mds_client.c | 16 ++++++++++++++-- fs/ceph/mds_client.h | 4 ++++ fs/ceph/metric.c | 35 +++++++++++++++++++++++++++++++++++ fs/ceph/metric.h | 17 +++++++++++++++++ fs/ceph/super.h | 1 + 8 files changed, 113 insertions(+), 7 deletions(-) create mode 100644 fs/ceph/metric.c create mode 100644 fs/ceph/metric.h
fs/ceph/Makefile +1 -1
@@ -8,7 +8,7 @@ obj-$(CONFIG_CEPH_FS) += ceph.o ceph-y := super.o inode.o dir.o file.o locks.o addr.o ioctl.o \ export.o caps.o snap.o xattr.o quota.o io.o \ mds_client.o mdsmap.o strings.o ceph_frag.o \ - debugfs.o util.o + debugfs.o util.o metric.o ceph-$(CONFIG_CEPH_FSCACHE) += cache.o ceph-$(CONFIG_CEPH_FS_POSIX_ACL) += acl.o
fs/ceph/debugfs.c +29 -4
@@ -124,6 +124,23 @@ static int mdsc_show(struct seq_file *s, void *p)return 0 ; } +static int metric_show (struct seq_file *s,void *p) +{ +struct ceph_fs_client *fsc = s->private; +struct ceph_mds_client *mdsc = fsc->mdsc; +struct ceph_client_metric *m = &mdsc->metric; + +seq_printf (s,"item total miss hit\n" ); +seq_printf (s,"-------------------------------------------------\n" ); + +seq_printf (s,"%-14s%-16lld%-16lld%lld\n" ,"d_lease" , +atomic64_read (&m->total_dentries), +percpu_counter_sum (&m->d_lease_mis), +percpu_counter_sum (&m->d_lease_hit)); + +return 0 ; +} +static int caps_show_cb (struct inode *inode,struct ceph_cap *cap,void *p) {struct seq_file *s = p;
@@ -222,6 +239,7 @@ static int mds_sessions_show(struct seq_file *s, void *ptr)DEFINE_SHOW_ATTRIBUTE (mdsc);DEFINE_SHOW_ATTRIBUTE (caps);DEFINE_SHOW_ATTRIBUTE (mds_sessions); +DEFINE_SHOW_ATTRIBUTE (metric);/*
@@ -255,6 +273,7 @@ void ceph_fs_debugfs_cleanup(struct ceph_fs_client *fsc)debugfs_remove (fsc->debugfs_mdsmap);debugfs_remove (fsc->debugfs_mds_sessions);debugfs_remove (fsc->debugfs_caps); +debugfs_remove (fsc->debugfs_metric);debugfs_remove (fsc->debugfs_mdsc); }
@@ -295,11 +314,17 @@ void ceph_fs_debugfs_init(struct ceph_fs_client *fsc) fsc, &mdsc_fops); + fsc->debugfs_metric =debugfs_create_file ("metrics" , +0400 , + fsc->client->debugfs_dir, + fsc, + &metric_fops); + fsc->debugfs_caps =debugfs_create_file ("caps" , -0400 , - fsc->client->debugfs_dir, - fsc, - &caps_fops); +0400 , + fsc->client->debugfs_dir, + fsc, + &caps_fops); }
fs/ceph/dir.c +12 -0
@@ -38,6 +38,8 @@static int ceph_d_init (struct dentry *dentry) {struct ceph_dentry_info *di; +struct ceph_fs_client *fsc =ceph_sb_to_client (dentry->d_sb); +struct ceph_mds_client *mdsc = fsc->mdsc; di =kmem_cache_zalloc (ceph_dentry_cachep,GFP_KERNEL );if (!di)
@@ -48,6 +50,9 @@ static int ceph_d_init(struct dentry *dentry) di->time = jiffies; dentry->d_fsdata = di;INIT_LIST_HEAD (&di->lease_list); + +atomic64_inc (&mdsc->metric.total_dentries); +return 0 ; }
@@ -1709,6 +1714,8 @@ static int ceph_d_revalidate(struct dentry *dentry, unsigned int flags)if (flags &LOOKUP_RCU )return -ECHILD ; +percpu_counter_inc (&mdsc->metric.d_lease_mis); + op =ceph_snap (dir) ==CEPH_SNAPDIR ?CEPH_MDS_OP_LOOKUPSNAP :CEPH_MDS_OP_LOOKUP ; req =ceph_mdsc_create_request (mdsc, op,USE_ANY_MDS );
@@ -1740,6 +1747,8 @@ static int ceph_d_revalidate(struct dentry *dentry, unsigned int flags)dout ("d_revalidate %p lookup result=%d\n" , dentry, err); } + }else { +percpu_counter_inc (&mdsc->metric.d_lease_hit); }dout ("d_revalidate %p %s\n" , dentry, valid ?"valid" :"invalid" );
@@ -1782,9 +1791,12 @@ static int ceph_d_delete(const struct dentry *dentry)static void ceph_d_release (struct dentry *dentry) {struct ceph_dentry_info *di =ceph_dentry (dentry); +struct ceph_fs_client *fsc =ceph_sb_to_client (dentry->d_sb);dout ("d_release %p\n" , dentry); +atomic64_dec (&fsc->mdsc->metric.total_dentries); +spin_lock (&dentry->d_lock);__dentry_lease_unlist (di); dentry->d_fsdata =NULL ;
fs/ceph/mds_client.c +14 -2
@@ -4325,6 +4325,7 @@ int ceph_mdsc_init(struct ceph_fs_client *fsc) {struct ceph_mds_client *mdsc; +int err; mdsc =kzalloc (sizeof (struct ceph_mds_client ),GFP_NOFS );if (!mdsc)
@@ -4333,8 +4334,8 @@ int ceph_mdsc_init(struct ceph_fs_client *fsc)mutex_init (&mdsc->mutex); mdsc->mdsmap =kzalloc (sizeof (*mdsc->mdsmap),GFP_NOFS );if (!mdsc->mdsmap) { -kfree (mdsc); -return -ENOMEM ; + err = -ENOMEM ; + goto err_mdsc; } fsc->mdsc = mdsc;
@@ -4373,6 +4374,9 @@ int ceph_mdsc_init(struct ceph_fs_client *fsc)init_waitqueue_head (&mdsc->cap_flushing_wq);INIT_WORK (&mdsc->cap_reclaim_work, ceph_cap_reclaim_work);atomic_set (&mdsc->cap_reclaim_pending,0 ); + err =ceph_metric_init (&mdsc->metric); +if (err) + goto err_mdsmap;spin_lock_init (&mdsc->dentry_list_lock);INIT_LIST_HEAD (&mdsc->dentry_leases);
@@ -4391,6 +4395,12 @@ int ceph_mdsc_init(struct ceph_fs_client *fsc)strscpy (mdsc->nodename,utsname ()->nodename,sizeof (mdsc->nodename));return 0 ; + +err_mdsmap: +kfree (mdsc->mdsmap); +err_mdsc: +kfree (mdsc); +return err; }/*
@@ -4648,6 +4658,8 @@ void ceph_mdsc_destroy(struct ceph_fs_client *fsc)ceph_mdsc_stop (mdsc); +ceph_metric_destroy (&mdsc->metric); + fsc->mdsc =NULL ;kfree (mdsc);dout ("mdsc_destroy %p done\n" , mdsc);
fs/ceph/mds_client.h +4 -0
@@ -16,6 +16,8 @@#include <linux/ceph/mdsmap.h> #include <linux/ceph/auth.h> +#include "metric.h" +/* The first 8 bits are reserved for old ceph releases */ enum ceph_feature_type {CEPHFS_FEATURE_MIMIC =8 ,
@@ -454,6 +456,8 @@ struct ceph_mds_client {struct list_head dentry_leases;/* fifo list */ struct list_head dentry_dir_leases;/* lru list */ +struct ceph_client_metric metric; +spinlock_t snapid_map_lock;struct rb_root snapid_map_tree;struct list_head snapid_map_lru;
fs/ceph/metric.c new file +35 -0
@@ -0,0 +1,35 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#include <linux/types.h> +#include <linux/percpu_counter.h> + +#include "metric.h" + +int ceph_metric_init (struct ceph_client_metric *m) +{ +int ret; + +if (!m) +return -EINVAL ; + +atomic64_set (&m->total_dentries,0 ); + ret =percpu_counter_init (&m->d_lease_hit,0 ,GFP_KERNEL ); +if (ret) +return ret; + ret =percpu_counter_init (&m->d_lease_mis,0 ,GFP_KERNEL ); +if (ret) { +percpu_counter_destroy (&m->d_lease_hit); +return ret; + } + +return 0 ; +} + +void ceph_metric_destroy (struct ceph_client_metric *m) +{ +if (!m) +return ; + +percpu_counter_destroy (&m->d_lease_mis); +percpu_counter_destroy (&m->d_lease_hit); +}
fs/ceph/metric.h new file +17 -0
@@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _FS_CEPH_MDS_METRIC_H +#define _FS_CEPH_MDS_METRIC_H + +#include <linux/types.h> +#include <linux/percpu_counter.h> + +/* This is the global metrics */ +struct ceph_client_metric { +atomic64_t total_dentries; +struct percpu_counter d_lease_hit; +struct percpu_counter d_lease_mis; +}; + +extern int ceph_metric_init (struct ceph_client_metric *m); +extern void ceph_metric_destroy (struct ceph_client_metric *m); +#endif /* _FS_CEPH_MDS_METRIC_H */
fs/ceph/super.h +1 -0
@@ -128,6 +128,7 @@ struct ceph_fs_client {struct dentry *debugfs_congestion_kb;struct dentry *debugfs_bdi;struct dentry *debugfs_mdsc, *debugfs_mdsmap; +struct dentry *debugfs_metric;struct dentry *debugfs_mds_sessions;#endif
Signature · 1 line
1.8.3.1
PATCH v13 2/4 ceph: add caps perf metric for each superblock
In reply to [email protected]From: Xiubo Li <[email protected]>
Count hits and misses in the caps cache. If the client has all of the necessary caps when a task needs references, then it's counted as a hit. Any other situation is a miss.
URL: https://tracker.ceph.com/issues/43215
--- fs/ceph/acl.c | 2 +- fs/ceph/caps.c | 19 +++++++++++++++++++ fs/ceph/debugfs.c | 16 ++++++++++++++++ fs/ceph/dir.c | 5 +++-- fs/ceph/inode.c | 4 ++-- fs/ceph/metric.c | 26 ++++++++++++++++++++++---- fs/ceph/metric.h | 13 +++++++++++++ fs/ceph/super.h | 8 +++++--- fs/ceph/xattr.c | 4 ++-- 9 files changed, 83 insertions(+), 14 deletions(-)
fs/ceph/acl.c +1 -1
@@ -22,7 +22,7 @@ static inline void ceph_set_cached_acl(struct inode *inode,struct ceph_inode_info *ci =ceph_inode (inode);spin_lock (&ci->i_ceph_lock); -if (__ceph_caps_issued_mask (ci,CEPH_CAP_XATTR_SHARED ,0 )) +if (__ceph_caps_issued_mask_metric (ci,CEPH_CAP_XATTR_SHARED ,0 ))set_cached_acl (inode, type, acl);else forget_cached_acl (inode, type);
fs/ceph/caps.c +19 -0
@@ -912,6 +912,20 @@ int __ceph_caps_issued_mask(struct ceph_inode_info *ci, int mask, int touch)return 0 ; } +int __ceph_caps_issued_mask_metric (struct ceph_inode_info *ci,int mask, +int touch) +{ +struct ceph_fs_client *fsc =ceph_sb_to_client (ci->vfs_inode.i_sb); +int r; + + r =__ceph_caps_issued_mask (ci, mask, touch); +if (r) +ceph_update_cap_hit (&fsc->mdsc->metric); +else +ceph_update_cap_mis (&fsc->mdsc->metric); +return r; +} +/* * Return true if mask caps are currently being revoked by an MDS. */
@@ -2685,6 +2699,11 @@ static int try_get_cap_refs(struct inode *inode, int need, int want,if (snap_rwsem_locked)up_read (&mdsc->snap_rwsem); +if (!ret) +ceph_update_cap_mis (&mdsc->metric); +else if (ret ==1 ) +ceph_update_cap_hit (&mdsc->metric); +dout ("get_cap_refs %p ret %d got %s\n" , inode, ret,ceph_cap_string (*got));return ret;
fs/ceph/debugfs.c +16 -0
@@ -129,6 +129,7 @@ static int metric_show(struct seq_file *s, void *p)struct ceph_fs_client *fsc = s->private;struct ceph_mds_client *mdsc = fsc->mdsc;struct ceph_client_metric *m = &mdsc->metric; +int i, nr_caps =0 ;seq_printf (s,"item total miss hit\n" );seq_printf (s,"-------------------------------------------------\n" );
@@ -138,6 +139,21 @@ static int metric_show(struct seq_file *s, void *p)percpu_counter_sum (&m->d_lease_mis), percpu_counter_sum(&m->d_lease_hit)); +mutex_lock (&mdsc->mutex); +for (i =0 ; i < mdsc->max_sessions; i++) { +struct ceph_mds_session *s; + + s =__ceph_lookup_mds_session (mdsc, i); +if (!s) +continue ; + nr_caps += s->s_nr_caps; +ceph_put_mds_session (s); + } +mutex_unlock (&mdsc->mutex); +seq_printf (s,"%-14s%-16d%-16lld%lld\n" ,"caps" , nr_caps, +percpu_counter_sum (&m->i_caps_mis), +percpu_counter_sum (&m->i_caps_hit)); +return 0 ; }
fs/ceph/dir.c +3 -2
@@ -349,8 +349,9 @@ static int ceph_readdir(struct file *file, struct dir_context *ctx) !ceph_test_mount_opt(fsc, NOASYNCREADDIR) && ceph_snap(inode) != CEPH_SNAPDIR && __ceph_dir_is_complete_ordered(ci) && - __ceph_caps_issued_mask(ci, CEPH_CAP_FILE_SHARED, 1)) { + __ceph_caps_issued_mask_metric(ci, CEPH_CAP_FILE_SHARED, 1)) {int shared_gen =atomic_read (&ci->i_shared_gen); +spin_unlock (&ci->i_ceph_lock); err =__dcache_readdir (file, ctx, shared_gen);if (err != -EAGAIN )
@@ -767,7 +768,7 @@ static struct dentry *ceph_lookup(struct inode *dir, struct dentry *dentry, !is_root_ceph_dentry(dir, dentry) && ceph_test_mount_opt(fsc, DCACHE) && __ceph_dir_is_complete(ci) && - (__ceph_caps_issued_mask(ci, CEPH_CAP_FILE_SHARED, 1))) { + __ceph_caps_issued_mask_metric(ci, CEPH_CAP_FILE_SHARED, 1)) {__ceph_touch_fmode (ci, mdsc,CEPH_FILE_MODE_RD );spin_unlock (&ci->i_ceph_lock);dout (" dir %p complete, -ENOENT\n" , dir);
fs/ceph/inode.c +2 -2
@@ -2288,8 +2288,8 @@ int __ceph_do_getattr(struct inode *inode, struct page *locked_page,dout ("do_getattr inode %p mask %s mode 0%o\n" , inode,ceph_cap_string (mask), inode->i_mode); -if (!force &&ceph_caps_issued_mask (ceph_inode (inode), mask,1 )) -return 0 ; +if (!force &&ceph_caps_issued_mask_metric (ceph_inode (inode), mask,1 )) +return 0 ; mode = (mask &CEPH_STAT_RSTAT ) ?USE_AUTH_MDS :USE_ANY_MDS ; req =ceph_mdsc_create_request (mdsc,CEPH_MDS_OP_GETATTR , mode);
fs/ceph/metric.c +22 -4
@@ -16,13 +16,29 @@ int ceph_metric_init(struct ceph_client_metric *m) ret =percpu_counter_init (&m->d_lease_hit,0 ,GFP_KERNEL );if (ret)return ret; + ret =percpu_counter_init (&m->d_lease_mis,0 ,GFP_KERNEL ); -if (ret) { -percpu_counter_destroy (&m->d_lease_hit); -return ret; - } +if (ret) + goto err_d_lease_mis; + + ret =percpu_counter_init (&m->i_caps_hit,0 ,GFP_KERNEL ); +if (ret) + goto err_i_caps_hit; + + ret =percpu_counter_init (&m->i_caps_mis,0 ,GFP_KERNEL ); +if (ret) + goto err_i_caps_mis;return 0 ; + +err_i_caps_mis: +percpu_counter_destroy (&m->i_caps_hit); +err_i_caps_hit: +percpu_counter_destroy (&m->d_lease_mis); +err_d_lease_mis: +percpu_counter_destroy (&m->d_lease_hit); + +return ret; }void ceph_metric_destroy (struct ceph_client_metric *m)
@@ -30,6 +46,8 @@ void ceph_metric_destroy(struct ceph_client_metric *m)if (!m)return ; +percpu_counter_destroy (&m->i_caps_mis); +percpu_counter_destroy (&m->i_caps_hit);percpu_counter_destroy (&m->d_lease_mis);percpu_counter_destroy (&m->d_lease_hit); }
fs/ceph/metric.h +13 -0
@@ -10,8 +10,21 @@ struct ceph_client_metric {atomic64_t total_dentries;struct percpu_counter d_lease_hit;struct percpu_counter d_lease_mis; + +struct percpu_counter i_caps_hit; + struct percpu_counter i_caps_mis; };extern int ceph_metric_init (struct ceph_client_metric *m);extern void ceph_metric_destroy (struct ceph_client_metric *m); + +static inline void ceph_update_cap_hit (struct ceph_client_metric *m) +{ +percpu_counter_inc (&m->i_caps_hit); +} + +static inline void ceph_update_cap_mis (struct ceph_client_metric *m) +{ +percpu_counter_inc (&m->i_caps_mis); +}#endif /* _FS_CEPH_MDS_METRIC_H */
fs/ceph/super.h +5 -3
@@ -645,6 +645,8 @@ static inline bool __ceph_is_any_real_caps(struct ceph_inode_info *ci)extern int __ceph_caps_issued (struct ceph_inode_info *ci,int *implemented);extern int __ceph_caps_issued_mask (struct ceph_inode_info *ci,int mask,int t); +extern int __ceph_caps_issued_mask_metric (struct ceph_inode_info *ci,int mask, +int t);extern int __ceph_caps_issued_other (struct ceph_inode_info *ci,struct ceph_cap *cap);
@@ -657,12 +659,12 @@ static inline int ceph_caps_issued(struct ceph_inode_info *ci)return issued; } -static inline int ceph_caps_issued_mask (struct ceph_inode_info *ci,int mask, -int touch) +static inline int ceph_caps_issued_mask_metric (struct ceph_inode_info *ci, +int mask,int touch) {int r;spin_lock (&ci->i_ceph_lock); - r =__ceph_caps_issued_mask (ci, mask, touch); + r =__ceph_caps_issued_mask_metric (ci, mask, touch);spin_unlock (&ci->i_ceph_lock);return r; }
fs/ceph/xattr.c +2 -2
@@ -856,7 +856,7 @@ ssize_t __ceph_getxattr(struct inode *inode, const char *name, void *value,if (ci->i_xattrs.version ==0 || !((req_mask &CEPH_CAP_XATTR_SHARED ) || -__ceph_caps_issued_mask (ci,CEPH_CAP_XATTR_SHARED ,1 ))) { +__ceph_caps_issued_mask_metric (ci,CEPH_CAP_XATTR_SHARED ,1 ))) {spin_unlock (&ci->i_ceph_lock);/* security module gets xattr while filling trace */
@@ -914,7 +914,7 @@ ssize_t ceph_listxattr(struct dentry *dentry, char *names, size_t size) ci->i_xattrs.version, ci->i_xattrs.index_version);if (ci->i_xattrs.version ==0 || - !__ceph_caps_issued_mask (ci,CEPH_CAP_XATTR_SHARED ,1 )) { + !__ceph_caps_issued_mask_metric (ci,CEPH_CAP_XATTR_SHARED ,1 )) {spin_unlock (&ci->i_ceph_lock); err =ceph_do_getattr (inode,CEPH_STAT_CAP_XATTR , true);if (err)
Signature · 1 line
1.8.3.1
PATCH v13 3/4 ceph: add read/write latency metric support
In reply to [email protected]From: Xiubo Li <[email protected]>
Calculate the latency for OSD read requests. Add a new r_end_stamp field to struct ceph_osd_request that will hold the time of that the reply was received. Use that to calculate the RTT for each call, and divide the sum of those by number of calls to get averate RTT.
Keep a tally of RTT for OSD writes and number of calls to track average latency of OSD writes.
URL: https://tracker.ceph.com/issues/43215
--- fs/ceph/addr.c | 20 ++++++++++++ fs/ceph/debugfs.c | 43 +++++++++++++++++++++++- fs/ceph/file.c | 30 +++++++++++++++++ fs/ceph/metric.c | 72 +++++++++++++++++++++++++++++++++++++++++ fs/ceph/metric.h | 22 +++++++++++++ include/linux/ceph/osd_client.h | 3 ++ net/ceph/osd_client.c | 3 ++ 7 files changed, 192 insertions(+), 1 deletion(-)
fs/ceph/addr.c +20 -0
@@ -11,10 +11,12 @@#include <linux/task_io_accounting_ops.h> #include <linux/signal.h> #include <linux/iversion.h> +#include <linux/ktime.h> #include "super.h" #include "mds_client.h" #include "cache.h" +#include "metric.h" #include <linux/ceph/osd_client.h> #include <linux/ceph/striper.h>
@@ -216,6 +218,9 @@ static int ceph_sync_readpages(struct ceph_fs_client *fsc,if (!rc) rc =ceph_osdc_wait_request (osdc, req); +ceph_update_read_latency (&fsc->mdsc->metric, req->r_start_latency, + req->r_end_latency, rc); +ceph_osdc_put_request (req);dout ("readpages result %d\n" , rc);return rc;
@@ -299,6 +304,7 @@ static int ceph_readpage(struct file *filp, struct page *page)static void finish_read (struct ceph_osd_request *req) {struct inode *inode = req->r_inode; +struct ceph_fs_client *fsc =ceph_inode_to_client (inode);struct ceph_osd_data *osd_data;int rc = req->r_result <=0 ? req->r_result :0 ;int bytes = req->r_result >=0 ? req->r_result :0 ;
@@ -336,6 +342,10 @@ static void finish_read(struct ceph_osd_request *req)put_page (page); bytes -=PAGE_SIZE ; } + +ceph_update_read_latency (&fsc->mdsc->metric, req->r_start_latency, + req->r_end_latency, rc); +kfree (osd_data->pages); }
@@ -643,6 +653,9 @@ static int ceph_sync_writepages(struct ceph_fs_client *fsc,if (!rc) rc =ceph_osdc_wait_request (osdc, req); +ceph_update_write_latency (&fsc->mdsc->metric, req->r_start_latency, + req->r_end_latency, rc); +ceph_osdc_put_request (req);if (rc ==0 ) rc = len;
@@ -794,6 +807,9 @@ static void writepages_finish(struct ceph_osd_request *req)ceph_clear_error_write (ci); } +ceph_update_write_latency (&fsc->mdsc->metric, req->r_start_latency, + req->r_end_latency, rc); +/* * We lost the cache cap, need to truncate the page before * it is unlocked, otherwise we'd truncate it later in the
@@ -1852,6 +1868,10 @@ int ceph_uninline_data(struct file *filp, struct page *locked_page) err =ceph_osdc_start_request (&fsc->client->osdc, req, false);if (!err) err =ceph_osdc_wait_request (&fsc->client->osdc, req); + +ceph_update_write_latency (&fsc->mdsc->metric, req->r_start_latency, + req->r_end_latency, err); + out_put:ceph_osdc_put_request (req);if (err == -ECANCELED )
fs/ceph/debugfs.c +42 -1
67 lines not on this page · raw message
fs/ceph/file.c +30 -0
@@ -11,11 +11,13 @@#include <linux/writeback.h> #include <linux/falloc.h> #include <linux/iversion.h> +#include <linux/ktime.h> #include "super.h" #include "mds_client.h" #include "cache.h" #include "io.h" +#include "metric.h" static __le32 ceph_flags_sys2wire (u32 flags) {
@@ -906,6 +908,12 @@ static ssize_t ceph_sync_read(struct kiocb *iocb, struct iov_iter *to, ret =ceph_osdc_start_request (osdc, req, false);if (!ret) ret =ceph_osdc_wait_request (osdc, req); + +ceph_update_read_latency (&fsc->mdsc->metric, + req->r_start_latency, + req->r_end_latency, + ret); +ceph_osdc_put_request (req); i_size =i_size_read (inode);
@@ -1044,6 +1052,8 @@ static void ceph_aio_complete_req(struct ceph_osd_request *req)struct inode *inode = req->r_inode;struct ceph_aio_request *aio_req = req->r_priv;struct ceph_osd_data *osd_data =osd_req_op_extent_osd_data (req,0 ); +struct ceph_fs_client *fsc =ceph_inode_to_client (inode); +struct ceph_client_metric *metric = &fsc->mdsc->metric;BUG_ON (osd_data->type !=CEPH_OSD_DATA_TYPE_BVECS );BUG_ON (!osd_data->num_bvecs);
@@ -1051,6 +1061,16 @@ static void ceph_aio_complete_req(struct ceph_osd_request *req)dout ("ceph_aio_complete_req %p rc %d bytes %u\n" , inode, rc, osd_data->bvec_pos.iter.bi_size); +/* r_start_latency == 0 means the request was not submitted */ +if (req->r_start_latency) { +if (aio_req->write) +ceph_update_write_latency (metric, req->r_start_latency, + req->r_end_latency, rc); +else +ceph_update_read_latency (metric, req->r_start_latency, + req->r_end_latency, rc); + } +if (rc == -EOLDSNAPC ) {struct ceph_aio_work *aio_work;BUG_ON (!aio_req->write);
@@ -1179,6 +1199,7 @@ static void ceph_aio_retry_work(struct work_struct *work)struct inode *inode =file_inode (file);struct ceph_inode_info *ci =ceph_inode (inode);struct ceph_fs_client *fsc =ceph_inode_to_client (inode); +struct ceph_client_metric *metric = &fsc->mdsc->metric;struct ceph_vino vino;struct ceph_osd_request *req;struct bio_vec *bvecs;
@@ -1295,6 +1316,13 @@ static void ceph_aio_retry_work(struct work_struct *work)if (!ret) ret =ceph_osdc_wait_request (&fsc->client->osdc, req); +if (write) +ceph_update_write_latency (metric, req->r_start_latency, + req->r_end_latency, ret); +else +ceph_update_read_latency (metric, req->r_start_latency, + req->r_end_latency, ret); + size =i_size_read (inode);if (!write) {if (ret == -ENOENT )
@@ -1466,6 +1494,8 @@ static void ceph_aio_retry_work(struct work_struct *work)if (!ret) ret =ceph_osdc_wait_request (&fsc->client->osdc, req); +ceph_update_write_latency (&fsc->mdsc->metric, req->r_start_latency, + req->r_end_latency, ret); out:ceph_osdc_put_request (req);if (ret !=0 ) {
fs/ceph/metric.c +72 -0
87 lines not on this page · raw message
fs/ceph/metric.h +22 -0
@@ -4,6 +4,7 @@#include <linux/types.h> #include <linux/percpu_counter.h> +#include <linux/ktime.h> /* This is the global metrics */ struct ceph_client_metric {
@@ -13,6 +14,20 @@ struct ceph_client_metric {struct percpu_counter i_caps_hit;struct percpu_counter i_caps_mis; + +spinlock_t read_latency_lock; +u64 total_reads; +ktime_t read_latency_sum; +ktime_t read_latency_sq_sum; +ktime_t read_latency_min; +ktime_t read_latency_max; + +spinlock_t write_latency_lock; +u64 total_writes; +ktime_t write_latency_sum; +ktime_t write_latency_sq_sum; +ktime_t write_latency_min; +ktime_t write_latency_max; };extern int ceph_metric_init (struct ceph_client_metric *m);
@@ -27,4 +42,11 @@ static inline void ceph_update_cap_mis(struct ceph_client_metric *m) {percpu_counter_inc (&m->i_caps_mis); } + +extern void ceph_update_read_latency (struct ceph_client_metric *m, +ktime_t r_start,ktime_t r_end, +int rc); +extern void ceph_update_write_latency (struct ceph_client_metric *m, +ktime_t r_start,ktime_t r_end, +int rc);#endif /* _FS_CEPH_MDS_METRIC_H */
include/linux/ceph/osd_client.h +3 -0
@@ -8,6 +8,7 @@#include <linux/mempool.h> #include <linux/rbtree.h> #include <linux/refcount.h> +#include <linux/ktime.h> #include <linux/ceph/types.h> #include <linux/ceph/osdmap.h>
@@ -213,6 +214,8 @@ struct ceph_osd_request {/* internal */ unsigned long r_stamp;/* jiffies, send or check time */ unsigned long r_start_stamp;/* jiffies */ +ktime_t r_start_latency;/* ktime_t */ +ktime_t r_end_latency;/* ktime_t */ int r_attempts;u32 r_map_dne_bound;
net/ceph/osd_client.c +3 -0
@@ -2373,6 +2373,7 @@ static void account_request(struct ceph_osd_request *req)atomic_inc (&req->r_osdc->num_requests); req->r_start_stamp = jiffies; + req->r_start_latency =ktime_get (); }static void submit_request (struct ceph_osd_request *req,bool wrlocked)
@@ -2389,6 +2390,8 @@ static void finish_request(struct ceph_osd_request *req)WARN_ON (lookup_request_mc (&osdc->map_checks, req->r_tid));dout ("%s req %p tid %llu\n" , __func__, req, req->r_tid); + req->r_end_latency =ktime_get (); +if (req->r_osd)unlink_request (req->r_osd, req);atomic_dec (&osdc->num_requests);
Signature · 1 line
1.8.3.1
PATCH v13 4/4 ceph: add metadata perf metric support
In reply to [email protected]From: Xiubo Li <[email protected]>
Add a new "r_ended" field to struct ceph_mds_request and use that to maintain the average latency of MDS requests.
URL: https://tracker.ceph.com/issues/43215
--- fs/ceph/debugfs.c | 10 ++++++++++ fs/ceph/mds_client.c | 7 +++++++ fs/ceph/mds_client.h | 3 +++ fs/ceph/metric.c | 23 +++++++++++++++++++++++ fs/ceph/metric.h | 10 ++++++++++ 5 files changed, 53 insertions(+)
fs/ceph/debugfs.c +10 -0
@@ -171,6 +171,16 @@ static int metric_show(struct seq_file *s, void *p)spin_unlock (&m->write_latency_lock);CEPH_METRIC_SHOW ("write" , total, avg, min, max, sq); +spin_lock (&m->metadata_latency_lock); + total = m->total_metadatas; + sum = m->metadata_latency_sum; + avg = total >0 ?DIV64_U64_ROUND_CLOSEST (sum, total) :0 ; + min = m->metadata_latency_min; + max = m->metadata_latency_max; + sq = m->metadata_latency_sq_sum; +spin_unlock (&m->metadata_latency_lock); +CEPH_METRIC_SHOW ("metadata" , total, avg, min, max, sq); +seq_printf (s,"\n" );seq_printf (s,"item total miss hit\n" );seq_printf (s,"-------------------------------------------------\n" );
fs/ceph/mds_client.c +7 -0
@@ -10,6 +10,7 @@#include <linux/seq_file.h> #include <linux/ratelimit.h> #include <linux/bits.h> +#include <linux/ktime.h> #include "super.h" #include "mds_client.h"
@@ -2201,6 +2202,7 @@ struct ceph_mds_request *mutex_init (&req->r_fill_mutex); req->r_mdsc = mdsc; req->r_started = jiffies; + req->r_start_latency =ktime_get (); req->r_resend_mds =-1 ;INIT_LIST_HEAD (&req->r_unsafe_dir_item);INIT_LIST_HEAD (&req->r_unsafe_target_item);
@@ -2547,6 +2549,8 @@ static struct ceph_msg *create_request_message(struct ceph_mds_client *mdsc,static void complete_request (struct ceph_mds_client *mdsc,struct ceph_mds_request *req) { + req->r_end_latency =ktime_get (); +if (req->r_callback) req->r_callback (mdsc, req);complete_all (&req->r_completion);
@@ -3155,6 +3159,9 @@ static void handle_reply(struct ceph_mds_session *session, struct ceph_msg *msg)/* kick calling process */ complete_request (mdsc, req); + +ceph_update_metadata_latency (&mdsc->metric, req->r_start_latency, + req->r_end_latency, err); out:ceph_mdsc_put_request (req);return ;
fs/ceph/mds_client.h +3 -0
@@ -10,6 +10,7 @@#include <linux/spinlock.h> #include <linux/refcount.h> #include <linux/utsname.h> +#include <linux/ktime.h> #include <linux/ceph/types.h> #include <linux/ceph/messenger.h>
@@ -299,6 +300,8 @@ struct ceph_mds_request {unsigned long r_timeout;/* optional. jiffies, 0 is "wait forever" */ unsigned long r_started;/* start time to measure timeout against */ +unsigned long r_start_latency;/* start time to measure latency */ +unsigned long r_end_latency;/* finish time to measure latency */ unsigned long r_request_started;/* start time for mds request only, used to measure lease durations */
fs/ceph/metric.c +23 -0
@@ -44,6 +44,13 @@ int ceph_metric_init(struct ceph_client_metric *m) m->total_writes =0 ; m->write_latency_sum =0 ; +spin_lock_init (&m->metadata_latency_lock); + m->metadata_latency_sq_sum =0 ; + m->metadata_latency_min =KTIME_MAX ; + m->metadata_latency_max =0 ; + m->total_metadatas =0 ; + m->metadata_latency_sum =0 ; +return 0 ; err_i_caps_mis:
@@ -123,3 +130,19 @@ void ceph_update_write_latency(struct ceph_client_metric *m, &m->write_latency_sq_sum, lat);spin_unlock (&m->write_latency_lock); } + +void ceph_update_metadata_latency (struct ceph_client_metric *m, +ktime_t r_start,ktime_t r_end, +int rc) +{ +ktime_t lat =ktime_sub (r_end, r_start); + +if (unlikely (rc && rc != -ENOENT )) +return ; + +spin_lock (&m->metadata_latency_lock); +__update_latency (&m->total_metadatas, &m->metadata_latency_sum, + &m->metadata_latency_min, &m->metadata_latency_max, + &m->metadata_latency_sq_sum, lat); +spin_unlock (&m->metadata_latency_lock); +}
fs/ceph/metric.h +10 -0
@@ -28,6 +28,13 @@ struct ceph_client_metric {ktime_t write_latency_sq_sum;ktime_t write_latency_min;ktime_t write_latency_max; + +spinlock_t metadata_latency_lock; +u64 total_metadatas; +ktime_t metadata_latency_sum; +ktime_t metadata_latency_sq_sum; +ktime_t metadata_latency_min; +ktime_t metadata_latency_max; };extern int ceph_metric_init (struct ceph_client_metric *m);
@@ -49,4 +56,7 @@ extern void ceph_update_read_latency(struct ceph_client_metric *m,extern void ceph_update_write_latency (struct ceph_client_metric *m,ktime_t r_start,ktime_t r_end,int rc); +extern void ceph_update_metadata_latency (struct ceph_client_metric *m, +ktime_t r_start,ktime_t r_end, +int rc);#endif /* _FS_CEPH_MDS_METRIC_H */
Signature · 1 line
1.8.3.1
Quoted 61 lines · On Thu, 2020-03-19 at 23:44 -0400, [email protected] wrote:
From: Xiubo Li <[email protected]>
# cat /sys/kernel/debug/ceph/9a972bfc-68cb-4d52-a610-7cd9a9adbbdd.client52904/metrics item total avg_lat(us) min_lat(us) max_lat(us) stdev(us) ----------------------------------------------------------------------------------- read 21979 2093 765 248778 2771 write 1129 45184 30252 368629 20437 metadata 3 6462 1674 14260 6811item total miss hit
-------------------------------------------------d_lease 2 0 1 caps 2 4 24248Chnaged in V13:
- [3/4] and [4/4] switch jiffies toktime_tfor the start/end time stamp, which will make it much preciser, such as when the IO latency(end - start) < 1ms and if the HZ==1000, then we will always get end == start in jiffies, and the min will always be 0, actually it should be in range (0, 1000)us.
- [3/4] since by using ktime helpers we are calculating the stdev in nanosecond, then switch to us, so to compute the reminder make no sense any more, remove it from stdev.Changed in V12:
- [3/4] and [4/4] switchatomic64_ttype to u64 for lat sum and total numbersChanged in V11:
- [3/4] and [4/4] fold the min/max/stdev factorsChanged in V10:
- rebase to the latest testing branch
- merge all the metric related patches into one
- [1/6] move metric helpers into a new filemetric.c
- [2/6] move metric helpers intometric.c
- [3/6] merge the read/write patches into a signal patch and move metric helpers tometric.c
- [4/6] move metric helpers tometric.c
- [5/6] min/max latency support
- [6/6] standard deviation supportChanged in V9:
- add anr_endedfield to the mds request struct and use that to calculate the metric
- fix some commit commentsXiubo Li (4):
ceph: add dentry lease metric support
ceph: add caps perf metric for each superblock
ceph: add read/write latency metric support
ceph: add metadata perf metric supportfs/ceph/Makefile | 2 +- fs/ceph/acl.c | 2 +- fs/ceph/addr.c | 20 ++++++ fs/ceph/caps.c | 19 ++++++ fs/ceph/debugfs.c | 100 +++++++++++++++++++++++++-- fs/ceph/dir.c | 17 ++++- fs/ceph/file.c | 30 ++++++++ fs/ceph/inode.c | 4 +- fs/ceph/mds_client.c | 23 ++++++- fs/ceph/mds_client.h | 7 ++ fs/ceph/metric.c | 148 ++++++++++++++++++++++++++++++++++++++++
Quoted 9 lines
fs/ceph/metric.h | 62 +++++++++++++++++ fs/ceph/super.h | 9 ++- fs/ceph/xattr.c | 4 +- include/linux/ceph/osd_client.h | 3 + net/ceph/osd_client.c | 3 + 16 files changed, 436 insertions(+), 17 deletions(-) create mode 100644 fs/ceph/metric.c create mode 100644 fs/ceph/metric.h
Thanks Xiubo,
I think this looks good now. I'm going to do a bit of testing and merge it later today.
Thanks again!
Signature · 1 line
Jeff Layton <[email protected]>