Received: by 2002:a25:868d:0:0:0:0:0 with SMTP id z13csp1322678ybk; Thu, 21 May 2020 04:11:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxh6pSTeNDFKrI/MtPm/aE09XTt54eGYYU1gNLrJPS3wf16/HLI3aqRAx3ipW85/BF9Yb47 X-Received: by 2002:a17:906:1ccd:: with SMTP id i13mr3151765ejh.148.1590059512991; Thu, 21 May 2020 04:11:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1590059512; cv=none; d=google.com; s=arc-20160816; b=KqbU8ldSu3jhsDg7gbxEQzC52nmw+n5vdMnJnLVEkIdDG2TdN37zP0jWjNz78R4BHn j6raIeeU6FeP7WyduIb1dHANGuatEALc9F2spXtXvTUAkeORlPVNrdVJDuJULgTvkH6b HsMQmn0kft4aLQ8ca9Awzqu/kIawZIXZqMqOS2Uioi1oqJq7aM9cPrYzargBGOH6V0pU CL4yGw9dc1V373o8oTbUEU5aY5vlnkl9toudMyN0TGlSHcBrqA/9nuMoAEM9d2t0Eugf JAiQZl2qZFktxaRfgiRHtfsRQLuYDq40UvLhpBgxgPOi+pBKUKBTpPV4SJnFfC0xCH2O Qomw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:date:cc:to:from:subject :message-id:dkim-signature; bh=Z6RajRfN4vrrS8PqB7hJAeQ6CroWinvTV17Etx5/jgk=; b=yStrQK9e7p51c1grC2ZHaFGn+8ucNh2BP01HQ/zjqfB/snVDpaycwravHvtXcDvojG 955Kh/Jt2Nswcy1wWJ9TIaj7PxhsVeDrVTIqLhxv0GkflJOIzSrI+AWHqxk50+wcSyPC xJfXo+NHpGyQYg9DYEhnx3dfrK1V5NDTs3yNlWcrw0cU6tyH1L/Fc+hGXNpD/lWl4txj ur2HTsg5Pwg/6MlhMRLqVDZ6JyTytBpYZNShei2Aa/OoCT0LQovMHUcSTe6sBkWTrjs9 Mq5WbAknOBDD5KrcbDxpnG77YhQSip3jOY/FAAflBtYkMgYwHmUQJgrHkKlO1gfqTJ+E PcdQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=sSAB0ije; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id o22si2891570edi.120.2020.05.21.04.11.29; Thu, 21 May 2020 04:11:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=sSAB0ije; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729080AbgEULJ5 (ORCPT + 99 others); Thu, 21 May 2020 07:09:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:41496 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729017AbgEULJy (ORCPT ); Thu, 21 May 2020 07:09:54 -0400 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 75F7120721; Thu, 21 May 2020 11:09:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590059393; bh=CYq5LvpdIkzN5Q2ml6NSFNeLsYGmkIUAGsU26W6nIUE=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=sSAB0ijeU/zJF/ltw7k79k69ZikOCsnrNtoPtdEHHISk+BhL7kaXFLaQnxh43Jn/I tazH3muCMsoFMJFPkE9Q5fCGKRGV+jrFzHJrghjznDxlFd2aEIMENW8sFFQu38VCUh p4hJhm+i8jSZMA8ZrNQ4SXXOjUFTkDI/whSvkEzU= Message-ID: Subject: Re: [PATCH] ceph: show max caps in debugfs caps file From: Jeff Layton To: Yanhu Cao Cc: idryomov@gmail.com, ceph-devel@vger.kernel.org, linux-kernel@vger.kernel.org Date: Thu, 21 May 2020 07:09:52 -0400 In-Reply-To: <20200521093845.15101-1-gmayyyha@gmail.com> References: <20200521093845.15101-1-gmayyyha@gmail.com> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.36.2 (3.36.2-1.fc32) MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 2020-05-21 at 17:38 +0800, Yanhu Cao wrote: > before > ------ > total 1026 > avail 1024 > used 2 > reserved 0 > min 1024 > > after > ------ > total 1026 > avail 1024 > used 2 > max 2048 > reserved 0 > min 1024 > > Signed-off-by: Yanhu Cao > --- > fs/ceph/caps.c | 6 ++++-- > fs/ceph/debugfs.c | 7 ++++--- > fs/ceph/super.h | 2 +- > 3 files changed, 9 insertions(+), 6 deletions(-) > > diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c > index 5f3aa4d607de..e2c759a2ef35 100644 > --- a/fs/ceph/caps.c > +++ b/fs/ceph/caps.c > @@ -404,8 +404,8 @@ void ceph_put_cap(struct ceph_mds_client *mdsc, struct ceph_cap *cap) > } > > void ceph_reservation_status(struct ceph_fs_client *fsc, > - int *total, int *avail, int *used, int *reserved, > - int *min) > + int *total, int *avail, int *used, int *max, > + int *reserved, int *min) > { > struct ceph_mds_client *mdsc = fsc->mdsc; > > @@ -417,6 +417,8 @@ void ceph_reservation_status(struct ceph_fs_client *fsc, > *avail = mdsc->caps_avail_count; > if (used) > *used = mdsc->caps_use_count; > + if (max) > + *max = mdsc->caps_use_max; Can you lay out what value this will provide? I'm not convinced that this information is really that helpful: mdsc->caps_use_max is just set to the value of the "caps_max" mount option, and that information is displayed in /proc/mounts if it's not set to the default. What might be more interesting is to track the most recent "max_caps" value sent by the MDS (see the CEPH_SESSION_RECALL_STATE message handling). Tracking that would give us a more dynamic view of the current maximum requested by the MDS, which is often going to be less than what "caps_max" was set to at mount time. > if (reserved) > *reserved = mdsc->caps_reserve_count; > if (min) > diff --git a/fs/ceph/debugfs.c b/fs/ceph/debugfs.c > index 481ac97b4d25..942004376588 100644 > --- a/fs/ceph/debugfs.c > +++ b/fs/ceph/debugfs.c > @@ -138,16 +138,17 @@ static int caps_show(struct seq_file *s, void *p) > { > struct ceph_fs_client *fsc = s->private; > struct ceph_mds_client *mdsc = fsc->mdsc; > - int total, avail, used, reserved, min, i; > + int total, avail, used, max, reserved, min, i; > struct cap_wait *cw; > > - ceph_reservation_status(fsc, &total, &avail, &used, &reserved, &min); > + ceph_reservation_status(fsc, &total, &avail, &used, &max, > + &reserved, &min); > seq_printf(s, "total\t\t%d\n" > "avail\t\t%d\n" > "used\t\t%d\n" > "reserved\t%d\n" > "min\t\t%d\n\n", > - total, avail, used, reserved, min); > + total, avail, used, max, reserved, min); > seq_printf(s, "ino issued implemented\n"); > seq_printf(s, "-----------------------------------------------\n"); > > diff --git a/fs/ceph/super.h b/fs/ceph/super.h > index 60aac3aee055..79aa42d9336c 100644 > --- a/fs/ceph/super.h > +++ b/fs/ceph/super.h > @@ -700,7 +700,7 @@ extern void ceph_unreserve_caps(struct ceph_mds_client *mdsc, > struct ceph_cap_reservation *ctx); > extern void ceph_reservation_status(struct ceph_fs_client *client, > int *total, int *avail, int *used, > - int *reserved, int *min); > + int *max, int *reserved, int *min); > > > -- Jeff Layton