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=-13.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY autolearn=unavailable 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 9AEC9C636CA for ; Thu, 15 Jul 2021 21:51:50 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 3A864613D4 for ; Thu, 15 Jul 2021 21:51:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3A864613D4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 9368D8D00F5; Thu, 15 Jul 2021 17:51:50 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 90D948D00EC; Thu, 15 Jul 2021 17:51:50 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7D6BD8D00F5; Thu, 15 Jul 2021 17:51:50 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0062.hostedemail.com [216.40.44.62]) by kanga.kvack.org (Postfix) with ESMTP id 5C70E8D00EC for ; Thu, 15 Jul 2021 17:51:50 -0400 (EDT) Received: from smtpin12.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 3C86A24897 for ; Thu, 15 Jul 2021 21:51:49 +0000 (UTC) X-FDA: 78366169938.12.9D8772A Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf28.hostedemail.com (Postfix) with ESMTP id D27959009F13 for ; Thu, 15 Jul 2021 21:51:46 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id ED588613D4; Thu, 15 Jul 2021 21:51:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1626385906; bh=6Oj1YIskroeIo98doAzAyq0ZaBG4ZNuSkw6bLyFZkuQ=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=K7//o4Kf3ebr4owF1Nuu5WrcpljB7Mk/gtKqc6RYzhIggMkoNhgGM90HMtaeb73It KYwLev45eDH5guJs20tuO61bt1ir27w3N6Hid9Pv8IjHnbqTftfn5s0HvI5c4LKTpr fRjto+/OAJoi0bza+NGyTmqK5nwCuiiQx7xYGkKl8+pTsWWAwNAqAbeaJDtrCVT+II MaEWXeKG9BW2Fs3PtZPXp1J3ATnh7qzML8lbX7zyHj1FA7pjivTewO4aVpZwBN/gGN 3/n82iP9d5eBu0eYPzkJhZTBYW28YcFqdn33DdLk1TLIh30Q4L06GbXcPgYinm8jOV DCkoaQ+9BTiaA== Date: Thu, 15 Jul 2021 14:51:45 -0700 From: "Darrick J. Wong" To: "Matthew Wilcox (Oracle)" Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org Subject: Re: [PATCH v14 103/138] iomap: Convert iomap_read_inline_data to take a folio Message-ID: <20210715215145.GN22357@magnolia> References: <20210715033704.692967-1-willy@infradead.org> <20210715033704.692967-104-willy@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210715033704.692967-104-willy@infradead.org> Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="K7//o4Kf"; spf=pass (imf28.hostedemail.com: domain of djwong@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=djwong@kernel.org; dmarc=pass (policy=none) header.from=kernel.org X-Rspamd-Server: rspam05 X-Stat-Signature: 5pnig9zpu6nbghnaig678jckfn1g79u4 X-Rspamd-Queue-Id: D27959009F13 X-HE-Tag: 1626385906-276273 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: On Thu, Jul 15, 2021 at 04:36:29AM +0100, Matthew Wilcox (Oracle) wrote: > Inline data is restricted to being less than a page in size, so we $deity I hope so. > don't need to handle multi-page folios. > > Signed-off-by: Matthew Wilcox (Oracle) Reviewed-by: Darrick J. Wong --D > --- > fs/iomap/buffered-io.c | 18 +++++++++--------- > 1 file changed, 9 insertions(+), 9 deletions(-) > > diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c > index 5e0aa23d4693..c616ef1feb21 100644 > --- a/fs/iomap/buffered-io.c > +++ b/fs/iomap/buffered-io.c > @@ -194,24 +194,24 @@ struct iomap_readpage_ctx { > struct readahead_control *rac; > }; > > -static void > -iomap_read_inline_data(struct inode *inode, struct page *page, > +static void iomap_read_inline_data(struct inode *inode, struct folio *folio, > struct iomap *iomap) > { > size_t size = i_size_read(inode); > void *addr; > > - if (PageUptodate(page)) > + if (folio_test_uptodate(folio)) > return; > > - BUG_ON(page->index); > + BUG_ON(folio->index); > + BUG_ON(folio_multi(folio)); > BUG_ON(size > PAGE_SIZE - offset_in_page(iomap->inline_data)); > > - addr = kmap_atomic(page); > + addr = kmap_local_folio(folio, 0); > memcpy(addr, iomap->inline_data, size); > memset(addr + size, 0, PAGE_SIZE - size); > - kunmap_atomic(addr); > - SetPageUptodate(page); > + kunmap_local(addr); > + folio_mark_uptodate(folio); > } > > static inline bool iomap_block_needs_zeroing(struct inode *inode, > @@ -236,7 +236,7 @@ iomap_readpage_actor(struct inode *inode, loff_t pos, loff_t length, void *data, > > if (iomap->type == IOMAP_INLINE) { > WARN_ON_ONCE(pos); > - iomap_read_inline_data(inode, &folio->page, iomap); > + iomap_read_inline_data(inode, folio, iomap); > return PAGE_SIZE; > } > > @@ -614,7 +614,7 @@ static int iomap_write_begin(struct inode *inode, loff_t pos, size_t len, > > page = folio_file_page(folio, pos >> PAGE_SHIFT); > if (srcmap->type == IOMAP_INLINE) > - iomap_read_inline_data(inode, page, srcmap); > + iomap_read_inline_data(inode, folio, srcmap); > else if (iomap->flags & IOMAP_F_BUFFER_HEAD) > status = __block_write_begin_int(page, pos, len, NULL, srcmap); > else > -- > 2.30.2 >