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.5 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 77BE1C11D00 for ; Wed, 19 Feb 2020 21:01:40 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 21796207FD for ; Wed, 19 Feb 2020 21:01:40 +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="cIKU5Kpw" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 21796207FD 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 99D176B0036; Wed, 19 Feb 2020 16:01:11 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 718BE6B0037; Wed, 19 Feb 2020 16:01:11 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 33FE86B0073; Wed, 19 Feb 2020 16:01:11 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0037.hostedemail.com [216.40.44.37]) by kanga.kvack.org (Postfix) with ESMTP id E7ADA6B0071 for ; Wed, 19 Feb 2020 16:01:10 -0500 (EST) Received: from smtpin09.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id AAE408248047 for ; Wed, 19 Feb 2020 21:01:10 +0000 (UTC) X-FDA: 76508096700.09.debt17_9f03355f3511 X-HE-Tag: debt17_9f03355f3511 X-Filterd-Recvd-Size: 6267 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf21.hostedemail.com (Postfix) with ESMTP for ; Wed, 19 Feb 2020 21:01:08 +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=AGxKmS7KKU/Z5k56hEU84InQBf+iQs56/nj8mKasb1o=; b=cIKU5Kpwk9KlEscN5+Gci4tcco 8fMFrpvRO1llrlqdQvvSOB8mkMBDBnLacRPpiS5w/2OKm0SM3itVgEOsy32GFqgwD0qAalBAfMGtp 892Fh7q2TFf+HRQZMBqvy30yc/A03NbYuWqZsVPMT96O8/2I9DphDnpsQqJ9gaLpCQG5JcRma2aVE FBV6wBWZajGvNNOZSac8JSYLYeM6H8T9pD5Uk/5J+NRNnXmY45F9EdhNj/SNL6CuaPvVxjN2rlkWH Dr0yXdBHL0ft2mpFkhC3P9p130KZbQCvlyaN9xFgVakv2nHfpD/GAIG11j25ZEA401a1aWvvohV/l QaSd9gNA==; Received: from willy by bombadil.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1j4WSu-0008TW-Tg; Wed, 19 Feb 2020 21:01:04 +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, John Hubbard Subject: [PATCH v7 05/24] mm: Use readahead_control to pass arguments Date: Wed, 19 Feb 2020 13:00:44 -0800 Message-Id: <20200219210103.32400-6-willy@infradead.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200219210103.32400-1-willy@infradead.org> References: <20200219210103.32400-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)" In this patch, only between __do_page_cache_readahead() and read_pages(), but it will be extended in upcoming patches. Also add the readahead_count() accessor. The read_pages() function becomes aops centric, as this makes the most sense by the end of the patchset. Signed-off-by: Matthew Wilcox (Oracle) Reviewed-by: John Hubbard --- include/linux/pagemap.h | 17 +++++++++++++++++ mm/readahead.c | 34 ++++++++++++++++++++-------------- 2 files changed, 37 insertions(+), 14 deletions(-) diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index 24894b9b90c9..55fcea0249e6 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -638,6 +638,23 @@ static inline int add_to_page_cache(struct page *pag= e, return error; } =20 +/* + * Readahead is of a block of consecutive pages. + */ +struct readahead_control { + struct file *file; + struct address_space *mapping; +/* private: use the readahead_* accessors instead */ + pgoff_t _index; + unsigned int _nr_pages; +}; + +/* The number of pages in this readahead block */ +static inline unsigned int readahead_count(struct readahead_control *rac= ) +{ + return rac->_nr_pages; +} + static inline unsigned long dir_pages(struct inode *inode) { return (unsigned long)(inode->i_size + PAGE_SIZE - 1) >> diff --git a/mm/readahead.c b/mm/readahead.c index 9fcd4e32b62d..6a9d99229bd6 100644 --- a/mm/readahead.c +++ b/mm/readahead.c @@ -113,29 +113,32 @@ int read_cache_pages(struct address_space *mapping,= struct list_head *pages, =20 EXPORT_SYMBOL(read_cache_pages); =20 -static void read_pages(struct address_space *mapping, struct file *filp, - struct list_head *pages, unsigned int nr_pages, gfp_t gfp) +static void read_pages(struct readahead_control *rac, struct list_head *= pages, + gfp_t gfp) { + const struct address_space_operations *aops =3D rac->mapping->a_ops; struct blk_plug plug; unsigned page_idx; =20 - if (!nr_pages) + if (!readahead_count(rac)) return; =20 blk_start_plug(&plug); =20 - if (mapping->a_ops->readpages) { - mapping->a_ops->readpages(filp, mapping, pages, nr_pages); + if (aops->readpages) { + aops->readpages(rac->file, rac->mapping, pages, + readahead_count(rac)); /* Clean up the remaining pages */ put_pages_list(pages); goto out; } =20 - for (page_idx =3D 0; page_idx < nr_pages; page_idx++) { + for (page_idx =3D 0; page_idx < readahead_count(rac); page_idx++) { struct page *page =3D lru_to_page(pages); list_del(&page->lru); - if (!add_to_page_cache_lru(page, mapping, page->index, gfp)) - mapping->a_ops->readpage(filp, page); + if (!add_to_page_cache_lru(page, rac->mapping, page->index, + gfp)) + aops->readpage(rac->file, page); put_page(page); } =20 @@ -143,6 +146,7 @@ static void read_pages(struct address_space *mapping,= struct file *filp, blk_finish_plug(&plug); =20 BUG_ON(!list_empty(pages)); + rac->_nr_pages =3D 0; } =20 /* @@ -160,9 +164,13 @@ void __do_page_cache_readahead(struct address_space = *mapping, unsigned long end_index; /* The last page we want to read */ LIST_HEAD(page_pool); int page_idx; - unsigned int nr_pages =3D 0; loff_t isize =3D i_size_read(inode); gfp_t gfp_mask =3D readahead_gfp_mask(mapping); + struct readahead_control rac =3D { + .mapping =3D mapping, + .file =3D filp, + ._nr_pages =3D 0, + }; =20 if (isize =3D=3D 0) return; @@ -185,9 +193,7 @@ void __do_page_cache_readahead(struct address_space *= mapping, * contiguous pages before continuing with the next * batch. */ - read_pages(mapping, filp, &page_pool, nr_pages, - gfp_mask); - nr_pages =3D 0; + read_pages(&rac, &page_pool, gfp_mask); continue; } =20 @@ -198,7 +204,7 @@ void __do_page_cache_readahead(struct address_space *= mapping, list_add(&page->lru, &page_pool); if (page_idx =3D=3D nr_to_read - lookahead_size) SetPageReadahead(page); - nr_pages++; + rac._nr_pages++; } =20 /* @@ -206,7 +212,7 @@ void __do_page_cache_readahead(struct address_space *= mapping, * uptodate then the caller will launch readpage again, and * will then handle the error. */ - read_pages(mapping, filp, &page_pool, nr_pages, gfp_mask); + read_pages(&rac, &page_pool, gfp_mask); } =20 /* --=20 2.25.0