From patchwork Wed Mar 18 05:45:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiubo Li X-Patchwork-Id: 11444565 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 653E61820 for ; Wed, 18 Mar 2020 05:46:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 45D7020724 for ; Wed, 18 Mar 2020 05:46:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="eUk2urvo" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727008AbgCRFqN (ORCPT ); Wed, 18 Mar 2020 01:46:13 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:49835 "EHLO us-smtp-delivery-74.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726478AbgCRFqM (ORCPT ); Wed, 18 Mar 2020 01:46:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584510371; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:in-reply-to:in-reply-to:references:references; bh=wlN4mzW8FjNx28pUhqZdUAlhAL2ic5ZDrL/OgayrLCU=; b=eUk2urvohMFG4irxk5Aw7fA2QRkO2A41gxVz7MZ8eM8xmLPkh7g8SaGJmVvYW6qECkN995 eIlbhusiWieFFwN2qiyXFwUVXFkbw0bdBWRc1JkUEZ82yKrzJG/uoMhmbQjAmEdJsUSzKF WhaosubhnPOqlWd0nFOyXxHpnQrPQoA= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-204-itwHq0goMSSRZ8G9z6GQQw-1; Wed, 18 Mar 2020 01:46:09 -0400 X-MC-Unique: itwHq0goMSSRZ8G9z6GQQw-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 54E4A189D6C0; Wed, 18 Mar 2020 05:46:08 +0000 (UTC) Received: from lxbceph0.gsslab.pek2.redhat.com (vm36-245.gsslab.pek2.redhat.com [10.72.36.245]) by smtp.corp.redhat.com (Postfix) with ESMTP id AD7848D553; Wed, 18 Mar 2020 05:46:05 +0000 (UTC) From: xiubli@redhat.com To: jlayton@kernel.org Cc: sage@redhat.com, idryomov@gmail.com, gfarnum@redhat.com, zyan@redhat.com, pdonnell@redhat.com, ceph-devel@vger.kernel.org, Xiubo Li Subject: [PATCH v4 1/4] ceph: switch to DIV64_U64_ROUND_CLOSEST to support 32-bit arches Date: Wed, 18 Mar 2020 01:45:52 -0400 Message-Id: <1584510355-6936-2-git-send-email-xiubli@redhat.com> In-Reply-To: <1584510355-6936-1-git-send-email-xiubli@redhat.com> References: <1584510355-6936-1-git-send-email-xiubli@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org From: Xiubo Li fs/ceph/debugfs.c:140: undefined reference to `__divdi3' Use math64 helpers to avoid 64-bit div on 32-bit arches. Reported-by: kbuild test robot Signed-off-by: Xiubo Li --- fs/ceph/debugfs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/ceph/debugfs.c b/fs/ceph/debugfs.c index 60f3e307..95e8693 100644 --- a/fs/ceph/debugfs.c +++ b/fs/ceph/debugfs.c @@ -137,19 +137,19 @@ static int metric_show(struct seq_file *s, void *p) total = percpu_counter_sum(&mdsc->metric.total_reads); sum = percpu_counter_sum(&mdsc->metric.read_latency_sum); sum = jiffies_to_usecs(sum); - avg = total ? sum / total : 0; + avg = total ? DIV64_U64_ROUND_CLOSEST(sum, total) : 0; seq_printf(s, "%-14s%-12lld%-16lld%lld\n", "read", total, sum, avg); total = percpu_counter_sum(&mdsc->metric.total_writes); sum = percpu_counter_sum(&mdsc->metric.write_latency_sum); sum = jiffies_to_usecs(sum); - avg = total ? sum / total : 0; + avg = total ? DIV64_U64_ROUND_CLOSEST(sum, total) : 0; seq_printf(s, "%-14s%-12lld%-16lld%lld\n", "write", total, sum, avg); total = percpu_counter_sum(&mdsc->metric.total_metadatas); sum = percpu_counter_sum(&mdsc->metric.metadata_latency_sum); sum = jiffies_to_usecs(sum); - avg = total ? sum / total : 0; + avg = total ? DIV64_U64_ROUND_CLOSEST(sum, total) : 0; seq_printf(s, "%-14s%-12lld%-16lld%lld\n", "metadata", total, sum, avg); seq_printf(s, "\n"); From patchwork Wed Mar 18 05:45:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiubo Li X-Patchwork-Id: 11444567 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BE8451667 for ; Wed, 18 Mar 2020 05:46:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9498520663 for ; Wed, 18 Mar 2020 05:46:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="RrJ5SGpx" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727028AbgCRFqS (ORCPT ); Wed, 18 Mar 2020 01:46:18 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:32501 "EHLO us-smtp-delivery-74.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726478AbgCRFqS (ORCPT ); Wed, 18 Mar 2020 01:46:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584510377; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:in-reply-to:in-reply-to:references:references; bh=ox89Tjhj7GdfazgQDp1pML5WCXLQ2IkLFBG4fYvt6ws=; b=RrJ5SGpxgiaUe/hbgJnpAnPXe9Ayq5WKSVfxvcvyfmyrLK3GNlLOi427kxuQ1kyFKlD09f KH7m6BcjwWJi7kOuH+Oo2y2CWlQtBbnsBGZhzuIprwClZf8yBesB46wKcLEYk74bITce0V 77zgSW3lQAw/IQV1SuvoB/hhL8ACuIc= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-450-HkqR_cW5N8aj9g7jSHkaTQ-1; Wed, 18 Mar 2020 01:46:12 -0400 X-MC-Unique: HkqR_cW5N8aj9g7jSHkaTQ-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 72160477; Wed, 18 Mar 2020 05:46:11 +0000 (UTC) Received: from lxbceph0.gsslab.pek2.redhat.com (vm36-245.gsslab.pek2.redhat.com [10.72.36.245]) by smtp.corp.redhat.com (Postfix) with ESMTP id CDF2D8D553; Wed, 18 Mar 2020 05:46:08 +0000 (UTC) From: xiubli@redhat.com To: jlayton@kernel.org Cc: sage@redhat.com, idryomov@gmail.com, gfarnum@redhat.com, zyan@redhat.com, pdonnell@redhat.com, ceph-devel@vger.kernel.org, Xiubo Li Subject: [PATCH v4 2/4] ceph: add min/max latency support for read/write/metadata metrics Date: Wed, 18 Mar 2020 01:45:53 -0400 Message-Id: <1584510355-6936-3-git-send-email-xiubli@redhat.com> In-Reply-To: <1584510355-6936-1-git-send-email-xiubli@redhat.com> References: <1584510355-6936-1-git-send-email-xiubli@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org From: Xiubo Li These will be very useful help diagnose problems. URL: https://tracker.ceph.com/issues/44533 Signed-off-by: Xiubo Li --- fs/ceph/debugfs.c | 27 +++++++++++++++++++++------ fs/ceph/mds_client.c | 9 +++++++++ fs/ceph/metric.h | 51 ++++++++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 78 insertions(+), 9 deletions(-) diff --git a/fs/ceph/debugfs.c b/fs/ceph/debugfs.c index 95e8693..01b95fe 100644 --- a/fs/ceph/debugfs.c +++ b/fs/ceph/debugfs.c @@ -129,28 +129,43 @@ static int metric_show(struct seq_file *s, void *p) struct ceph_fs_client *fsc = s->private; struct ceph_mds_client *mdsc = fsc->mdsc; int i, nr_caps = 0; - s64 total, sum, avg = 0; + s64 total, sum, avg = 0, min, max; - seq_printf(s, "item total sum_lat(us) avg_lat(us)\n"); - seq_printf(s, "-----------------------------------------------------\n"); + seq_printf(s, "item total sum_lat(us) avg_lat(us) min_lat(us) max_lat(us)\n"); + seq_printf(s, "-------------------------------------------------------------------------------------\n"); total = percpu_counter_sum(&mdsc->metric.total_reads); sum = percpu_counter_sum(&mdsc->metric.read_latency_sum); sum = jiffies_to_usecs(sum); avg = total ? DIV64_U64_ROUND_CLOSEST(sum, total) : 0; - seq_printf(s, "%-14s%-12lld%-16lld%lld\n", "read", total, sum, avg); + min = atomic64_read(&mdsc->metric.read_latency_min); + min = jiffies_to_usecs(min == S64_MAX ? 0 : min); + max = atomic64_read(&mdsc->metric.read_latency_max); + max = jiffies_to_usecs(max); + seq_printf(s, "%-14s%-12lld%-16lld%-16lld%-16lld%lld\n", "read", + total, sum, avg, min, max); total = percpu_counter_sum(&mdsc->metric.total_writes); sum = percpu_counter_sum(&mdsc->metric.write_latency_sum); sum = jiffies_to_usecs(sum); avg = total ? DIV64_U64_ROUND_CLOSEST(sum, total) : 0; - seq_printf(s, "%-14s%-12lld%-16lld%lld\n", "write", total, sum, avg); + min = atomic64_read(&mdsc->metric.write_latency_min); + min = jiffies_to_usecs(min == S64_MAX ? 0 : min); + max = atomic64_read(&mdsc->metric.write_latency_max); + max = jiffies_to_usecs(max); + seq_printf(s, "%-14s%-12lld%-16lld%-16lld%-16lld%lld\n", "write", + total, sum, avg, min, max); total = percpu_counter_sum(&mdsc->metric.total_metadatas); sum = percpu_counter_sum(&mdsc->metric.metadata_latency_sum); sum = jiffies_to_usecs(sum); avg = total ? DIV64_U64_ROUND_CLOSEST(sum, total) : 0; - seq_printf(s, "%-14s%-12lld%-16lld%lld\n", "metadata", total, sum, avg); + min = atomic64_read(&mdsc->metric.metadata_latency_min); + min = jiffies_to_usecs(min == S64_MAX ? 0 : min); + max = atomic64_read(&mdsc->metric.metadata_latency_max); + max = jiffies_to_usecs(max); + seq_printf(s, "%-14s%-12lld%-16lld%-16lld%-16lld%lld\n", "metadata", + total, sum, avg, min, max); seq_printf(s, "\n"); seq_printf(s, "item total miss hit\n"); diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c index 5c03ed3..a3b2810 100644 --- a/fs/ceph/mds_client.c +++ b/fs/ceph/mds_client.c @@ -4358,6 +4358,9 @@ static int ceph_mdsc_metric_init(struct ceph_client_metric *metric) 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; @@ -4366,6 +4369,9 @@ static int ceph_mdsc_metric_init(struct ceph_client_metric *metric) 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; @@ -4374,6 +4380,9 @@ static int ceph_mdsc_metric_init(struct ceph_client_metric *metric) 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: diff --git a/fs/ceph/metric.h b/fs/ceph/metric.h index faba142..b36f7f9 100644 --- a/fs/ceph/metric.h +++ b/fs/ceph/metric.h @@ -2,6 +2,9 @@ #ifndef _FS_CEPH_MDS_METRIC_H #define _FS_CEPH_MDS_METRIC_H +#include +#include + /* This is the global metrics */ struct ceph_client_metric { atomic64_t total_dentries; @@ -13,12 +16,18 @@ struct ceph_client_metric { struct percpu_counter total_reads; struct percpu_counter read_latency_sum; + atomic64_t read_latency_min; + atomic64_t read_latency_max; struct percpu_counter total_writes; struct percpu_counter write_latency_sum; + atomic64_t write_latency_min; + atomic64_t write_latency_max; struct percpu_counter total_metadatas; struct percpu_counter metadata_latency_sum; + atomic64_t metadata_latency_min; + atomic64_t metadata_latency_max; }; static inline void ceph_update_cap_hit(struct ceph_client_metric *m) @@ -31,16 +40,44 @@ 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, r_end - r_start); + 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, @@ -48,11 +85,15 @@ static inline void ceph_update_write_latency(struct ceph_client_metric *m, 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, r_end - r_start); + 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, @@ -60,10 +101,14 @@ static inline void ceph_update_metadata_latency(struct ceph_client_metric *m, 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, r_end - r_start); + percpu_counter_add(&m->metadata_latency_sum, lat); + __update_min_latency(&m->metadata_latency_min, lat); + __update_max_latency(&m->metadata_latency_max, lat); } #endif /* _FS_CEPH_MDS_METRIC_H */ From patchwork Wed Mar 18 05:45:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiubo Li X-Patchwork-Id: 11444569 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id F12F61820 for ; Wed, 18 Mar 2020 05:46:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C79AB20663 for ; Wed, 18 Mar 2020 05:46:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="DYSzVG+5" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727040AbgCRFqV (ORCPT ); Wed, 18 Mar 2020 01:46:21 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:56299 "EHLO us-smtp-delivery-74.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726478AbgCRFqV (ORCPT ); Wed, 18 Mar 2020 01:46:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584510379; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:in-reply-to:in-reply-to:references:references; bh=3Alc0ExUJAjmp2VQ69yx/G112TOHUWybRBtZra9grXY=; b=DYSzVG+5mEaaMUA2TxDtdA1ay13QDc+ZO0pVU479fPdI+3cYqCFezncxT611tfBzCsU90D nXY1EpnnSXRQ/lk8oQm3fQooGxDtujOgV2mrz1CGSQlOzsFdW6m94f5OS107AUgRz4J+6o CsZ6YYgvM5lYuqq8SvDFEeyMeeJuajk= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-42-ChBZggceN66C58B4KbVkaA-1; Wed, 18 Mar 2020 01:46:15 -0400 X-MC-Unique: ChBZggceN66C58B4KbVkaA-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8E1CD8017DF; Wed, 18 Mar 2020 05:46:14 +0000 (UTC) Received: from lxbceph0.gsslab.pek2.redhat.com (vm36-245.gsslab.pek2.redhat.com [10.72.36.245]) by smtp.corp.redhat.com (Postfix) with ESMTP id EA9618D553; Wed, 18 Mar 2020 05:46:11 +0000 (UTC) From: xiubli@redhat.com To: jlayton@kernel.org Cc: sage@redhat.com, idryomov@gmail.com, gfarnum@redhat.com, zyan@redhat.com, pdonnell@redhat.com, ceph-devel@vger.kernel.org, Xiubo Li Subject: [PATCH v4 3/4] ceph: move the metric helpers into one separate file Date: Wed, 18 Mar 2020 01:45:54 -0400 Message-Id: <1584510355-6936-4-git-send-email-xiubli@redhat.com> In-Reply-To: <1584510355-6936-1-git-send-email-xiubli@redhat.com> References: <1584510355-6936-1-git-send-email-xiubli@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org From: Xiubo Li 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 --- 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 +#include + +#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 -#include +#include /* 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 */ From patchwork Wed Mar 18 05:45:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiubo Li X-Patchwork-Id: 11444573 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C6CF71820 for ; Wed, 18 Mar 2020 05:46:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9312520663 for ; Wed, 18 Mar 2020 05:46:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="OT4D0V6k" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727124AbgCRFq0 (ORCPT ); Wed, 18 Mar 2020 01:46:26 -0400 Received: from us-smtp-delivery-74.mimecast.com ([216.205.24.74]:27590 "EHLO us-smtp-delivery-74.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727029AbgCRFq0 (ORCPT ); Wed, 18 Mar 2020 01:46:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584510384; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:in-reply-to:in-reply-to:references:references; bh=SJhv3JRts9Zb8GyfXn59WSKVJ12iD8bW7vMm2b2oyjM=; b=OT4D0V6kjPzNZRybUz3LFH/poH8sPG5WTLT0kF6g3+gNIVG98Ultmj4meTnEnMFSRGzpi+ +3oBt0AF6rPYTzuSEZI/s5ppXTv/iH61kA9k9alNTTSD30eD3cIOPzxFOztQqzr1I8QMV0 16WJT5tdX8CAgzZ9eMRMmcjC7r/mt0s= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-485-Xriqf919P8-pHeNYG4hyhQ-1; Wed, 18 Mar 2020 01:46:18 -0400 X-MC-Unique: Xriqf919P8-pHeNYG4hyhQ-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AEB45107ACC9; Wed, 18 Mar 2020 05:46:17 +0000 (UTC) Received: from lxbceph0.gsslab.pek2.redhat.com (vm36-245.gsslab.pek2.redhat.com [10.72.36.245]) by smtp.corp.redhat.com (Postfix) with ESMTP id 13EC69080E; Wed, 18 Mar 2020 05:46:14 +0000 (UTC) From: xiubli@redhat.com To: jlayton@kernel.org Cc: sage@redhat.com, idryomov@gmail.com, gfarnum@redhat.com, zyan@redhat.com, pdonnell@redhat.com, ceph-devel@vger.kernel.org, Xiubo Li Subject: [PATCH v4 4/4] ceph: add standard deviation support for read/write/metadata perf metric Date: Wed, 18 Mar 2020 01:45:55 -0400 Message-Id: <1584510355-6936-5-git-send-email-xiubli@redhat.com> In-Reply-To: <1584510355-6936-1-git-send-email-xiubli@redhat.com> References: <1584510355-6936-1-git-send-email-xiubli@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org From: Xiubo Li Switch {read/write/metadata}_latency_sum to atomic type and remove {read/write/metadata}_latency_sum showing in the debugfs, which makes no sense. URL: https://tracker.ceph.com/issues/44534 Signed-off-by: Xiubo Li --- fs/ceph/debugfs.c | 88 +++++++++++++++++++++++++++++++++---------------- fs/ceph/metric.c | 99 ++++++++++++++++++++++++++++++++----------------------- fs/ceph/metric.h | 18 ++++++---- 3 files changed, 129 insertions(+), 76 deletions(-) diff --git a/fs/ceph/debugfs.c b/fs/ceph/debugfs.c index 01b95fe..21f5663 100644 --- a/fs/ceph/debugfs.c +++ b/fs/ceph/debugfs.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 #include +#include #include #include #include @@ -124,48 +125,77 @@ static int mdsc_show(struct seq_file *s, void *p) return 0; } +static s64 get_avg(atomic64_t *totalp, atomic64_t *sump, spinlock_t *lockp, + s64 *total) +{ + s64 n, sum, avg = 0; + + spin_lock(lockp); + n = atomic64_read(totalp); + sum = atomic64_read(sump); + spin_unlock(lockp); + + if (likely(n)) + avg = DIV64_U64_ROUND_CLOSEST(sum, n); + + *total = n; + return avg; +} + +#define METRIC(name, total, avg, min, max, sq) { \ + s64 _total, _avg, _min, _max, _sq, _st, _re = 0; \ + _avg = jiffies_to_usecs(avg); \ + _min = jiffies_to_usecs(min == S64_MAX ? 0 : min); \ + _max = jiffies_to_usecs(max); \ + _total = total - 1; \ + _sq = _total > 0 ? DIV64_U64_ROUND_CLOSEST(sq, _total) : 0; \ + _sq = jiffies_to_usecs(_sq); \ + _st = int_sqrt64(_sq); \ + if (_st > 0) { \ + _re = 5 * (_sq - (_st * _st)); \ + _re = _re > 0 ? _re - 1 : 0; \ + _re = _st > 0 ? div64_s64(_re, _st) : 0; \ + } \ + seq_printf(s, "%-14s%-12lld%-16lld%-16lld%-16lld%lld.%lld\n", \ + name, total, _avg, _min, _max, _st, _re); \ +} + static int metric_show(struct seq_file *s, void *p) { struct ceph_fs_client *fsc = s->private; struct ceph_mds_client *mdsc = fsc->mdsc; int i, nr_caps = 0; - s64 total, sum, avg = 0, min, max; + s64 total, avg, min, max, sq; - seq_printf(s, "item total sum_lat(us) avg_lat(us) min_lat(us) max_lat(us)\n"); - seq_printf(s, "-------------------------------------------------------------------------------------\n"); + seq_printf(s, "item total avg_lat(us) min_lat(us) max_lat(us) stdev(us)\n"); + seq_printf(s, "-----------------------------------------------------------------------------------\n"); - total = percpu_counter_sum(&mdsc->metric.total_reads); - sum = percpu_counter_sum(&mdsc->metric.read_latency_sum); - sum = jiffies_to_usecs(sum); - avg = total ? DIV64_U64_ROUND_CLOSEST(sum, total) : 0; + avg = get_avg(&mdsc->metric.total_reads, + &mdsc->metric.read_latency_sum, + &mdsc->metric.read_latency_lock, + &total); min = atomic64_read(&mdsc->metric.read_latency_min); - min = jiffies_to_usecs(min == S64_MAX ? 0 : min); max = atomic64_read(&mdsc->metric.read_latency_max); - max = jiffies_to_usecs(max); - seq_printf(s, "%-14s%-12lld%-16lld%-16lld%-16lld%lld\n", "read", - total, sum, avg, min, max); - - total = percpu_counter_sum(&mdsc->metric.total_writes); - sum = percpu_counter_sum(&mdsc->metric.write_latency_sum); - sum = jiffies_to_usecs(sum); - avg = total ? DIV64_U64_ROUND_CLOSEST(sum, total) : 0; + sq = percpu_counter_sum(&mdsc->metric.read_latency_sq_sum); + METRIC("read", total, avg, min, max, sq); + + avg = get_avg(&mdsc->metric.total_writes, + &mdsc->metric.write_latency_sum, + &mdsc->metric.write_latency_lock, + &total); min = atomic64_read(&mdsc->metric.write_latency_min); - min = jiffies_to_usecs(min == S64_MAX ? 0 : min); max = atomic64_read(&mdsc->metric.write_latency_max); - max = jiffies_to_usecs(max); - seq_printf(s, "%-14s%-12lld%-16lld%-16lld%-16lld%lld\n", "write", - total, sum, avg, min, max); - - total = percpu_counter_sum(&mdsc->metric.total_metadatas); - sum = percpu_counter_sum(&mdsc->metric.metadata_latency_sum); - sum = jiffies_to_usecs(sum); - avg = total ? DIV64_U64_ROUND_CLOSEST(sum, total) : 0; + sq = percpu_counter_sum(&mdsc->metric.write_latency_sq_sum); + METRIC("write", total, avg, min, max, sq); + + avg = get_avg(&mdsc->metric.total_metadatas, + &mdsc->metric.metadata_latency_sum, + &mdsc->metric.metadata_latency_lock, + &total); min = atomic64_read(&mdsc->metric.metadata_latency_min); - min = jiffies_to_usecs(min == S64_MAX ? 0 : min); max = atomic64_read(&mdsc->metric.metadata_latency_max); - max = jiffies_to_usecs(max); - seq_printf(s, "%-14s%-12lld%-16lld%-16lld%-16lld%lld\n", "metadata", - total, sum, avg, min, max); + sq = percpu_counter_sum(&mdsc->metric.metadata_latency_sq_sum); + METRIC("metadata", total, avg, min, max, sq); seq_printf(s, "\n"); seq_printf(s, "item total miss hit\n"); diff --git a/fs/ceph/metric.c b/fs/ceph/metric.c index 1b764df..23bd80f 100644 --- a/fs/ceph/metric.c +++ b/fs/ceph/metric.c @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only +#include #include #include @@ -29,52 +30,43 @@ int ceph_mdsc_metric_init(struct ceph_client_metric *m) if (ret) goto err_i_caps_mis; - ret = percpu_counter_init(&m->total_reads, 0, GFP_KERNEL); + ret = percpu_counter_init(&m->read_latency_sq_sum, 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; + goto err_read_latency_sq_sum; + spin_lock_init(&m->read_latency_lock); + atomic64_set(&m->total_reads, 0); + atomic64_set(&m->read_latency_sum, 0); 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); + ret = percpu_counter_init(&m->write_latency_sq_sum, 0, GFP_KERNEL); if (ret) - goto err_write_latency_sum; + goto err_write_latency_sq_sum; + spin_lock_init(&m->write_latency_lock); + atomic64_set(&m->total_writes, 0); + atomic64_set(&m->write_latency_sum, 0); 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); + ret = percpu_counter_init(&m->metadata_latency_sq_sum, 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; + goto err_metadata_latency_sq_sum; + spin_lock_init(&m->metadata_latency_lock); + atomic64_set(&m->total_metadatas, 0); + atomic64_set(&m->metadata_latency_sum, 0); 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: +err_metadata_latency_sq_sum: + percpu_counter_destroy(&m->write_latency_sq_sum); +err_write_latency_sq_sum: + percpu_counter_destroy(&m->read_latency_sq_sum); +err_read_latency_sq_sum: percpu_counter_destroy(&m->i_caps_mis); err_i_caps_mis: percpu_counter_destroy(&m->i_caps_hit); @@ -88,12 +80,9 @@ int ceph_mdsc_metric_init(struct ceph_client_metric *m) 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->metadata_latency_sq_sum); + percpu_counter_destroy(&m->write_latency_sq_sum); + percpu_counter_destroy(&m->read_latency_sq_sum); percpu_counter_destroy(&m->i_caps_mis); percpu_counter_destroy(&m->i_caps_hit); percpu_counter_destroy(&m->d_lease_mis); @@ -124,6 +113,28 @@ static inline void __update_max_latency(atomic64_t *max, unsigned long lat) } while (unlikely((cur = atomic64_cmpxchg(max, old, lat)) != old)); } +static inline void __update_avg_and_sq(atomic64_t *totalp, atomic64_t *lat_sump, + struct percpu_counter *sq_sump, + spinlock_t *lockp, unsigned long lat) +{ + s64 total, avg, sq, lsum; + + spin_lock(lockp); + total = atomic64_inc_return(totalp); + lsum = atomic64_add_return(lat, lat_sump); + spin_unlock(lockp); + + if (unlikely(total == 1)) + return; + + /* the sq is (lat - old_avg) * (lat - new_avg) */ + avg = DIV64_U64_ROUND_CLOSEST((lsum - lat), (total - 1)); + sq = lat - avg; + avg = DIV64_U64_ROUND_CLOSEST(lsum, total); + sq = sq * (lat - avg); + percpu_counter_add(sq_sump, sq); +} + void ceph_update_read_latency(struct ceph_client_metric *m, unsigned long r_start, unsigned long r_end, @@ -134,10 +145,12 @@ void ceph_update_read_latency(struct ceph_client_metric *m, 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); + __update_avg_and_sq(&m->total_reads, &m->read_latency_sum, + &m->read_latency_sq_sum, + &m->read_latency_lock, + lat); } void ceph_update_write_latency(struct ceph_client_metric *m, @@ -150,10 +163,12 @@ void ceph_update_write_latency(struct ceph_client_metric *m, 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); + __update_avg_and_sq(&m->total_writes, &m->write_latency_sum, + &m->write_latency_sq_sum, + &m->write_latency_lock, + lat); } void ceph_update_metadata_latency(struct ceph_client_metric *m, @@ -166,8 +181,10 @@ void ceph_update_metadata_latency(struct ceph_client_metric *m, 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); + __update_avg_and_sq(&m->total_metadatas, &m->metadata_latency_sum, + &m->metadata_latency_sq_sum, + &m->metadata_latency_lock, + lat); } diff --git a/fs/ceph/metric.h b/fs/ceph/metric.h index f139aff..d63b95e 100644 --- a/fs/ceph/metric.h +++ b/fs/ceph/metric.h @@ -14,18 +14,24 @@ struct ceph_client_metric { struct percpu_counter i_caps_hit; struct percpu_counter i_caps_mis; - struct percpu_counter total_reads; - struct percpu_counter read_latency_sum; + struct percpu_counter read_latency_sq_sum; + spinlock_t read_latency_lock; + atomic64_t total_reads; + atomic64_t read_latency_sum; atomic64_t read_latency_min; atomic64_t read_latency_max; - struct percpu_counter total_writes; - struct percpu_counter write_latency_sum; + struct percpu_counter write_latency_sq_sum; + spinlock_t write_latency_lock; + atomic64_t total_writes; + atomic64_t write_latency_sum; atomic64_t write_latency_min; atomic64_t write_latency_max; - struct percpu_counter total_metadatas; - struct percpu_counter metadata_latency_sum; + struct percpu_counter metadata_latency_sq_sum; + spinlock_t metadata_latency_lock; + atomic64_t total_metadatas; + atomic64_t metadata_latency_sum; atomic64_t metadata_latency_min; atomic64_t metadata_latency_max; };