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.5 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 6D5F7C433DF for ; Fri, 29 May 2020 02:59:27 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 2EBB02075F for ; Fri, 29 May 2020 02:59:27 +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="tEx655Vs" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2EBB02075F 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 789AE800CB; Thu, 28 May 2020 22:58:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 96706800CE; Thu, 28 May 2020 22:58:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4DA0B800D3; Thu, 28 May 2020 22:58:32 -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 03A1B800CE for ; Thu, 28 May 2020 22:58:31 -0400 (EDT) Received: from smtpin29.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id B9602181AEF0B for ; Fri, 29 May 2020 02:58:31 +0000 (UTC) X-FDA: 76868248422.29.sock67_1037ecd3be320 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin29.hostedemail.com (Postfix) with ESMTP id A052818086CD8 for ; Fri, 29 May 2020 02:58:31 +0000 (UTC) X-HE-Tag: sock67_1037ecd3be320 X-Filterd-Recvd-Size: 4308 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf21.hostedemail.com (Postfix) with ESMTP for ; Fri, 29 May 2020 02:58:31 +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=szc1w0bR49MUADtu9J/T+C7YUFT1QaCORo7QYzrGYc8=; b=tEx655VsZUZJb4RjDWdLlz/kYN KjLgesfGpUB19OLPv0n8cSoN+ad8FZRgkH2OWWnBMH8Ak0SoGJ+0i4XZnGWO1sG3gSQ0wdAKiXyZc LzgAbRYyU0fZjT8skMoaSDFeKCb13LBvccB51x6IK5lHfjFQG4qgFYRx41+ojxo6T0oyx2JOrm2J/ GUkEHAzSDdM6imCusLU/FisKpIb7KBOnbO3TXz5j3pR8ewpSLyEaayG4zJCJiVzbAbJY3feoTWwFa RIyp7UKvEgDA04CSEt214aTso8eMchHyEUDzo/7VG+dOAaPIQ3NqUp1mKbTtsXIUz+oUq/wqI/TKG V01/pxxw==; Received: from willy by bombadil.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1jeVE3-0008RM-5p; Fri, 29 May 2020 02:58:27 +0000 From: Matthew Wilcox To: linux-fsdevel@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v5 16/39] iomap: Support large pages in read paths Date: Thu, 28 May 2020 19:58:01 -0700 Message-Id: <20200529025824.32296-17-willy@infradead.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200529025824.32296-1-willy@infradead.org> References: <20200529025824.32296-1-willy@infradead.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: A052818086CD8 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam01 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)" Use thp_size() instead of PAGE_SIZE, offset_in_thp() instead of offset_in_page() and bio_for_each_thp_segment_all(). Signed-off-by: Matthew Wilcox (Oracle) --- fs/iomap/buffered-io.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index 23eaaf1de906..bd70b7c1efd0 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -198,7 +198,7 @@ iomap_read_end_io(struct bio *bio) struct bio_vec *bvec; struct bvec_iter_all iter_all; =20 - bio_for_each_segment_all(bvec, bio, iter_all) + bio_for_each_thp_segment_all(bvec, bio, iter_all) iomap_read_page_end_io(bvec, error); bio_put(bio); } @@ -238,6 +238,16 @@ static inline bool iomap_block_needs_zeroing(struct = inode *inode, pos >=3D i_size_read(inode); } =20 +/* + * Estimate the number of vectors we need based on the current page size= ; + * if we're wrong we'll end up doing an overly large allocation or needi= ng + * to do a second allocation, neither of which is a big deal. + */ +static unsigned int iomap_nr_vecs(struct page *page, loff_t length) +{ + return (length + thp_size(page) - 1) >> page_shift(page); +} + static loff_t iomap_readpage_actor(struct inode *inode, loff_t pos, loff_t length, voi= d *data, struct iomap *iomap, struct iomap *srcmap) @@ -294,7 +304,7 @@ iomap_readpage_actor(struct inode *inode, loff_t pos,= loff_t length, void *data, if (!ctx->bio || !is_contig || bio_full(ctx->bio, plen)) { gfp_t gfp =3D mapping_gfp_constraint(page->mapping, GFP_KERNEL); gfp_t orig_gfp =3D gfp; - int nr_vecs =3D (length + PAGE_SIZE - 1) >> PAGE_SHIFT; + int nr_vecs =3D iomap_nr_vecs(page, length); =20 if (ctx->bio) submit_bio(ctx->bio); @@ -338,9 +348,9 @@ iomap_readpage(struct page *page, const struct iomap_= ops *ops) =20 trace_iomap_readpage(page->mapping->host, 1); =20 - for (poff =3D 0; poff < PAGE_SIZE; poff +=3D ret) { + for (poff =3D 0; poff < thp_size(page); poff +=3D ret) { ret =3D iomap_apply(inode, page_offset(page) + poff, - PAGE_SIZE - poff, 0, ops, &ctx, + thp_size(page) - poff, 0, ops, &ctx, iomap_readpage_actor); if (ret <=3D 0) { WARN_ON_ONCE(ret =3D=3D 0); @@ -374,7 +384,8 @@ iomap_readahead_actor(struct inode *inode, loff_t pos= , loff_t length, loff_t done, ret; =20 for (done =3D 0; done < length; done +=3D ret) { - if (ctx->cur_page && offset_in_page(pos + done) =3D=3D 0) { + if (ctx->cur_page && + offset_in_thp(ctx->cur_page, pos + done) =3D=3D 0) { if (!ctx->cur_page_in_bio) unlock_page(ctx->cur_page); put_page(ctx->cur_page); --=20 2.26.2