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=-9.6 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,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 6FF20C4332D for ; Fri, 20 Mar 2020 14:38:07 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 2AEA920709 for ; Fri, 20 Mar 2020 14:38:07 +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="ObxEAQK1" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2AEA920709 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 A40316B0096; Fri, 20 Mar 2020 10:38:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9CA886B0099; Fri, 20 Mar 2020 10:38:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8B75E6B009A; Fri, 20 Mar 2020 10:38:05 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0249.hostedemail.com [216.40.44.249]) by kanga.kvack.org (Postfix) with ESMTP id 6AD5B6B0096 for ; Fri, 20 Mar 2020 10:38:05 -0400 (EDT) Received: from smtpin01.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 308CD180AD81D for ; Fri, 20 Mar 2020 14:38:05 +0000 (UTC) X-FDA: 76615995330.01.pigs50_c5aa98626c27 X-HE-Tag: pigs50_c5aa98626c27 X-Filterd-Recvd-Size: 7593 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf20.hostedemail.com (Postfix) with ESMTP for ; Fri, 20 Mar 2020 14:38:04 +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; bh=hqy/t10yKfTB3i8jTf14qN8xpQZi9a0mnsywDFDnELs=; b=ObxEAQK1b8oYkHH9D6oBrZwWl6 R7BRwVkg5GQ4FaMyCG7otUsB8m8eXB4UO12VSuxcD2pRN5l1UZ+iYbQl6HM78UZyZwKQPhRn+cDZ/ l33XPCsdi77Nt2bfVkzSJKQY+JAfxydIidvQqPX35ZrCpwISfZ09O24nwdepRk6jrJSO0XZFrBsuN 9+O8YDEiPzd/p1HTE18JE3M0lzbaaYwNsI2zxADtIQB3quuzPvuTWq82l7w4Ew4Yxx/LuYqelzwKx K0YSX+Q9OGXCh0zMts09atOXGIbzqCKFBF0jR4TXx7LQwKD9n30jMMft2Tvsi+GUZg2d9CLwAn7L3 F1FMWERw==; Received: from willy by bombadil.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1jFIXh-0000iu-St; Fri, 20 Mar 2020 14:22:33 +0000 From: Matthew Wilcox To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-btrfs@vger.kernel.org, linux-erofs@lists.ozlabs.org, linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, cluster-devel@redhat.com, ocfs2-devel@oss.oracle.com, linux-xfs@vger.kernel.org, William Kucharski Subject: [PATCH v9 17/25] btrfs: Convert from readpages to readahead Date: Fri, 20 Mar 2020 07:22:23 -0700 Message-Id: <20200320142231.2402-18-willy@infradead.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200320142231.2402-1-willy@infradead.org> References: <20200320142231.2402-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)" Implement the new readahead method in btrfs using the new readahead_page_batch() function. Signed-off-by: Matthew Wilcox (Oracle) Reviewed-by: William Kucharski --- fs/btrfs/extent_io.c | 46 ++++++++++++++------------------------------ fs/btrfs/extent_io.h | 3 +-- fs/btrfs/inode.c | 16 +++++++-------- 3 files changed, 22 insertions(+), 43 deletions(-) diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index c0f202741e09..e70f14c1de60 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -4278,52 +4278,34 @@ int extent_writepages(struct address_space *mappi= ng, return ret; } =20 -int extent_readpages(struct address_space *mapping, struct list_head *pa= ges, - unsigned nr_pages) +void extent_readahead(struct readahead_control *rac) { struct bio *bio =3D NULL; unsigned long bio_flags =3D 0; struct page *pagepool[16]; struct extent_map *em_cached =3D NULL; - struct extent_io_tree *tree =3D &BTRFS_I(mapping->host)->io_tree; - int nr =3D 0; + struct extent_io_tree *tree =3D &BTRFS_I(rac->mapping->host)->io_tree; u64 prev_em_start =3D (u64)-1; + int nr; =20 - while (!list_empty(pages)) { - u64 contig_end =3D 0; - - for (nr =3D 0; nr < ARRAY_SIZE(pagepool) && !list_empty(pages);) { - struct page *page =3D lru_to_page(pages); - - 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; - contig_end =3D page_offset(page) + PAGE_SIZE - 1; - } + while ((nr =3D readahead_page_batch(rac, pagepool))) { + u64 contig_start =3D page_offset(pagepool[0]); + u64 contig_end =3D page_offset(pagepool[nr - 1]) + PAGE_SIZE - 1; =20 - if (nr) { - u64 contig_start =3D page_offset(pagepool[0]); + ASSERT(contig_start + nr * PAGE_SIZE - 1 =3D=3D contig_end); =20 - ASSERT(contig_start + nr * PAGE_SIZE - 1 =3D=3D contig_end); - - contiguous_readpages(tree, pagepool, nr, contig_start, - contig_end, &em_cached, &bio, &bio_flags, - &prev_em_start); - } + contiguous_readpages(tree, pagepool, nr, contig_start, + contig_end, &em_cached, &bio, &bio_flags, + &prev_em_start); } =20 if (em_cached) free_extent_map(em_cached); =20 - if (bio) - return submit_one_bio(bio, 0, bio_flags); - return 0; + if (bio) { + if (submit_one_bio(bio, 0, bio_flags)) + return; + } } =20 /* diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h index 5d205bbaafdc..bddac32948c7 100644 --- a/fs/btrfs/extent_io.h +++ b/fs/btrfs/extent_io.h @@ -198,8 +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 nr_pages); +void extent_readahead(struct readahead_control *rac); int extent_fiemap(struct inode *inode, struct fiemap_extent_info *fieinf= o, __u64 start, __u64 len); void set_page_extent_mapped(struct page *page); diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 7d26b4bfb2c6..61d5137ce4e9 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -4802,8 +4802,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 @@ -7004,11 +7004,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. */ @@ -8247,11 +8247,9 @@ 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 void btrfs_readahead(struct readahead_control *rac) { - return extent_readpages(mapping, pages, nr_pages); + extent_readahead(rac); } =20 static int __btrfs_releasepage(struct page *page, gfp_t gfp_flags) @@ -10456,7 +10454,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.25.1