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 2355DC34031 for ; Mon, 17 Feb 2020 18:46:45 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id CD07322527 for ; Mon, 17 Feb 2020 18:46:44 +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="PilV6Nbn" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CD07322527 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 42D576B000E; Mon, 17 Feb 2020 13:46:22 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 29EAA6B0070; Mon, 17 Feb 2020 13:46:22 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C87866B000E; Mon, 17 Feb 2020 13:46:21 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0072.hostedemail.com [216.40.44.72]) by kanga.kvack.org (Postfix) with ESMTP id A76836B000E for ; Mon, 17 Feb 2020 13:46:21 -0500 (EST) Received: from smtpin11.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 47A0E2C93 for ; Mon, 17 Feb 2020 18:46:21 +0000 (UTC) X-FDA: 76500499362.11.sleet97_1a5a042e59113 X-HE-Tag: sleet97_1a5a042e59113 X-Filterd-Recvd-Size: 6038 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf01.hostedemail.com (Postfix) with ESMTP for ; Mon, 17 Feb 2020 18:46:20 +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=c1RHQNQxAXbf5ukt2BNF7izx4iTSuNQC5EsGyGLZYjM=; b=PilV6Nbnp5jeR3BGkYdLmIHP+0 PemIro+LMam5FDrFdQV47s7w0ljGT9Umtu4ajE78hjqlTcMnO1ZqjwyB6UNIiDpsqAq6hVz7y+yPi vKmTQ4UgvuffWOVq3liQTyr+/bXLQzOSae98w3a8DvliVoYSYsyupobLHKFqKbEytaDORWEaIpfY7 yGq4FDarj0LzoQek3vMA3QotZUSztvbszSae+Homo9HXkO747iu2h2BFYhXvrgGzKKpAC9HcZO+MV 7FkaahGbzj8tYko/oTcUrCmw4CDvwZPp3U1buusRJz9oy83OGg4g6GGuFPxZBmY6G9Mg9MKTI8gFM ozQ2KRbA==; Received: from willy by bombadil.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1j3lPM-0005BL-1r; Mon, 17 Feb 2020 18:46:16 +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 v6 12/19] erofs: Convert uncompressed files from readpages to readahead Date: Mon, 17 Feb 2020 10:46:01 -0800 Message-Id: <20200217184613.19668-21-willy@infradead.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200217184613.19668-1-willy@infradead.org> References: <20200217184613.19668-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 erofs Signed-off-by: Matthew Wilcox (Oracle) --- fs/erofs/data.c | 39 +++++++++++++----------------------- fs/erofs/zdata.c | 2 +- include/trace/events/erofs.h | 6 +++--- 3 files changed, 18 insertions(+), 29 deletions(-) diff --git a/fs/erofs/data.c b/fs/erofs/data.c index fc3a8d8064f8..82ebcee9d178 100644 --- a/fs/erofs/data.c +++ b/fs/erofs/data.c @@ -280,47 +280,36 @@ static int erofs_raw_access_readpage(struct file *f= ile, struct page *page) return 0; } =20 -static int erofs_raw_access_readpages(struct file *filp, - struct address_space *mapping, - struct list_head *pages, - unsigned int nr_pages) +static void erofs_raw_access_readahead(struct readahead_control *rac) { erofs_off_t last_block; struct bio *bio =3D NULL; - gfp_t gfp =3D readahead_gfp_mask(mapping); - struct page *page =3D list_last_entry(pages, struct page, lru); - - trace_erofs_readpages(mapping->host, page, nr_pages, true); + struct page *page; =20 - for (; nr_pages; --nr_pages) { - page =3D list_entry(pages->prev, struct page, lru); + trace_erofs_readpages(rac->mapping->host, readahead_index(rac), + readahead_count(rac), true); =20 + readahead_for_each(rac, page) { prefetchw(&page->flags); - list_del(&page->lru); =20 - if (!add_to_page_cache_lru(page, mapping, page->index, gfp)) { - bio =3D erofs_read_raw_page(bio, mapping, page, - &last_block, nr_pages, true); + bio =3D erofs_read_raw_page(bio, rac->mapping, page, &last_block, + readahead_count(rac), true); =20 - /* all the page errors are ignored when readahead */ - if (IS_ERR(bio)) { - pr_err("%s, readahead error at page %lu of nid %llu\n", - __func__, page->index, - EROFS_I(mapping->host)->nid); + /* all the page errors are ignored when readahead */ + if (IS_ERR(bio)) { + pr_err("%s, readahead error at page %lu of nid %llu\n", + __func__, page->index, + EROFS_I(rac->mapping->host)->nid); =20 - bio =3D NULL; - } + bio =3D NULL; } =20 - /* pages could still be locked */ put_page(page); } - DBG_BUGON(!list_empty(pages)); =20 /* the rare case (end in gaps) */ if (bio) submit_bio(bio); - return 0; } =20 static int erofs_get_block(struct inode *inode, sector_t iblock, @@ -358,7 +347,7 @@ static sector_t erofs_bmap(struct address_space *mapp= ing, sector_t block) /* for uncompressed (aligned) files and raw access for other files */ const struct address_space_operations erofs_raw_access_aops =3D { .readpage =3D erofs_raw_access_readpage, - .readpages =3D erofs_raw_access_readpages, + .readahead =3D erofs_raw_access_readahead, .bmap =3D erofs_bmap, }; =20 diff --git a/fs/erofs/zdata.c b/fs/erofs/zdata.c index 80e47f07d946..17f45fcb8c5c 100644 --- a/fs/erofs/zdata.c +++ b/fs/erofs/zdata.c @@ -1315,7 +1315,7 @@ static int z_erofs_readpages(struct file *filp, str= uct address_space *mapping, struct page *head =3D NULL; LIST_HEAD(pagepool); =20 - trace_erofs_readpages(mapping->host, lru_to_page(pages), + trace_erofs_readpages(mapping->host, lru_to_page(pages)->index, nr_pages, false); =20 f.headoffset =3D (erofs_off_t)lru_to_page(pages)->index << PAGE_SHIFT; diff --git a/include/trace/events/erofs.h b/include/trace/events/erofs.h index 27f5caa6299a..bf9806fd1306 100644 --- a/include/trace/events/erofs.h +++ b/include/trace/events/erofs.h @@ -113,10 +113,10 @@ TRACE_EVENT(erofs_readpage, =20 TRACE_EVENT(erofs_readpages, =20 - TP_PROTO(struct inode *inode, struct page *page, unsigned int nrpage, + TP_PROTO(struct inode *inode, pgoff_t start, unsigned int nrpage, bool raw), =20 - TP_ARGS(inode, page, nrpage, raw), + TP_ARGS(inode, start, nrpage, raw), =20 TP_STRUCT__entry( __field(dev_t, dev ) @@ -129,7 +129,7 @@ TRACE_EVENT(erofs_readpages, TP_fast_assign( __entry->dev =3D inode->i_sb->s_dev; __entry->nid =3D EROFS_I(inode)->nid; - __entry->start =3D page->index; + __entry->start =3D start; __entry->nrpage =3D nrpage; __entry->raw =3D raw; ), --=20 2.25.0