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,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 9F3E3C07E99 for ; Mon, 12 Jul 2021 03:59:45 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 26DFA60FF3 for ; Mon, 12 Jul 2021 03:59:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 26DFA60FF3 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 456BB6B0099; Sun, 11 Jul 2021 23:59:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 406BD6B009B; Sun, 11 Jul 2021 23:59:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2CF976B009C; Sun, 11 Jul 2021 23:59:45 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0113.hostedemail.com [216.40.44.113]) by kanga.kvack.org (Postfix) with ESMTP id 08E246B0099 for ; Sun, 11 Jul 2021 23:59:45 -0400 (EDT) Received: from smtpin16.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 2F6D28248047 for ; Mon, 12 Jul 2021 03:59:44 +0000 (UTC) X-FDA: 78352581888.16.AB5F01A Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf04.hostedemail.com (Postfix) with ESMTP id E1FDB50000A0 for ; Mon, 12 Jul 2021 03:59:43 +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=1VxVAER2WoN9bRCzfSLJBgKZ2elY35emYxLJan5Dqrg=; b=ZqnJxyKLanQUGJhyk0g5ihLNQZ x0kjoAEg19XYWYNz+zliCFluH3sEAvf7bdpBADEz2iuccqAHv9uAaqQmF9akooYwOeO1fx5oa8LW5 PmiwLerjywYboD9PLCT3TXGKk2FdTd+tTNN59Bhjtlh2zySsRIPX0QrKacdhU8/0XSJ3A5TE3Fcft ibLhmc03hBPE0wDqH0aKU8KZhXzTw44i+n2bNOe12Z8MvlmcfM999aWkxcGbd6KlV+HB29njGWb0e iQfFuSmYxpQw9Gk9L6s3b2s1N0uVtcwdc6OLP09z1z2Qhs43K5xMnfw2/nTzjpKkGc+RoVEeFIHTT 2atJwpIQ==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1m2n5K-00GqP1-7k; Mon, 12 Jul 2021 03:58:40 +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 v13 098/137] iomap: Convert bio completions to use folios Date: Mon, 12 Jul 2021 04:06:22 +0100 Message-Id: <20210712030701.4000097-99-willy@infradead.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210712030701.4000097-1-willy@infradead.org> References: <20210712030701.4000097-1-willy@infradead.org> MIME-Version: 1.0 Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=ZqnJxyKL; spf=none (imf04.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: rspam03 X-Rspamd-Queue-Id: E1FDB50000A0 X-Stat-Signature: iazbz4qm79yc7h1iubceud4uu1gjorh7 X-HE-Tag: 1626062383-845821 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: 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) --- 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 3a0572ee10dc..05f7321fbd66 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); } =20 -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 =3D bvec->bv_page; - struct folio *folio =3D page_folio(page); struct iomap_page *iop =3D to_iomap_page(folio); =20 if (unlikely(error)) { folio_clear_uptodate_flag(folio); folio_set_error_flag(folio); } else { - size_t off =3D (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); } =20 - 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); } =20 -static void -iomap_read_end_io(struct bio *bio) +static void iomap_read_end_io(struct bio *bio) { int error =3D blk_status_to_errno(bio->bi_status); - struct bio_vec *bvec; - struct bvec_iter_all iter_all; + struct folio_iter fi; =20 - 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); } =20 @@ -1014,23 +1007,21 @@ vm_fault_t iomap_page_mkwrite(struct vm_fault *vm= f, const struct iomap_ops *ops) } EXPORT_SYMBOL_GPL(iomap_page_mkwrite); =20 -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 =3D page_folio(page); struct iomap_page *iop =3D to_iomap_page(folio); =20 if (error) { - SetPageError(page); + folio_set_error_flag(folio); mapping_set_error(inode->i_mapping, -EIO); } =20 - 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) <=3D 0); =20 if (!iop || atomic_sub_and_test(len, &iop->write_bytes_pending)) - end_page_writeback(page); + folio_end_writeback(folio); } =20 /* @@ -1049,8 +1040,7 @@ iomap_finish_ioend(struct iomap_ioend *ioend, int e= rror) bool quiet =3D bio_flagged(bio, BIO_QUIET); =20 for (bio =3D &ioend->io_inline_bio; bio; bio =3D next) { - struct bio_vec *bv; - struct bvec_iter_all iter_all; + struct folio_iter fi; =20 /* * 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 =3D bio->bi_private; =20 - /* 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() */ --=20 2.30.2