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=-16.7 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 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 050D0C636CA for ; Thu, 15 Jul 2021 21:55:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DE7EB60E0C for ; Thu, 15 Jul 2021 21:55:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231529AbhGOV6H (ORCPT ); Thu, 15 Jul 2021 17:58:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:46920 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229776AbhGOV6F (ORCPT ); Thu, 15 Jul 2021 17:58:05 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id A836260240; Thu, 15 Jul 2021 21:55:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1626386111; bh=IZhXG0pFZmYaSBld/7CAwZc8B7u7L40FuYffUY/p3/c=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=W3DFgeuTWh5VVOoNJ0gbXPTbjBbFT/EgbckCbMmG8A+gngFuTlO0l2+0gBjrmOs77 q5nBihgxs2PiXv2qpSoCEg+GtXnsXMUtzyp7sRBrgm/MGceXZ5P0ova+s5NY+SOrXd herhQ/ELYwITCcyT7XTabXrmTQIpYULgs3KXhumjLFjJPIkzwr94t/rxleAEshmt/R 749cFi2H7R4ku2B5KGpUzhtRpy0rGSA5aRQIfbqCoBs95X0MPtrZ5bIVCxs50uJM+0 kBJ+K5ZMF1QNRA0zMjKMPf6uTPlDb1QBa+xetSgUrhMdhov9AjBIJKubIUyVFCdR8x NCp0l/GTTpiSw== Date: Thu, 15 Jul 2021 14:55:11 -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 104/138] iomap: Convert iomap_write_end_inline to take a folio Message-ID: <20210715215511.GO22357@magnolia> References: <20210715033704.692967-1-willy@infradead.org> <20210715033704.692967-105-willy@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210715033704.692967-105-willy@infradead.org> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Jul 15, 2021 at 04:36:30AM +0100, Matthew Wilcox (Oracle) wrote: > Inline data only occupies a single page, but using a folio means that > we don't need to call compound_head() in PageUptodate(). > > Signed-off-by: Matthew Wilcox (Oracle) /me isn't the expert on inlinedata, but this looks reasonable to me... Reviewed-by: Darrick J. Wong --D > --- > fs/iomap/buffered-io.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c > index c616ef1feb21..ac33f19325ab 100644 > --- a/fs/iomap/buffered-io.c > +++ b/fs/iomap/buffered-io.c > @@ -662,18 +662,18 @@ static size_t __iomap_write_end(struct inode *inode, loff_t pos, size_t len, > return copied; > } > > -static size_t iomap_write_end_inline(struct inode *inode, struct page *page, > +static size_t iomap_write_end_inline(struct inode *inode, struct folio *folio, > struct iomap *iomap, loff_t pos, size_t copied) > { > void *addr; > > - WARN_ON_ONCE(!PageUptodate(page)); > + WARN_ON_ONCE(!folio_test_uptodate(folio)); > BUG_ON(pos + copied > PAGE_SIZE - offset_in_page(iomap->inline_data)); > > - flush_dcache_page(page); > - addr = kmap_atomic(page); > + flush_dcache_folio(folio); > + addr = kmap_local_folio(folio, 0); > memcpy(iomap->inline_data + pos, addr + pos, copied); > - kunmap_atomic(addr); > + kunmap_local(addr); > > mark_inode_dirty(inode); > return copied; > @@ -690,7 +690,7 @@ static size_t iomap_write_end(struct inode *inode, loff_t pos, size_t len, > size_t ret; > > if (srcmap->type == IOMAP_INLINE) { > - ret = iomap_write_end_inline(inode, page, iomap, pos, copied); > + ret = iomap_write_end_inline(inode, folio, iomap, pos, copied); > } else if (srcmap->flags & IOMAP_F_BUFFER_HEAD) { > ret = block_write_end(NULL, inode->i_mapping, pos, len, copied, > page, NULL); > -- > 2.30.2 >