From: Xiubo Li <xiubli@xxxxxxxxxx> The inline is not proper any more dues to the helpers becomes larger. URL: https://tracker.ceph.com/issues/44534 Signed-off-by: Xiubo Li <xiubli@xxxxxxxxxx> --- fs/ceph/Makefile | 2 +- fs/ceph/mds_client.c | 92 +-------------------------- fs/ceph/metric.c | 173 +++++++++++++++++++++++++++++++++++++++++++++++++++ fs/ceph/metric.h | 87 +++++--------------------- 4 files changed, 190 insertions(+), 164 deletions(-) create mode 100644 fs/ceph/metric.c diff --git a/fs/ceph/Makefile b/fs/ceph/Makefile index 0a0823d..50c635d 100644 --- a/fs/ceph/Makefile +++ b/fs/ceph/Makefile @@ -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 diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c index a3b2810..eb2657e 100644 --- a/fs/ceph/mds_client.c +++ b/fs/ceph/mds_client.c @@ -4326,87 +4326,6 @@ static void delayed_work(struct work_struct *work) schedule_delayed(mdsc); } -static int ceph_mdsc_metric_init(struct ceph_client_metric *metric) -{ - int ret; - - if (!metric) - return -EINVAL; - - atomic64_set(&metric->total_dentries, 0); - ret = percpu_counter_init(&metric->d_lease_hit, 0, GFP_KERNEL); - if (ret) - return ret; - - ret = percpu_counter_init(&metric->d_lease_mis, 0, GFP_KERNEL); - if (ret) - goto err_d_lease_mis; - - ret = percpu_counter_init(&metric->i_caps_hit, 0, GFP_KERNEL); - if (ret) - goto err_i_caps_hit; - - ret = percpu_counter_init(&metric->i_caps_mis, 0, GFP_KERNEL); - if (ret) - goto err_i_caps_mis; - - ret = percpu_counter_init(&metric->total_reads, 0, GFP_KERNEL); - if (ret) - goto err_total_reads; - - ret = percpu_counter_init(&metric->read_latency_sum, 0, GFP_KERNEL); - if (ret) - goto err_read_latency_sum; - - atomic64_set(&metric->read_latency_min, S64_MAX); - atomic64_set(&metric->read_latency_max, 0); - - ret = percpu_counter_init(&metric->total_writes, 0, GFP_KERNEL); - if (ret) - goto err_total_writes; - - ret = percpu_counter_init(&metric->write_latency_sum, 0, GFP_KERNEL); - if (ret) - goto err_write_latency_sum; - - atomic64_set(&metric->write_latency_min, S64_MAX); - atomic64_set(&metric->write_latency_max, 0); - - ret = percpu_counter_init(&metric->total_metadatas, 0, GFP_KERNEL); - if (ret) - goto err_total_metadatas; - - ret = percpu_counter_init(&metric->metadata_latency_sum, 0, GFP_KERNEL); - if (ret) - goto err_metadata_latency_sum; - - atomic64_set(&metric->metadata_latency_min, S64_MAX); - atomic64_set(&metric->metadata_latency_max, 0); - - return 0; - -err_metadata_latency_sum: - percpu_counter_destroy(&metric->total_metadatas); -err_total_metadatas: - percpu_counter_destroy(&metric->write_latency_sum); -err_write_latency_sum: - percpu_counter_destroy(&metric->total_writes); -err_total_writes: - percpu_counter_destroy(&metric->read_latency_sum); -err_read_latency_sum: - percpu_counter_destroy(&metric->total_reads); -err_total_reads: - percpu_counter_destroy(&metric->i_caps_mis); -err_i_caps_mis: - percpu_counter_destroy(&metric->i_caps_hit); -err_i_caps_hit: - percpu_counter_destroy(&metric->d_lease_mis); -err_d_lease_mis: - percpu_counter_destroy(&metric->d_lease_hit); - - return ret; -} - int ceph_mdsc_init(struct ceph_fs_client *fsc) { @@ -4744,16 +4663,7 @@ void ceph_mdsc_destroy(struct ceph_fs_client *fsc) ceph_mdsc_stop(mdsc); - percpu_counter_destroy(&mdsc->metric.metadata_latency_sum); - percpu_counter_destroy(&mdsc->metric.total_metadatas); - percpu_counter_destroy(&mdsc->metric.write_latency_sum); - percpu_counter_destroy(&mdsc->metric.total_writes); - percpu_counter_destroy(&mdsc->metric.read_latency_sum); - percpu_counter_destroy(&mdsc->metric.total_reads); - percpu_counter_destroy(&mdsc->metric.i_caps_mis); - percpu_counter_destroy(&mdsc->metric.i_caps_hit); - percpu_counter_destroy(&mdsc->metric.d_lease_mis); - percpu_counter_destroy(&mdsc->metric.d_lease_hit); + ceph_mdsc_metric_destroy(&mdsc->metric); fsc->mdsc = NULL; kfree(mdsc); diff --git a/fs/ceph/metric.c b/fs/ceph/metric.c new file mode 100644 index 0000000..1b764df --- /dev/null +++ b/fs/ceph/metric.c @@ -0,0 +1,173 @@ +// SPDX-License-Identifier: GPL-2.0-only + +#include <linux/atomic.h> +#include <linux/percpu_counter.h> + +#include "metric.h" + +int ceph_mdsc_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) + 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; + + ret = percpu_counter_init(&m->total_reads, 0, GFP_KERNEL); + if (ret) + goto err_total_reads; + + ret = percpu_counter_init(&m->read_latency_sum, 0, GFP_KERNEL); + if (ret) + goto err_read_latency_sum; + + atomic64_set(&m->read_latency_min, S64_MAX); + atomic64_set(&m->read_latency_max, 0); + + ret = percpu_counter_init(&m->total_writes, 0, GFP_KERNEL); + if (ret) + goto err_total_writes; + + ret = percpu_counter_init(&m->write_latency_sum, 0, GFP_KERNEL); + if (ret) + goto err_write_latency_sum; + + atomic64_set(&m->write_latency_min, S64_MAX); + atomic64_set(&m->write_latency_max, 0); + + ret = percpu_counter_init(&m->total_metadatas, 0, GFP_KERNEL); + if (ret) + goto err_total_metadatas; + + ret = percpu_counter_init(&m->metadata_latency_sum, 0, GFP_KERNEL); + if (ret) + goto err_metadata_latency_sum; + + atomic64_set(&m->metadata_latency_min, S64_MAX); + atomic64_set(&m->metadata_latency_max, 0); + + return 0; + +err_metadata_latency_sum: + percpu_counter_destroy(&m->total_metadatas); +err_total_metadatas: + percpu_counter_destroy(&m->write_latency_sum); +err_write_latency_sum: + percpu_counter_destroy(&m->total_writes); +err_total_writes: + percpu_counter_destroy(&m->read_latency_sum); +err_read_latency_sum: + percpu_counter_destroy(&m->total_reads); +err_total_reads: + percpu_counter_destroy(&m->i_caps_mis); +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_mdsc_metric_destroy(struct ceph_client_metric *m) +{ + percpu_counter_destroy(&m->metadata_latency_sum); + percpu_counter_destroy(&m->total_metadatas); + percpu_counter_destroy(&m->write_latency_sum); + percpu_counter_destroy(&m->total_writes); + percpu_counter_destroy(&m->read_latency_sum); + percpu_counter_destroy(&m->total_reads); + 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); +} + +static inline void __update_min_latency(atomic64_t *min, unsigned long lat) +{ + unsigned long cur, old; + + cur = atomic64_read(min); + do { + old = cur; + if (likely(lat >= old)) + break; + } while (unlikely((cur = atomic64_cmpxchg(min, old, lat)) != old)); +} + +static inline void __update_max_latency(atomic64_t *max, unsigned long lat) +{ + unsigned long cur, old; + + cur = atomic64_read(max); + do { + old = cur; + if (likely(lat <= old)) + break; + } while (unlikely((cur = atomic64_cmpxchg(max, old, lat)) != old)); +} + +void ceph_update_read_latency(struct ceph_client_metric *m, + unsigned long r_start, + unsigned long r_end, + int rc) +{ + unsigned long lat = r_end - r_start; + + if (rc < 0 && rc != -ENOENT && rc != -ETIMEDOUT) + return; + + percpu_counter_inc(&m->total_reads); + percpu_counter_add(&m->read_latency_sum, lat); + __update_min_latency(&m->read_latency_min, lat); + __update_max_latency(&m->read_latency_max, lat); +} + +void ceph_update_write_latency(struct ceph_client_metric *m, + unsigned long r_start, + unsigned long r_end, + int rc) +{ + unsigned long lat = r_end - r_start; + + if (rc && rc != -ETIMEDOUT) + return; + + percpu_counter_inc(&m->total_writes); + percpu_counter_add(&m->write_latency_sum, lat); + __update_min_latency(&m->write_latency_min, lat); + __update_max_latency(&m->write_latency_max, lat); +} + +void ceph_update_metadata_latency(struct ceph_client_metric *m, + unsigned long r_start, + unsigned long r_end, + int rc) +{ + unsigned long lat = r_end - r_start; + + if (rc && rc != -ENOENT) + return; + + percpu_counter_inc(&m->total_metadatas); + percpu_counter_add(&m->metadata_latency_sum, lat); + __update_min_latency(&m->metadata_latency_min, lat); + __update_max_latency(&m->metadata_latency_max, lat); +} diff --git a/fs/ceph/metric.h b/fs/ceph/metric.h index b36f7f9..f139aff 100644 --- a/fs/ceph/metric.h +++ b/fs/ceph/metric.h @@ -3,7 +3,7 @@ #define _FS_CEPH_MDS_METRIC_H #include <linux/atomic.h> -#include <linux/percpu.h> +#include <linux/percpu_counter.h> /* This is the global metrics */ struct ceph_client_metric { @@ -40,75 +40,18 @@ static inline void ceph_update_cap_mis(struct ceph_client_metric *m) percpu_counter_inc(&m->i_caps_mis); } -static inline void __update_min_latency(atomic64_t *min, unsigned long lat) -{ - unsigned long cur, old; - - cur = atomic64_read(min); - do { - old = cur; - if (likely(lat >= old)) - break; - } while (unlikely((cur = atomic64_cmpxchg(min, old, lat)) != old)); -} - -static inline void __update_max_latency(atomic64_t *max, unsigned long lat) -{ - unsigned long cur, old; - - cur = atomic64_read(max); - do { - old = cur; - if (likely(lat <= old)) - break; - } while (unlikely((cur = atomic64_cmpxchg(max, old, lat)) != old)); -} - -static inline void ceph_update_read_latency(struct ceph_client_metric *m, - unsigned long r_start, - unsigned long r_end, - int rc) -{ - unsigned long lat = r_end - r_start; - - if (rc < 0 && rc != -ENOENT && rc != -ETIMEDOUT) - return; - - percpu_counter_inc(&m->total_reads); - percpu_counter_add(&m->read_latency_sum, lat); - __update_min_latency(&m->read_latency_min, lat); - __update_max_latency(&m->read_latency_max, lat); -} - -static inline void ceph_update_write_latency(struct ceph_client_metric *m, - unsigned long r_start, - unsigned long r_end, - int rc) -{ - unsigned long lat = r_end - r_start; - - if (rc && rc != -ETIMEDOUT) - return; - - percpu_counter_inc(&m->total_writes); - percpu_counter_add(&m->write_latency_sum, lat); - __update_min_latency(&m->write_latency_min, lat); - __update_max_latency(&m->write_latency_max, lat); -} - -static inline void ceph_update_metadata_latency(struct ceph_client_metric *m, - unsigned long r_start, - unsigned long r_end, - int rc) -{ - unsigned long lat = r_end - r_start; - - if (rc && rc != -ENOENT) - return; - - percpu_counter_inc(&m->total_metadatas); - percpu_counter_add(&m->metadata_latency_sum, lat); - __update_min_latency(&m->metadata_latency_min, lat); - __update_max_latency(&m->metadata_latency_max, lat); -} +extern int ceph_mdsc_metric_init(struct ceph_client_metric *m); +extern void ceph_mdsc_metric_destroy(struct ceph_client_metric *m); +extern void ceph_update_read_latency(struct ceph_client_metric *m, + unsigned long r_start, + unsigned long r_end, + int rc); +extern void ceph_update_write_latency(struct ceph_client_metric *m, + unsigned long r_start, + unsigned long r_end, + int rc); +extern void ceph_update_metadata_latency(struct ceph_client_metric *m, + unsigned long r_start, + unsigned long r_end, + int rc); #endif /* _FS_CEPH_MDS_METRIC_H */ -- 1.8.3.1
