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=-6.8 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,UNWANTED_LANGUAGE_BODY,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 68A7BC35E1E for ; Tue, 25 Feb 2020 21:48:55 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 0B4C52467E for ; Tue, 25 Feb 2020 21:48:55 +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="C/LlxEzQ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0B4C52467E 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 DF1566B000D; Tue, 25 Feb 2020 16:48:45 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id CC28F6B0036; Tue, 25 Feb 2020 16:48:45 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 89CCC6B0008; Tue, 25 Feb 2020 16:48:45 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0247.hostedemail.com [216.40.44.247]) by kanga.kvack.org (Postfix) with ESMTP id 249FD6B000D for ; Tue, 25 Feb 2020 16:48:45 -0500 (EST) Received: from smtpin09.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id C9ED9180AD811 for ; Tue, 25 Feb 2020 21:48:44 +0000 (UTC) X-FDA: 76529989368.09.sound42_2f353c669ef61 X-HE-Tag: sound42_2f353c669ef61 X-Filterd-Recvd-Size: 7242 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf06.hostedemail.com (Postfix) with ESMTP for ; Tue, 25 Feb 2020 21:48:44 +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=/YJ0sSq9BBtDgy7CcJstdFLF86NYpYiig2J/aQqOczg=; b=C/LlxEzQ0ZXPYjeWMEus4SCkyX 3C5cBNDKiXeS2IULtqq3L/PwSwDGOkwXrRErXKMSb7WgOm9HFyXVu2S92s/XnzW04LhaYH7BrTIIn lKsMD+RwMcm1y8JpsSUWBcVkuJe5KVwSY49NUGgs/8NKHba+kaQ5YX09cW6tvfL4vFMAUXD5QENgI 13VxlbEYkUJQuJgh++FrtFxffXj1+alNX4q91EyV3RBiRKPlE7KzoukodRbH/xgHL1R0bFb7osa4N btd3wMOFY9kjLmqU8HpTYfqI+EflUcoj7W7jLvYNGRKCvTGV3p2QAZysCH04CtDzYob4aE+GVJIee +4JIWhrQ==; Received: from willy by bombadil.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1j6i4H-0007rE-N9; Tue, 25 Feb 2020 21:48:41 +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, 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 Subject: [PATCH v8 22/25] f2fs: Convert from readpages to readahead Date: Tue, 25 Feb 2020 13:48:35 -0800 Message-Id: <20200225214838.30017-23-willy@infradead.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200225214838.30017-1-willy@infradead.org> References: <20200225214838.30017-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 f2fs Signed-off-by: Matthew Wilcox (Oracle) --- fs/f2fs/data.c | 47 +++++++++++++++---------------------- include/trace/events/f2fs.h | 6 ++--- 2 files changed, 22 insertions(+), 31 deletions(-) diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index 8e9aa2254490..237dff36fe73 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -2160,8 +2160,7 @@ int f2fs_read_multi_pages(struct compress_ctx *cc, = struct bio **bio_ret, * from read-ahead. */ static int f2fs_mpage_readpages(struct address_space *mapping, - struct list_head *pages, struct page *page, - unsigned nr_pages, bool is_readahead) + struct readahead_control *rac, struct page *page) { struct bio *bio =3D NULL; sector_t last_block_in_bio =3D 0; @@ -2179,6 +2178,7 @@ static int f2fs_mpage_readpages(struct address_spac= e *mapping, .nr_cpages =3D 0, }; #endif + unsigned nr_pages =3D rac ? readahead_count(rac) : 1; unsigned max_nr_pages =3D nr_pages; int ret =3D 0; =20 @@ -2192,15 +2192,9 @@ static int f2fs_mpage_readpages(struct address_spa= ce *mapping, map.m_may_create =3D false; =20 for (; nr_pages; nr_pages--) { - if (pages) { - page =3D list_last_entry(pages, struct page, lru); - + if (rac) { + page =3D readahead_page(rac); prefetchw(&page->flags); - list_del(&page->lru); - if (add_to_page_cache_lru(page, mapping, - page_index(page), - readahead_gfp_mask(mapping))) - goto next_page; } =20 #ifdef CONFIG_F2FS_FS_COMPRESSION @@ -2210,7 +2204,7 @@ static int f2fs_mpage_readpages(struct address_spac= e *mapping, ret =3D f2fs_read_multi_pages(&cc, &bio, max_nr_pages, &last_block_in_bio, - is_readahead); + rac); f2fs_destroy_compress_ctx(&cc); if (ret) goto set_error_page; @@ -2233,7 +2227,7 @@ static int f2fs_mpage_readpages(struct address_spac= e *mapping, #endif =20 ret =3D f2fs_read_single_page(inode, page, max_nr_pages, &map, - &bio, &last_block_in_bio, is_readahead); + &bio, &last_block_in_bio, rac); if (ret) { #ifdef CONFIG_F2FS_FS_COMPRESSION set_error_page: @@ -2242,8 +2236,10 @@ static int f2fs_mpage_readpages(struct address_spa= ce *mapping, zero_user_segment(page, 0, PAGE_SIZE); unlock_page(page); } +#ifdef CONFIG_F2FS_FS_COMPRESSION next_page: - if (pages) +#endif + if (rac) put_page(page); =20 #ifdef CONFIG_F2FS_FS_COMPRESSION @@ -2253,16 +2249,15 @@ static int f2fs_mpage_readpages(struct address_sp= ace *mapping, ret =3D f2fs_read_multi_pages(&cc, &bio, max_nr_pages, &last_block_in_bio, - is_readahead); + rac); f2fs_destroy_compress_ctx(&cc); } } #endif } - BUG_ON(pages && !list_empty(pages)); if (bio) __submit_bio(F2FS_I_SB(inode), bio, DATA); - return pages ? 0 : ret; + return ret; } =20 static int f2fs_read_data_page(struct file *file, struct page *page) @@ -2281,28 +2276,24 @@ static int f2fs_read_data_page(struct file *file,= struct page *page) if (f2fs_has_inline_data(inode)) ret =3D f2fs_read_inline_data(inode, page); if (ret =3D=3D -EAGAIN) - ret =3D f2fs_mpage_readpages(page_file_mapping(page), - NULL, page, 1, false); + ret =3D f2fs_mpage_readpages(page_file_mapping(page), NULL, page); return ret; } =20 -static int f2fs_read_data_pages(struct file *file, - struct address_space *mapping, - struct list_head *pages, unsigned nr_pages) +static void f2fs_readahead(struct readahead_control *rac) { - struct inode *inode =3D mapping->host; - struct page *page =3D list_last_entry(pages, struct page, lru); + struct inode *inode =3D rac->mapping->host; =20 - trace_f2fs_readpages(inode, page, nr_pages); + trace_f2fs_readpages(inode, readahead_index(rac), readahead_count(rac))= ; =20 if (!f2fs_is_compress_backend_ready(inode)) - return 0; + return; =20 /* If the file has inline data, skip readpages */ if (f2fs_has_inline_data(inode)) - return 0; + return; =20 - return f2fs_mpage_readpages(mapping, pages, NULL, nr_pages, true); + f2fs_mpage_readpages(rac->mapping, rac, NULL); } =20 int f2fs_encrypt_one_page(struct f2fs_io_info *fio) @@ -3784,7 +3775,7 @@ static void f2fs_swap_deactivate(struct file *file) =20 const struct address_space_operations f2fs_dblock_aops =3D { .readpage =3D f2fs_read_data_page, - .readpages =3D f2fs_read_data_pages, + .readahead =3D f2fs_readahead, .writepage =3D f2fs_write_data_page, .writepages =3D f2fs_write_data_pages, .write_begin =3D f2fs_write_begin, diff --git a/include/trace/events/f2fs.h b/include/trace/events/f2fs.h index 67a97838c2a0..d72da4a33883 100644 --- a/include/trace/events/f2fs.h +++ b/include/trace/events/f2fs.h @@ -1375,9 +1375,9 @@ TRACE_EVENT(f2fs_writepages, =20 TRACE_EVENT(f2fs_readpages, =20 - TP_PROTO(struct inode *inode, struct page *page, unsigned int nrpage), + TP_PROTO(struct inode *inode, pgoff_t start, unsigned int nrpage), =20 - TP_ARGS(inode, page, nrpage), + TP_ARGS(inode, start, nrpage), =20 TP_STRUCT__entry( __field(dev_t, dev) @@ -1389,7 +1389,7 @@ TRACE_EVENT(f2fs_readpages, TP_fast_assign( __entry->dev =3D inode->i_sb->s_dev; __entry->ino =3D inode->i_ino; - __entry->start =3D page->index; + __entry->start =3D start; __entry->nrpage =3D nrpage; ), =20 --=20 2.25.0