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.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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 AD378C636CA for ; Thu, 15 Jul 2021 21:30:05 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 596A3613AB for ; Thu, 15 Jul 2021 21:30:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 596A3613AB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 6BCD58D00F4; Thu, 15 Jul 2021 17:30:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 66B188D00EC; Thu, 15 Jul 2021 17:30:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 532B98D00F4; Thu, 15 Jul 2021 17:30:05 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 305178D00EC for ; Thu, 15 Jul 2021 17:30:05 -0400 (EDT) Received: from smtpin16.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id DFF371858967D for ; Thu, 15 Jul 2021 21:30:03 +0000 (UTC) X-FDA: 78366115086.16.0A779EA Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf30.hostedemail.com (Postfix) with ESMTP id 7FFD1E00182F for ; Thu, 15 Jul 2021 21:30:03 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id A2B43611F1; Thu, 15 Jul 2021 21:30:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1626384602; bh=D3QDdLM89cxBk7tfEwcimk2qfKuQ6CQwajjunO6VrTo=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=ZUhEnZIwp986F3rBuWYAaDd4TiNr5DR8eh2sxjLi/w42J398gXfMwbgAEmi4ywjUr ifqr5c/KxRc880gZ4KZStYXI9dgotUfWRN1rSigbaNGqqrdhnSSp2M0CSSCTXMNoWP SlovpvnTmKi2iI6IuhXCBA1X8h1+nMWGXFUeD57MwvN9Q/jCsxrAM9zg22IuxSaLaC MlorCXh99D1IScq7On/UVWNUu2+gVd6nARD2JwP9eLBQQXfqPquaZHsuCVR1AlghPQ q78ogM224/iOjcQ5munLr/tODl12zY/6nUlW3E7BNNTdxc7uvFuak1UHYmxiuHTPSB SVz1E8koAPtRw== Date: Thu, 15 Jul 2021 14:30:02 -0700 From: "Darrick J. Wong" To: "Matthew Wilcox (Oracle)" Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org Subject: Re: [PATCH v14 099/138] iomap: Convert bio completions to use folios Message-ID: <20210715213002.GJ22357@magnolia> References: <20210715033704.692967-1-willy@infradead.org> <20210715033704.692967-100-willy@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210715033704.692967-100-willy@infradead.org> X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 7FFD1E00182F X-Stat-Signature: tmr7ekpg7mnginkoadq5ebwhsormxbk5 Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=ZUhEnZIw; spf=pass (imf30.hostedemail.com: domain of djwong@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=djwong@kernel.org; dmarc=pass (policy=none) header.from=kernel.org X-HE-Tag: 1626384603-51519 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: On Thu, Jul 15, 2021 at 04:36:25AM +0100, Matthew Wilcox (Oracle) wrote: > Use bio_for_each_folio() to iterate over each folio in the bio > instead of iterating over each page. > > Signed-off-by: Matthew Wilcox (Oracle) Neat conversion, Reviewed-by: Darrick J. Wong --D > --- > fs/iomap/buffered-io.c | 46 +++++++++++++++++------------------------- > 1 file changed, 18 insertions(+), 28 deletions(-) > > diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c > index 707a96e36651..4732298f74e1 100644 > --- a/fs/iomap/buffered-io.c > +++ b/fs/iomap/buffered-io.c > @@ -161,36 +161,29 @@ static void iomap_set_range_uptodate(struct folio *folio, > folio_mark_uptodate(folio); > } > > -static void > -iomap_read_page_end_io(struct bio_vec *bvec, int error) > +static void iomap_finish_folio_read(struct folio *folio, size_t offset, > + size_t len, int error) > { > - struct page *page = bvec->bv_page; > - struct folio *folio = page_folio(page); > struct iomap_page *iop = to_iomap_page(folio); > > if (unlikely(error)) { > folio_clear_uptodate(folio); > folio_set_error(folio); > } else { > - size_t off = (page - &folio->page) * PAGE_SIZE + > - bvec->bv_offset; > - > - iomap_set_range_uptodate(folio, iop, off, bvec->bv_len); > + iomap_set_range_uptodate(folio, iop, offset, len); > } > > - if (!iop || atomic_sub_and_test(bvec->bv_len, &iop->read_bytes_pending)) > + if (!iop || atomic_sub_and_test(len, &iop->read_bytes_pending)) > folio_unlock(folio); > } > > -static void > -iomap_read_end_io(struct bio *bio) > +static void iomap_read_end_io(struct bio *bio) > { > int error = blk_status_to_errno(bio->bi_status); > - struct bio_vec *bvec; > - struct bvec_iter_all iter_all; > + struct folio_iter fi; > > - bio_for_each_segment_all(bvec, bio, iter_all) > - iomap_read_page_end_io(bvec, error); > + bio_for_each_folio_all(fi, bio) > + iomap_finish_folio_read(fi.folio, fi.offset, fi.length, error); > bio_put(bio); > } > > @@ -1014,23 +1007,21 @@ vm_fault_t iomap_page_mkwrite(struct vm_fault *vmf, const struct iomap_ops *ops) > } > EXPORT_SYMBOL_GPL(iomap_page_mkwrite); > > -static void > -iomap_finish_page_writeback(struct inode *inode, struct page *page, > - int error, unsigned int len) > +static void iomap_finish_folio_write(struct inode *inode, struct folio *folio, > + size_t len, int error) > { > - struct folio *folio = page_folio(page); > struct iomap_page *iop = to_iomap_page(folio); > > if (error) { > - SetPageError(page); > + folio_set_error(folio); > mapping_set_error(inode->i_mapping, -EIO); > } > > - WARN_ON_ONCE(i_blocks_per_page(inode, page) > 1 && !iop); > + WARN_ON_ONCE(i_blocks_per_folio(inode, folio) > 1 && !iop); > WARN_ON_ONCE(iop && atomic_read(&iop->write_bytes_pending) <= 0); > > if (!iop || atomic_sub_and_test(len, &iop->write_bytes_pending)) > - end_page_writeback(page); > + folio_end_writeback(folio); > } > > /* > @@ -1049,8 +1040,7 @@ iomap_finish_ioend(struct iomap_ioend *ioend, int error) > bool quiet = bio_flagged(bio, BIO_QUIET); > > for (bio = &ioend->io_inline_bio; bio; bio = next) { > - struct bio_vec *bv; > - struct bvec_iter_all iter_all; > + struct folio_iter fi; > > /* > * For the last bio, bi_private points to the ioend, so we > @@ -1061,10 +1051,10 @@ iomap_finish_ioend(struct iomap_ioend *ioend, int error) > else > next = bio->bi_private; > > - /* walk each page on bio, ending page IO on them */ > - bio_for_each_segment_all(bv, bio, iter_all) > - iomap_finish_page_writeback(inode, bv->bv_page, error, > - bv->bv_len); > + /* walk all folios in bio, ending page IO on them */ > + bio_for_each_folio_all(fi, bio) > + iomap_finish_folio_write(inode, fi.folio, fi.length, > + error); > bio_put(bio); > } > /* The ioend has been freed by bio_put() */ > -- > 2.30.2 >