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 60B54C07E95 for ; Mon, 19 Jul 2021 19:09:31 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id DDB356109E for ; Mon, 19 Jul 2021 19:09:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DDB356109E 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 883436B018C; Mon, 19 Jul 2021 15:09:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 85B3E8D00F5; Mon, 19 Jul 2021 15:09:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6FB3B8D00EC; Mon, 19 Jul 2021 15:09:31 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0234.hostedemail.com [216.40.44.234]) by kanga.kvack.org (Postfix) with ESMTP id 4DC9D6B018C for ; Mon, 19 Jul 2021 15:09:31 -0400 (EDT) Received: from smtpin39.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id D586E1DAF8 for ; Mon, 19 Jul 2021 19:09:29 +0000 (UTC) X-FDA: 78380276058.39.994B561 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf01.hostedemail.com (Postfix) with ESMTP id 6CD7E5011FB6 for ; Mon, 19 Jul 2021 19:09:29 +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=mlTMIIhEO4A+eKAPhaylrj4/q9kL52p6vpG/M9ZjXV4=; b=LhvRmpC3e3NwuMAruZCouKkTJU IuLW+omfJc+5c+rPmflNkkUQCjs566QAfP0BYUDQR86Wv+UT6221juYSaNfv5KMULw+co9bgisTnX RlzO+/baMCvEfd9HZiSCQtBs/yNdMOcNVKE+zUfyPzzQu7dj4jksYPEBbYdmLj567o8uNb1R4KiGb KYaNpVboSy1YU2j/QGBW65+sG3i/ZVxTHbjGWgM+RvSMYn1JwoqOXtOJZtSDWMqYLO1hqcfmJ6Sgb hyGcGWbScoh5JuIfvJuSTnju4Iri35onbdOgz4uqcCSJwOxxzjo34ron6tZqESIm262rKwirOLbXc UcTxNmsw==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1m5YHL-007Ln3-2b; Mon, 19 Jul 2021 18:46:44 +0000 From: "Matthew Wilcox (Oracle)" To: linux-fsdevel@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-block@vger.kernel.org, "Darrick J . Wong" Subject: [PATCH v15 09/17] iomap: Use folio offsets instead of page offsets Date: Mon, 19 Jul 2021 19:39:53 +0100 Message-Id: <20210719184001.1750630-10-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: imf01.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=LhvRmpC3; spf=none (imf01.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: 5ykhcguccioq5zbmygn81hjuhnpy3p31 X-Rspamd-Queue-Id: 6CD7E5011FB6 X-HE-Tag: 1626721769-464992 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: Pass a folio around instead of the page, and make sure the offset is relative to the start of the folio instead of the start of a page. Also use size_t for offset & length to make it clear that these are byte counts, and to support >2GB folios in the future. Signed-off-by: Matthew Wilcox (Oracle) Reviewed-by: Darrick J. Wong --- fs/iomap/buffered-io.c | 83 ++++++++++++++++++++++-------------------- 1 file changed, 43 insertions(+), 40 deletions(-) diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index 62d8ebcda429..0f70bd185c2a 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -75,18 +75,18 @@ static void iomap_page_release(struct folio *folio) } =20 /* - * Calculate the range inside the page that we actually need to read. + * Calculate the range inside the folio that we actually need to read. */ -static void -iomap_adjust_read_range(struct inode *inode, struct iomap_page *iop, - loff_t *pos, loff_t length, unsigned *offp, unsigned *lenp) +static void iomap_adjust_read_range(struct inode *inode, struct folio *f= olio, + loff_t *pos, loff_t length, size_t *offp, size_t *lenp) { + struct iomap_page *iop =3D to_iomap_page(folio); loff_t orig_pos =3D *pos; loff_t isize =3D i_size_read(inode); unsigned block_bits =3D inode->i_blkbits; unsigned block_size =3D (1 << block_bits); - unsigned poff =3D offset_in_page(*pos); - unsigned plen =3D min_t(loff_t, PAGE_SIZE - poff, length); + size_t poff =3D offset_in_folio(folio, *pos); + size_t plen =3D min_t(loff_t, folio_size(folio) - poff, length); unsigned first =3D poff >> block_bits; unsigned last =3D (poff + plen - 1) >> block_bits; =20 @@ -124,7 +124,7 @@ iomap_adjust_read_range(struct inode *inode, struct i= omap_page *iop, * page cache for blocks that are entirely outside of i_size. */ if (orig_pos <=3D isize && orig_pos + length > isize) { - unsigned end =3D offset_in_page(isize - 1) >> block_bits; + unsigned end =3D offset_in_folio(folio, isize - 1) >> block_bits; =20 if (first <=3D end && last > end) plen -=3D (last - end) * block_size; @@ -134,31 +134,31 @@ iomap_adjust_read_range(struct inode *inode, struct= iomap_page *iop, *lenp =3D plen; } =20 -static void iomap_iop_set_range_uptodate(struct page *page, - struct iomap_page *iop, unsigned off, unsigned len) +static void iomap_iop_set_range_uptodate(struct folio *folio, + struct iomap_page *iop, size_t off, size_t len) { - struct inode *inode =3D page->mapping->host; + struct inode *inode =3D folio->mapping->host; unsigned first =3D off >> inode->i_blkbits; unsigned last =3D (off + len - 1) >> inode->i_blkbits; unsigned long flags; =20 spin_lock_irqsave(&iop->uptodate_lock, flags); bitmap_set(iop->uptodate, first, last - first + 1); - if (bitmap_full(iop->uptodate, i_blocks_per_page(inode, page))) - SetPageUptodate(page); + if (bitmap_full(iop->uptodate, i_blocks_per_folio(inode, folio))) + folio_mark_uptodate(folio); spin_unlock_irqrestore(&iop->uptodate_lock, flags); } =20 -static void iomap_set_range_uptodate(struct page *page, - struct iomap_page *iop, unsigned off, unsigned len) +static void iomap_set_range_uptodate(struct folio *folio, + struct iomap_page *iop, size_t off, size_t len) { - if (PageError(page)) + if (folio_test_error(folio)) return; =20 if (iop) - iomap_iop_set_range_uptodate(page, iop, off, len); + iomap_iop_set_range_uptodate(folio, iop, off, len); else - SetPageUptodate(page); + folio_mark_uptodate(folio); } =20 static void @@ -169,15 +169,17 @@ iomap_read_page_end_io(struct bio_vec *bvec, int er= ror) struct iomap_page *iop =3D to_iomap_page(folio); =20 if (unlikely(error)) { - ClearPageUptodate(page); - SetPageError(page); + folio_clear_uptodate(folio); + folio_set_error(folio); } else { - iomap_set_range_uptodate(page, iop, bvec->bv_offset, - bvec->bv_len); + size_t off =3D (page - &folio->page) * PAGE_SIZE + + bvec->bv_offset; + + iomap_set_range_uptodate(folio, iop, off, bvec->bv_len); } =20 if (!iop || atomic_sub_and_test(bvec->bv_len, &iop->read_bytes_pending)= ) - unlock_page(page); + folio_unlock(folio); } =20 static void @@ -238,7 +240,7 @@ iomap_readpage_actor(struct inode *inode, loff_t pos,= loff_t length, void *data, struct iomap_page *iop; bool same_page =3D false, is_contig =3D false; loff_t orig_pos =3D pos; - unsigned poff, plen; + size_t poff, plen; sector_t sector; =20 if (iomap->type =3D=3D IOMAP_INLINE) { @@ -249,13 +251,13 @@ iomap_readpage_actor(struct inode *inode, loff_t po= s, loff_t length, void *data, =20 /* zero post-eof blocks as the page may be mapped */ iop =3D iomap_page_create(inode, folio); - iomap_adjust_read_range(inode, iop, &pos, length, &poff, &plen); + iomap_adjust_read_range(inode, folio, &pos, length, &poff, &plen); if (plen =3D=3D 0) goto done; =20 if (iomap_block_needs_zeroing(inode, iomap, pos)) { - zero_user(page, poff, plen); - iomap_set_range_uptodate(page, iop, poff, plen); + zero_user(&folio->page, poff, plen); + iomap_set_range_uptodate(folio, iop, poff, plen); goto done; } =20 @@ -266,7 +268,7 @@ iomap_readpage_actor(struct inode *inode, loff_t pos,= loff_t length, void *data, /* Try to merge into a previous segment if we can */ sector =3D iomap_sector(iomap, pos); if (ctx->bio && bio_end_sector(ctx->bio) =3D=3D sector) { - if (__bio_try_merge_page(ctx->bio, page, plen, poff, + if (__bio_try_merge_page(ctx->bio, &folio->page, plen, poff, &same_page)) goto done; is_contig =3D true; @@ -298,7 +300,7 @@ iomap_readpage_actor(struct inode *inode, loff_t pos,= loff_t length, void *data, ctx->bio->bi_end_io =3D iomap_read_end_io; } =20 - bio_add_page(ctx->bio, page, plen, poff); + bio_add_folio(ctx->bio, folio, plen, poff); done: /* * Move the caller beyond our range so that it keeps making progress. @@ -533,9 +535,8 @@ iomap_write_failed(struct inode *inode, loff_t pos, u= nsigned len) truncate_pagecache_range(inode, max(pos, i_size), pos + len); } =20 -static int -iomap_read_page_sync(loff_t block_start, struct page *page, unsigned pof= f, - unsigned plen, struct iomap *iomap) +static int iomap_read_folio_sync(loff_t block_start, struct folio *folio= , + size_t poff, size_t plen, struct iomap *iomap) { struct bio_vec bvec; struct bio bio; @@ -544,7 +545,7 @@ iomap_read_page_sync(loff_t block_start, struct page = *page, unsigned poff, bio.bi_opf =3D REQ_OP_READ; bio.bi_iter.bi_sector =3D iomap_sector(iomap, block_start); bio_set_dev(&bio, iomap->bdev); - __bio_add_page(&bio, page, plen, poff); + bio_add_folio(&bio, folio, plen, poff); return submit_bio_wait(&bio); } =20 @@ -557,14 +558,15 @@ __iomap_write_begin(struct inode *inode, loff_t pos= , unsigned len, int flags, loff_t block_size =3D i_blocksize(inode); loff_t block_start =3D round_down(pos, block_size); loff_t block_end =3D round_up(pos + len, block_size); - unsigned from =3D offset_in_page(pos), to =3D from + len, poff, plen; + size_t from =3D offset_in_folio(folio, pos), to =3D from + len; + size_t poff, plen; =20 - if (PageUptodate(page)) + if (folio_test_uptodate(folio)) return 0; - ClearPageError(page); + folio_clear_error(folio); =20 do { - iomap_adjust_read_range(inode, iop, &block_start, + iomap_adjust_read_range(inode, folio, &block_start, block_end - block_start, &poff, &plen); if (plen =3D=3D 0) break; @@ -577,14 +579,15 @@ __iomap_write_begin(struct inode *inode, loff_t pos= , unsigned len, int flags, if (iomap_block_needs_zeroing(inode, srcmap, block_start)) { if (WARN_ON_ONCE(flags & IOMAP_WRITE_F_UNSHARE)) return -EIO; - zero_user_segments(page, poff, from, to, poff + plen); + zero_user_segments(&folio->page, poff, from, to, + poff + plen); } else { - int status =3D iomap_read_page_sync(block_start, page, + int status =3D iomap_read_folio_sync(block_start, folio, poff, plen, srcmap); if (status) return status; } - iomap_set_range_uptodate(page, iop, poff, plen); + iomap_set_range_uptodate(folio, iop, poff, plen); } while ((block_start +=3D plen) < block_end); =20 return 0; @@ -663,7 +666,7 @@ static size_t __iomap_write_end(struct inode *inode, = loff_t pos, size_t len, */ if (unlikely(copied < len && !PageUptodate(page))) return 0; - iomap_set_range_uptodate(page, iop, offset_in_page(pos), len); + iomap_set_range_uptodate(folio, iop, offset_in_folio(folio, pos), len); __set_page_dirty_nobuffers(page); return copied; } --=20 2.30.2