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=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 8E784C38A29 for ; Sat, 18 Apr 2020 14:47:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 629AA2072B for ; Sat, 18 Apr 2020 14:47:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587221240; bh=11YmNg45o4pl7Os+GerbzsB168UPbIySpr1+8MNxj/A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=kSFInQ5w6h13xltJBOqY8pIfnx87y/2OGyzzccJnyawnoB72jeiMGJCSYAKv8Fhro qFlUTxo9woGaHSD2iVVhCIfYpqjbhRNP9s40WL7/z6z61+5l76BtOMY4bUDlYauiXE CS828qYykN1j+7dYkJ+SHGDwtrOzebOI0RDIOl7c= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728626AbgDROrT (ORCPT ); Sat, 18 Apr 2020 10:47:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:55772 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728757AbgDROoM (ORCPT ); Sat, 18 Apr 2020 10:44:12 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 47B5622245; Sat, 18 Apr 2020 14:44:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587221052; bh=11YmNg45o4pl7Os+GerbzsB168UPbIySpr1+8MNxj/A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EA0rSatZQM1kOsFkwyaBi3jmwh6WxzAnd9H/J2HiZhHUt/HfO6NusWy0zLEI8OXof I/gatePH2JcfzaV5junQaBjw/aR4ad6I316bpkuL8bMdsoqnQGjllYQ8XcGGtHPIoY 7++nJamaaA0CRTodrUXlNo1dupDbYk37cmlH3+6g= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: "Yan, Zheng" , Jeff Layton , Ilya Dryomov , Sasha Levin , ceph-devel@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 05/23] ceph: don't skip updating wanted caps when cap is stale Date: Sat, 18 Apr 2020 10:43:47 -0400 Message-Id: <20200418144405.10565-5-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200418144405.10565-1-sashal@kernel.org> References: <20200418144405.10565-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "Yan, Zheng" [ Upstream commit 0aa971b6fd3f92afef6afe24ef78d9bb14471519 ] 1. try_get_cap_refs() fails to get caps and finds that mds_wanted does not include what it wants. It returns -ESTALE. 2. ceph_get_caps() calls ceph_renew_caps(). ceph_renew_caps() finds that inode has cap, so it calls ceph_check_caps(). 3. ceph_check_caps() finds that issued caps (without checking if it's stale) already includes caps wanted by open file, so it skips updating wanted caps. Above events can cause an infinite loop inside ceph_get_caps(). Signed-off-by: "Yan, Zheng" Reviewed-by: Jeff Layton Signed-off-by: Ilya Dryomov Signed-off-by: Sasha Levin --- fs/ceph/caps.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c index f5d9835264aa1..617e9ae67f506 100644 --- a/fs/ceph/caps.c +++ b/fs/ceph/caps.c @@ -1764,8 +1764,12 @@ void ceph_check_caps(struct ceph_inode_info *ci, int flags, } /* want more caps from mds? */ - if (want & ~(cap->mds_wanted | cap->issued)) - goto ack; + if (want & ~cap->mds_wanted) { + if (want & ~(cap->mds_wanted | cap->issued)) + goto ack; + if (!__cap_is_valid(cap)) + goto ack; + } /* things we might delay */ if ((cap->issued & ~retain) == 0 && -- 2.20.1