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=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 C62ADC83004 for ; Wed, 29 Apr 2020 13:37:43 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 82315208FE for ; Wed, 29 Apr 2020 13:37:43 +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="Jcl0Tbsf" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 82315208FE 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 2784A8E0020; Wed, 29 Apr 2020 09:37:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F314C8E0026; Wed, 29 Apr 2020 09:37:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CE2FD8E0027; Wed, 29 Apr 2020 09:37:03 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0221.hostedemail.com [216.40.44.221]) by kanga.kvack.org (Postfix) with ESMTP id A091D8E0026 for ; Wed, 29 Apr 2020 09:37:03 -0400 (EDT) Received: from smtpin02.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 5EED352CC for ; Wed, 29 Apr 2020 13:37:03 +0000 (UTC) X-FDA: 76760993526.02.brass28_3d91820309f27 X-HE-Tag: brass28_3d91820309f27 X-Filterd-Recvd-Size: 5602 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf45.hostedemail.com (Postfix) with ESMTP for ; Wed, 29 Apr 2020 13:37:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.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=lT3WB4tsfdqi9806CIQgzRbn5jUT7F3rePhx8THgs3Q=; b=Jcl0TbsfsY8IflEMKQTrpztMNu c45bt2AMTsw3vV6NvK3uz90AhgzeZPKq+60441w2HNyHbpyG6Av/Y0Nrt1wK1D/eZ7Uer76B+jvV0 x5HalM50dJ/ZW/Pfdk+WkU7e0sbt64o6fauakZh6HiaHwW0jjCndHk8O2rHWG5YKsZnzEbnkqAsUo W9vp4A+go+Rcf4Rvbg3JdkZbYSos9dH+hfp3VugiLc9Naumz8c/gUz0DwWeqGAu/xjjURxBKh/2h4 DYWNM3s0vVA6KhEUwH0BPlS54HMAT7gz5iC2l/rX9u+aalPRLeGvP8KA4MdwikCtlHGgsw2kOTn1N 2AKnWiMg==; Received: from willy by bombadil.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1jTmtX-0005un-9N; Wed, 29 Apr 2020 13:36:59 +0000 From: Matthew Wilcox To: linux-fsdevel@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Christoph Hellwig Subject: [PATCH v3 06/25] fs: Introduce i_blocks_per_page Date: Wed, 29 Apr 2020 06:36:38 -0700 Message-Id: <20200429133657.22632-7-willy@infradead.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200429133657.22632-1-willy@infradead.org> References: <20200429133657.22632-1-willy@infradead.org> MIME-Version: 1.0 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: From: "Matthew Wilcox (Oracle)" This helper is useful for both large pages in the page cache and for supporting block size larger than page size. Convert some example users (we have a few different ways of writing this idiom). Signed-off-by: Matthew Wilcox (Oracle) Reviewed-by: Christoph Hellwig --- fs/iomap/buffered-io.c | 8 ++++---- fs/jfs/jfs_metapage.c | 2 +- fs/xfs/xfs_aops.c | 2 +- include/linux/pagemap.h | 16 ++++++++++++++++ 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index 890c8fcda4f3..4bc37bf8d057 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -46,7 +46,7 @@ iomap_page_create(struct inode *inode, struct page *pag= e) { struct iomap_page *iop =3D to_iomap_page(page); =20 - if (iop || i_blocksize(inode) =3D=3D PAGE_SIZE) + if (iop || i_blocks_per_page(inode, page) <=3D 1) return iop; =20 iop =3D kmalloc(sizeof(*iop), GFP_NOFS | __GFP_NOFAIL); @@ -152,7 +152,7 @@ iomap_iop_set_range_uptodate(struct page *page, unsig= ned off, unsigned len) unsigned int i; =20 spin_lock_irqsave(&iop->uptodate_lock, flags); - for (i =3D 0; i < PAGE_SIZE / i_blocksize(inode); i++) { + for (i =3D 0; i < i_blocks_per_page(inode, page); i++) { if (i >=3D first && i <=3D last) set_bit(i, iop->uptodate); else if (!test_bit(i, iop->uptodate)) @@ -1090,7 +1090,7 @@ iomap_finish_page_writeback(struct inode *inode, st= ruct page *page, mapping_set_error(inode->i_mapping, -EIO); } =20 - WARN_ON_ONCE(i_blocksize(inode) < PAGE_SIZE && !iop); + WARN_ON_ONCE(i_blocks_per_page(inode, page) > 1 && !iop); WARN_ON_ONCE(iop && atomic_read(&iop->write_count) <=3D 0); =20 if (!iop || atomic_dec_and_test(&iop->write_count)) @@ -1386,7 +1386,7 @@ iomap_writepage_map(struct iomap_writepage_ctx *wpc= , int error =3D 0, count =3D 0, i; LIST_HEAD(submit_list); =20 - WARN_ON_ONCE(i_blocksize(inode) < PAGE_SIZE && !iop); + WARN_ON_ONCE(i_blocks_per_page(inode, page) > 1 && !iop); WARN_ON_ONCE(iop && atomic_read(&iop->write_count) !=3D 0); =20 /* diff --git a/fs/jfs/jfs_metapage.c b/fs/jfs/jfs_metapage.c index a2f5338a5ea1..176580f54af9 100644 --- a/fs/jfs/jfs_metapage.c +++ b/fs/jfs/jfs_metapage.c @@ -473,7 +473,7 @@ static int metapage_readpage(struct file *fp, struct = page *page) struct inode *inode =3D page->mapping->host; struct bio *bio =3D NULL; int block_offset; - int blocks_per_page =3D PAGE_SIZE >> inode->i_blkbits; + int blocks_per_page =3D i_blocks_per_page(inode, page); sector_t page_start; /* address of page in fs blocks */ sector_t pblock; int xlen; diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c index 1fd4fb7a607c..5b25f5ee84dc 100644 --- a/fs/xfs/xfs_aops.c +++ b/fs/xfs/xfs_aops.c @@ -544,7 +544,7 @@ xfs_discard_page( page, ip->i_ino, offset); =20 error =3D xfs_bmap_punch_delalloc_range(ip, start_fsb, - PAGE_SIZE / i_blocksize(inode)); + i_blocks_per_page(inode, page)); if (error && !XFS_FORCED_SHUTDOWN(mp)) xfs_alert(mp, "page discard unable to remove delalloc mapping."); out_invalidate: diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index 36bfc9d855bb..ba16f7bf676b 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -816,4 +816,20 @@ static inline int page_mkwrite_check_truncate(struct= page *page, return offset; } =20 +/** + * i_blocks_per_page - How many blocks fit in this page. + * @inode: The inode which contains the blocks. + * @page: The (potentially large) page. + * + * If the block size is larger than the size of this page, will return + * zero, + * + * Context: Any context. + * Return: The number of filesystem blocks covered by this page. + */ +static inline +unsigned int i_blocks_per_page(struct inode *inode, struct page *page) +{ + return thp_size(page) >> inode->i_blkbits; +} #endif /* _LINUX_PAGEMAP_H */ --=20 2.26.2