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=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,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 3FACCC433DF for ; Mon, 24 Aug 2020 15:19:19 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id F38E62074D for ; Mon, 24 Aug 2020 15:19:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="H05djLHG" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F38E62074D 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 9925A6B0029; Mon, 24 Aug 2020 11:19:18 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9491B6B002A; Mon, 24 Aug 2020 11:19:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8576F6B002B; Mon, 24 Aug 2020 11:19:18 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0040.hostedemail.com [216.40.44.40]) by kanga.kvack.org (Postfix) with ESMTP id 715B66B0029 for ; Mon, 24 Aug 2020 11:19:18 -0400 (EDT) Received: from smtpin01.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 395E8181AEF1A for ; Mon, 24 Aug 2020 15:19:18 +0000 (UTC) X-FDA: 77185820796.01.sail24_560235a27054 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin01.hostedemail.com (Postfix) with ESMTP id 1ECCC1004F63A for ; Mon, 24 Aug 2020 15:17:08 +0000 (UTC) X-HE-Tag: sail24_560235a27054 X-Filterd-Recvd-Size: 5207 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf18.hostedemail.com (Postfix) with ESMTP for ; Mon, 24 Aug 2020 15:17:07 +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=dyVV1/WtfynBLYrYkKLGof4OOEqAPKqK6TxXZzYjTco=; b=H05djLHGmbjcLzwN2UkfMkgywz cBT773asAxYxNl0FfZCC4YxpgQYKexyL+T9KYhcLqabzR42Rt+jLn+oAx+Wd+nxEUB68ImToQl8vz iPt8nyRkZaXL7Ak6LzrdCxg2mpHL86NDxywIsPMEBuzsqrQNXk3bv8V4Loz8INQdMhEhY7E5Lwx7o Kig1UbJsto4PSwnYbgxrS5XJf580l7EgSPaJmKs7hn8hCVs2htX5K7NS/GsK+7WexgDVcGswaPiIA 8bUPrHiKrPIPfrYy+7M4pcPyA26Kn4dIlFnyUoy0qCF5Lag0jGZUxtOVefahuOXUR8oGES9ohpwvB 002L+kKA==; Received: from willy by casper.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1kAEDX-0004Cq-9R; Mon, 24 Aug 2020 15:17:03 +0000 From: "Matthew Wilcox (Oracle)" To: linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" , "Darrick J . Wong" , linux-block@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 05/11] iomap: Support THPs in iomap_adjust_read_range Date: Mon, 24 Aug 2020 16:16:54 +0100 Message-Id: <20200824151700.16097-6-willy@infradead.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200824151700.16097-1-willy@infradead.org> References: <20200824151700.16097-1-willy@infradead.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 1ECCC1004F63A X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam02 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 the struct page instead of the iomap_page so we can determine the size of the page. Use offset_in_thp() instead of offset_in_page() and use thp_size() instead of PAGE_SIZE. Convert the arguments to be size_t instead of unsigned int, in case pages ever get larger than 2^31 bytes. Signed-off-by: Matthew Wilcox (Oracle) --- fs/iomap/buffered-io.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index 2dba054095e8..5cc0343b6a8e 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -76,16 +76,16 @@ iomap_page_release(struct page *page) /* * Calculate the range inside the page 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 page *pa= ge, + loff_t *pos, loff_t length, size_t *offp, size_t *lenp) { + struct iomap_page *iop =3D to_iomap_page(page); 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_thp(page, *pos); + size_t plen =3D min_t(loff_t, thp_size(page) - poff, length); unsigned first =3D poff >> block_bits; unsigned last =3D (poff + plen - 1) >> block_bits; =20 @@ -123,7 +123,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_thp(page, isize - 1) >> block_bits; =20 if (first <=3D end && last > end) plen -=3D (last - end) * block_size; @@ -234,7 +234,7 @@ iomap_readpage_actor(struct inode *inode, loff_t pos,= loff_t length, void *data, struct iomap_page *iop =3D iomap_page_create(inode, page); 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) { @@ -244,7 +244,7 @@ iomap_readpage_actor(struct inode *inode, loff_t pos,= loff_t length, void *data, } =20 /* zero post-eof blocks as the page may be mapped */ - iomap_adjust_read_range(inode, iop, &pos, length, &poff, &plen); + iomap_adjust_read_range(inode, page, &pos, length, &poff, &plen); if (plen =3D=3D 0) goto done; =20 @@ -550,18 +550,19 @@ static int __iomap_write_begin(struct inode *inode, loff_t pos, unsigned len, int f= lags, struct page *page, struct iomap *srcmap) { - struct iomap_page *iop =3D iomap_page_create(inode, page); loff_t block_size =3D i_blocksize(inode); loff_t block_start =3D pos & ~(block_size - 1); loff_t block_end =3D (pos + len + block_size - 1) & ~(block_size - 1); - unsigned from =3D offset_in_page(pos), to =3D from + len, poff, plen; + unsigned from =3D offset_in_page(pos), to =3D from + len; + size_t poff, plen; int status; =20 if (PageUptodate(page)) return 0; + iomap_page_create(inode, page); =20 do { - iomap_adjust_read_range(inode, iop, &block_start, + iomap_adjust_read_range(inode, page, &block_start, block_end - block_start, &poff, &plen); if (plen =3D=3D 0) break; --=20 2.28.0