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=-7.0 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,URIBL_DBL_ABUSE_MALW,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 C22E3C33CB3 for ; Sat, 1 Feb 2020 15:13:10 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 71B322073B for ; Sat, 1 Feb 2020 15:13: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="MBrxoQXt" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 71B322073B 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 25EDE6B0605; Sat, 1 Feb 2020 10:12:50 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1EB796B0606; Sat, 1 Feb 2020 10:12:50 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0B0AB6B0608; Sat, 1 Feb 2020 10:12:50 -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 E84206B0605 for ; Sat, 1 Feb 2020 10:12:49 -0500 (EST) Received: from smtpin02.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 996728248047 for ; Sat, 1 Feb 2020 15:12:49 +0000 (UTC) X-FDA: 76441900458.02.cook91_8d0a21e8b6e0a X-HE-Tag: cook91_8d0a21e8b6e0a X-Filterd-Recvd-Size: 6646 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf03.hostedemail.com (Postfix) with ESMTP for ; Sat, 1 Feb 2020 15:12:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.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:Resent-Date:Resent-From :Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=AsVOh91gi/2Ld/EfqBNlMyY/ZrCMfPz2+/lz/gfCdpw=; b=MBrxoQXtUvy8vWHQ3XAweprjhV tiYtG3J6A6nnhKyc9Z+LC9yr/9LTS1M7W6UuRWcP250YINSxrdnppzWLvnS64GmblAIYmr3GHoyKa cS18kXvn2dq8Dn6ZmNxSay0CVSfYAo/NuwsUzkOjNpGhYPQT6+6C2OXa01PFnp8WeEce/ndx837Sq w2JmNkZLCnnhvzVhe3bU9W0seTvgZ+OenrncJ1GqCYhvFSYxnmo4HviXXgV86zMKgL83odgIKwARF mCSyXZrK7AHtA57CwUWvEpo7xmwlfy43RwcqC0Z9HOWSQBDprLMpEWDd6qYm2ceJmXSgpHGeSELp+ lFE1U3Zg==; Received: from willy by bombadil.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1ixuRu-0006Hb-8R; Sat, 01 Feb 2020 15:12:42 +0000 From: Matthew Wilcox To: linux-fsdevel@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-btrfs@vger.kernel.org Subject: [PATCH v4 06/12] btrfs: Convert from readpages to readahead Date: Sat, 1 Feb 2020 07:12:34 -0800 Message-Id: <20200201151240.24082-7-willy@infradead.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200201151240.24082-1-willy@infradead.org> References: <20200201151240.24082-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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: From: "Matthew Wilcox (Oracle)" Use the new readahead operation in btrfs Signed-off-by: Matthew Wilcox (Oracle) Cc: linux-btrfs@vger.kernel.org --- fs/btrfs/extent_io.c | 19 +++++++------------ fs/btrfs/extent_io.h | 2 +- fs/btrfs/inode.c | 18 +++++++++--------- 3 files changed, 17 insertions(+), 22 deletions(-) diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index e2d30287e2d5..18b1fbfdcab2 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -4269,7 +4269,7 @@ int extent_writepages(struct address_space *mapping= , return ret; } =20 -int extent_readpages(struct address_space *mapping, struct list_head *pa= ges, +unsigned extent_readahead(struct address_space *mapping, pgoff_t start, unsigned nr_pages) { struct bio *bio =3D NULL; @@ -4280,22 +4280,17 @@ int extent_readpages(struct address_space *mappin= g, struct list_head *pages, int nr =3D 0; u64 prev_em_start =3D (u64)-1; =20 - while (!list_empty(pages)) { + while (nr_pages) { u64 contig_end =3D 0; =20 - for (nr =3D 0; nr < ARRAY_SIZE(pagepool) && !list_empty(pages);) { - struct page *page =3D lru_to_page(pages); + for (nr =3D 0; nr < ARRAY_SIZE(pagepool); nr++) { + struct page *page =3D readahead_page(mapping, start++); =20 prefetchw(&page->flags); - list_del(&page->lru); - if (add_to_page_cache_lru(page, mapping, page->index, - readahead_gfp_mask(mapping))) { - put_page(page); - break; - } - - pagepool[nr++] =3D page; + pagepool[nr] =3D page; contig_end =3D page_offset(page) + PAGE_SIZE - 1; + if (--nr_pages =3D=3D 0) + break; } =20 if (nr) { diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h index 5d205bbaafdc..4fd9dc05592b 100644 --- a/fs/btrfs/extent_io.h +++ b/fs/btrfs/extent_io.h @@ -198,7 +198,7 @@ int extent_writepages(struct address_space *mapping, struct writeback_control *wbc); int btree_write_cache_pages(struct address_space *mapping, struct writeback_control *wbc); -int extent_readpages(struct address_space *mapping, struct list_head *pa= ges, +unsigned extent_readahead(struct address_space *mapping, pgoff_t start, unsigned nr_pages); int extent_fiemap(struct inode *inode, struct fiemap_extent_info *fieinf= o, __u64 start, __u64 len); diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 6d2bb58d277a..7622918d7624 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -4723,8 +4723,8 @@ static void evict_inode_truncate_pages(struct inode= *inode) =20 /* * Keep looping until we have no more ranges in the io tree. - * We can have ongoing bios started by readpages (called from readahead= ) - * that have their endio callback (extent_io.c:end_bio_extent_readpage) + * We can have ongoing bios started by readahead that have + * their endio callback (extent_io.c:end_bio_extent_readpage) * still in progress (unlocked the pages in the bio but did not yet * unlocked the ranges in the io tree). Therefore this means some * ranges can still be locked and eviction started because before @@ -6925,11 +6925,11 @@ static int lock_extent_direct(struct inode *inode= , u64 lockstart, u64 lockend, * for it to complete) and then invalidate the pages for * this range (through invalidate_inode_pages2_range()), * but that can lead us to a deadlock with a concurrent - * call to readpages() (a buffered read or a defrag call + * call to readahead (a buffered read or a defrag call * triggered a readahead) on a page lock due to an * ordered dio extent we created before but did not have * yet a corresponding bio submitted (whence it can not - * complete), which makes readpages() wait for that + * complete), which makes readahead wait for that * ordered extent to complete while holding a lock on * that page. */ @@ -8168,11 +8168,11 @@ static int btrfs_writepages(struct address_space = *mapping, return extent_writepages(mapping, wbc); } =20 -static int -btrfs_readpages(struct file *file, struct address_space *mapping, - struct list_head *pages, unsigned nr_pages) +static unsigned +btrfs_readahead(struct file *file, struct address_space *mapping, + pgoff_t start, unsigned nr_pages) { - return extent_readpages(mapping, pages, nr_pages); + return extent_readahead(mapping, start, nr_pages); } =20 static int __btrfs_releasepage(struct page *page, gfp_t gfp_flags) @@ -10377,7 +10377,7 @@ static const struct address_space_operations btrf= s_aops =3D { .readpage =3D btrfs_readpage, .writepage =3D btrfs_writepage, .writepages =3D btrfs_writepages, - .readpages =3D btrfs_readpages, + .readahead =3D btrfs_readahead, .direct_IO =3D btrfs_direct_IO, .invalidatepage =3D btrfs_invalidatepage, .releasepage =3D btrfs_releasepage, --=20 2.24.1