From patchwork Mon Nov 2 18:43:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 11874953 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A0FD41130 for ; Mon, 2 Nov 2020 18:44:18 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 50E76223AC for ; Mon, 2 Nov 2020 18:44:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="M4UFc6+R" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 50E76223AC 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 553436B0085; Mon, 2 Nov 2020 13:43:34 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 507CE6B0083; Mon, 2 Nov 2020 13:43:34 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1F4CB6B0088; Mon, 2 Nov 2020 13:43:34 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0049.hostedemail.com [216.40.44.49]) by kanga.kvack.org (Postfix) with ESMTP id BD9D36B0083 for ; Mon, 2 Nov 2020 13:43:33 -0500 (EST) Received: from smtpin17.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 54C98181AC9C6 for ; Mon, 2 Nov 2020 18:43:33 +0000 (UTC) X-FDA: 77440351506.17.plane34_3b05745272b2 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin17.hostedemail.com (Postfix) with ESMTP id 3D730180D0181 for ; Mon, 2 Nov 2020 18:43:33 +0000 (UTC) X-Spam-Summary: 1,0,0,aed6c7a3e60af231,d41d8cd98f00b204,willy@infradead.org,,RULES_HIT:41:69:355:379:541:800:960:973:988:989:1260:1311:1314:1345:1359:1437:1515:1534:1541:1711:1730:1747:1777:1792:2393:2559:2562:3138:3139:3140:3141:3142:3352:3865:3866:3867:4321:5007:6261:6653:8957:10004:11026:11473:11658:11914:12043:12296:12297:12438:12555:12895:12986:13069:13161:13229:13311:13357:13894:14096:14181:14384:14394:14721:21080:21212:21324:21451:21627:21990:30054,0,RBL:90.155.50.34:@infradead.org:.lbl8.mailshell.net-64.201.201.201 62.8.15.100;04yrfqzhmr863kp1715e5qcobwkszocfekkk8zrcpfkaddzr3e3wg6rontfmz9d.gs6hztm8qeiqqt873cytw174sz1fptdymrxsczrnyhuz71fhedshygpe6zn4ujo.k-lbl8.mailshell.net-223.238.255.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fn,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:68,LUA_SUMMARY:none X-HE-Tag: plane34_3b05745272b2 X-Filterd-Recvd-Size: 2909 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf36.hostedemail.com (Postfix) with ESMTP for ; Mon, 2 Nov 2020 18:43:32 +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=n+REdW1xoOea4wiyJWdr2S+YGLxyipm2rcZL5gYfVC8=; b=M4UFc6+RWWZ4YxauVIwZf4ObKR enRZBjteDCpQ4K18wTrH8TqUhXHXIshDmOAhQQKHybNLpQ79LULFq8sK3uh1UqZvKVisJYO8r4B4r RtBh0KahVKVU9QHVx9ZljhoQVh+xvSmiJ9/Z6+zlY6yafvqIX0bkWCSxqjIEzseUvis/ZXzuWYsUb NcIIVnVENX+/XrN+rAKSghdqIqSb0Ey0s17L3I46HApZsv/eWGkd7CJnYByUfvjbuGNBSvd3xycbT gBPY5ua8luCMoHo5DCBrJMdmPHg34P1guWSctRyNaZTbQYxXpazwFtkff1QGNYKL7wjIgy0Bo7uHt NgZJHZZw==; Received: from willy by casper.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1kZeni-0006qS-Gy; Mon, 02 Nov 2020 18:43:30 +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 15/17] mm/filemap: Don't relock the page after calling readpage Date: Mon, 2 Nov 2020 18:43:10 +0000 Message-Id: <20201102184312.25926-16-willy@infradead.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20201102184312.25926-1-willy@infradead.org> References: <20201102184312.25926-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 --- mm/filemap.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index f16b1eb03bca..f2de97d51441 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2209,23 +2209,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 kiocb *iocb,