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 0B847C433DF for ; Wed, 14 Oct 2020 03:04:53 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 8092522227 for ; Wed, 14 Oct 2020 03:04: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="abukv0v1" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8092522227 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 724BC900004; Tue, 13 Oct 2020 23:04:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 69761940008; Tue, 13 Oct 2020 23:04:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3509E900003; Tue, 13 Oct 2020 23:04:05 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0199.hostedemail.com [216.40.44.199]) by kanga.kvack.org (Postfix) with ESMTP id C43426B0068 for ; Tue, 13 Oct 2020 23:04:04 -0400 (EDT) Received: from smtpin15.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 599F28249980 for ; Wed, 14 Oct 2020 03:04:04 +0000 (UTC) X-FDA: 77369036808.15.birth72_550e27627208 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin15.hostedemail.com (Postfix) with ESMTP id 34B3E1814B0C1 for ; Wed, 14 Oct 2020 03:04:04 +0000 (UTC) X-HE-Tag: birth72_550e27627208 X-Filterd-Recvd-Size: 7183 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf04.hostedemail.com (Postfix) with ESMTP for ; Wed, 14 Oct 2020 03:04:03 +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=78jQva7SN0URAIlYak97f7/G/y+lO4R9hQAD5LqWZfM=; b=abukv0v1g/Y5sNHv1T8SRp7RLT 2S5W1gZUZIfNydJ4TCWEIlrzKkaM/3O3UM23uKmiN2gir7ANyxX1ey2ra2cmfmfZgzkoiK/aNfLp+ icIlf5blq+ln6nx68CNgDpx/WHFyJ4HYIjaWn/H+V3SKzU/uO3cX0y6PqSi9S7wdlahpPmDfufqSl brOCMrF/BB2pNmj3zPHnqgxi4W+UX55+Pux6nJ1dDDV1RtWeS9vbxQG96lB9iim18PVZYVN09Om+d VFGJqwolfbxukF80XjIg8zUZRHnxz+/tzMFGTffHBFsW5HQAJCodJYccYZymlCQ3//N6FuIZntpV+ p8bkrL9Q==; Received: from willy by casper.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1kSX57-0005j3-G0; 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 09/14] iomap: Change iomap_write_begin calling convention Date: Wed, 14 Oct 2020 04:03:52 +0100 Message-Id: <20201014030357.21898-10-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: Pass (up to) the remaining length of the extent to iomap_write_begin() and have it return the number of bytes that will fit in the page. That lets us copy more bytes per call to iomap_write_begin() if the page cache has already allocated a THP (and will in future allow us to pass a hint to the page cache that it should try to allocate a larger page if there are none in the cache). Signed-off-by: Matthew Wilcox (Oracle) --- fs/iomap/buffered-io.c | 61 +++++++++++++++++++++++------------------- 1 file changed, 33 insertions(+), 28 deletions(-) diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index 4ef02afaedc5..397795db3ce5 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -616,14 +616,14 @@ iomap_read_page_sync(loff_t block_start, struct pag= e *page, unsigned poff, return submit_bio_wait(&bio); } =20 -static int -__iomap_write_begin(struct inode *inode, loff_t pos, unsigned len, int f= lags, - struct page *page, struct iomap *srcmap) +static ssize_t __iomap_write_begin(struct inode *inode, loff_t pos, + size_t len, int flags, struct page *page, struct iomap *srcmap) { 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; + size_t from =3D offset_in_thp(page, pos); + size_t to =3D from + len; size_t poff, plen; =20 if (PageUptodate(page)) @@ -658,12 +658,13 @@ __iomap_write_begin(struct inode *inode, loff_t pos= , unsigned len, int flags, return 0; } =20 -static int -iomap_write_begin(struct inode *inode, loff_t pos, unsigned len, unsigne= d flags, - struct page **pagep, struct iomap *iomap, struct iomap *srcmap) +static ssize_t iomap_write_begin(struct inode *inode, loff_t pos, loff_t= len, + unsigned flags, struct page **pagep, struct iomap *iomap, + struct iomap *srcmap) { const struct iomap_page_ops *page_ops =3D iomap->page_ops; struct page *page; + size_t offset; int status =3D 0; =20 BUG_ON(pos + len > iomap->offset + iomap->length); @@ -674,6 +675,8 @@ iomap_write_begin(struct inode *inode, loff_t pos, un= signed len, unsigned flags, return -EINTR; =20 if (page_ops && page_ops->page_prepare) { + if (len > UINT_MAX) + len =3D UINT_MAX; status =3D page_ops->page_prepare(inode, pos, len, iomap); if (status) return status; @@ -685,6 +688,10 @@ iomap_write_begin(struct inode *inode, loff_t pos, u= nsigned len, unsigned flags, status =3D -ENOMEM; goto out_no_page; } + page =3D thp_head(page); + offset =3D offset_in_thp(page, pos); + if (len > thp_size(page) - offset) + len =3D thp_size(page) - offset; =20 if (srcmap->type =3D=3D IOMAP_INLINE) iomap_read_inline_data(inode, page, srcmap); @@ -694,11 +701,11 @@ iomap_write_begin(struct inode *inode, loff_t pos, = unsigned len, unsigned flags, status =3D __iomap_write_begin(inode, pos, len, flags, page, srcmap); =20 - if (unlikely(status)) + if (status < 0) goto out_unlock; =20 *pagep =3D page; - return 0; + return len; =20 out_unlock: unlock_page(page); @@ -854,8 +861,10 @@ iomap_write_actor(struct inode *inode, loff_t pos, l= off_t length, void *data, =20 status =3D iomap_write_begin(inode, pos, bytes, 0, &page, iomap, srcmap); - if (unlikely(status)) + if (status < 0) break; + /* We may be partway through a THP */ + offset =3D offset_in_thp(page, pos); =20 if (mapping_writably_mapped(inode->i_mapping)) flush_dcache_page(page); @@ -915,7 +924,6 @@ static loff_t iomap_unshare_actor(struct inode *inode, loff_t pos, loff_t length, void= *data, struct iomap *iomap, struct iomap *srcmap) { - long status =3D 0; loff_t written =3D 0; =20 /* don't bother with blocks that are not shared to start with */ @@ -926,25 +934,24 @@ iomap_unshare_actor(struct inode *inode, loff_t pos= , loff_t length, void *data, return length; =20 do { - unsigned long offset =3D offset_in_page(pos); - unsigned long bytes =3D min_t(loff_t, PAGE_SIZE - offset, length); struct page *page; + ssize_t bytes; =20 - status =3D iomap_write_begin(inode, pos, bytes, + bytes =3D iomap_write_begin(inode, pos, length, IOMAP_WRITE_F_UNSHARE, &page, iomap, srcmap); - if (unlikely(status)) - return status; + if (bytes < 0) + return bytes; =20 - status =3D iomap_write_end(inode, pos, bytes, bytes, page, iomap, + bytes =3D iomap_write_end(inode, pos, bytes, bytes, page, iomap, srcmap); - if (WARN_ON_ONCE(status =3D=3D 0)) + if (WARN_ON_ONCE(bytes =3D=3D 0)) return -EIO; =20 cond_resched(); =20 - pos +=3D status; - written +=3D status; - length -=3D status; + pos +=3D bytes; + written +=3D bytes; + length -=3D bytes; =20 balance_dirty_pages_ratelimited(inode->i_mapping); } while (length); @@ -975,15 +982,13 @@ static s64 iomap_zero(struct inode *inode, loff_t p= os, u64 length, struct iomap *iomap, struct iomap *srcmap) { struct page *page; - int status; - unsigned offset =3D offset_in_page(pos); - unsigned bytes =3D min_t(u64, PAGE_SIZE - offset, length); + ssize_t bytes; =20 - status =3D iomap_write_begin(inode, pos, bytes, 0, &page, iomap, srcmap= ); - if (status) - return status; + bytes =3D iomap_write_begin(inode, pos, length, 0, &page, iomap, srcmap= ); + if (bytes < 0) + return bytes; =20 - zero_user(page, offset, bytes); + zero_user(page, offset_in_thp(page, pos), bytes); mark_page_accessed(page); =20 return iomap_write_end(inode, pos, bytes, bytes, page, iomap, srcmap); --=20 2.28.0