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,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 C65C7C2D0CE for ; Sat, 25 Jan 2020 01:35:59 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 8BE3820718 for ; Sat, 25 Jan 2020 01:35:59 +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="f2COFivh" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8BE3820718 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 0A0DE6B000A; Fri, 24 Jan 2020 20:35:59 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id F11B86B0007; Fri, 24 Jan 2020 20:35:58 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D8AD76B000C; Fri, 24 Jan 2020 20:35:58 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0138.hostedemail.com [216.40.44.138]) by kanga.kvack.org (Postfix) with ESMTP id BC4016B0007 for ; Fri, 24 Jan 2020 20:35:58 -0500 (EST) Received: from smtpin15.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with SMTP id 6AE68181AEF23 for ; Sat, 25 Jan 2020 01:35:58 +0000 (UTC) X-FDA: 76414440396.15.error58_16fdc17e08c2e X-HE-Tag: error58_16fdc17e08c2e X-Filterd-Recvd-Size: 5901 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf35.hostedemail.com (Postfix) with ESMTP for ; Sat, 25 Jan 2020 01:35:57 +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=U7hujabz41VV6VgB2q/wXDy+RPQPgZhvGCBmGp2dGHU=; b=f2COFivhr/4OzD5mRKQg71+cA0 tFEHOMOSSQFweZ6l+XdNRsdQ4sltZZ0usSdvDS4BfCya8WnXVB+snxI+KhutGzkKNwGnL8xqhigDF Fqmr73B20Icvf/HkdGGA3iHXKa57rJXS6JUvKhRitLTdTrUvG6wdgpA/Uvd2VuXcnSs8TxsNVjS/+ EUaKtmVNNtPuEHWHlVX2vc27MgaGb71YL7FYISSTQCU+79ZI0I2d6NdQpz5st1Epg3WdqAFqT4796 5snIvDZJ1W+p+/KGqTIf0dCuJKpgls3wg+7OSJJNAnaRNjVfiPTUs/8i8/pXSiQJQgGMhOBPHJ/EQ I6waKDtA==; Received: from willy by bombadil.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1ivAMd-0006Vx-Gc; Sat, 25 Jan 2020 01:35:55 +0000 From: Matthew Wilcox To: linux-fsdevel@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net Subject: [PATCH 10/12] f2fs: Convert from readpages to readahead Date: Fri, 24 Jan 2020 17:35:51 -0800 Message-Id: <20200125013553.24899-11-willy@infradead.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200125013553.24899-1-willy@infradead.org> References: <20200125013553.24899-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) Cc: linux-f2fs-devel@lists.sourceforge.net --- fs/f2fs/data.c | 33 +++++++++++++-------------------- include/trace/events/f2fs.h | 6 +++--- 2 files changed, 16 insertions(+), 23 deletions(-) diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index a034cd0ce021..70bbcdfbd368 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -1882,7 +1882,7 @@ static int f2fs_read_single_page(struct inode *inod= e, struct page *page, * from read-ahead. */ static int f2fs_mpage_readpages(struct address_space *mapping, - struct list_head *pages, struct page *page, + pgoff_t start, struct page *page, unsigned nr_pages, bool is_readahead) { struct bio *bio =3D NULL; @@ -1901,15 +1901,10 @@ static int f2fs_mpage_readpages(struct address_sp= ace *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 (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(page), - readahead_gfp_mask(mapping))) - goto next_page; } =20 ret =3D f2fs_read_single_page(inode, page, nr_pages, &map, &bio, @@ -1919,14 +1914,12 @@ static int f2fs_mpage_readpages(struct address_sp= ace *mapping, zero_user_segment(page, 0, PAGE_SIZE); unlock_page(page); } -next_page: - if (pages) + if (is_readahead) put_page(page); } - 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) @@ -1941,24 +1934,24 @@ static int f2fs_read_data_page(struct file *file,= struct page *page) 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); + 0, page, 1, false); return ret; } =20 -static int f2fs_read_data_pages(struct file *file, +static unsigned f2fs_readahead(struct file *file, struct address_space *mapping, - struct list_head *pages, unsigned nr_pages) + pgoff_t start, unsigned nr_pages) { struct inode *inode =3D mapping->host; - struct page *page =3D list_last_entry(pages, struct page, lru); =20 - trace_f2fs_readpages(inode, page, nr_pages); + trace_f2fs_readpages(inode, start, nr_pages); =20 /* If the file has inline data, skip readpages */ if (f2fs_has_inline_data(inode)) - return 0; + return nr_pages; =20 - return f2fs_mpage_readpages(mapping, pages, NULL, nr_pages, true); + f2fs_mpage_readpages(mapping, start, NULL, nr_pages, true); + return 0; } =20 static int encrypt_one_page(struct f2fs_io_info *fio) @@ -3265,7 +3258,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 1796ff99c3e9..35b5bb2188a3 100644 --- a/include/trace/events/f2fs.h +++ b/include/trace/events/f2fs.h @@ -1368,9 +1368,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) @@ -1382,7 +1382,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.24.1