From patchwork Sun Apr 7 17:59:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 10888531 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 85DAA922 for ; Sun, 7 Apr 2019 18:01:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 728B82624D for ; Sun, 7 Apr 2019 18:01:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 66E6628399; Sun, 7 Apr 2019 18:01:43 +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 1E9DE2624D for ; Sun, 7 Apr 2019 18:01:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726471AbfDGSBm (ORCPT ); Sun, 7 Apr 2019 14:01:42 -0400 Received: from mail-it1-f195.google.com ([209.85.166.195]:38984 "EHLO mail-it1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726466AbfDGSBm (ORCPT ); Sun, 7 Apr 2019 14:01:42 -0400 Received: by mail-it1-f195.google.com with SMTP id 139so17333775ita.4 for ; Sun, 07 Apr 2019 11:01:41 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=q8TSoPO9kXJFJoeGK9oXZX+ELAH+5w6/Bv+37JBTH1s=; b=QknhAW1jvgXp+37wkZfD9DefY6yjJS7YkqSRLEjFGtf+qa/J4Oo8r4D4qm4IWtcV2m +5kM2/Dgdd/KMvRHOnD61UhXyX7H9eR4v+fwjzbs/88G5rImV9xo56aOsF/y3iPOJSaJ 8JDTStWX8CSIjbVd5f2BqsjnAcib36sqRyfs6cXOnV/hDv04zm/rxoWe2Pg6MIsqUn85 mK2ZNQxWQXXUTITzCR3bzbJL+rQLb88wA9yuyZsOcDTewKv1FIBh0DIPBsgVDfRBIkHd pz3/ilvP/4q3nq7dqMwGT4wbG/GUQYTl0pJP/szsIaZqtrBD48mlj9/fi/GUsjCRY8iq 6Jow== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=q8TSoPO9kXJFJoeGK9oXZX+ELAH+5w6/Bv+37JBTH1s=; b=dfVA7BqUUZ+ukazmTKjEOOlPAGg9iLj3Vb2v6X0DhsAONPaR1gsOrOlm2z4mWCBv2q 5KOEiLbBfGDCdR+b0IOOiZnwvtHKvtpse93MUDp/1qfUNuGVyEc6GW7xIY4eqnFs5q3M GQs5mWw/f9FfiA8/gIlBaZmmBHLXLrltULnSHq+7OT9deluO7ze7gaeqV7LVsoXCIfrJ K2jrXGYmQjsaIDFuqrRkPajFRNd9hYUSR3u9mcMpkEGvF61KvqwgE9vsNGBfhvM5J447 Uv6jczNMX16bzjPTYaWZ3NDXb7Wj4GtQR9xd+PKNVovOx7lj4y2g42VZ2xV1uLdA1GhY LH/g== X-Gm-Message-State: APjAAAUOzLbZYRlMsBLQGPeSTz/RAD/3Xm2CkULILjAQ7xVBx8arbNol G3JP0X43htbjnfwKnEFWxFecq4Q= X-Google-Smtp-Source: APXvYqxdkdmMsTFk0NTevMVp3QRuXv95Yp69vC9EJYvVl5doecqEyrJvbO2zwXKGb3lvsMbPnr+eCw== X-Received: by 2002:a24:454e:: with SMTP id y75mr17434055ita.5.1554660101180; Sun, 07 Apr 2019 11:01:41 -0700 (PDT) Received: from localhost.localdomain (c-68-40-189-247.hsd1.mi.comcast.net. [68.40.189.247]) by smtp.gmail.com with ESMTPSA id m6sm10807362ioj.36.2019.04.07.11.01.40 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 07 Apr 2019 11:01:40 -0700 (PDT) From: Trond Myklebust X-Google-Original-From: Trond Myklebust To: Anna Schumaker Cc: linux-nfs@vger.kernel.org Subject: [PATCH v3 20/29] NFS: Don't call generic_error_remove_page() while holding locks Date: Sun, 7 Apr 2019 13:59:03 -0400 Message-Id: <20190407175912.23528-21-trond.myklebust@hammerspace.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190407175912.23528-20-trond.myklebust@hammerspace.com> References: <20190407175912.23528-1-trond.myklebust@hammerspace.com> <20190407175912.23528-2-trond.myklebust@hammerspace.com> <20190407175912.23528-3-trond.myklebust@hammerspace.com> <20190407175912.23528-4-trond.myklebust@hammerspace.com> <20190407175912.23528-5-trond.myklebust@hammerspace.com> <20190407175912.23528-6-trond.myklebust@hammerspace.com> <20190407175912.23528-7-trond.myklebust@hammerspace.com> <20190407175912.23528-8-trond.myklebust@hammerspace.com> <20190407175912.23528-9-trond.myklebust@hammerspace.com> <20190407175912.23528-10-trond.myklebust@hammerspace.com> <20190407175912.23528-11-trond.myklebust@hammerspace.com> <20190407175912.23528-12-trond.myklebust@hammerspace.com> <20190407175912.23528-13-trond.myklebust@hammerspace.com> <20190407175912.23528-14-trond.myklebust@hammerspace.com> <20190407175912.23528-15-trond.myklebust@hammerspace.com> <20190407175912.23528-16-trond.myklebust@hammerspace.com> <20190407175912.23528-17-trond.myklebust@hammerspace.com> <20190407175912.23528-18-trond.myklebust@hammerspace.com> <20190407175912.23528-19-trond.myklebust@hammerspace.com> <20190407175912.23528-20-trond.myklebust@hammerspace.com> MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The NFS read code can trigger writeback while holding the page lock. If an error then triggers a call to nfs_write_error_remove_page(), we can deadlock. Signed-off-by: Trond Myklebust --- fs/nfs/write.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fs/nfs/write.c b/fs/nfs/write.c index 9198a23bb58b..64cf6a340ba6 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c @@ -584,9 +584,8 @@ nfs_lock_and_join_requests(struct page *page) static void nfs_write_error_remove_page(struct nfs_page *req) { + SetPageError(req->wb_page); nfs_end_page_writeback(req); - generic_error_remove_page(page_file_mapping(req->wb_page), - req->wb_page); nfs_release_request(req); }