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 66E9BC433DF for ; Mon, 24 Aug 2020 15:17:24 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 2964D2074D for ; Mon, 24 Aug 2020 15:17:24 +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="KNITFqto" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2964D2074D 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 C78D06B0024; Mon, 24 Aug 2020 11:17:23 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C276B6B0025; Mon, 24 Aug 2020 11:17:23 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AF2696B0026; Mon, 24 Aug 2020 11:17:23 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0163.hostedemail.com [216.40.44.163]) by kanga.kvack.org (Postfix) with ESMTP id 9924A6B0024 for ; Mon, 24 Aug 2020 11:17:23 -0400 (EDT) Received: from smtpin21.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 317F1180AD80F for ; Mon, 24 Aug 2020 15:17:23 +0000 (UTC) X-FDA: 77185815966.21.goose18_43181a227054 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin21.hostedemail.com (Postfix) with ESMTP id 4883B180442ED for ; Mon, 24 Aug 2020 15:17:11 +0000 (UTC) X-HE-Tag: goose18_43181a227054 X-Filterd-Recvd-Size: 4348 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf29.hostedemail.com (Postfix) with ESMTP for ; Mon, 24 Aug 2020 15:17:10 +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=6v6sxL9n7n7WqGQ7gCiCB5GZIc0luvdHyz2bcr1RQfk=; b=KNITFqto3qR1lC83tciVGERcJ8 Ud8xyxeHgC8obkoXv0ujny3E3xheErjrM6iaM89jBUF3PJXghzWhI+jRS/+KPc37Typi8yLronrIR vnCvSo6qlkYa2TS6b09bJ//ByhEbWmfKWhZZMvz/0Wuto0d92ZweL1SUc3yooHxGDj0VA/k8tN1Bs 3KRjTrvzG40z2Yil+hka0gIS/iGLx+v2prWrtqZri2knxemrCNJKqA0LqeHRmgB9wb+TCHDZyW5av IX+e2b1Iw1BSbfYWdmHFv0w+S4dLsXfyb7XuvkP/B5wHLIwx9RyYjWDewsNFC5gt1sMN0BuR63gMs 0yIcBFRA==; Received: from willy by casper.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1kAEDX-0004D6-Sv; 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 07/11] iomap: Support THPs in read paths Date: Mon, 24 Aug 2020 16:16:56 +0100 Message-Id: <20200824151700.16097-8-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: 4883B180442ED X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam04 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: 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 9ea162617398..d14de8886d5c 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -187,7 +187,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); } @@ -227,6 +227,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) @@ -280,7 +290,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); @@ -324,9 +334,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); @@ -360,7 +370,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.28.0