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=-7.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=no 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 62D5AC433E2 for ; Sat, 12 Sep 2020 03:54:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 151F021D91 for ; Sat, 12 Sep 2020 03:54:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="NQcV2qWM" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725798AbgILDyO (ORCPT ); Fri, 11 Sep 2020 23:54:14 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:48810 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725791AbgILDyN (ORCPT ); Fri, 11 Sep 2020 23:54:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599882851; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Y3xGhdSiUSJ3qXjQTn2hAwJZ6/YHNCpDt5nWLcdYQbw=; b=NQcV2qWMujIOyF7dQklUFJKva5xawjU4IWbKo1VVpSeRm4/nLPW5z63vj3K02qb2LHnr/V Ld0ItbvYLkMbJtFw9LMvSnleRvXnPJOWatIsUO05x9ku5YH+OBgaLveWvauCVR44WBxqUu 4oCbeSptd+AJh/FuoHoTNYwqCfIG+PU= 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-362-ev2Vda3DPaOplAqQ2LUGjQ-1; Fri, 11 Sep 2020 23:54:09 -0400 X-MC-Unique: ev2Vda3DPaOplAqQ2LUGjQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 998EC1074641; Sat, 12 Sep 2020 03:54:08 +0000 (UTC) Received: from [10.72.12.33] (ovpn-12-33.pek2.redhat.com [10.72.12.33]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 530FA5C269; Sat, 12 Sep 2020 03:54:05 +0000 (UTC) Subject: Re: [PATCH v5 0/2] ceph: metrics for opened files, pinned caps and opened inodes To: Jeff Layton , Ilya Dryomov Cc: "Yan, Zheng" , Patrick Donnelly , Ceph Development References: <20200903130140.799392-1-xiubli@redhat.com> <449a56624f3dd4e2a4a4cf95cd24d69c53700b6d.camel@kernel.org> <9a5c5d2f-d105-21c4-327e-5ad18bf49518@redhat.com> From: Xiubo Li Message-ID: <4642cccf-32c0-fa4e-aacb-b76c520ed3cf@redhat.com> Date: Sat, 12 Sep 2020 11:54:02 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.12.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org On 2020/9/11 19:49, Jeff Layton wrote: > On Fri, 2020-09-11 at 11:43 +0800, Xiubo Li wrote: >> On 2020/9/10 20:13, Jeff Layton wrote: >>> On Thu, 2020-09-10 at 08:00 +0200, Ilya Dryomov wrote: >>>> On Thu, Sep 10, 2020 at 2:59 AM Xiubo Li wrote: >>>>> On 2020/9/10 4:34, Ilya Dryomov wrote: >>>>>> On Thu, Sep 3, 2020 at 4:22 PM Xiubo Li wrote: >>>>>>> On 2020/9/3 22:18, Jeff Layton wrote: >>>>>>>> On Thu, 2020-09-03 at 09:01 -0400, xiubli@redhat.com wrote: >>>>>>>>> From: Xiubo Li >>>>>>>>> >>>>>>>>> Changed in V5: >>>>>>>>> - Remove mdsc parsing helpers except the ceph_sb_to_mdsc() >>>>>>>>> - Remove the is_opened member. >>>>>>>>> >>>>>>>>> Changed in V4: >>>>>>>>> - A small fix about the total_inodes. >>>>>>>>> >>>>>>>>> Changed in V3: >>>>>>>>> - Resend for V2 just forgot one patch, which is adding some helpers >>>>>>>>> support to simplify the code. >>>>>>>>> >>>>>>>>> Changed in V2: >>>>>>>>> - Add number of inodes that have opened files. >>>>>>>>> - Remove the dir metrics and fold into files. >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> Xiubo Li (2): >>>>>>>>> ceph: add ceph_sb_to_mdsc helper support to parse the mdsc >>>>>>>>> ceph: metrics for opened files, pinned caps and opened inodes >>>>>>>>> >>>>>>>>> fs/ceph/caps.c | 41 +++++++++++++++++++++++++++++++++++++---- >>>>>>>>> fs/ceph/debugfs.c | 11 +++++++++++ >>>>>>>>> fs/ceph/dir.c | 20 +++++++------------- >>>>>>>>> fs/ceph/file.c | 13 ++++++------- >>>>>>>>> fs/ceph/inode.c | 11 ++++++++--- >>>>>>>>> fs/ceph/locks.c | 2 +- >>>>>>>>> fs/ceph/metric.c | 14 ++++++++++++++ >>>>>>>>> fs/ceph/metric.h | 7 +++++++ >>>>>>>>> fs/ceph/quota.c | 10 +++++----- >>>>>>>>> fs/ceph/snap.c | 2 +- >>>>>>>>> fs/ceph/super.h | 6 ++++++ >>>>>>>>> 11 files changed, 103 insertions(+), 34 deletions(-) >>>>>>>>> >>>>>>>> Looks good. I went ahead and merge this into testing. >>>>>>>> >>>>>>>> Small merge conflict in quota.c, which I guess is probably due to not >>>>>>>> basing this on testing branch. I also dropped what looks like an >>>>>>>> unrelated hunk in the second patch. >>>>>>>> >>>>>>>> In the future, if you can be sure that patches you post apply cleanly to >>>>>>>> testing branch then that would make things easier. >>>>>>> Okay, will do it. >>>>>> Hi Xiubo, >>>>>> >>>>>> There is a problem with lifetimes here. mdsc isn't guaranteed to exist >>>>>> when ->free_inode() is called. This can lead to crashes on a NULL mdsc >>>>>> in ceph_free_inode() in case of e.g. "umount -f". I know it was Jeff's >>>>>> suggestion to move the decrement of total_inodes into ceph_free_inode(), >>>>>> but it doesn't look like it can be easily deferred past ->evict_inode(). >>>>> Okay, I will take a look. >>>> Given that it's just a counter which we don't care about if the >>>> mount is going away, some form of "if (mdsc)" check might do, but >>>> need to make sure that it covers possible races, if any. >>>> >>> Good catch, Ilya. >>> >>> What may be best is to move the increment out of ceph_alloc_inode and >>> instead put it in ceph_set_ino_cb. Then the decrement can go back into >>> ceph_evict_inode. >> Hi Jeff, Ilya >> >> Checked the code, it seems in the ceph_evict_inode() we will also hit >> the same issue . >> >> With the '-f' options when umounting, it will skip the inodes whose >> i_count ref > 0. And then free the fsc/mdsc in ceph. And later the >> iput_final() will call the ceph_evict_inode() and then ceph_free_inode(). >> >> Could we just check if !!(sb->s_flags & SB_ACTIVE) is false will we skip >> the counting ? >> > Note that umount -f (MNT_FORCE) just means that ceph_umount_begin is > called before unmounting. Yeah, right. I misread the SB_FORCE and the MNT_FORCE. > If what you're saying it true, then we have bigger problems. > ceph_evict_inode does this today when ci->i_snap_realm is set: > > struct ceph_mds_client *mdsc = ceph_inode_to_client(inode)->mdsc; > > ...and then goes on to use that mdsc pointer. > > I wonder if we ought to be moving move some of the operations in > ceph_kill_sb into ceph_put_super... particularly the call to > destroy_fs_client()?