The use of `jiffies_to_timespec64()` seems incorrect too, switch
that to `ktime_to_timespec64()`.
Signed-off-by: Venky Shankar <vshankar@xxxxxxxxxx>
---
fs/ceph/metric.c | 36 +++++++++++++++++++-----------------
fs/ceph/metric.h | 44 +++++++++++++++++++++++++++++++-------------
2 files changed, 50 insertions(+), 30 deletions(-)
diff --git a/fs/ceph/metric.c b/fs/ceph/metric.c
index e00b1c2ce25b..cb332ae2411f 100644
--- a/fs/ceph/metric.c
+++ b/fs/ceph/metric.c
@@ -8,6 +8,13 @@
#include "metric.h"
#include "mds_client.h"
+static void to_ceph_timespec(struct ceph_timespec *ts, ktime_t val)
+{
+ struct timespec64 t = ktime_to_timespec64(val);
+ ts->tv_sec = cpu_to_le32(t.tv_sec);
+ ts->tv_nsec = cpu_to_le32(t.tv_nsec);
+}
+
static bool ceph_mdsc_send_metrics(struct ceph_mds_client *mdsc,
struct ceph_mds_session *s)
{
@@ -20,8 +27,6 @@ static bool ceph_mdsc_send_metrics(struct ceph_mds_client *mdsc,
struct ceph_client_metric *m = &mdsc->metric;
u64 nr_caps = atomic64_read(&m->total_caps);
struct ceph_msg *msg;
- struct timespec64 ts;
- s64 sum;
s32 items = 0;
s32 len;
@@ -51,37 +56,34 @@ static bool ceph_mdsc_send_metrics(struct ceph_mds_client *mdsc,
/* encode the read latency metric */
read = (struct ceph_metric_read_latency *)(cap + 1);
read->type = cpu_to_le32(CLIENT_METRIC_TYPE_READ_LATENCY);
- read->ver = 1;
+ read->ver = 2;
read->compat = 1;
read->data_len = cpu_to_le32(sizeof(*read) - 10);
- sum = m->read_latency_sum;
- jiffies_to_timespec64(sum, &ts);
- read->lat.tv_sec = cpu_to_le32(ts.tv_sec);
- read->lat.tv_nsec = cpu_to_le32(ts.tv_nsec);
+ to_ceph_timespec(&read->lat, m->read_latency_sum);
+ to_ceph_timespec(&read->avg, m->avg_read_latency);
+ to_ceph_timespec(&read->stdev, m->read_latency_stdev);
items++;
/* encode the write latency metric */
write = (struct ceph_metric_write_latency *)(read + 1);
write->type = cpu_to_le32(CLIENT_METRIC_TYPE_WRITE_LATENCY);
- write->ver = 1;
+ write->ver = 2;
write->compat = 1;
write->data_len = cpu_to_le32(sizeof(*write) - 10);
- sum = m->write_latency_sum;
- jiffies_to_timespec64(sum, &ts);
- write->lat.tv_sec = cpu_to_le32(ts.tv_sec);
- write->lat.tv_nsec = cpu_to_le32(ts.tv_nsec);
+ to_ceph_timespec(&write->lat, m->write_latency_sum);
+ to_ceph_timespec(&write->avg, m->avg_write_latency);
+ to_ceph_timespec(&write->stdev, m->write_latency_stdev);
items++;
/* encode the metadata latency metric */
meta = (struct ceph_metric_metadata_latency *)(write + 1);
meta->type = cpu_to_le32(CLIENT_METRIC_TYPE_METADATA_LATENCY);
- meta->ver = 1;
+ meta->ver = 2;
meta->compat = 1;
meta->data_len = cpu_to_le32(sizeof(*meta) - 10);
- sum = m->metadata_latency_sum;
- jiffies_to_timespec64(sum, &ts);
- meta->lat.tv_sec = cpu_to_le32(ts.tv_sec);
- meta->lat.tv_nsec = cpu_to_le32(ts.tv_nsec);
+ to_ceph_timespec(&meta->lat, m->metadata_latency_sum);
+ to_ceph_timespec(&meta->avg, m->avg_metadata_latency);
+ to_ceph_timespec(&meta->stdev, m->metadata_latency_stdev);
items++;
/* encode the dentry lease metric */
diff --git a/fs/ceph/metric.h b/fs/ceph/metric.h
index 136689fa0aec..b68927378e59 100644
--- a/fs/ceph/metric.h
+++ b/fs/ceph/metric.h
@@ -14,22 +14,34 @@ enum ceph_metric_type {
CLIENT_METRIC_TYPE_WRITE_LATENCY,
CLIENT_METRIC_TYPE_METADATA_LATENCY,
CLIENT_METRIC_TYPE_DENTRY_LEASE,
-
- CLIENT_METRIC_TYPE_MAX = CLIENT_METRIC_TYPE_DENTRY_LEASE,
+ CLIENT_METRIC_TYPE_AVG_READ_LATENCY,
+ CLIENT_METRIC_TYPE_STDEV_READ_LATENCY,
+ CLIENT_METRIC_TYPE_AVG_WRITE_LATENCY,
+ CLIENT_METRIC_TYPE_STDEV_WRITE_LATENCY,
+ CLIENT_METRIC_TYPE_AVG_METADATA_LATENCY,
+ CLIENT_METRIC_TYPE_STDEV_METADATA_LATENCY,
+
+ CLIENT_METRIC_TYPE_MAX = CLIENT_METRIC_TYPE_STDEV_METADATA_LATENCY,
};
/*
* This will always have the highest metric bit value
* as the last element of the array.
*/
-#define CEPHFS_METRIC_SPEC_CLIENT_SUPPORTED { \
- CLIENT_METRIC_TYPE_CAP_INFO, \
- CLIENT_METRIC_TYPE_READ_LATENCY, \
- CLIENT_METRIC_TYPE_WRITE_LATENCY, \
- CLIENT_METRIC_TYPE_METADATA_LATENCY, \
- CLIENT_METRIC_TYPE_DENTRY_LEASE, \
- \
- CLIENT_METRIC_TYPE_MAX, \
+#define CEPHFS_METRIC_SPEC_CLIENT_SUPPORTED { \
+ CLIENT_METRIC_TYPE_CAP_INFO, \
+ CLIENT_METRIC_TYPE_READ_LATENCY, \
+ CLIENT_METRIC_TYPE_WRITE_LATENCY, \
+ CLIENT_METRIC_TYPE_METADATA_LATENCY, \
+ CLIENT_METRIC_TYPE_DENTRY_LEASE, \
+ CLIENT_METRIC_TYPE_AVG_READ_LATENCY, \
+ CLIENT_METRIC_TYPE_STDEV_READ_LATENCY, \
+ CLIENT_METRIC_TYPE_AVG_WRITE_LATENCY, \
+ CLIENT_METRIC_TYPE_STDEV_WRITE_LATENCY, \
+ CLIENT_METRIC_TYPE_AVG_METADATA_LATENCY, \
+ CLIENT_METRIC_TYPE_STDEV_METADATA_LATENCY, \
+ \
+ CLIENT_METRIC_TYPE_MAX, \
}
/* metric caps header */
@@ -52,8 +64,10 @@ struct ceph_metric_read_latency {
__u8 ver;
__u8 compat;
- __le32 data_len; /* length of sizeof(lat) */
+ __le32 data_len; /* length of sizeof(lat+avg+stdev) */
struct ceph_timespec lat;
+ struct ceph_timespec avg;
+ struct ceph_timespec stdev;
} __packed;
/* metric write latency header */
@@ -63,8 +77,10 @@ struct ceph_metric_write_latency {
__u8 ver;
__u8 compat;
- __le32 data_len; /* length of sizeof(lat) */
+ __le32 data_len; /* length of sizeof(lat_avg_stdev) */
struct ceph_timespec lat;
+ struct ceph_timespec avg;
+ struct ceph_timespec stdev;
} __packed;
/* metric metadata latency header */
@@ -74,8 +90,10 @@ struct ceph_metric_metadata_latency {
__u8 ver;
__u8 compat;
- __le32 data_len; /* length of sizeof(lat) */
+ __le32 data_len; /* length of sizeof(lat+avg+stdev) */
struct ceph_timespec lat;
+ struct ceph_timespec avg;
+ struct ceph_timespec stdev;
} __packed;
/* metric dentry lease header */
--
2.27.0
