Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp2643514pxj; Mon, 14 Jun 2021 03:52:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyIakv+IHR8WKQgSHN+/c4jI81CcyFDAtqJvK/YjcCIroezGexsbThjC73Kk56gdqsEc4Jm X-Received: by 2002:a05:6402:3444:: with SMTP id l4mr16890072edc.259.1623667945002; Mon, 14 Jun 2021 03:52:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623667944; cv=none; d=google.com; s=arc-20160816; b=krj6pdyPpVPIvbcyL2sVQ/3ciXXDf7nsR/JOpayPujnyOjADMUZR29HKQYN6K8pQJY ONZJZn9ymTvQwMd2h20vVA17IaXC3RqQW/oIW67RZiGSaPR1+612pu+ScBtEauiEB95Z OXCrHNYIUqXwAkt8NLzJfiXkugMJUKa+RmV8YJhInRMB4+8X5XeYOfxFX2bfj99W0t5R dK9ZK6R6t9wwp9ohXCoBct/ygJ77/vbWaarWwJPDADqumoyyFb5q8WMGmtux9IERjz/F t7FZ0Eo1k2t1dTzlAyDedDuZR29TZGI03hSfwMSGrqTnVEaWN6DddZPR+nJPhxiGhg4v au2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=OJlabm1079oe1EQ4W38M6fV01Et03p2Ya3nm0mwgJQc=; b=EtKS9GftPBze8ZXA9IiwIqqf2NKkXQa0Om/POiyDtesLiNKTC+gr6BXXZqjbmlIYA+ BroFfdYOj/G9pw5a7uB8MUYcKpl2wGy3Ftg7iF4XT7YT5ZzFclxFrojxkRy7BTkYxl7G oC4NOlZqYT9xVx5NstJdyeFHsD/518JWVPW6sFyJXaurbTogIsTRTxkqSIRxWXrDzVEj ywP49Ls5XPbC8HAaCyKDmH634l098bXGVlVoUlZ+phPBGKlK0N7VIJKmByiOhvF6FuFA iERZN7zkH5wgSMkwoASgo0/GQ94cBac8IZGwRCfJX3LdSjDDWTm84+m7GI16enT1/WtL 3A8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=LwIuLv3P; 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=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id t12si11185725ejs.333.2021.06.14.03.52.02; Mon, 14 Jun 2021 03:52:24 -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=@linuxfoundation.org header.s=korg header.b=LwIuLv3P; 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=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234529AbhFNKw6 (ORCPT + 99 others); Mon, 14 Jun 2021 06:52:58 -0400 Received: from mail.kernel.org ([198.145.29.99]:52126 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233812AbhFNKqI (ORCPT ); Mon, 14 Jun 2021 06:46:08 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id C719561444; Mon, 14 Jun 2021 10:36:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1623667006; bh=AIj8YWVQp9GAyHgi3R9OCWzwr9Sr1OKAMjIMJMenaDg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LwIuLv3PcQmqG9cTchjhc74MEW4mpdaBPpHpVRQxlPVldvuiVFrf8IFo7eIaN3Zcf lzShlPOumSv208Se8fZRlbY5mNM5GgAsJsc8PzWQHbdcXDmGCW8AGYiIIw7T9ctW+x iolxS5byvv5PR2U9VS889VkG80gV+P2s9lC9zAL4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Trond Myklebust Subject: [PATCH 4.19 61/67] NFSv4: Fix second deadlock in nfs4_evict_inode() Date: Mon, 14 Jun 2021 12:27:44 +0200 Message-Id: <20210614102645.838455543@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210614102643.797691914@linuxfoundation.org> References: <20210614102643.797691914@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Trond Myklebust commit c3aba897c6e67fa464ec02b1f17911577d619713 upstream. If the inode is being evicted but has to return a layout first, then that too can cause a deadlock in the corner case where the server reboots. Signed-off-by: Trond Myklebust Signed-off-by: Greg Kroah-Hartman --- fs/nfs/nfs4proc.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -9067,15 +9067,20 @@ int nfs4_proc_layoutreturn(struct nfs4_l &task_setup_data.rpc_client, &msg); dprintk("--> %s\n", __func__); + lrp->inode = nfs_igrab_and_active(lrp->args.inode); if (!sync) { - lrp->inode = nfs_igrab_and_active(lrp->args.inode); if (!lrp->inode) { nfs4_layoutreturn_release(lrp); return -EAGAIN; } task_setup_data.flags |= RPC_TASK_ASYNC; } - nfs4_init_sequence(&lrp->args.seq_args, &lrp->res.seq_res, 1, 0); + if (!lrp->inode) + nfs4_init_sequence(&lrp->args.seq_args, &lrp->res.seq_res, 1, + 1); + else + nfs4_init_sequence(&lrp->args.seq_args, &lrp->res.seq_res, 1, + 0); task = rpc_run_task(&task_setup_data); if (IS_ERR(task)) return PTR_ERR(task);