From patchwork Thu Oct 11 09:55:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xuehan Xu X-Patchwork-Id: 10636399 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 4E454933 for ; Thu, 11 Oct 2018 09:55:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3706F2AFDF for ; Thu, 11 Oct 2018 09:55:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2B43B2B133; Thu, 11 Oct 2018 09:55:58 +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 5BB322AFDF for ; Thu, 11 Oct 2018 09:55:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726607AbeJKRW2 (ORCPT ); Thu, 11 Oct 2018 13:22:28 -0400 Received: from mail-pf1-f195.google.com ([209.85.210.195]:37255 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726035AbeJKRW2 (ORCPT ); Thu, 11 Oct 2018 13:22:28 -0400 Received: by mail-pf1-f195.google.com with SMTP id j23-v6so4148986pfi.4 for ; Thu, 11 Oct 2018 02:55:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=qIYxYZGGEOjwERkOe+lVxajmVlMZQMjydMGG0G9pHbI=; b=JlnYfUUchRM5jOxT2u0tNrZ5IIF/drtpTGCGY9mAANikl+WfibSytcdVV3Nz5vFoX0 RkmagQV6CLTMutjS2j4DtYdOgW37akjFAbuFBEdBQEv2D3fFdoZYjhT+HnxlDdlj84vL GtZ90phDlw+J85qR2mHSeZOYNiVn1kwrxNCg7QKyE13SyMhAYs4Gd/esQ3qVpvAq4cex TkmmpDxN2fbPt88Q8HINZzRekmec8ISumB+/2Zre4gOQsCdkmcHobpIyrCBk6HOwMToe ag28oUnzFFhbLiFXlZbPfAHef3zTH/HFzbzdhP3qk/ji534u5bbYtZpAk5sSI2/x9p04 qGyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=qIYxYZGGEOjwERkOe+lVxajmVlMZQMjydMGG0G9pHbI=; b=CMvUp3TCfG8IO14K29895IkP6ex0mMzfeeXbpLttW0RyYzmnacMkUGJ9RCoUH4adpJ 7lxoUZlqudNoIsi7J+XEfRodz05shwO956QKbFZVAqzspcyShVsSS3CnIKwC5qCAYk2N AcEqUNcPXNkB+R29vDmY3KBh/B0dNVD+v9jZmOXTTsV6RDttYJdDO84tr7dDvpiCw1Wu hVJgRgfmHl8vH8OY7z9B/uGMtsyPmhcN0oVt1FQrrqK+OwgDGhkVgaaENS0SSH8c+eBp v9hCi2HEfrX4DGk89UDQRJr5B3ctJPh9SovjP14HFufxFdCsDMv7f5o+sDAOAXkZv4ee POXA== X-Gm-Message-State: ABuFfojUuG2hJnBwSX1nkZb8s/fCWO7AY7q0D8tmSOvsw9f9UBRd2zjG pX1jrz4PEK6osv6DTKd3M/JtbQAEQevnZg== X-Google-Smtp-Source: ACcGV61E3exZXSaF6vmWZcDwj0xEsSzF1I9E6vvizY4QeYb3ZLQIwNNjyCGBH/UfjwZN8mp4FuNdfw== X-Received: by 2002:a65:664e:: with SMTP id z14-v6mr741265pgv.347.1539251754626; Thu, 11 Oct 2018 02:55:54 -0700 (PDT) Received: from ceph02v.ops.corp.qihoo.net ([104.192.108.9]) by smtp.gmail.com with ESMTPSA id y24-v6sm42337075pfi.24.2018.10.11.02.55.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Oct 2018 02:55:53 -0700 (PDT) From: xxhdx1985126@gmail.com To: ceph-devel@vger.kernel.org Cc: Xuehan Xu , Xuehan Xu Subject: [PATCH] ceph: set timeout conditionally in __cap_delay_requeue Date: Thu, 11 Oct 2018 17:55:39 +0800 Message-Id: <20181011095539.15113-1-xxhdx1985126@gmail.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 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 From: Xuehan Xu __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. Fixes: http://tracker.ceph.com/issues/36369 Signed-off-by: Xuehan Xu --- fs/ceph/caps.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) 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); 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 {