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 634E6C07E96 for ; Thu, 15 Jul 2021 05:00:18 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 0CFC6611AD for ; Thu, 15 Jul 2021 05:00:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0CFC6611AD 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 5E1958D006C; Thu, 15 Jul 2021 01:00:18 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 591788D0065; Thu, 15 Jul 2021 01:00:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 432438D006C; Thu, 15 Jul 2021 01:00:18 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0141.hostedemail.com [216.40.44.141]) by kanga.kvack.org (Postfix) with ESMTP id 16A428D0065 for ; Thu, 15 Jul 2021 01:00:18 -0400 (EDT) Received: from smtpin02.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id F273C824556B for ; Thu, 15 Jul 2021 05:00:16 +0000 (UTC) X-FDA: 78363620832.02.64DE0D6 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf24.hostedemail.com (Postfix) with ESMTP id 86A68B000814 for ; Thu, 15 Jul 2021 05:00:16 +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=9HKLvlz7zVTwBIOVo7c/wMHDJHKm1KxRIyfN8qxLj0A=; b=hBpwOZyoFwGxTMHGpTvihwBHOt ydal5ikUFxFsfarnu2J3LxPZxnOFV1U6BesWk7wmDyg6r5dWHqZXu+Jln5LRUlJtX/HgQjnZs5m4J +XPhykd72E9mYOvyKRu173sjJoItTg9b+TMiTeUwFv6z0M1YKzQ/HCuFar+mDINJ/rL/orJoUPdw5 M0X7e17lydk6FfiAZ3Vmfjx56MBtiktAYy4Lo1FynH6QZsXa+gDUDFEQUejgm64UL6efg55F/c62+ Q277pEiHajE58yNIL0gKh6ez3tLnbFGwyKaoiu0ZJ29HGjftYg4wac99EZvYkg2kJrSbTZXP//h/X tHgW+Ocg==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1m3tSp-002zWM-GL; Thu, 15 Jul 2021 04:59:27 +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 102/138] iomap: Convert iomap_write_begin and iomap_write_end to folios Date: Thu, 15 Jul 2021 04:36:28 +0100 Message-Id: <20210715033704.692967-103-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 X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 86A68B000814 X-Stat-Signature: knhmg6bmm833hihn1sc8mtph5uyejhoq Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=hBpwOZyo; spf=none (imf24.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-HE-Tag: 1626325216-712972 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: These functions still only work in PAGE_SIZE chunks, but there are fewer conversions from head to tail pages as a result of this patch. Signed-off-by: Matthew Wilcox (Oracle) --- fs/iomap/buffered-io.c | 68 ++++++++++++++++++++++-------------------- 1 file changed, 36 insertions(+), 32 deletions(-) diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index a3fe0d36c739..5e0aa23d4693 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -541,9 +541,8 @@ static int iomap_read_folio_sync(loff_t block_start, = struct folio *folio, =20 static int __iomap_write_begin(struct inode *inode, loff_t pos, unsigned len, int f= lags, - struct page *page, struct iomap *srcmap) + struct folio *folio, struct iomap *srcmap) { - struct folio *folio =3D page_folio(page); struct iomap_page *iop =3D iomap_page_create(inode, folio); loff_t block_size =3D i_blocksize(inode); loff_t block_start =3D round_down(pos, block_size); @@ -583,12 +582,14 @@ __iomap_write_begin(struct inode *inode, loff_t pos= , unsigned len, int flags, return 0; } =20 -static int -iomap_write_begin(struct inode *inode, loff_t pos, unsigned len, unsigne= d flags, - struct page **pagep, struct iomap *iomap, struct iomap *srcmap) +static int iomap_write_begin(struct inode *inode, loff_t pos, size_t len= , + unsigned flags, struct folio **foliop, struct iomap *iomap, + struct iomap *srcmap) { const struct iomap_page_ops *page_ops =3D iomap->page_ops; + struct folio *folio; struct page *page; + unsigned fgp =3D FGP_LOCK | FGP_WRITE | FGP_CREAT | FGP_STABLE | FGP_NO= FS; int status =3D 0; =20 BUG_ON(pos + len > iomap->offset + iomap->length); @@ -604,30 +605,31 @@ iomap_write_begin(struct inode *inode, loff_t pos, = unsigned len, unsigned flags, return status; } =20 - page =3D grab_cache_page_write_begin(inode->i_mapping, pos >> PAGE_SHIF= T, - AOP_FLAG_NOFS); - if (!page) { + folio =3D __filemap_get_folio(inode->i_mapping, pos >> PAGE_SHIFT, fgp, + mapping_gfp_mask(inode->i_mapping)); + if (!folio) { status =3D -ENOMEM; goto out_no_page; } =20 + page =3D folio_file_page(folio, pos >> PAGE_SHIFT); if (srcmap->type =3D=3D IOMAP_INLINE) iomap_read_inline_data(inode, page, srcmap); else if (iomap->flags & IOMAP_F_BUFFER_HEAD) status =3D __block_write_begin_int(page, pos, len, NULL, srcmap); else - status =3D __iomap_write_begin(inode, pos, len, flags, page, + status =3D __iomap_write_begin(inode, pos, len, flags, folio, srcmap); =20 if (unlikely(status)) goto out_unlock; =20 - *pagep =3D page; + *foliop =3D folio; return 0; =20 out_unlock: - unlock_page(page); - put_page(page); + folio_unlock(folio); + folio_put(folio); iomap_write_failed(inode, pos, len); =20 out_no_page: @@ -637,11 +639,10 @@ iomap_write_begin(struct inode *inode, loff_t pos, = unsigned len, unsigned flags, } =20 static size_t __iomap_write_end(struct inode *inode, loff_t pos, size_t = len, - size_t copied, struct page *page) + size_t copied, struct folio *folio) { - struct folio *folio =3D page_folio(page); struct iomap_page *iop =3D to_iomap_page(folio); - flush_dcache_page(page); + flush_dcache_folio(folio); =20 /* * The blocks that were entirely written will now be uptodate, so we @@ -654,10 +655,10 @@ static size_t __iomap_write_end(struct inode *inode= , loff_t pos, size_t len, * uptodate page as a zero-length write, and force the caller to redo * the whole thing. */ - if (unlikely(copied < len && !PageUptodate(page))) + if (unlikely(copied < len && !folio_test_uptodate(folio))) return 0; iomap_set_range_uptodate(folio, iop, offset_in_folio(folio, pos), len); - __set_page_dirty_nobuffers(page); + filemap_dirty_folio(inode->i_mapping, folio); return copied; } =20 @@ -680,9 +681,10 @@ static size_t iomap_write_end_inline(struct inode *i= node, struct page *page, =20 /* Returns the number of bytes copied. May be 0. Cannot be an errno. *= / static size_t iomap_write_end(struct inode *inode, loff_t pos, size_t le= n, - size_t copied, struct page *page, struct iomap *iomap, + size_t copied, struct folio *folio, struct iomap *iomap, struct iomap *srcmap) { + struct page *page =3D folio_file_page(folio, pos / PAGE_SIZE); const struct iomap_page_ops *page_ops =3D iomap->page_ops; loff_t old_size =3D inode->i_size; size_t ret; @@ -693,7 +695,7 @@ static size_t iomap_write_end(struct inode *inode, lo= ff_t pos, size_t len, ret =3D block_write_end(NULL, inode->i_mapping, pos, len, copied, page, NULL); } else { - ret =3D __iomap_write_end(inode, pos, len, copied, page); + ret =3D __iomap_write_end(inode, pos, len, copied, folio); } =20 /* @@ -705,13 +707,13 @@ static size_t iomap_write_end(struct inode *inode, = loff_t pos, size_t len, i_size_write(inode, pos + ret); iomap->flags |=3D IOMAP_F_SIZE_CHANGED; } - unlock_page(page); + folio_unlock(folio); =20 if (old_size < pos) pagecache_isize_extended(inode, old_size, pos); if (page_ops && page_ops->page_done) page_ops->page_done(inode, pos, ret, page, iomap); - put_page(page); + folio_put(folio); =20 if (ret < len) iomap_write_failed(inode, pos, len); @@ -727,6 +729,7 @@ iomap_write_actor(struct inode *inode, loff_t pos, lo= ff_t length, void *data, ssize_t written =3D 0; =20 do { + struct folio *folio; struct page *page; unsigned long offset; /* Offset into pagecache page */ unsigned long bytes; /* Bytes to write to page */ @@ -750,18 +753,19 @@ iomap_write_actor(struct inode *inode, loff_t pos, = loff_t length, void *data, break; } =20 - status =3D iomap_write_begin(inode, pos, bytes, 0, &page, iomap, + status =3D iomap_write_begin(inode, pos, bytes, 0, &folio, iomap, srcmap); if (unlikely(status)) break; =20 + page =3D folio_file_page(folio, pos / PAGE_SIZE); if (mapping_writably_mapped(inode->i_mapping)) flush_dcache_page(page); =20 copied =3D copy_page_from_iter_atomic(page, offset, bytes, i); =20 - status =3D iomap_write_end(inode, pos, bytes, copied, page, iomap, - srcmap); + status =3D iomap_write_end(inode, pos, bytes, copied, folio, + iomap, srcmap); =20 if (unlikely(copied !=3D status)) iov_iter_revert(i, copied - status); @@ -825,14 +829,14 @@ iomap_unshare_actor(struct inode *inode, loff_t pos= , loff_t length, void *data, do { unsigned long offset =3D offset_in_page(pos); unsigned long bytes =3D min_t(loff_t, PAGE_SIZE - offset, length); - struct page *page; + struct folio *folio; =20 status =3D iomap_write_begin(inode, pos, bytes, - IOMAP_WRITE_F_UNSHARE, &page, iomap, srcmap); + IOMAP_WRITE_F_UNSHARE, &folio, iomap, srcmap); if (unlikely(status)) return status; =20 - status =3D iomap_write_end(inode, pos, bytes, bytes, page, iomap, + status =3D iomap_write_end(inode, pos, bytes, bytes, folio, iomap, srcmap); if (WARN_ON_ONCE(status =3D=3D 0)) return -EIO; @@ -871,19 +875,19 @@ EXPORT_SYMBOL_GPL(iomap_file_unshare); static s64 iomap_zero(struct inode *inode, loff_t pos, u64 length, struct iomap *iomap, struct iomap *srcmap) { - struct page *page; + struct folio *folio; int status; unsigned offset =3D offset_in_page(pos); unsigned bytes =3D min_t(u64, PAGE_SIZE - offset, length); =20 - status =3D iomap_write_begin(inode, pos, bytes, 0, &page, iomap, srcmap= ); + status =3D iomap_write_begin(inode, pos, bytes, 0, &folio, iomap, srcma= p); if (status) return status; =20 - zero_user(page, offset, bytes); - mark_page_accessed(page); + zero_user(folio_file_page(folio, pos / PAGE_SIZE), offset, bytes); + folio_mark_accessed(folio); =20 - return iomap_write_end(inode, pos, bytes, bytes, page, iomap, srcmap); + return iomap_write_end(inode, pos, bytes, bytes, folio, iomap, srcmap); } =20 static loff_t iomap_zero_range_actor(struct inode *inode, loff_t pos, --=20 2.30.2