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 B8234C07E99 for ; Mon, 12 Jul 2021 04:02:07 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 6BEFA61006 for ; Mon, 12 Jul 2021 04:02:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6BEFA61006 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 8C0306B0070; Mon, 12 Jul 2021 00:02:07 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 870C26B0072; Mon, 12 Jul 2021 00:02:07 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 711296B0078; Mon, 12 Jul 2021 00:02:07 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0064.hostedemail.com [216.40.44.64]) by kanga.kvack.org (Postfix) with ESMTP id 4CF216B0070 for ; Mon, 12 Jul 2021 00:02:07 -0400 (EDT) Received: from smtpin29.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 6A25D184491BA for ; Mon, 12 Jul 2021 04:02:06 +0000 (UTC) X-FDA: 78352587852.29.5D33011 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf14.hostedemail.com (Postfix) with ESMTP id 2A5D26001988 for ; Mon, 12 Jul 2021 04:02:06 +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=WHaka9e0fatzFLgDtUgWFCe9KKgRn2ECeJFaE6GKxVI=; b=mzmtogdYG19aoaiuM1iLg2qwNA 6m6eygDp43sy+4WFldbAjTxsPxVmwJEyYb6ImmIDSSBBnV3EWe5pVgF2VrmcbbfXTSXZlgrHE2z7k vxSOijB7EwFgQbBE2Ub3YmQaxfjxMUe5ji9rju2snHaCQN5yO/KVJomQUVia9mrWiGCXpiw7a4OPa sF8TaQ64Dh2JI6NKn+5z3B77VFuP3zgldtFWFtz9g/QJIrXC89FfB1ChvjWcXLrVv7TvkNRjkMmBX ly6Hdwy7HlU27NYngBuN9UoE8benBN81Cka+oXan/FJWgCWe0ll5mkyp5qFKF6YPpJiFk7M/bhvET 14Slo84A==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1m2n8J-00Gqck-4f; Mon, 12 Jul 2021 04:01:33 +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 104/137] iomap: Convert iomap_add_to_ioend to take a folio Date: Mon, 12 Jul 2021 04:06:28 +0100 Message-Id: <20210712030701.4000097-105-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 X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 2A5D26001988 X-Stat-Signature: fiqskdh47napjr7kka13wam54ojb87cs Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=mzmtogdY; dmarc=none; spf=none (imf14.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org X-HE-Tag: 1626062526-362027 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: We still iterate one block at a time, but now we call compound_head() less often. Rename file_offset to pos to fit the rest of the file. Signed-off-by: Matthew Wilcox (Oracle) --- fs/iomap/buffered-io.c | 66 +++++++++++++++++++----------------------- 1 file changed, 30 insertions(+), 36 deletions(-) diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index 0336427b723b..5b6a3e675101 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -1252,36 +1252,29 @@ iomap_can_add_to_ioend(struct iomap_writepage_ctx= *wpc, loff_t offset, * first, otherwise finish off the current ioend and start another. */ static void -iomap_add_to_ioend(struct inode *inode, loff_t offset, struct page *page= , +iomap_add_to_ioend(struct inode *inode, loff_t pos, struct folio *folio, struct iomap_page *iop, struct iomap_writepage_ctx *wpc, struct writeback_control *wbc, struct list_head *iolist) { - sector_t sector =3D iomap_sector(&wpc->iomap, offset); + sector_t sector =3D iomap_sector(&wpc->iomap, pos); unsigned len =3D i_blocksize(inode); - unsigned poff =3D offset & (PAGE_SIZE - 1); - bool merged, same_page =3D false; + size_t poff =3D offset_in_folio(folio, pos); =20 - if (!wpc->ioend || !iomap_can_add_to_ioend(wpc, offset, sector)) { + if (!wpc->ioend || !iomap_can_add_to_ioend(wpc, pos, sector)) { if (wpc->ioend) list_add(&wpc->ioend->io_list, iolist); - wpc->ioend =3D iomap_alloc_ioend(inode, wpc, offset, sector, wbc); + wpc->ioend =3D iomap_alloc_ioend(inode, wpc, pos, sector, wbc); } =20 - merged =3D __bio_try_merge_page(wpc->ioend->io_bio, page, len, poff, - &same_page); if (iop) atomic_add(len, &iop->write_bytes_pending); - - if (!merged) { - if (bio_full(wpc->ioend->io_bio, len)) { - wpc->ioend->io_bio =3D - iomap_chain_bio(wpc->ioend->io_bio); - } - bio_add_page(wpc->ioend->io_bio, page, len, poff); + if (!bio_add_folio(wpc->ioend->io_bio, folio, len, poff)) { + wpc->ioend->io_bio =3D iomap_chain_bio(wpc->ioend->io_bio); + bio_add_folio(wpc->ioend->io_bio, folio, len, poff); } =20 wpc->ioend->io_size +=3D len; - wbc_account_cgroup_owner(wbc, page, len); + wbc_account_cgroup_owner(wbc, &folio->page, len); } =20 /* @@ -1309,40 +1302,41 @@ iomap_writepage_map(struct iomap_writepage_ctx *w= pc, struct iomap_page *iop =3D to_iomap_page(folio); struct iomap_ioend *ioend, *next; unsigned len =3D i_blocksize(inode); - u64 file_offset; /* file offset of page */ + unsigned nblocks =3D i_blocks_per_folio(inode, folio); + loff_t pos =3D folio_pos(folio); int error =3D 0, count =3D 0, i; LIST_HEAD(submit_list); =20 - WARN_ON_ONCE(i_blocks_per_page(inode, page) > 1 && !iop); + WARN_ON_ONCE(nblocks > 1 && !iop); WARN_ON_ONCE(iop && atomic_read(&iop->write_bytes_pending) !=3D 0); =20 /* - * Walk through the page to find areas to write back. If we run off the - * end of the current map or find the current map invalid, grab a new - * one. + * Walk through the folio to find areas to write back. If we + * run off the end of the current map or find the current map + * invalid, grab a new one. */ - for (i =3D 0, file_offset =3D page_offset(page); - i < (PAGE_SIZE >> inode->i_blkbits) && file_offset < end_offset; - i++, file_offset +=3D len) { + for (i =3D 0; i < nblocks; i++, pos +=3D len) { + if (pos >=3D end_offset) + break; if (iop && !test_bit(i, iop->uptodate)) continue; =20 - error =3D wpc->ops->map_blocks(wpc, inode, file_offset); + error =3D wpc->ops->map_blocks(wpc, inode, pos); if (error) break; if (WARN_ON_ONCE(wpc->iomap.type =3D=3D IOMAP_INLINE)) continue; if (wpc->iomap.type =3D=3D IOMAP_HOLE) continue; - iomap_add_to_ioend(inode, file_offset, page, iop, wpc, wbc, + iomap_add_to_ioend(inode, pos, folio, iop, wpc, wbc, &submit_list); count++; } =20 WARN_ON_ONCE(!wpc->ioend && !list_empty(&submit_list)); - WARN_ON_ONCE(!PageLocked(page)); - WARN_ON_ONCE(PageWriteback(page)); - WARN_ON_ONCE(PageDirty(page)); + WARN_ON_ONCE(!folio_locked(folio)); + WARN_ON_ONCE(folio_writeback(folio)); + WARN_ON_ONCE(folio_dirty(folio)); =20 /* * We cannot cancel the ioend directly here on error. We may have @@ -1358,16 +1352,16 @@ iomap_writepage_map(struct iomap_writepage_ctx *w= pc, * now. */ if (wpc->ops->discard_page) - wpc->ops->discard_page(page, file_offset); + wpc->ops->discard_page(&folio->page, pos); if (!count) { - ClearPageUptodate(page); - unlock_page(page); + folio_clear_uptodate_flag(folio); + folio_unlock(folio); goto done; } } =20 - set_page_writeback(page); - unlock_page(page); + folio_start_writeback(folio); + folio_unlock(folio); =20 /* * Preserve the original error if there was one, otherwise catch @@ -1388,9 +1382,9 @@ iomap_writepage_map(struct iomap_writepage_ctx *wpc= , * with a partial page truncate on a sub-page block sized filesystem. */ if (!count) - end_page_writeback(page); + folio_end_writeback(folio); done: - mapping_set_error(page->mapping, error); + mapping_set_error(folio->mapping, error); return error; } =20 --=20 2.30.2