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 1932BC07E95 for ; Mon, 19 Jul 2021 19:07:01 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id A15EF60720 for ; Mon, 19 Jul 2021 19:07:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A15EF60720 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 3CAE06B018C; Mon, 19 Jul 2021 15:07:01 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 37B868D00F4; Mon, 19 Jul 2021 15:07:01 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 21C1F8D00EC; Mon, 19 Jul 2021 15:07:01 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0218.hostedemail.com [216.40.44.218]) by kanga.kvack.org (Postfix) with ESMTP id EE45D6B018C for ; Mon, 19 Jul 2021 15:07:00 -0400 (EDT) Received: from smtpin33.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 908218248D7C for ; Mon, 19 Jul 2021 19:06:59 +0000 (UTC) X-FDA: 78380269758.33.77D89AB Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf21.hostedemail.com (Postfix) with ESMTP id 22AB8D009E5E for ; Mon, 19 Jul 2021 19:06:59 +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=Wt8akQHsu1kN8nqRP6WSiuGEKy3H738/UTIxIBbjchM=; b=o+mYoP8f+PsuB63z7qRjTdgrEb NUm2NYuXLwhBDQoqArbCEm38wJGHtj+phrmMZzEdxqsnQZwyeK0i0x/fwlf7ky6QrKCrrvoF+85o3 EnsJXbup/EwOj0edPA2K6iHwUbZPKMAqneq8+0A2VYwo5TRXifG1uI91HEWSuR4XKGk7+16ZszUhE r+86oAF/x+xBeAen2tDcFm57QerU4Okb8ptXTlS6ex5tZk4RQNCpgMCNRcnug1YTCcDhirM4GQMIH GygqOg2WrfXU8y2YHDf4gPBJMR7AeQB2A1sGxay/D6B7BK58Yn4eUG9tLlI4Gv29pxCyVqrj6QG3t YDX2sxnA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1m5YP9-007MRw-Qf; Mon, 19 Jul 2021 18:54:41 +0000 From: "Matthew Wilcox (Oracle)" To: linux-fsdevel@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-block@vger.kernel.org Subject: [PATCH v15 16/17] iomap: Convert iomap_add_to_ioend to take a folio Date: Mon, 19 Jul 2021 19:40:00 +0100 Message-Id: <20210719184001.1750630-17-willy@infradead.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210719184001.1750630-1-willy@infradead.org> References: <20210719184001.1750630-1-willy@infradead.org> MIME-Version: 1.0 Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=o+mYoP8f; spf=none (imf21.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: z9t19nacur9kgubdskrmwpb15wgk8t7j X-Rspamd-Queue-Id: 22AB8D009E5E X-HE-Tag: 1626721619-897613 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 | 109 ++++++++++++++++++----------------------- 1 file changed, 48 insertions(+), 61 deletions(-) diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index f8ca307270e7..60d3b7af61d1 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -1253,36 +1253,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 /* @@ -1304,45 +1297,43 @@ iomap_add_to_ioend(struct inode *inode, loff_t of= fset, struct page *page, static int iomap_writepage_map(struct iomap_writepage_ctx *wpc, struct writeback_control *wbc, struct inode *inode, - struct page *page, u64 end_offset) + struct folio *folio, loff_t end_pos) { - struct folio *folio =3D page_folio(page); struct iomap_page *iop =3D iomap_page_create(inode, 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(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 && pos < end_pos; i++, pos +=3D len) { 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_test_locked(folio)); + WARN_ON_ONCE(folio_test_writeback(folio)); + WARN_ON_ONCE(folio_test_dirty(folio)); =20 /* * We cannot cancel the ioend directly here on error. We may have @@ -1358,16 +1349,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(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 +1379,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 @@ -1404,16 +1395,15 @@ iomap_writepage_map(struct iomap_writepage_ctx *w= pc, static int iomap_do_writepage(struct page *page, struct writeback_control *wbc, voi= d *data) { + struct folio *folio =3D page_folio(page); struct iomap_writepage_ctx *wpc =3D data; - struct inode *inode =3D page->mapping->host; - pgoff_t end_index; - u64 end_offset; - loff_t offset; + struct inode *inode =3D folio->mapping->host; + loff_t end_pos, isize; =20 - trace_iomap_writepage(inode, page_offset(page), PAGE_SIZE); + trace_iomap_writepage(inode, folio_pos(folio), folio_size(folio)); =20 /* - * Refuse to write the page out if we are called from reclaim context. + * Refuse to write the folio out if we are called from reclaim context. * * This avoids stack overflows when called from deeply used stacks in * random callers for direct reclaim or memcg reclaim. We explicitly @@ -1427,10 +1417,10 @@ iomap_do_writepage(struct page *page, struct writ= eback_control *wbc, void *data) goto redirty; =20 /* - * Is this page beyond the end of the file? + * Is this folio beyond the end of the file? * - * The page index is less than the end_index, adjust the end_offset - * to the highest offset that this page should represent. + * The folio index is less than the end_index, adjust the end_pos + * to the highest offset that this folio should represent. * ----------------------------------------------------- * | file mapping | | * ----------------------------------------------------- @@ -1439,11 +1429,9 @@ iomap_do_writepage(struct page *page, struct write= back_control *wbc, void *data) * | desired writeback range | see else | * ---------------------------------^------------------| */ - offset =3D i_size_read(inode); - end_index =3D offset >> PAGE_SHIFT; - if (page->index < end_index) - end_offset =3D (loff_t)(page->index + 1) << PAGE_SHIFT; - else { + isize =3D i_size_read(inode); + end_pos =3D folio_pos(folio) + folio_size(folio); + if (end_pos - 1 >=3D isize) { /* * Check whether the page to write out is beyond or straddles * i_size or not. @@ -1455,7 +1443,8 @@ iomap_do_writepage(struct page *page, struct writeb= ack_control *wbc, void *data) * | | Straddles | * ---------------------------------^-----------|--------| */ - unsigned offset_into_page =3D offset & (PAGE_SIZE - 1); + size_t poff =3D offset_in_folio(folio, isize); + pgoff_t end_index =3D isize >> PAGE_SHIFT; =20 /* * Skip the page if it is fully outside i_size, e.g. due to a @@ -1474,8 +1463,8 @@ iomap_do_writepage(struct page *page, struct writeb= ack_control *wbc, void *data) * if the page to write is totally beyond the i_size or if it's * offset is just equal to the EOF. */ - if (page->index > end_index || - (page->index =3D=3D end_index && offset_into_page =3D=3D 0)) + if (folio->index > end_index || + (folio->index =3D=3D end_index && poff =3D=3D 0)) goto redirty; =20 /* @@ -1486,17 +1475,15 @@ iomap_do_writepage(struct page *page, struct writ= eback_control *wbc, void *data) * memory is zeroed when mapped, and writes to that region are * not written out to the file." */ - zero_user_segment(page, offset_into_page, PAGE_SIZE); - - /* Adjust the end_offset to the end of file */ - end_offset =3D offset; + zero_user_segment(&folio->page, poff, folio_size(folio)); + end_pos =3D isize; } =20 - return iomap_writepage_map(wpc, wbc, inode, page, end_offset); + return iomap_writepage_map(wpc, wbc, inode, folio, end_pos); =20 redirty: - redirty_page_for_writepage(wbc, page); - unlock_page(page); + folio_redirty_for_writepage(wbc, folio); + folio_unlock(folio); return 0; } =20 --=20 2.30.2