From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 34206C4741F for ; Fri, 6 Nov 2020 14:24:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CD4E72078B for ; Fri, 6 Nov 2020 14:24:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604672661; bh=QY5JomV7wL6w9NwbPNVUhDcmGXOeRkS9dvrD3GDTYSY=; h=Subject:From:To:Cc:Date:In-Reply-To:References:List-ID:From; b=kQZbocyfAztGbqD7BrD4ULKoc0KcSPOwv4CkEzyzBzyYRWYYIf2hSDkflxXsvjD7+ sBvINktEWlSMADLUBXOOTc9FOCwvlB1gwzYYpZzihFGl5fH1aVywKMtrL1LwFXUoS3 IPk3aBcVOK5t+VIBUizSEOh4tmV3PC93WfM878jI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727053AbgKFOYV (ORCPT ); Fri, 6 Nov 2020 09:24:21 -0500 Received: from mail.kernel.org ([198.145.29.99]:59628 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726317AbgKFOYU (ORCPT ); Fri, 6 Nov 2020 09:24:20 -0500 Received: from tleilax.poochiereds.net (68-20-15-154.lightspeed.rlghnc.sbcglobal.net [68.20.15.154]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C2D7520719; Fri, 6 Nov 2020 14:24:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604672659; bh=QY5JomV7wL6w9NwbPNVUhDcmGXOeRkS9dvrD3GDTYSY=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=QlURMk0bt5FY4kwh1L0VIU16znK5WmvTslryRxv1VD95OXxswxIRx78cHq33XJlX+ O52uZZroeWbwXiGaSfeDYtrJWqhoUGoMApMnz6MGHLilmsC9jMEMk7T9vlI1ZP2Qho kXwxF5HU2y+28jsFqOW/Mw5EGTnY24+IjlOqqk98= Message-ID: Subject: Re: [PATCH v2] ceph: send dentry lease metrics to MDS daemon From: Jeff Layton To: xiubli@redhat.com Cc: idryomov@gmail.com, zyan@redhat.com, pdonnell@redhat.com, ceph-devel@vger.kernel.org Date: Fri, 06 Nov 2020 09:24:17 -0500 In-Reply-To: <20201106043021.966064-1-xiubli@redhat.com> References: <20201106043021.966064-1-xiubli@redhat.com> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.38.1 (3.38.1-1.fc33) MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org On Thu, 2020-11-05 at 23:30 -0500, xiubli@redhat.com wrote: > From: Xiubo Li > > For the old ceph version, if it received this one metric message > containing the dentry lease metric info, it will just ignore it. > > URL: https://tracker.ceph.com/issues/43423 > Signed-off-by: Xiubo Li > --- >  fs/ceph/metric.c | 18 +++++++++++++++--- >  fs/ceph/metric.h | 14 ++++++++++++++ >  2 files changed, 29 insertions(+), 3 deletions(-) > > diff --git a/fs/ceph/metric.c b/fs/ceph/metric.c > index fee4c4778313..5ec94bd4c1de 100644 > --- a/fs/ceph/metric.c > +++ b/fs/ceph/metric.c > @@ -16,6 +16,7 @@ static bool ceph_mdsc_send_metrics(struct ceph_mds_client *mdsc, >   struct ceph_metric_read_latency *read; >   struct ceph_metric_write_latency *write; >   struct ceph_metric_metadata_latency *meta; > + struct ceph_metric_dlease *dlease; >   struct ceph_client_metric *m = &mdsc->metric; >   u64 nr_caps = atomic64_read(&m->total_caps); >   struct ceph_msg *msg; > @@ -25,7 +26,7 @@ static bool ceph_mdsc_send_metrics(struct ceph_mds_client *mdsc, >   s32 len; >   > >   len = sizeof(*head) + sizeof(*cap) + sizeof(*read) + sizeof(*write) > - + sizeof(*meta); > + + sizeof(*meta) + sizeof(*dlease); >   > >   msg = ceph_msg_new(CEPH_MSG_CLIENT_METRICS, len, GFP_NOFS, true); >   if (!msg) { > @@ -42,8 +43,8 @@ static bool ceph_mdsc_send_metrics(struct ceph_mds_client *mdsc, >   cap->ver = 1; >   cap->compat = 1; >   cap->data_len = cpu_to_le32(sizeof(*cap) - 10); > - cap->hit = cpu_to_le64(percpu_counter_sum(&mdsc->metric.i_caps_hit)); > - cap->mis = cpu_to_le64(percpu_counter_sum(&mdsc->metric.i_caps_mis)); > + cap->hit = cpu_to_le64(percpu_counter_sum(&m->i_caps_hit)); > + cap->mis = cpu_to_le64(percpu_counter_sum(&m->i_caps_mis)); >   cap->total = cpu_to_le64(nr_caps); >   items++; >   > > @@ -83,6 +84,17 @@ static bool ceph_mdsc_send_metrics(struct ceph_mds_client *mdsc, >   meta->nsec = cpu_to_le32(ts.tv_nsec); >   items++; >   > > + /* encode the dentry lease metric */ > + dlease = (struct ceph_metric_dlease *)(meta + 1); > + dlease->type = cpu_to_le32(CLIENT_METRIC_TYPE_DENTRY_LEASE); > + dlease->ver = 1; > + dlease->compat = 1; > + dlease->data_len = cpu_to_le32(sizeof(*dlease) - 10); > + dlease->hit = cpu_to_le64(percpu_counter_sum(&m->d_lease_hit)); > + dlease->mis = cpu_to_le64(percpu_counter_sum(&m->d_lease_mis)); > + dlease->total = cpu_to_le64(atomic64_read(&m->total_dentries)); > + items++; > + >   put_unaligned_le32(items, &head->num); >   msg->front.iov_len = len; >   msg->hdr.version = cpu_to_le16(1); > diff --git a/fs/ceph/metric.h b/fs/ceph/metric.h > index 710f3f1dceab..af6038ff39d4 100644 > --- a/fs/ceph/metric.h > +++ b/fs/ceph/metric.h > @@ -27,6 +27,7 @@ enum ceph_metric_type { >   CLIENT_METRIC_TYPE_READ_LATENCY, \ >   CLIENT_METRIC_TYPE_WRITE_LATENCY, \ >   CLIENT_METRIC_TYPE_METADATA_LATENCY, \ > + CLIENT_METRIC_TYPE_DENTRY_LEASE, \ >   \ >   CLIENT_METRIC_TYPE_MAX, \ >  } > @@ -80,6 +81,19 @@ struct ceph_metric_metadata_latency { >   __le32 nsec; >  } __packed; >   > > +/* metric dentry lease header */ > +struct ceph_metric_dlease { > + __le32 type; /* ceph metric type */ > + > + __u8 ver; > + __u8 compat; > + > + __le32 data_len; /* length of sizeof(hit + mis + total) */ > + __le64 hit; > + __le64 mis; > + __le64 total; > +} __packed; > + >  struct ceph_metric_head { >   __le32 num; /* the number of metrics that will be sent */ >  } __packed; Thanks Xiubo, Merged into testing branch and should make v5.11. -- Jeff Layton