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 7EB4BC33CB3 for ; Sat, 1 Feb 2020 15:13:16 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 372F32073B for ; Sat, 1 Feb 2020 15:13:16 +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="T7D+lG5G" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 372F32073B 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 8C80E6B0609; Sat, 1 Feb 2020 10:12:51 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 878056B060A; Sat, 1 Feb 2020 10:12:51 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7B7866B060B; Sat, 1 Feb 2020 10:12:51 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0070.hostedemail.com [216.40.44.70]) by kanga.kvack.org (Postfix) with ESMTP id 65B076B0609 for ; Sat, 1 Feb 2020 10:12:51 -0500 (EST) Received: from smtpin02.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 32C9C2827 for ; Sat, 1 Feb 2020 15:12:51 +0000 (UTC) X-FDA: 76441900542.02.can66_8d42ff05a3d0e X-HE-Tag: can66_8d42ff05a3d0e X-Filterd-Recvd-Size: 8651 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf23.hostedemail.com (Postfix) with ESMTP for ; Sat, 1 Feb 2020 15:12:50 +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=xYwAfdpS6hrmEl94Puvsi7IdImGde6rBNX47LcdKaVk=; b=T7D+lG5GLXYKWTZpicm/6rP+Dy BGGfBYqgDqdVsPkeCgloGKm21LWX+OmYBNOuyoiHCkn1URRQf8+LBBlAbw3wQKVNzO+KnaGLoCTd5 C4TVclnA99vj0PbiDQury7MRKSUlP+bQbw5Nneu8mrKSR5n+YJC41TL+wu+9o0E9+PkjND8fwWKG2 GuTsHnkhEVKV8iN461UDqtyqhf9SSmoo2tv43fI5/lNjdRFyz1aHpAFHcGL6AXQRR/OtB6laaZgCV tqEuPiQY+sQ/vikq277LnDGO+lU0GyIUDT3qh8h064exlNntBmhPVa4CMd0NJHIMIkKe6gDrilX7u evbguPQg==; Received: from willy by bombadil.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1ixuRu-0006Ht-Bn; 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-ext4@vger.kernel.org Subject: [PATCH v4 09/12] ext4: Convert from readpages to readahead Date: Sat, 1 Feb 2020 07:12:37 -0800 Message-Id: <20200201151240.24082-10-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 ext4 Signed-off-by: Matthew Wilcox (Oracle) Cc: linux-ext4@vger.kernel.org --- fs/ext4/ext4.h | 5 ++--- fs/ext4/inode.c | 24 ++++++++++++------------ fs/ext4/readpage.c | 20 +++++++------------- fs/ext4/verity.c | 16 +++++++++++----- 4 files changed, 32 insertions(+), 33 deletions(-) diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index 9a2ee2428ecc..346ad9e1403b 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -3275,9 +3275,8 @@ static inline void ext4_set_de_type(struct super_bl= ock *sb, } =20 /* readpages.c */ -extern int ext4_mpage_readpages(struct address_space *mapping, - struct list_head *pages, struct page *page, - unsigned nr_pages, bool is_readahead); +extern int ext4_mpage_readpages(struct address_space *mapping, pgoff_t s= tart, + struct page *page, unsigned nr_pages, bool is_readahead); extern int __init ext4_init_post_read_processing(void); extern void ext4_exit_post_read_processing(void); =20 diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 3313168b680f..e1f5864e5ecf 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -3218,7 +3218,7 @@ static sector_t ext4_bmap(struct address_space *map= ping, sector_t block) static int ext4_readpage(struct file *file, struct page *page) { int ret =3D -EAGAIN; - struct inode *inode =3D page->mapping->host; + struct inode *inode =3D file_inode(file); =20 trace_ext4_readpage(page); =20 @@ -3226,23 +3226,23 @@ static int ext4_readpage(struct file *file, struc= t page *page) ret =3D ext4_readpage_inline(inode, page); =20 if (ret =3D=3D -EAGAIN) - return ext4_mpage_readpages(page->mapping, NULL, page, 1, - false); + return ext4_mpage_readpages(page->mapping, 0, page, 1, false); =20 return ret; } =20 -static int -ext4_readpages(struct file *file, struct address_space *mapping, - struct list_head *pages, unsigned nr_pages) +static unsigned +ext4_readahead(struct file *file, struct address_space *mapping, + pgoff_t start, unsigned nr_pages) { struct inode *inode =3D mapping->host; =20 - /* If the file has inline data, no need to do readpages. */ + /* If the file has inline data, no need to do readahead. */ if (ext4_has_inline_data(inode)) - return 0; + return nr_pages; =20 - return ext4_mpage_readpages(mapping, pages, NULL, nr_pages, true); + ext4_mpage_readpages(mapping, start, NULL, nr_pages, true); + return 0; } =20 static void ext4_invalidatepage(struct page *page, unsigned int offset, @@ -3587,7 +3587,7 @@ static int ext4_set_page_dirty(struct page *page) =20 static const struct address_space_operations ext4_aops =3D { .readpage =3D ext4_readpage, - .readpages =3D ext4_readpages, + .readahead =3D ext4_readahead, .writepage =3D ext4_writepage, .writepages =3D ext4_writepages, .write_begin =3D ext4_write_begin, @@ -3604,7 +3604,7 @@ static const struct address_space_operations ext4_a= ops =3D { =20 static const struct address_space_operations ext4_journalled_aops =3D { .readpage =3D ext4_readpage, - .readpages =3D ext4_readpages, + .readahead =3D ext4_readahead, .writepage =3D ext4_writepage, .writepages =3D ext4_writepages, .write_begin =3D ext4_write_begin, @@ -3620,7 +3620,7 @@ static const struct address_space_operations ext4_j= ournalled_aops =3D { =20 static const struct address_space_operations ext4_da_aops =3D { .readpage =3D ext4_readpage, - .readpages =3D ext4_readpages, + .readahead =3D ext4_readahead, .writepage =3D ext4_writepage, .writepages =3D ext4_writepages, .write_begin =3D ext4_da_write_begin, diff --git a/fs/ext4/readpage.c b/fs/ext4/readpage.c index c1769afbf799..aaeb298c8fdb 100644 --- a/fs/ext4/readpage.c +++ b/fs/ext4/readpage.c @@ -7,8 +7,8 @@ * * This was originally taken from fs/mpage.c * - * The intent is the ext4_mpage_readpages() function here is intended - * to replace mpage_readpages() in the general case, not just for + * The ext4_mpage_readahead() function here is intended to + * replace mpage_readahead() in the general case, not just for * encrypted files. It has some limitations (see below), where it * will fall back to read_block_full_page(), but these limitations * should only be hit when page_size !=3D block_size. @@ -221,9 +221,8 @@ static inline loff_t ext4_readpage_limit(struct inode= *inode) return i_size_read(inode); } =20 -int ext4_mpage_readpages(struct address_space *mapping, - struct list_head *pages, struct page *page, - unsigned nr_pages, bool is_readahead) +int ext4_mpage_readpages(struct address_space *mapping, pgoff_t start, + struct page *page, unsigned nr_pages, bool is_readahead) { struct bio *bio =3D NULL; sector_t last_block_in_bio =3D 0; @@ -251,14 +250,10 @@ int ext4_mpage_readpages(struct address_space *mapp= ing, int fully_mapped =3D 1; unsigned first_hole =3D blocks_per_page; =20 - if (pages) { - page =3D lru_to_page(pages); + if (is_readahead) { + 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))) - goto next_page; } =20 if (page_has_buffers(page)) @@ -406,10 +401,9 @@ int ext4_mpage_readpages(struct address_space *mappi= ng, else unlock_page(page); next_page: - if (pages) + if (is_readahead) put_page(page); } - BUG_ON(pages && !list_empty(pages)); if (bio) submit_bio(bio); return 0; diff --git a/fs/ext4/verity.c b/fs/ext4/verity.c index dc5ec724d889..40a550c0da2b 100644 --- a/fs/ext4/verity.c +++ b/fs/ext4/verity.c @@ -351,7 +351,6 @@ static int ext4_get_verity_descriptor(struct inode *i= node, void *buf, static void ext4_merkle_tree_readahead(struct address_space *mapping, pgoff_t start_index, unsigned long count) { - LIST_HEAD(pages); unsigned int nr_pages =3D 0; struct page *page; pgoff_t index; @@ -360,16 +359,23 @@ static void ext4_merkle_tree_readahead(struct addre= ss_space *mapping, for (index =3D start_index; index < start_index + count; index++) { page =3D xa_load(&mapping->i_pages, index); if (!page || xa_is_value(page)) { - page =3D __page_cache_alloc(readahead_gfp_mask(mapping)); + gfp_t gfp =3D readahead_gfp_mask(mapping); + page =3D __page_cache_alloc(gfp); if (!page) break; - page->index =3D index; - list_add(&page->lru, &pages); + if (add_to_page_cache_lru(page, mapping, index, gfp)) { + put_page(page); + break; + } nr_pages++; } } + + if (!nr_pages) + return; + blk_start_plug(&plug); - ext4_mpage_readpages(mapping, &pages, NULL, nr_pages, true); + ext4_mpage_readpages(mapping, start_index, NULL, nr_pages, true); blk_finish_plug(&plug); } =20 --=20 2.24.1