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,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 7FFBFC2BA83 for ; Wed, 12 Feb 2020 04:39:47 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 3BD66206ED for ; Wed, 12 Feb 2020 04:39:47 +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="JmBotVia" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3BD66206ED 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 103B26B03CA; Tue, 11 Feb 2020 23:39:46 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0B67D6B03CB; Tue, 11 Feb 2020 23:39:46 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E72A56B03CC; Tue, 11 Feb 2020 23:39:45 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0125.hostedemail.com [216.40.44.125]) by kanga.kvack.org (Postfix) with ESMTP id CFCDC6B03CA for ; Tue, 11 Feb 2020 23:39:45 -0500 (EST) Received: from smtpin26.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 56F2F180AD804 for ; Wed, 12 Feb 2020 04:39:45 +0000 (UTC) X-FDA: 76480221930.26.rings33_38027b91ddd5c X-HE-Tag: rings33_38027b91ddd5c X-Filterd-Recvd-Size: 7192 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf34.hostedemail.com (Postfix) with ESMTP for ; Wed, 12 Feb 2020 04:39:44 +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=Akb0WAOF7QXNlcGV5Jo3slrj0DWeTKrSDHLBEAFZyQo=; b=JmBotViaw17Fpv0rX8r920ud8v gvwB06iH1yebAwT05IgWsF35N8L/z3MfTRwcbA/+edkCt5PDtRRvyJKgX1Zs1xyjKXrgoQ3/F7wtm ClUFOlYoly8K5XVu4kihVGcq6CUd7NvtQILRNTP6QsiUvvynXlJ46xVlgeQhzcjY1fuBtH/tDm9z5 Jl6laf1T4z3RGi8SXvH2Sq6PNhsQb4w+o53oYwsZf2z52oko7ArM0zDh/dYlKzgFBxaucQ8gU1YWs awYt2DS8lkSJQcODtOu89pHporVkbPNTgIWslA25H3eCLiT3GdPBpKVuDxv/4gk0//WUuxD/wAxNl gtvYFBPw==; Received: from willy by bombadil.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1j1jU7-0006oK-65; Wed, 12 Feb 2020 04:18:47 +0000 From: Matthew Wilcox To: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , linux-kernel@vger.kernel.org Subject: [PATCH v2 17/25] iomap: Support large pages in write paths Date: Tue, 11 Feb 2020 20:18:37 -0800 Message-Id: <20200212041845.25879-18-willy@infradead.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200212041845.25879-1-willy@infradead.org> References: <20200212041845.25879-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)" Use thp_size() instead of PAGE_SIZE, offset_in_this_page(). Also simplify the logic in iomap_do_writepage() for determining end of file. Signed-off-by: Matthew Wilcox (Oracle) --- fs/iomap/buffered-io.c | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index 68f8903ecd6d..af1f56408fcd 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -445,7 +445,7 @@ iomap_is_partially_uptodate(struct page *page, unsign= ed long from, unsigned i; =20 /* Limit range to one page */ - len =3D min_t(unsigned, PAGE_SIZE - from, count); + len =3D min_t(unsigned, thp_size(page) - from, count); =20 /* First and last blocks in range within page */ first =3D from >> inode->i_blkbits; @@ -488,7 +488,7 @@ iomap_invalidatepage(struct page *page, unsigned int = offset, unsigned int len) * If we are invalidating the entire page, clear the dirty state from i= t * and release it to avoid unnecessary buildup of the LRU. */ - if (offset =3D=3D 0 && len =3D=3D PAGE_SIZE) { + if (offset =3D=3D 0 && len =3D=3D thp_size(page)) { WARN_ON_ONCE(PageWriteback(page)); cancel_dirty_page(page); iomap_page_release(page); @@ -564,7 +564,9 @@ __iomap_write_begin(struct inode *inode, loff_t pos, = unsigned len, int flags, 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, poff, plen; + unsigned from =3D offset_in_this_page(page, pos); + unsigned to =3D from + len; + unsigned poff, plen; int status; =20 if (PageUptodate(page)) @@ -696,7 +698,7 @@ __iomap_write_end(struct inode *inode, loff_t pos, un= signed len, */ if (unlikely(copied < len && !PageUptodate(page))) return 0; - iomap_set_range_uptodate(page, offset_in_page(pos), len); + iomap_set_range_uptodate(page, offset_in_this_page(page, pos), len); iomap_set_page_dirty(page); return copied; } @@ -771,6 +773,10 @@ iomap_write_actor(struct inode *inode, loff_t pos, l= off_t length, void *data, unsigned long bytes; /* Bytes to write to page */ size_t copied; /* Bytes copied from user */ =20 + /* + * XXX: We don't know what size page we'll find in the + * page cache, so only copy up to a regular page boundary. + */ offset =3D offset_in_page(pos); bytes =3D min_t(unsigned long, PAGE_SIZE - offset, iov_iter_count(i)); @@ -1320,7 +1326,7 @@ iomap_add_to_ioend(struct inode *inode, loff_t offs= et, struct page *page, { sector_t sector =3D iomap_sector(&wpc->iomap, offset); unsigned len =3D i_blocksize(inode); - unsigned poff =3D offset & (PAGE_SIZE - 1); + unsigned poff =3D offset & (thp_size(page) - 1); bool merged, same_page =3D false; =20 if (!wpc->ioend || !iomap_can_add_to_ioend(wpc, offset, sector)) { @@ -1372,9 +1378,10 @@ iomap_writepage_map(struct iomap_writepage_ctx *wp= c, unsigned len =3D i_blocksize(inode); u64 file_offset; /* file offset of page */ int error =3D 0, count =3D 0, i; + int nr_blocks =3D i_blocks_per_page(inode, page); LIST_HEAD(submit_list); =20 - WARN_ON_ONCE(i_blocks_per_page(inode, page) > 1 && !iop); + WARN_ON_ONCE(nr_blocks > 1 && !iop); WARN_ON_ONCE(iop && atomic_read(&iop->write_count) !=3D 0); =20 /* @@ -1382,8 +1389,8 @@ iomap_writepage_map(struct iomap_writepage_ctx *wpc= , * end of the current map or find the current map invalid, grab a new * one. */ - for (i =3D 0, file_offset =3D page_offset(page); - i < (PAGE_SIZE >> inode->i_blkbits) && file_offset < end_offset; + for (i =3D 0, file_offset =3D file_offset_of_page(page); + i < nr_blocks && file_offset < end_offset; i++, file_offset +=3D len) { if (iop && !test_bit(i, iop->uptodate)) continue; @@ -1477,7 +1484,6 @@ iomap_do_writepage(struct page *page, struct writeb= ack_control *wbc, void *data) { struct iomap_writepage_ctx *wpc =3D data; struct inode *inode =3D page->mapping->host; - pgoff_t end_index; u64 end_offset; loff_t offset; =20 @@ -1518,10 +1524,9 @@ iomap_do_writepage(struct page *page, struct write= back_control *wbc, void *data) * ---------------------------------^------------------| */ offset =3D i_size_read(inode); - end_index =3D offset >> PAGE_SHIFT; - if (page->index < end_index) - end_offset =3D (loff_t)(page->index + 1) << PAGE_SHIFT; - else { + end_offset =3D file_offset_of_next_page(page); + + if (end_offset > offset) { /* * Check whether the page to write out is beyond or straddles * i_size or not. @@ -1533,7 +1538,8 @@ iomap_do_writepage(struct page *page, struct writeb= ack_control *wbc, void *data) * | | Straddles | * ---------------------------------^-----------|--------| */ - unsigned offset_into_page =3D offset & (PAGE_SIZE - 1); + unsigned offset_into_page =3D offset_in_this_page(page, offset); + pgoff_t end_index =3D offset >> PAGE_SHIFT; =20 /* * Skip the page if it is fully outside i_size, e.g. due to a @@ -1564,7 +1570,7 @@ iomap_do_writepage(struct page *page, struct writeb= ack_control *wbc, void *data) * memory is zeroed when mapped, and writes to that region are * not written out to the file." */ - zero_user_segment(page, offset_into_page, PAGE_SIZE); + zero_user_segment(page, offset_into_page, thp_size(page)); =20 /* Adjust the end_offset to the end of file */ end_offset =3D offset; --=20 2.25.0