From patchwork Wed Oct 10 03:04:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xuehan Xu X-Patchwork-Id: 10633875 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 70DEF13BB for ; Wed, 10 Oct 2018 03:03:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5683429777 for ; Wed, 10 Oct 2018 03:03:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 49869297DC; Wed, 10 Oct 2018 03:03:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9670429777 for ; Wed, 10 Oct 2018 03:03:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726647AbeJJKXt (ORCPT ); Wed, 10 Oct 2018 06:23:49 -0400 Received: from mail-lj1-f195.google.com ([209.85.208.195]:38622 "EHLO mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725874AbeJJKXt (ORCPT ); Wed, 10 Oct 2018 06:23:49 -0400 Received: by mail-lj1-f195.google.com with SMTP id v7-v6so3475317ljg.5 for ; Tue, 09 Oct 2018 20:03:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=gOlDxeXSdXhHSpoY10Q9XT8kC6/AeCldm0l8rSuEHf0=; b=f1uMKOXsr6Ngj5DEVS8U9q7YCSurXoy6snfvdBl+1GXSFeFmAtN8mLIYellEpLu7Qr mZL5+cJQ+icwN58Eh9rN1vZ9nsW8IB+ljXyywrgIgLPy+cjuJ8dhiTOkfqgiKXWuu3h/ LHDHPd0v1wKBMWuyqJZ6/EJFFn6DLw6tDgd1uGnWZsIJ5iGpWoHGEfm/HxF980YUZ3Q2 NIqnY2hxWfwe5cTLIfHEjzoSXf+nJjWII3j4s70aLclb/L7ka5lKisUtJYzCOxMg0p7T b6qW6l2svVzZ4Po8TL/3cwdU6s/53OFXIxRD3eYk/iNr4UO5x9Ijz5e7opNR5PB2Hw+L B7Yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=gOlDxeXSdXhHSpoY10Q9XT8kC6/AeCldm0l8rSuEHf0=; b=nw6FWMHTwq3tS6XT70NjXS4/GAnTtg1VCOl0o/CH2OGHyy05/cvy2diZor6jtOsc6G ZLQ7HiQdx3jzjEUPaBVmMAFuCW7ikneryOkugIHLP2hcfUoqvNJIsEuJPIk23Fq8rfIj DH0pZ4GMDhD/SrPM82FDNI4FIlvNz+XJ1ESHvecH1rMB69VdvA3J9SLpQiJEzj7uyTOA C2wsCnSnD0nbOCqCPvN5frCwWd/wqrdI4c2DkamOvsoGc6MyRin9O7YL5UC2vanfO9nF 4cIFp3p0SOQAZSCJDvZhy409ZZqqrdscvAgbEFWNS2aSQsXXJUAbrXY4rA5MA+/5hzZS TnOg== X-Gm-Message-State: ABuFfoi4Hx3ReujqbG7W9aoW95KON2UKca7SSjr1LxUaR3GVf+MDRxl8 lFQM11TZbxBPSVivn8WhisEg6suNSPZX7AuS26SQwMG2p/CqJA== X-Google-Smtp-Source: ACcGV62jsHc7JeV3e7tLPePEMZ/Ec5i9pzq8r7M9/bTPruGHMVRihxkw53Ca+X1cvE/2h5xTltMGvKn2lQHddpEvA80= X-Received: by 2002:a2e:4e01:: with SMTP id c1-v6mr20808794ljb.157.1539140626819; Tue, 09 Oct 2018 20:03:46 -0700 (PDT) MIME-Version: 1.0 From: Xuehan Xu Date: Wed, 10 Oct 2018 11:04:02 +0800 Message-ID: Subject: [PATCH] ceph: set timeout conditionally in __cap_delay_requeue To: ceph-devel Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP __cap_delay_requeue could be invoked through ceph_check_caps when there exists caps that needs to be sent and are delayed by "i_hold_caps_min" or "i_hold_caps_max". If __cap_delay_requeue sets timeout unconditionally, there could be a chance that some "wanted" caps can not be release for a long since their timeouts are reset every time they get delayed. Signed-off-by: Xuehan Xu --- fs/ceph/caps.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) if (!mdsc->stopping) { @@ -734,7 +736,7 @@ void ceph_add_cap(struct inode *inode, dout(" issued %s, mds wanted %s, actual %s, queueing\n", ceph_cap_string(issued), ceph_cap_string(wanted), ceph_cap_string(actual_wanted)); - __cap_delay_requeue(mdsc, ci); + __cap_delay_requeue(mdsc, ci, true); } if (flags & CEPH_CAP_FLAG_AUTH) { @@ -1661,7 +1663,7 @@ int __ceph_mark_dirty_caps(struct ceph_inode_info *ci, int mask, if (((was | ci->i_flushing_caps) & CEPH_CAP_FILE_BUFFER) && (mask & CEPH_CAP_FILE_BUFFER)) dirty |= I_DIRTY_DATASYNC; - __cap_delay_requeue(mdsc, ci); + __cap_delay_requeue(mdsc, ci, true); return dirty; } @@ -2079,7 +2081,7 @@ void ceph_check_caps(struct ceph_inode_info *ci, int flags, /* Reschedule delayed caps release if we delayed anything */ if (delayed) - __cap_delay_requeue(mdsc, ci); + __cap_delay_requeue(mdsc, ci, false); spin_unlock(&ci->i_ceph_lock); @@ -2139,7 +2141,7 @@ static int try_flush_caps(struct inode *inode, u64 *ptid) if (delayed) { spin_lock(&ci->i_ceph_lock); - __cap_delay_requeue(mdsc, ci); + __cap_delay_requeue(mdsc, ci, true); spin_unlock(&ci->i_ceph_lock); } } else { diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c index 990258c..486cc77 100644 --- a/fs/ceph/caps.c +++ b/fs/ceph/caps.c @@ -533,9 +533,11 @@ static void __cap_set_timeouts(struct ceph_mds_client *mdsc, * -> we take mdsc->cap_delay_lock */ static void __cap_delay_requeue(struct ceph_mds_client *mdsc, - struct ceph_inode_info *ci) + struct ceph_inode_info *ci, + bool set_timeout) { - __cap_set_timeouts(mdsc, ci); + if (set_timeout) + __cap_set_timeouts(mdsc, ci); dout("__cap_delay_requeue %p flags %d at %lu\n", &ci->vfs_inode, ci->i_ceph_flags, ci->i_hold_caps_max);