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.5 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,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 1AF8DC433E7 for ; Wed, 14 Oct 2020 03:05:19 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 36465221FF for ; Wed, 14 Oct 2020 03:04:14 +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="Nk0Ramlg" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 36465221FF 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 D50136B006E; Tue, 13 Oct 2020 23:04:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9DF5A900002; Tue, 13 Oct 2020 23:04:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6D69D6B0073; Tue, 13 Oct 2020 23:04:04 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0106.hostedemail.com [216.40.44.106]) by kanga.kvack.org (Postfix) with ESMTP id EFEA1900002 for ; Tue, 13 Oct 2020 23:04:03 -0400 (EDT) Received: from smtpin17.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 85938181AEF00 for ; Wed, 14 Oct 2020 03:04:03 +0000 (UTC) X-FDA: 77369036766.17.iron22_140ef1e27208 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin17.hostedemail.com (Postfix) with ESMTP id 6B2CC180D0180 for ; Wed, 14 Oct 2020 03:04:03 +0000 (UTC) X-HE-Tag: iron22_140ef1e27208 X-Filterd-Recvd-Size: 3477 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf20.hostedemail.com (Postfix) with ESMTP for ; Wed, 14 Oct 2020 03:04:02 +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=rdRSJzenCaIYGt1c8MjAxB4wKLLuGR+cw6SImpK8bI0=; b=Nk0RamlgvFMF3mfimqDPDv38YJ k1gSyEeWe3JCYqS7T7athwnlLgcyd0P2Fb9Po755SB01tnrMWAFTijZxeBzd4TW/PDxKxFit+H5ID hqjAdiDH71a2YRdx9q965OeHOYfhzmY/Hz1sjf3qcozLR9fNew4FybrFICoJig4+8JKH8jBbolkQI CXmKrCX7BrT/LwIZZ6Z4UD5/8g9CeVXm7g2FChVcECTAGu5lLACZ52E+Y/nnTXSm0/dVrXDbBL1bA HDCcjAK9gkkfF0b6I7L2QD+TPiSVl6U1Mgm0ncYdO3NQC82J2km+nJQjis4xaFJkRykAbVlPnOtX8 4nPVlDfw==; Received: from willy by casper.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1kSX57-0005iw-6i; Wed, 14 Oct 2020 03:04:01 +0000 From: "Matthew Wilcox (Oracle)" To: linux-fsdevel@vger.kernel.org, linux-xfs@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org Subject: [PATCH 08/14] iomap: Support THPs in readahead Date: Wed, 14 Oct 2020 04:03:51 +0100 Message-Id: <20201014030357.21898-9-willy@infradead.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20201014030357.21898-1-willy@infradead.org> References: <20201014030357.21898-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: Use offset_in_thp() instead of offset_in_page() and change how we estimat= e the number of bio_vecs we're going to need. Signed-off-by: Matthew Wilcox (Oracle) --- fs/iomap/buffered-io.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index ca305fbaf811..4ef02afaedc5 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -264,6 +264,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) @@ -309,7 +319,7 @@ iomap_readpage_actor(struct inode *inode, loff_t pos,= loff_t length, void *data, if (!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); @@ -424,7 +434,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