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 564EBC07E9B for ; Mon, 19 Jul 2021 19:07:47 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id E9014610CC for ; Mon, 19 Jul 2021 19:07:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E9014610CC 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 922848D00EC; Mon, 19 Jul 2021 15:07:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8F8D76B018E; Mon, 19 Jul 2021 15:07:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 79A218D00EC; Mon, 19 Jul 2021 15:07:45 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0047.hostedemail.com [216.40.44.47]) by kanga.kvack.org (Postfix) with ESMTP id 4E1906B018D for ; Mon, 19 Jul 2021 15:07:45 -0400 (EDT) Received: from smtpin30.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id E467D184B83EC for ; Mon, 19 Jul 2021 19:07:43 +0000 (UTC) X-FDA: 78380271606.30.76A83FD Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf21.hostedemail.com (Postfix) with ESMTP id 7A035D009E53 for ; Mon, 19 Jul 2021 19:07: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=8oEtzw7Wtww6cLhpam+LORNjOFIlMkhUcFQofhWnEFo=; b=RSTRqrKE/VVt8UuDkahmTro8GF vF4Eyxh4qgC/wk5QyjGguk+vwYIaKm5u2wUYpjld9Uaqk1lfIa+mtLrFkIzORbYue7rtfTIc9syeR xYoE3ZLbaheEPHwso52FTz7+Prx8JDQ1tvZvcjZORLFwUahisVDUyboRb6JDUUAu6BhwrZyrldb9z WrNnCjEESO1BqpBzTKEN5WW7ureAs0xWYYJAvXAbW+N+wohWmUfBbTxh3O9h8RebBUkmfU/iI3efn oLdi/66s3yFfELv0AnCCyhIKj7deGSO49wl9fRbNXaWDfBI6p5xBEKIci6eE+vCAOJeDZlHGb563g 1OkTYjiA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1m5YL9-007MEn-Q1; Mon, 19 Jul 2021 18:50:20 +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 13/17] iomap: Convert iomap_write_begin and iomap_write_end to folios Date: Mon, 19 Jul 2021 19:39:57 +0100 Message-Id: <20210719184001.1750630-14-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=RSTRqrKE; 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: rspam02 X-Stat-Signature: 85tfek4q8o8osnx1finuwjjj5cunj46z X-Rspamd-Queue-Id: 7A035D009E53 X-HE-Tag: 1626721663-702930 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 dd05db36e135..4b02337009bc 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -543,9 +543,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); @@ -585,12 +584,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); @@ -606,30 +607,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: @@ -639,11 +641,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 @@ -656,10 +657,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 @@ -682,9 +683,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_SHIFT); const struct iomap_page_ops *page_ops =3D iomap->page_ops; loff_t old_size =3D inode->i_size; size_t ret; @@ -695,7 +697,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 /* @@ -707,13 +709,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); @@ -729,6 +731,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 */ @@ -752,18 +755,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_SHIFT); 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); @@ -827,14 +831,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; @@ -873,19 +877,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_SHIFT), 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