From patchwork Thu Jan 21 04:16:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 12034491 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=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 E8F80C433E6 for ; Thu, 21 Jan 2021 04:31:38 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 2EE5620674 for ; Thu, 21 Jan 2021 04:31:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2EE5620674 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id A4DCC6B0007; Wed, 20 Jan 2021 23:31:37 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 9D7C16B000C; Wed, 20 Jan 2021 23:31:37 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 89FB66B000D; Wed, 20 Jan 2021 23:31:37 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0050.hostedemail.com [216.40.44.50]) by kanga.kvack.org (Postfix) with ESMTP id 6F9EA6B0007 for ; Wed, 20 Jan 2021 23:31:37 -0500 (EST) Received: from smtpin07.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 349D38249980 for ; Thu, 21 Jan 2021 04:31:37 +0000 (UTC) X-FDA: 77728508634.07.blade25_470611d27560 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin07.hostedemail.com (Postfix) with ESMTP id 1D14C1803F9A9 for ; Thu, 21 Jan 2021 04:31:37 +0000 (UTC) X-HE-Tag: blade25_470611d27560 X-Filterd-Recvd-Size: 2987 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf33.hostedemail.com (Postfix) with ESMTP for ; Thu, 21 Jan 2021 04:31:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=L/kAHgpjppUCPJtFgtuXWn2k2U+9M1K3OHHff2LOzvg=; b=IbObjVQK/FbUqCBrRNWa8Y6jE0 CKUqA4JoWZrMonCu4mo0QNWaAdZ/+XJXmy15tLqBUyPUYdAqiBRRs1d4wBwnNKBkIcLeIeNWegHnu n51nkbrnfyqp1oLh7Dou+qaorL+NyuDNJ2LyKsW3H4ZTDG3RMFaG+AWlTv2GbKG/3hS6JO+Pq8eQL tRSAXeeWf5GEZic6l8rXcXr3kQQuY06E+Sf1C3ywKl9TGaMPVyASDTiEdJ0XarKpAxilw36mAhsza RZH/lxHrHXXKr0n8Ec92svqv2e461EWnhDXcuP/iEGZG9iIQcRWnCCHTNU0+hPf65Ami0lVy3nvUi 6CiEkHOQ==; Received: from willy by casper.infradead.org with local (Exim 4.94 #2 (Red Hat Linux)) id 1l2RaO-00GbkB-Nd; Thu, 21 Jan 2021 04:29:00 +0000 From: "Matthew Wilcox (Oracle)" To: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , hch@lst.de, kent.overstreet@gmail.com Subject: [PATCH v4 16/18] mm/filemap: Don't relock the page after calling readpage Date: Thu, 21 Jan 2021 04:16:14 +0000 Message-Id: <20210121041616.3955703-17-willy@infradead.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210121041616.3955703-1-willy@infradead.org> References: <20210121041616.3955703-1-willy@infradead.org> MIME-Version: 1.0 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: We don't need to get the page lock again; we just need to wait for the I/O to finish, so use wait_on_page_locked_killable() like the other callers of ->readpage. Signed-off-by: Matthew Wilcox (Oracle) Reviewed-by: Kent Overstreet Reviewed-by: Christoph Hellwig --- mm/filemap.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index e09f0f1209a90..5563bfe5e544b 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2204,23 +2204,16 @@ static int filemap_read_page(struct file *file, struct address_space *mapping, error = mapping->a_ops->readpage(file, page); if (error) return error; - if (PageUptodate(page)) - return 0; - error = lock_page_killable(page); + error = wait_on_page_locked_killable(page); if (error) return error; - if (!PageUptodate(page)) { - if (page->mapping == NULL) { - /* page truncated */ - error = AOP_TRUNCATED_PAGE; - } else { - shrink_readahead_size_eio(&file->f_ra); - error = -EIO; - } - } - unlock_page(page); - return error; + if (PageUptodate(page)) + return 0; + if (!page->mapping) /* page truncated */ + return AOP_TRUNCATED_PAGE; + shrink_readahead_size_eio(&file->f_ra); + return -EIO; } static bool filemap_range_uptodate(struct address_space *mapping,