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=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 A405AC47E48 for ; Thu, 15 Jul 2021 04:59:03 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 516DF6128B for ; Thu, 15 Jul 2021 04:59:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 516DF6128B 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 A50C58D006A; Thu, 15 Jul 2021 00:59:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9D95D8D0065; Thu, 15 Jul 2021 00:59:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 87B1B8D006A; Thu, 15 Jul 2021 00:59:03 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0122.hostedemail.com [216.40.44.122]) by kanga.kvack.org (Postfix) with ESMTP id 5D8328D0065 for ; Thu, 15 Jul 2021 00:59:03 -0400 (EDT) Received: from smtpin37.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 406872287F for ; Thu, 15 Jul 2021 04:59:02 +0000 (UTC) X-FDA: 78363617724.37.E1D5641 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf02.hostedemail.com (Postfix) with ESMTP id 00B0C7001713 for ; Thu, 15 Jul 2021 04:59:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.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=Q2hA1ivaovhKxfetP87tlrElqQjhxilUL49td311VjA=; b=SOzz0J/yYJJaLQtudBbWiusLQ3 Tg6cmeI5jKoONbKX77mU94awZDQ8suWV22uLDPRJZcj4IProAl8z2f9s15XEzNM7WaT8FITsqRwgN kXSyaPjX+Rx2KXdpxoTEqHJXyXKTk3vbq1jKPqCcvNxA2hF2LdP26vXMzIsm17cS1nWkcpyH2iYJf SPbUxzq3hRgXszJwd4ghjvPWqqU01gDj6KnQu1KXO/0b3a1VEZZtzaD2huOg14l0i8YrsrsPtbjMV j4t8XeyPR/pNYh6UecwPcJeecHdAFZgKoyLTmGxICrhH7NjXRNl95/32frdpk0Mh5TulJd9k8D4oR rnPFF+bw==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1m3tQX-002zFh-5M; Thu, 15 Jul 2021 04:57:06 +0000 From: "Matthew Wilcox (Oracle)" To: linux-kernel@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org Subject: [PATCH v14 100/138] iomap: Convert readahead and readpage to use a folio Date: Thu, 15 Jul 2021 04:36:26 +0100 Message-Id: <20210715033704.692967-101-willy@infradead.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210715033704.692967-1-willy@infradead.org> References: <20210715033704.692967-1-willy@infradead.org> MIME-Version: 1.0 Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b="SOzz0J/y"; spf=none (imf02.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none X-Rspamd-Server: rspam05 X-Stat-Signature: ta4pz6ioeq64tqb9az96rqg64xqha5fe X-Rspamd-Queue-Id: 00B0C7001713 X-HE-Tag: 1626325141-10605 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: Handle folios of arbitrary size instead of working in PAGE_SIZE units. Signed-off-by: Matthew Wilcox (Oracle) --- fs/iomap/buffered-io.c | 61 +++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index 4732298f74e1..7c702d6c2f64 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -188,8 +188,8 @@ static void iomap_read_end_io(struct bio *bio) } =20 struct iomap_readpage_ctx { - struct page *cur_page; - bool cur_page_in_bio; + struct folio *cur_folio; + bool cur_folio_in_bio; struct bio *bio; struct readahead_control *rac; }; @@ -227,8 +227,7 @@ iomap_readpage_actor(struct inode *inode, loff_t pos,= loff_t length, void *data, struct iomap *iomap, struct iomap *srcmap) { struct iomap_readpage_ctx *ctx =3D data; - struct page *page =3D ctx->cur_page; - struct folio *folio =3D page_folio(page); + struct folio *folio =3D ctx->cur_folio; struct iomap_page *iop =3D iomap_page_create(inode, folio); bool same_page =3D false, is_contig =3D false; loff_t orig_pos =3D pos; @@ -237,7 +236,7 @@ iomap_readpage_actor(struct inode *inode, loff_t pos,= loff_t length, void *data, =20 if (iomap->type =3D=3D IOMAP_INLINE) { WARN_ON_ONCE(pos); - iomap_read_inline_data(inode, page, iomap); + iomap_read_inline_data(inode, &folio->page, iomap); return PAGE_SIZE; } =20 @@ -252,7 +251,7 @@ iomap_readpage_actor(struct inode *inode, loff_t pos,= loff_t length, void *data, goto done; } =20 - ctx->cur_page_in_bio =3D true; + ctx->cur_folio_in_bio =3D true; if (iop) atomic_add(plen, &iop->read_bytes_pending); =20 @@ -266,7 +265,7 @@ iomap_readpage_actor(struct inode *inode, loff_t pos,= loff_t length, void *data, } =20 if (!is_contig || bio_full(ctx->bio, plen)) { - gfp_t gfp =3D mapping_gfp_constraint(page->mapping, GFP_KERNEL); + gfp_t gfp =3D mapping_gfp_constraint(folio->mapping, GFP_KERNEL); gfp_t orig_gfp =3D gfp; unsigned int nr_vecs =3D DIV_ROUND_UP(length, PAGE_SIZE); =20 @@ -305,30 +304,31 @@ iomap_readpage_actor(struct inode *inode, loff_t po= s, loff_t length, void *data, int iomap_readpage(struct page *page, const struct iomap_ops *ops) { - struct iomap_readpage_ctx ctx =3D { .cur_page =3D page }; - struct inode *inode =3D page->mapping->host; - unsigned poff; + struct folio *folio =3D page_folio(page); + struct iomap_readpage_ctx ctx =3D { .cur_folio =3D folio }; + struct inode *inode =3D folio->mapping->host; + size_t poff; loff_t ret; + size_t len =3D folio_size(folio); =20 - trace_iomap_readpage(page->mapping->host, 1); + trace_iomap_readpage(inode, 1); =20 - for (poff =3D 0; poff < PAGE_SIZE; poff +=3D ret) { - ret =3D iomap_apply(inode, page_offset(page) + poff, - PAGE_SIZE - poff, 0, ops, &ctx, - iomap_readpage_actor); + for (poff =3D 0; poff < len; poff +=3D ret) { + ret =3D iomap_apply(inode, folio_pos(folio) + poff, len - poff, + 0, ops, &ctx, iomap_readpage_actor); if (ret <=3D 0) { WARN_ON_ONCE(ret =3D=3D 0); - SetPageError(page); + folio_set_error(folio); break; } } =20 if (ctx.bio) { submit_bio(ctx.bio); - WARN_ON_ONCE(!ctx.cur_page_in_bio); + WARN_ON_ONCE(!ctx.cur_folio_in_bio); } else { - WARN_ON_ONCE(ctx.cur_page_in_bio); - unlock_page(page); + WARN_ON_ONCE(ctx.cur_folio_in_bio); + folio_unlock(folio); } =20 /* @@ -348,15 +348,15 @@ iomap_readahead_actor(struct inode *inode, loff_t p= os, loff_t length, loff_t done, ret; =20 for (done =3D 0; done < length; done +=3D ret) { - if (ctx->cur_page && offset_in_page(pos + done) =3D=3D 0) { - if (!ctx->cur_page_in_bio) - unlock_page(ctx->cur_page); - put_page(ctx->cur_page); - ctx->cur_page =3D NULL; + if (ctx->cur_folio && + offset_in_folio(ctx->cur_folio, pos + done) =3D=3D 0) { + if (!ctx->cur_folio_in_bio) + folio_unlock(ctx->cur_folio); + ctx->cur_folio =3D NULL; } - if (!ctx->cur_page) { - ctx->cur_page =3D readahead_page(ctx->rac); - ctx->cur_page_in_bio =3D false; + if (!ctx->cur_folio) { + ctx->cur_folio =3D readahead_folio(ctx->rac); + ctx->cur_folio_in_bio =3D false; } ret =3D iomap_readpage_actor(inode, pos + done, length - done, ctx, iomap, srcmap); @@ -404,10 +404,9 @@ void iomap_readahead(struct readahead_control *rac, = const struct iomap_ops *ops) =20 if (ctx.bio) submit_bio(ctx.bio); - if (ctx.cur_page) { - if (!ctx.cur_page_in_bio) - unlock_page(ctx.cur_page); - put_page(ctx.cur_page); + if (ctx.cur_folio) { + if (!ctx.cur_folio_in_bio) + folio_unlock(ctx.cur_folio); } } EXPORT_SYMBOL_GPL(iomap_readahead); --=20 2.30.2