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 Received: from aib29ajc255.phx1.oracleemaildelivery.com (aib29ajc255.phx1.oracleemaildelivery.com [192.29.103.255]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5EB19C43334 for ; Wed, 8 Jun 2022 15:23:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=oss-phx-1109; d=oss.oracle.com; h=Date:To:From:Subject:Message-Id:MIME-Version:Sender; bh=e4ZtZVL2KA4+YKDU3gwSukBH4pWaHmGX4gs6TiuAA8c=; b=SK0PN2gl03WEpcSIUfzccjcPU0XtxCyjjrDAtS0jGik7VCwUlNoJRc8kuOLt+I5sma2tu5YMIR5x CwFIdDhUgO0e1gUPvXhuRIy5QjGsivhWyAdua/TLCMAi3g1qJIjn4g6gOEwJxT4zZNUcJlsnGqh4 7p1cTbWNX9MoVlD8vaSl7zWERxXiJNggtRep0jEdSWIYwyS4V3IeRhAnyQF+T3kpzN2lmwKsm3aG 8lIm9a20MBuklciLfJR2/BbEn9hqbpor5T4yNsUsI78GltCJ1OMSaEQjqEvbAw97/QD6oU9RDexF pn6hfIR5LyGQoOJCQw7qmG/6dxX1wDSLUDEKCw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=prod-phx-20191217; d=phx1.rp.oracleemaildelivery.com; h=Date:To:From:Subject:Message-Id:MIME-Version:Sender; bh=e4ZtZVL2KA4+YKDU3gwSukBH4pWaHmGX4gs6TiuAA8c=; b=ri6248m3aLDHoiRBDq7c9hApCDFdEZ8M7kQAEfIEpuMAy6KGrLFN2Pvub95W7MnTf8nNvmljGghF 4nyhC/5k2iInqp/5Bb9WxZToiICrRpVv6qXUPIjy8nM6q4tcZYIVjf9VhNeXGCWTz2obS8L5rGYF ZKqCuL5ucafkE0jGGyZlg8tBTOti/9olOH+FI7OEZiGdof2yjKvONCHjF1GTC6sVmUTAB/fxtgbl Ans4ycqn4iJfTaOA0rUO/Uqo8UYA/66RZV4L3RYlAAw4/7Z1TEZ9sgZPwQrEFzZDd8R/MGwXTswm JcB+CVJLKeX3PAXk5SU8LPars8E+1essLpS5kg== Received: by omta-ad3-fd3-302-us-phoenix-1.omtaad3.vcndpphx.oraclevcn.com (Oracle Communications Messaging Server 8.1.0.1.20220517 64bit (built May 17 2022)) with ESMTPS id <0RD600BUC02N6T10@omta-ad3-fd3-302-us-phoenix-1.omtaad3.vcndpphx.oraclevcn.com> for ocfs2-devel@archiver.kernel.org; Wed, 08 Jun 2022 15:23:11 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1654701776; bh=SgYW51aN3OeqjU6+EIk8CHclo6M6cc2uvUEPUetN9AY=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=p7z+0eY7ntbEVxA2gI3ZDLWM0mQwSUHKo0XnCgV0chmlHkz2P/vCANEjmqGsAdwGb EoSpjHFAP8n9bDzPCEYaP1TdvsHfTZs7ZO2YCb1PhaDgWMEewk0XhfG2S7DJV8N6Zq 6BFFHYmv/C0EtAhNH8ykQ23VCX1LuObfUCtnf/2zRNky8BKsi3YeFoHUI0AgtoZtnU /s5ocIdJDBgJaNkjIJoR2ZyE63FMuzKBldotmlU9Pd6NrsbPX3n/4O3QNinmpI+xhS eF/3KfLyFpQXF2Gi5KoPPct1DqMaQ4m32g9c7heF/cNtqM6cQYwdFJN5c8DpxFzwH1 PF1h9+AG7Xw/A== Date: Wed, 8 Jun 2022 08:22:56 -0700 To: "Matthew Wilcox (Oracle)" Message-id: References: <20220608150249.3033815-1-willy@infradead.org> <20220608150249.3033815-12-willy@infradead.org> MIME-version: 1.0 Content-disposition: inline In-reply-to: <20220608150249.3033815-12-willy@infradead.org> X-Source-IP: 145.40.68.75 X-Proofpoint-Virus-Version: vendor=nai engine=6400 definitions=10372 signatures=594849 Cc: linux-aio@kvack.org, linux-nfs@vger.kernel.org, cluster-devel@redhat.com, linux-ntfs-dev@lists.sourceforge.net, linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-block@vger.kernel.org, linux-mm@kvack.org, linux-mtd@lists.infradead.org, ocfs2-devel@oss.oracle.com, linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, virtualization@lists.linux-foundation.org, linux-xfs@vger.kernel.org, linux-btrfs@vger.kernel.org Subject: Re: [Ocfs2-devel] [PATCH v2 11/19] mm/migrate: Add filemap_migrate_folio() X-BeenThere: ocfs2-devel@oss.oracle.com X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: "Darrick J. Wong via Ocfs2-devel" Reply-to: "Darrick J. Wong" Content-type: text/plain; charset="us-ascii" Content-transfer-encoding: 7bit Errors-to: ocfs2-devel-bounces@oss.oracle.com X-ServerName: ams.source.kernel.org X-Proofpoint-SPF-Result: pass X-Proofpoint-SPF-Record: v=spf1 include:_spf.kernel.org ~all X-Proofpoint-Spam-Reason: safe X-Spam: OrgSafeList X-SpamRule: orgsafelist X-Proofpoint-GUID: beSsk4C_eXnxSUqX-bHmHg4VCy13fvib X-Proofpoint-ORIG-GUID: beSsk4C_eXnxSUqX-bHmHg4VCy13fvib Reporting-Meta: AAHJO9aEsJOTJwAsJu37n/pbcHb37DX0hLGjbNmU78lmr8/QNzH19izNQ2HZfEz0 rKzfV6cnkaBWzlDfdb7VlL0VlmaS56suk5QiIYmriGlrMjnKnt4T3Z1uCQxQILIJ JehRcL0bPhb4bkqSeos/7OZKdaS4xV07EQGtOizmcGBYdJ76odyeIAp3a2yeLWnI A6ODR8jJpCz25CL+exPLDzTEZxpCO6hdqIHEn7h4wgMNwy6I00zwWiRfbS7bpyaS Ih3m73g58Xd/UmlFUCuXDlhwqL1i46XJY0D/dmTY/+nSRap72hyuq52XORzOdx00 d0bbi5MolsbOrR97ksPWexz3TYSPK+It6KaLagS95LAYhkWO0ikguusOVZaGAgzF vfsTYGXkZWj0dIpg2wj0YCKgUU6vRwDNAqWMOV4MVXPrTchV0sw4BfGRyOsbVwwB 7/qVqVMTzOabkGHdIkJgKPFMAx8xGR3VslzbHO9H+wJ2wS6iHvs4G5JjUMoRptc6 u9w0fAqLzK9OcV5/jakzUxFMq7rOIUzu/PwnhLquhHDX On Wed, Jun 08, 2022 at 04:02:41PM +0100, Matthew Wilcox (Oracle) wrote: > There is nothing iomap-specific about iomap_migratepage(), and it fits > a pattern used by several other filesystems, so move it to mm/migrate.c, > convert it to be filemap_migrate_folio() and convert the iomap filesystems > to use it. > > Signed-off-by: Matthew Wilcox (Oracle) > Reviewed-by: Christoph Hellwig LGTM Reviewed-by: Darrick J. Wong --D > --- > fs/gfs2/aops.c | 2 +- > fs/iomap/buffered-io.c | 25 ------------------------- > fs/xfs/xfs_aops.c | 2 +- > fs/zonefs/super.c | 2 +- > include/linux/iomap.h | 6 ------ > include/linux/pagemap.h | 6 ++++++ > mm/migrate.c | 20 ++++++++++++++++++++ > 7 files changed, 29 insertions(+), 34 deletions(-) > > diff --git a/fs/gfs2/aops.c b/fs/gfs2/aops.c > index 106e90a36583..57ff883d432c 100644 > --- a/fs/gfs2/aops.c > +++ b/fs/gfs2/aops.c > @@ -774,7 +774,7 @@ static const struct address_space_operations gfs2_aops = { > .invalidate_folio = iomap_invalidate_folio, > .bmap = gfs2_bmap, > .direct_IO = noop_direct_IO, > - .migratepage = iomap_migrate_page, > + .migrate_folio = filemap_migrate_folio, > .is_partially_uptodate = iomap_is_partially_uptodate, > .error_remove_page = generic_error_remove_page, > }; > diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c > index 66278a14bfa7..5a91aa1db945 100644 > --- a/fs/iomap/buffered-io.c > +++ b/fs/iomap/buffered-io.c > @@ -489,31 +489,6 @@ void iomap_invalidate_folio(struct folio *folio, size_t offset, size_t len) > } > EXPORT_SYMBOL_GPL(iomap_invalidate_folio); > > -#ifdef CONFIG_MIGRATION > -int > -iomap_migrate_page(struct address_space *mapping, struct page *newpage, > - struct page *page, enum migrate_mode mode) > -{ > - struct folio *folio = page_folio(page); > - struct folio *newfolio = page_folio(newpage); > - int ret; > - > - ret = folio_migrate_mapping(mapping, newfolio, folio, 0); > - if (ret != MIGRATEPAGE_SUCCESS) > - return ret; > - > - if (folio_test_private(folio)) > - folio_attach_private(newfolio, folio_detach_private(folio)); > - > - if (mode != MIGRATE_SYNC_NO_COPY) > - folio_migrate_copy(newfolio, folio); > - else > - folio_migrate_flags(newfolio, folio); > - return MIGRATEPAGE_SUCCESS; > -} > -EXPORT_SYMBOL_GPL(iomap_migrate_page); > -#endif /* CONFIG_MIGRATION */ > - > static void > iomap_write_failed(struct inode *inode, loff_t pos, unsigned len) > { > diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c > index 8ec38b25187b..5d1a995b15f8 100644 > --- a/fs/xfs/xfs_aops.c > +++ b/fs/xfs/xfs_aops.c > @@ -570,7 +570,7 @@ const struct address_space_operations xfs_address_space_operations = { > .invalidate_folio = iomap_invalidate_folio, > .bmap = xfs_vm_bmap, > .direct_IO = noop_direct_IO, > - .migratepage = iomap_migrate_page, > + .migrate_folio = filemap_migrate_folio, > .is_partially_uptodate = iomap_is_partially_uptodate, > .error_remove_page = generic_error_remove_page, > .swap_activate = xfs_iomap_swapfile_activate, > diff --git a/fs/zonefs/super.c b/fs/zonefs/super.c > index bcb21aea990a..d4c3f28f34ee 100644 > --- a/fs/zonefs/super.c > +++ b/fs/zonefs/super.c > @@ -237,7 +237,7 @@ static const struct address_space_operations zonefs_file_aops = { > .dirty_folio = filemap_dirty_folio, > .release_folio = iomap_release_folio, > .invalidate_folio = iomap_invalidate_folio, > - .migratepage = iomap_migrate_page, > + .migrate_folio = filemap_migrate_folio, > .is_partially_uptodate = iomap_is_partially_uptodate, > .error_remove_page = generic_error_remove_page, > .direct_IO = noop_direct_IO, > diff --git a/include/linux/iomap.h b/include/linux/iomap.h > index e552097c67e0..758a1125e72f 100644 > --- a/include/linux/iomap.h > +++ b/include/linux/iomap.h > @@ -231,12 +231,6 @@ void iomap_readahead(struct readahead_control *, const struct iomap_ops *ops); > bool iomap_is_partially_uptodate(struct folio *, size_t from, size_t count); > bool iomap_release_folio(struct folio *folio, gfp_t gfp_flags); > void iomap_invalidate_folio(struct folio *folio, size_t offset, size_t len); > -#ifdef CONFIG_MIGRATION > -int iomap_migrate_page(struct address_space *mapping, struct page *newpage, > - struct page *page, enum migrate_mode mode); > -#else > -#define iomap_migrate_page NULL > -#endif > int iomap_file_unshare(struct inode *inode, loff_t pos, loff_t len, > const struct iomap_ops *ops); > int iomap_zero_range(struct inode *inode, loff_t pos, loff_t len, > diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h > index 1caccb9f99aa..2a67c0ad7348 100644 > --- a/include/linux/pagemap.h > +++ b/include/linux/pagemap.h > @@ -1078,6 +1078,12 @@ static inline int __must_check write_one_page(struct page *page) > int __set_page_dirty_nobuffers(struct page *page); > bool noop_dirty_folio(struct address_space *mapping, struct folio *folio); > > +#ifdef CONFIG_MIGRATION > +int filemap_migrate_folio(struct address_space *mapping, struct folio *dst, > + struct folio *src, enum migrate_mode mode); > +#else > +#define filemap_migrate_folio NULL > +#endif > void page_endio(struct page *page, bool is_write, int err); > > void folio_end_private_2(struct folio *folio); > diff --git a/mm/migrate.c b/mm/migrate.c > index 785e32d0cf1b..4d8115ca93bb 100644 > --- a/mm/migrate.c > +++ b/mm/migrate.c > @@ -784,6 +784,26 @@ int buffer_migrate_folio_norefs(struct address_space *mapping, > } > #endif > > +int filemap_migrate_folio(struct address_space *mapping, > + struct folio *dst, struct folio *src, enum migrate_mode mode) > +{ > + int ret; > + > + ret = folio_migrate_mapping(mapping, dst, src, 0); > + if (ret != MIGRATEPAGE_SUCCESS) > + return ret; > + > + if (folio_get_private(src)) > + folio_attach_private(dst, folio_detach_private(src)); > + > + if (mode != MIGRATE_SYNC_NO_COPY) > + folio_migrate_copy(dst, src); > + else > + folio_migrate_flags(dst, src); > + return MIGRATEPAGE_SUCCESS; > +} > +EXPORT_SYMBOL_GPL(filemap_migrate_folio); > + > /* > * Writeback a folio to clean the dirty state > */ > -- > 2.35.1 > _______________________________________________ Ocfs2-devel mailing list Ocfs2-devel@oss.oracle.com https://oss.oracle.com/mailman/listinfo/ocfs2-devel 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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 500D9C433EF for ; Wed, 8 Jun 2022 15:26:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244388AbiFHP0n (ORCPT ); Wed, 8 Jun 2022 11:26:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43964 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244751AbiFHP0Q (ORCPT ); Wed, 8 Jun 2022 11:26:16 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1DE68142AB5; Wed, 8 Jun 2022 08:22:57 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 37F0360AE5; Wed, 8 Jun 2022 15:22:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8D62AC34116; Wed, 8 Jun 2022 15:22:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1654701776; bh=SgYW51aN3OeqjU6+EIk8CHclo6M6cc2uvUEPUetN9AY=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=p7z+0eY7ntbEVxA2gI3ZDLWM0mQwSUHKo0XnCgV0chmlHkz2P/vCANEjmqGsAdwGb EoSpjHFAP8n9bDzPCEYaP1TdvsHfTZs7ZO2YCb1PhaDgWMEewk0XhfG2S7DJV8N6Zq 6BFFHYmv/C0EtAhNH8ykQ23VCX1LuObfUCtnf/2zRNky8BKsi3YeFoHUI0AgtoZtnU /s5ocIdJDBgJaNkjIJoR2ZyE63FMuzKBldotmlU9Pd6NrsbPX3n/4O3QNinmpI+xhS eF/3KfLyFpQXF2Gi5KoPPct1DqMaQ4m32g9c7heF/cNtqM6cQYwdFJN5c8DpxFzwH1 PF1h9+AG7Xw/A== Date: Wed, 8 Jun 2022 08:22:56 -0700 From: "Darrick J. Wong" To: "Matthew Wilcox (Oracle)" Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, linux-aio@kvack.org, linux-btrfs@vger.kernel.org, linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, cluster-devel@redhat.com, linux-mm@kvack.org, linux-xfs@vger.kernel.org, linux-nfs@vger.kernel.org, linux-ntfs-dev@lists.sourceforge.net, ocfs2-devel@oss.oracle.com, linux-mtd@lists.infradead.org, virtualization@lists.linux-foundation.org, Christoph Hellwig Subject: Re: [PATCH v2 11/19] mm/migrate: Add filemap_migrate_folio() Message-ID: References: <20220608150249.3033815-1-willy@infradead.org> <20220608150249.3033815-12-willy@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220608150249.3033815-12-willy@infradead.org> Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org On Wed, Jun 08, 2022 at 04:02:41PM +0100, Matthew Wilcox (Oracle) wrote: > There is nothing iomap-specific about iomap_migratepage(), and it fits > a pattern used by several other filesystems, so move it to mm/migrate.c, > convert it to be filemap_migrate_folio() and convert the iomap filesystems > to use it. > > Signed-off-by: Matthew Wilcox (Oracle) > Reviewed-by: Christoph Hellwig LGTM Reviewed-by: Darrick J. Wong --D > --- > fs/gfs2/aops.c | 2 +- > fs/iomap/buffered-io.c | 25 ------------------------- > fs/xfs/xfs_aops.c | 2 +- > fs/zonefs/super.c | 2 +- > include/linux/iomap.h | 6 ------ > include/linux/pagemap.h | 6 ++++++ > mm/migrate.c | 20 ++++++++++++++++++++ > 7 files changed, 29 insertions(+), 34 deletions(-) > > diff --git a/fs/gfs2/aops.c b/fs/gfs2/aops.c > index 106e90a36583..57ff883d432c 100644 > --- a/fs/gfs2/aops.c > +++ b/fs/gfs2/aops.c > @@ -774,7 +774,7 @@ static const struct address_space_operations gfs2_aops = { > .invalidate_folio = iomap_invalidate_folio, > .bmap = gfs2_bmap, > .direct_IO = noop_direct_IO, > - .migratepage = iomap_migrate_page, > + .migrate_folio = filemap_migrate_folio, > .is_partially_uptodate = iomap_is_partially_uptodate, > .error_remove_page = generic_error_remove_page, > }; > diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c > index 66278a14bfa7..5a91aa1db945 100644 > --- a/fs/iomap/buffered-io.c > +++ b/fs/iomap/buffered-io.c > @@ -489,31 +489,6 @@ void iomap_invalidate_folio(struct folio *folio, size_t offset, size_t len) > } > EXPORT_SYMBOL_GPL(iomap_invalidate_folio); > > -#ifdef CONFIG_MIGRATION > -int > -iomap_migrate_page(struct address_space *mapping, struct page *newpage, > - struct page *page, enum migrate_mode mode) > -{ > - struct folio *folio = page_folio(page); > - struct folio *newfolio = page_folio(newpage); > - int ret; > - > - ret = folio_migrate_mapping(mapping, newfolio, folio, 0); > - if (ret != MIGRATEPAGE_SUCCESS) > - return ret; > - > - if (folio_test_private(folio)) > - folio_attach_private(newfolio, folio_detach_private(folio)); > - > - if (mode != MIGRATE_SYNC_NO_COPY) > - folio_migrate_copy(newfolio, folio); > - else > - folio_migrate_flags(newfolio, folio); > - return MIGRATEPAGE_SUCCESS; > -} > -EXPORT_SYMBOL_GPL(iomap_migrate_page); > -#endif /* CONFIG_MIGRATION */ > - > static void > iomap_write_failed(struct inode *inode, loff_t pos, unsigned len) > { > diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c > index 8ec38b25187b..5d1a995b15f8 100644 > --- a/fs/xfs/xfs_aops.c > +++ b/fs/xfs/xfs_aops.c > @@ -570,7 +570,7 @@ const struct address_space_operations xfs_address_space_operations = { > .invalidate_folio = iomap_invalidate_folio, > .bmap = xfs_vm_bmap, > .direct_IO = noop_direct_IO, > - .migratepage = iomap_migrate_page, > + .migrate_folio = filemap_migrate_folio, > .is_partially_uptodate = iomap_is_partially_uptodate, > .error_remove_page = generic_error_remove_page, > .swap_activate = xfs_iomap_swapfile_activate, > diff --git a/fs/zonefs/super.c b/fs/zonefs/super.c > index bcb21aea990a..d4c3f28f34ee 100644 > --- a/fs/zonefs/super.c > +++ b/fs/zonefs/super.c > @@ -237,7 +237,7 @@ static const struct address_space_operations zonefs_file_aops = { > .dirty_folio = filemap_dirty_folio, > .release_folio = iomap_release_folio, > .invalidate_folio = iomap_invalidate_folio, > - .migratepage = iomap_migrate_page, > + .migrate_folio = filemap_migrate_folio, > .is_partially_uptodate = iomap_is_partially_uptodate, > .error_remove_page = generic_error_remove_page, > .direct_IO = noop_direct_IO, > diff --git a/include/linux/iomap.h b/include/linux/iomap.h > index e552097c67e0..758a1125e72f 100644 > --- a/include/linux/iomap.h > +++ b/include/linux/iomap.h > @@ -231,12 +231,6 @@ void iomap_readahead(struct readahead_control *, const struct iomap_ops *ops); > bool iomap_is_partially_uptodate(struct folio *, size_t from, size_t count); > bool iomap_release_folio(struct folio *folio, gfp_t gfp_flags); > void iomap_invalidate_folio(struct folio *folio, size_t offset, size_t len); > -#ifdef CONFIG_MIGRATION > -int iomap_migrate_page(struct address_space *mapping, struct page *newpage, > - struct page *page, enum migrate_mode mode); > -#else > -#define iomap_migrate_page NULL > -#endif > int iomap_file_unshare(struct inode *inode, loff_t pos, loff_t len, > const struct iomap_ops *ops); > int iomap_zero_range(struct inode *inode, loff_t pos, loff_t len, > diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h > index 1caccb9f99aa..2a67c0ad7348 100644 > --- a/include/linux/pagemap.h > +++ b/include/linux/pagemap.h > @@ -1078,6 +1078,12 @@ static inline int __must_check write_one_page(struct page *page) > int __set_page_dirty_nobuffers(struct page *page); > bool noop_dirty_folio(struct address_space *mapping, struct folio *folio); > > +#ifdef CONFIG_MIGRATION > +int filemap_migrate_folio(struct address_space *mapping, struct folio *dst, > + struct folio *src, enum migrate_mode mode); > +#else > +#define filemap_migrate_folio NULL > +#endif > void page_endio(struct page *page, bool is_write, int err); > > void folio_end_private_2(struct folio *folio); > diff --git a/mm/migrate.c b/mm/migrate.c > index 785e32d0cf1b..4d8115ca93bb 100644 > --- a/mm/migrate.c > +++ b/mm/migrate.c > @@ -784,6 +784,26 @@ int buffer_migrate_folio_norefs(struct address_space *mapping, > } > #endif > > +int filemap_migrate_folio(struct address_space *mapping, > + struct folio *dst, struct folio *src, enum migrate_mode mode) > +{ > + int ret; > + > + ret = folio_migrate_mapping(mapping, dst, src, 0); > + if (ret != MIGRATEPAGE_SUCCESS) > + return ret; > + > + if (folio_get_private(src)) > + folio_attach_private(dst, folio_detach_private(src)); > + > + if (mode != MIGRATE_SYNC_NO_COPY) > + folio_migrate_copy(dst, src); > + else > + folio_migrate_flags(dst, src); > + return MIGRATEPAGE_SUCCESS; > +} > +EXPORT_SYMBOL_GPL(filemap_migrate_folio); > + > /* > * Writeback a folio to clean the dirty state > */ > -- > 2.35.1 > 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 Received: from lists.sourceforge.net (lists.sourceforge.net [216.105.38.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 922C0C43334 for ; Wed, 8 Jun 2022 15:23:07 +0000 (UTC) Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.94.2) (envelope-from ) id 1nyxWV-0004LT-Lo; Wed, 08 Jun 2022 15:23:06 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nyxWU-0004LJ-BQ; Wed, 08 Jun 2022 15:23:05 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=In-Reply-To:Content-Type:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=EBEBsguk9B864LzDV1rxx+vKGHWqnsS1K2RzBp60+x4=; b=DHJMgC37VccEyHSmtFg/lccMt6 NY9TXuAVqxv+i9H8Rp0bk3exNj3uKtIQt9DzsyvEWXggBagAwTf62DLSMc1CRAF6olWGmH84HnfMa YLFH1yG1viLk4l+EaNx0UHyUIS0R8E8Nv1qDE2t7Law5Hhh/qslTu6jZoTJ7xheP7Hoc=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=In-Reply-To:Content-Type:MIME-Version:References:Message-ID:Subject:Cc:To :From:Date:Sender:Reply-To:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=EBEBsguk9B864LzDV1rxx+vKGHWqnsS1K2RzBp60+x4=; b=WPpCXw21LS9yOoYAplo51ZiamY w+c5ukH6ILzZ97HucO6kQZwNpfWUUYsieU8Ja5rrSYFR0PxbdBumQZW8vO2FymfkP0qeU+kGGyG7p pHvkO131TvjTQa6l511v2B/QZLlIQnD9WqVX2IXX/3BVs8rbCy9vdybNoNXVYM5myfvg=; Received: from ams.source.kernel.org ([145.40.68.75]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.94.2) id 1nyxWS-009yvW-1g; Wed, 08 Jun 2022 15:23:04 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id CCEBAB82615; Wed, 8 Jun 2022 15:22:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8D62AC34116; Wed, 8 Jun 2022 15:22:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1654701776; bh=SgYW51aN3OeqjU6+EIk8CHclo6M6cc2uvUEPUetN9AY=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=p7z+0eY7ntbEVxA2gI3ZDLWM0mQwSUHKo0XnCgV0chmlHkz2P/vCANEjmqGsAdwGb EoSpjHFAP8n9bDzPCEYaP1TdvsHfTZs7ZO2YCb1PhaDgWMEewk0XhfG2S7DJV8N6Zq 6BFFHYmv/C0EtAhNH8ykQ23VCX1LuObfUCtnf/2zRNky8BKsi3YeFoHUI0AgtoZtnU /s5ocIdJDBgJaNkjIJoR2ZyE63FMuzKBldotmlU9Pd6NrsbPX3n/4O3QNinmpI+xhS eF/3KfLyFpQXF2Gi5KoPPct1DqMaQ4m32g9c7heF/cNtqM6cQYwdFJN5c8DpxFzwH1 PF1h9+AG7Xw/A== Date: Wed, 8 Jun 2022 08:22:56 -0700 From: "Darrick J. Wong" To: "Matthew Wilcox (Oracle)" Message-ID: References: <20220608150249.3033815-1-willy@infradead.org> <20220608150249.3033815-12-willy@infradead.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20220608150249.3033815-12-willy@infradead.org> X-Headers-End: 1nyxWS-009yvW-1g Subject: Re: [f2fs-dev] [PATCH v2 11/19] mm/migrate: Add filemap_migrate_folio() X-BeenThere: linux-f2fs-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-aio@kvack.org, linux-nfs@vger.kernel.org, cluster-devel@redhat.com, linux-ntfs-dev@lists.sourceforge.net, Christoph Hellwig , linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-block@vger.kernel.org, linux-mm@kvack.org, linux-mtd@lists.infradead.org, ocfs2-devel@oss.oracle.com, linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, virtualization@lists.linux-foundation.org, linux-xfs@vger.kernel.org, linux-btrfs@vger.kernel.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net On Wed, Jun 08, 2022 at 04:02:41PM +0100, Matthew Wilcox (Oracle) wrote: > There is nothing iomap-specific about iomap_migratepage(), and it fits > a pattern used by several other filesystems, so move it to mm/migrate.c, > convert it to be filemap_migrate_folio() and convert the iomap filesystems > to use it. > > Signed-off-by: Matthew Wilcox (Oracle) > Reviewed-by: Christoph Hellwig LGTM Reviewed-by: Darrick J. Wong --D > --- > fs/gfs2/aops.c | 2 +- > fs/iomap/buffered-io.c | 25 ------------------------- > fs/xfs/xfs_aops.c | 2 +- > fs/zonefs/super.c | 2 +- > include/linux/iomap.h | 6 ------ > include/linux/pagemap.h | 6 ++++++ > mm/migrate.c | 20 ++++++++++++++++++++ > 7 files changed, 29 insertions(+), 34 deletions(-) > > diff --git a/fs/gfs2/aops.c b/fs/gfs2/aops.c > index 106e90a36583..57ff883d432c 100644 > --- a/fs/gfs2/aops.c > +++ b/fs/gfs2/aops.c > @@ -774,7 +774,7 @@ static const struct address_space_operations gfs2_aops = { > .invalidate_folio = iomap_invalidate_folio, > .bmap = gfs2_bmap, > .direct_IO = noop_direct_IO, > - .migratepage = iomap_migrate_page, > + .migrate_folio = filemap_migrate_folio, > .is_partially_uptodate = iomap_is_partially_uptodate, > .error_remove_page = generic_error_remove_page, > }; > diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c > index 66278a14bfa7..5a91aa1db945 100644 > --- a/fs/iomap/buffered-io.c > +++ b/fs/iomap/buffered-io.c > @@ -489,31 +489,6 @@ void iomap_invalidate_folio(struct folio *folio, size_t offset, size_t len) > } > EXPORT_SYMBOL_GPL(iomap_invalidate_folio); > > -#ifdef CONFIG_MIGRATION > -int > -iomap_migrate_page(struct address_space *mapping, struct page *newpage, > - struct page *page, enum migrate_mode mode) > -{ > - struct folio *folio = page_folio(page); > - struct folio *newfolio = page_folio(newpage); > - int ret; > - > - ret = folio_migrate_mapping(mapping, newfolio, folio, 0); > - if (ret != MIGRATEPAGE_SUCCESS) > - return ret; > - > - if (folio_test_private(folio)) > - folio_attach_private(newfolio, folio_detach_private(folio)); > - > - if (mode != MIGRATE_SYNC_NO_COPY) > - folio_migrate_copy(newfolio, folio); > - else > - folio_migrate_flags(newfolio, folio); > - return MIGRATEPAGE_SUCCESS; > -} > -EXPORT_SYMBOL_GPL(iomap_migrate_page); > -#endif /* CONFIG_MIGRATION */ > - > static void > iomap_write_failed(struct inode *inode, loff_t pos, unsigned len) > { > diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c > index 8ec38b25187b..5d1a995b15f8 100644 > --- a/fs/xfs/xfs_aops.c > +++ b/fs/xfs/xfs_aops.c > @@ -570,7 +570,7 @@ const struct address_space_operations xfs_address_space_operations = { > .invalidate_folio = iomap_invalidate_folio, > .bmap = xfs_vm_bmap, > .direct_IO = noop_direct_IO, > - .migratepage = iomap_migrate_page, > + .migrate_folio = filemap_migrate_folio, > .is_partially_uptodate = iomap_is_partially_uptodate, > .error_remove_page = generic_error_remove_page, > .swap_activate = xfs_iomap_swapfile_activate, > diff --git a/fs/zonefs/super.c b/fs/zonefs/super.c > index bcb21aea990a..d4c3f28f34ee 100644 > --- a/fs/zonefs/super.c > +++ b/fs/zonefs/super.c > @@ -237,7 +237,7 @@ static const struct address_space_operations zonefs_file_aops = { > .dirty_folio = filemap_dirty_folio, > .release_folio = iomap_release_folio, > .invalidate_folio = iomap_invalidate_folio, > - .migratepage = iomap_migrate_page, > + .migrate_folio = filemap_migrate_folio, > .is_partially_uptodate = iomap_is_partially_uptodate, > .error_remove_page = generic_error_remove_page, > .direct_IO = noop_direct_IO, > diff --git a/include/linux/iomap.h b/include/linux/iomap.h > index e552097c67e0..758a1125e72f 100644 > --- a/include/linux/iomap.h > +++ b/include/linux/iomap.h > @@ -231,12 +231,6 @@ void iomap_readahead(struct readahead_control *, const struct iomap_ops *ops); > bool iomap_is_partially_uptodate(struct folio *, size_t from, size_t count); > bool iomap_release_folio(struct folio *folio, gfp_t gfp_flags); > void iomap_invalidate_folio(struct folio *folio, size_t offset, size_t len); > -#ifdef CONFIG_MIGRATION > -int iomap_migrate_page(struct address_space *mapping, struct page *newpage, > - struct page *page, enum migrate_mode mode); > -#else > -#define iomap_migrate_page NULL > -#endif > int iomap_file_unshare(struct inode *inode, loff_t pos, loff_t len, > const struct iomap_ops *ops); > int iomap_zero_range(struct inode *inode, loff_t pos, loff_t len, > diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h > index 1caccb9f99aa..2a67c0ad7348 100644 > --- a/include/linux/pagemap.h > +++ b/include/linux/pagemap.h > @@ -1078,6 +1078,12 @@ static inline int __must_check write_one_page(struct page *page) > int __set_page_dirty_nobuffers(struct page *page); > bool noop_dirty_folio(struct address_space *mapping, struct folio *folio); > > +#ifdef CONFIG_MIGRATION > +int filemap_migrate_folio(struct address_space *mapping, struct folio *dst, > + struct folio *src, enum migrate_mode mode); > +#else > +#define filemap_migrate_folio NULL > +#endif > void page_endio(struct page *page, bool is_write, int err); > > void folio_end_private_2(struct folio *folio); > diff --git a/mm/migrate.c b/mm/migrate.c > index 785e32d0cf1b..4d8115ca93bb 100644 > --- a/mm/migrate.c > +++ b/mm/migrate.c > @@ -784,6 +784,26 @@ int buffer_migrate_folio_norefs(struct address_space *mapping, > } > #endif > > +int filemap_migrate_folio(struct address_space *mapping, > + struct folio *dst, struct folio *src, enum migrate_mode mode) > +{ > + int ret; > + > + ret = folio_migrate_mapping(mapping, dst, src, 0); > + if (ret != MIGRATEPAGE_SUCCESS) > + return ret; > + > + if (folio_get_private(src)) > + folio_attach_private(dst, folio_detach_private(src)); > + > + if (mode != MIGRATE_SYNC_NO_COPY) > + folio_migrate_copy(dst, src); > + else > + folio_migrate_flags(dst, src); > + return MIGRATEPAGE_SUCCESS; > +} > +EXPORT_SYMBOL_GPL(filemap_migrate_folio); > + > /* > * Writeback a folio to clean the dirty state > */ > -- > 2.35.1 > _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel 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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7F059CCA47B for ; Wed, 8 Jun 2022 15:23:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Nj5I9qbuCZLCyFd5Qe8DY58tdNvC/SJvp3d5sA9UPog=; b=mDku4i5J7Ihffg BThNEgzdF8kEt3eD2kLKsMaQAQfvuRTQRq8DA82uqQSx0/p/FB47xx8xWAK9efXNYkLdtNCE+WnQG X4EXChI5rt47zKRitwAnIXp2apzY9mdDvYCVyJOJCXGEhk5fWpJuTKHSWo+pLJppaa1RVLdq6OAi8 RZ0I3WkryUqa9MHriHvgEMYWK4Na5v9VKgPZA+XnaRRkgG+GBZ60yUk88hGreMlZABHPYdGIDB0Z/ /EWiVd4AlnfdTifvsoUZYf6+/8HIrBvggM5w6GSoExXiGTVz0cd9hBHE5Sh2iiwvBuc2MddHvxzVH gR55Sde33m9YN3HRZiCw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nyxWQ-00E0vn-VQ; Wed, 08 Jun 2022 15:23:03 +0000 Received: from ams.source.kernel.org ([145.40.68.75]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nyxWN-00E0uU-5G for linux-mtd@lists.infradead.org; Wed, 08 Jun 2022 15:23:01 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id CCEBAB82615; Wed, 8 Jun 2022 15:22:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8D62AC34116; Wed, 8 Jun 2022 15:22:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1654701776; bh=SgYW51aN3OeqjU6+EIk8CHclo6M6cc2uvUEPUetN9AY=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=p7z+0eY7ntbEVxA2gI3ZDLWM0mQwSUHKo0XnCgV0chmlHkz2P/vCANEjmqGsAdwGb EoSpjHFAP8n9bDzPCEYaP1TdvsHfTZs7ZO2YCb1PhaDgWMEewk0XhfG2S7DJV8N6Zq 6BFFHYmv/C0EtAhNH8ykQ23VCX1LuObfUCtnf/2zRNky8BKsi3YeFoHUI0AgtoZtnU /s5ocIdJDBgJaNkjIJoR2ZyE63FMuzKBldotmlU9Pd6NrsbPX3n/4O3QNinmpI+xhS eF/3KfLyFpQXF2Gi5KoPPct1DqMaQ4m32g9c7heF/cNtqM6cQYwdFJN5c8DpxFzwH1 PF1h9+AG7Xw/A== Date: Wed, 8 Jun 2022 08:22:56 -0700 From: "Darrick J. Wong" To: "Matthew Wilcox (Oracle)" Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, linux-aio@kvack.org, linux-btrfs@vger.kernel.org, linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, cluster-devel@redhat.com, linux-mm@kvack.org, linux-xfs@vger.kernel.org, linux-nfs@vger.kernel.org, linux-ntfs-dev@lists.sourceforge.net, ocfs2-devel@oss.oracle.com, linux-mtd@lists.infradead.org, virtualization@lists.linux-foundation.org, Christoph Hellwig Subject: Re: [PATCH v2 11/19] mm/migrate: Add filemap_migrate_folio() Message-ID: References: <20220608150249.3033815-1-willy@infradead.org> <20220608150249.3033815-12-willy@infradead.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20220608150249.3033815-12-willy@infradead.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220608_082259_555081_A3627F3F X-CRM114-Status: GOOD ( 25.45 ) X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-mtd" Errors-To: linux-mtd-bounces+linux-mtd=archiver.kernel.org@lists.infradead.org On Wed, Jun 08, 2022 at 04:02:41PM +0100, Matthew Wilcox (Oracle) wrote: > There is nothing iomap-specific about iomap_migratepage(), and it fits > a pattern used by several other filesystems, so move it to mm/migrate.c, > convert it to be filemap_migrate_folio() and convert the iomap filesystems > to use it. > > Signed-off-by: Matthew Wilcox (Oracle) > Reviewed-by: Christoph Hellwig LGTM Reviewed-by: Darrick J. Wong --D > --- > fs/gfs2/aops.c | 2 +- > fs/iomap/buffered-io.c | 25 ------------------------- > fs/xfs/xfs_aops.c | 2 +- > fs/zonefs/super.c | 2 +- > include/linux/iomap.h | 6 ------ > include/linux/pagemap.h | 6 ++++++ > mm/migrate.c | 20 ++++++++++++++++++++ > 7 files changed, 29 insertions(+), 34 deletions(-) > > diff --git a/fs/gfs2/aops.c b/fs/gfs2/aops.c > index 106e90a36583..57ff883d432c 100644 > --- a/fs/gfs2/aops.c > +++ b/fs/gfs2/aops.c > @@ -774,7 +774,7 @@ static const struct address_space_operations gfs2_aops = { > .invalidate_folio = iomap_invalidate_folio, > .bmap = gfs2_bmap, > .direct_IO = noop_direct_IO, > - .migratepage = iomap_migrate_page, > + .migrate_folio = filemap_migrate_folio, > .is_partially_uptodate = iomap_is_partially_uptodate, > .error_remove_page = generic_error_remove_page, > }; > diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c > index 66278a14bfa7..5a91aa1db945 100644 > --- a/fs/iomap/buffered-io.c > +++ b/fs/iomap/buffered-io.c > @@ -489,31 +489,6 @@ void iomap_invalidate_folio(struct folio *folio, size_t offset, size_t len) > } > EXPORT_SYMBOL_GPL(iomap_invalidate_folio); > > -#ifdef CONFIG_MIGRATION > -int > -iomap_migrate_page(struct address_space *mapping, struct page *newpage, > - struct page *page, enum migrate_mode mode) > -{ > - struct folio *folio = page_folio(page); > - struct folio *newfolio = page_folio(newpage); > - int ret; > - > - ret = folio_migrate_mapping(mapping, newfolio, folio, 0); > - if (ret != MIGRATEPAGE_SUCCESS) > - return ret; > - > - if (folio_test_private(folio)) > - folio_attach_private(newfolio, folio_detach_private(folio)); > - > - if (mode != MIGRATE_SYNC_NO_COPY) > - folio_migrate_copy(newfolio, folio); > - else > - folio_migrate_flags(newfolio, folio); > - return MIGRATEPAGE_SUCCESS; > -} > -EXPORT_SYMBOL_GPL(iomap_migrate_page); > -#endif /* CONFIG_MIGRATION */ > - > static void > iomap_write_failed(struct inode *inode, loff_t pos, unsigned len) > { > diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c > index 8ec38b25187b..5d1a995b15f8 100644 > --- a/fs/xfs/xfs_aops.c > +++ b/fs/xfs/xfs_aops.c > @@ -570,7 +570,7 @@ const struct address_space_operations xfs_address_space_operations = { > .invalidate_folio = iomap_invalidate_folio, > .bmap = xfs_vm_bmap, > .direct_IO = noop_direct_IO, > - .migratepage = iomap_migrate_page, > + .migrate_folio = filemap_migrate_folio, > .is_partially_uptodate = iomap_is_partially_uptodate, > .error_remove_page = generic_error_remove_page, > .swap_activate = xfs_iomap_swapfile_activate, > diff --git a/fs/zonefs/super.c b/fs/zonefs/super.c > index bcb21aea990a..d4c3f28f34ee 100644 > --- a/fs/zonefs/super.c > +++ b/fs/zonefs/super.c > @@ -237,7 +237,7 @@ static const struct address_space_operations zonefs_file_aops = { > .dirty_folio = filemap_dirty_folio, > .release_folio = iomap_release_folio, > .invalidate_folio = iomap_invalidate_folio, > - .migratepage = iomap_migrate_page, > + .migrate_folio = filemap_migrate_folio, > .is_partially_uptodate = iomap_is_partially_uptodate, > .error_remove_page = generic_error_remove_page, > .direct_IO = noop_direct_IO, > diff --git a/include/linux/iomap.h b/include/linux/iomap.h > index e552097c67e0..758a1125e72f 100644 > --- a/include/linux/iomap.h > +++ b/include/linux/iomap.h > @@ -231,12 +231,6 @@ void iomap_readahead(struct readahead_control *, const struct iomap_ops *ops); > bool iomap_is_partially_uptodate(struct folio *, size_t from, size_t count); > bool iomap_release_folio(struct folio *folio, gfp_t gfp_flags); > void iomap_invalidate_folio(struct folio *folio, size_t offset, size_t len); > -#ifdef CONFIG_MIGRATION > -int iomap_migrate_page(struct address_space *mapping, struct page *newpage, > - struct page *page, enum migrate_mode mode); > -#else > -#define iomap_migrate_page NULL > -#endif > int iomap_file_unshare(struct inode *inode, loff_t pos, loff_t len, > const struct iomap_ops *ops); > int iomap_zero_range(struct inode *inode, loff_t pos, loff_t len, > diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h > index 1caccb9f99aa..2a67c0ad7348 100644 > --- a/include/linux/pagemap.h > +++ b/include/linux/pagemap.h > @@ -1078,6 +1078,12 @@ static inline int __must_check write_one_page(struct page *page) > int __set_page_dirty_nobuffers(struct page *page); > bool noop_dirty_folio(struct address_space *mapping, struct folio *folio); > > +#ifdef CONFIG_MIGRATION > +int filemap_migrate_folio(struct address_space *mapping, struct folio *dst, > + struct folio *src, enum migrate_mode mode); > +#else > +#define filemap_migrate_folio NULL > +#endif > void page_endio(struct page *page, bool is_write, int err); > > void folio_end_private_2(struct folio *folio); > diff --git a/mm/migrate.c b/mm/migrate.c > index 785e32d0cf1b..4d8115ca93bb 100644 > --- a/mm/migrate.c > +++ b/mm/migrate.c > @@ -784,6 +784,26 @@ int buffer_migrate_folio_norefs(struct address_space *mapping, > } > #endif > > +int filemap_migrate_folio(struct address_space *mapping, > + struct folio *dst, struct folio *src, enum migrate_mode mode) > +{ > + int ret; > + > + ret = folio_migrate_mapping(mapping, dst, src, 0); > + if (ret != MIGRATEPAGE_SUCCESS) > + return ret; > + > + if (folio_get_private(src)) > + folio_attach_private(dst, folio_detach_private(src)); > + > + if (mode != MIGRATE_SYNC_NO_COPY) > + folio_migrate_copy(dst, src); > + else > + folio_migrate_flags(dst, src); > + return MIGRATEPAGE_SUCCESS; > +} > +EXPORT_SYMBOL_GPL(filemap_migrate_folio); > + > /* > * Writeback a folio to clean the dirty state > */ > -- > 2.35.1 > ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/ From mboxrd@z Thu Jan 1 00:00:00 1970 From: Darrick J. Wong Date: Wed, 8 Jun 2022 08:22:56 -0700 Subject: [Cluster-devel] [PATCH v2 11/19] mm/migrate: Add filemap_migrate_folio() In-Reply-To: <20220608150249.3033815-12-willy@infradead.org> References: <20220608150249.3033815-1-willy@infradead.org> <20220608150249.3033815-12-willy@infradead.org> Message-ID: List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit On Wed, Jun 08, 2022 at 04:02:41PM +0100, Matthew Wilcox (Oracle) wrote: > There is nothing iomap-specific about iomap_migratepage(), and it fits > a pattern used by several other filesystems, so move it to mm/migrate.c, > convert it to be filemap_migrate_folio() and convert the iomap filesystems > to use it. > > Signed-off-by: Matthew Wilcox (Oracle) > Reviewed-by: Christoph Hellwig LGTM Reviewed-by: Darrick J. Wong --D > --- > fs/gfs2/aops.c | 2 +- > fs/iomap/buffered-io.c | 25 ------------------------- > fs/xfs/xfs_aops.c | 2 +- > fs/zonefs/super.c | 2 +- > include/linux/iomap.h | 6 ------ > include/linux/pagemap.h | 6 ++++++ > mm/migrate.c | 20 ++++++++++++++++++++ > 7 files changed, 29 insertions(+), 34 deletions(-) > > diff --git a/fs/gfs2/aops.c b/fs/gfs2/aops.c > index 106e90a36583..57ff883d432c 100644 > --- a/fs/gfs2/aops.c > +++ b/fs/gfs2/aops.c > @@ -774,7 +774,7 @@ static const struct address_space_operations gfs2_aops = { > .invalidate_folio = iomap_invalidate_folio, > .bmap = gfs2_bmap, > .direct_IO = noop_direct_IO, > - .migratepage = iomap_migrate_page, > + .migrate_folio = filemap_migrate_folio, > .is_partially_uptodate = iomap_is_partially_uptodate, > .error_remove_page = generic_error_remove_page, > }; > diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c > index 66278a14bfa7..5a91aa1db945 100644 > --- a/fs/iomap/buffered-io.c > +++ b/fs/iomap/buffered-io.c > @@ -489,31 +489,6 @@ void iomap_invalidate_folio(struct folio *folio, size_t offset, size_t len) > } > EXPORT_SYMBOL_GPL(iomap_invalidate_folio); > > -#ifdef CONFIG_MIGRATION > -int > -iomap_migrate_page(struct address_space *mapping, struct page *newpage, > - struct page *page, enum migrate_mode mode) > -{ > - struct folio *folio = page_folio(page); > - struct folio *newfolio = page_folio(newpage); > - int ret; > - > - ret = folio_migrate_mapping(mapping, newfolio, folio, 0); > - if (ret != MIGRATEPAGE_SUCCESS) > - return ret; > - > - if (folio_test_private(folio)) > - folio_attach_private(newfolio, folio_detach_private(folio)); > - > - if (mode != MIGRATE_SYNC_NO_COPY) > - folio_migrate_copy(newfolio, folio); > - else > - folio_migrate_flags(newfolio, folio); > - return MIGRATEPAGE_SUCCESS; > -} > -EXPORT_SYMBOL_GPL(iomap_migrate_page); > -#endif /* CONFIG_MIGRATION */ > - > static void > iomap_write_failed(struct inode *inode, loff_t pos, unsigned len) > { > diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c > index 8ec38b25187b..5d1a995b15f8 100644 > --- a/fs/xfs/xfs_aops.c > +++ b/fs/xfs/xfs_aops.c > @@ -570,7 +570,7 @@ const struct address_space_operations xfs_address_space_operations = { > .invalidate_folio = iomap_invalidate_folio, > .bmap = xfs_vm_bmap, > .direct_IO = noop_direct_IO, > - .migratepage = iomap_migrate_page, > + .migrate_folio = filemap_migrate_folio, > .is_partially_uptodate = iomap_is_partially_uptodate, > .error_remove_page = generic_error_remove_page, > .swap_activate = xfs_iomap_swapfile_activate, > diff --git a/fs/zonefs/super.c b/fs/zonefs/super.c > index bcb21aea990a..d4c3f28f34ee 100644 > --- a/fs/zonefs/super.c > +++ b/fs/zonefs/super.c > @@ -237,7 +237,7 @@ static const struct address_space_operations zonefs_file_aops = { > .dirty_folio = filemap_dirty_folio, > .release_folio = iomap_release_folio, > .invalidate_folio = iomap_invalidate_folio, > - .migratepage = iomap_migrate_page, > + .migrate_folio = filemap_migrate_folio, > .is_partially_uptodate = iomap_is_partially_uptodate, > .error_remove_page = generic_error_remove_page, > .direct_IO = noop_direct_IO, > diff --git a/include/linux/iomap.h b/include/linux/iomap.h > index e552097c67e0..758a1125e72f 100644 > --- a/include/linux/iomap.h > +++ b/include/linux/iomap.h > @@ -231,12 +231,6 @@ void iomap_readahead(struct readahead_control *, const struct iomap_ops *ops); > bool iomap_is_partially_uptodate(struct folio *, size_t from, size_t count); > bool iomap_release_folio(struct folio *folio, gfp_t gfp_flags); > void iomap_invalidate_folio(struct folio *folio, size_t offset, size_t len); > -#ifdef CONFIG_MIGRATION > -int iomap_migrate_page(struct address_space *mapping, struct page *newpage, > - struct page *page, enum migrate_mode mode); > -#else > -#define iomap_migrate_page NULL > -#endif > int iomap_file_unshare(struct inode *inode, loff_t pos, loff_t len, > const struct iomap_ops *ops); > int iomap_zero_range(struct inode *inode, loff_t pos, loff_t len, > diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h > index 1caccb9f99aa..2a67c0ad7348 100644 > --- a/include/linux/pagemap.h > +++ b/include/linux/pagemap.h > @@ -1078,6 +1078,12 @@ static inline int __must_check write_one_page(struct page *page) > int __set_page_dirty_nobuffers(struct page *page); > bool noop_dirty_folio(struct address_space *mapping, struct folio *folio); > > +#ifdef CONFIG_MIGRATION > +int filemap_migrate_folio(struct address_space *mapping, struct folio *dst, > + struct folio *src, enum migrate_mode mode); > +#else > +#define filemap_migrate_folio NULL > +#endif > void page_endio(struct page *page, bool is_write, int err); > > void folio_end_private_2(struct folio *folio); > diff --git a/mm/migrate.c b/mm/migrate.c > index 785e32d0cf1b..4d8115ca93bb 100644 > --- a/mm/migrate.c > +++ b/mm/migrate.c > @@ -784,6 +784,26 @@ int buffer_migrate_folio_norefs(struct address_space *mapping, > } > #endif > > +int filemap_migrate_folio(struct address_space *mapping, > + struct folio *dst, struct folio *src, enum migrate_mode mode) > +{ > + int ret; > + > + ret = folio_migrate_mapping(mapping, dst, src, 0); > + if (ret != MIGRATEPAGE_SUCCESS) > + return ret; > + > + if (folio_get_private(src)) > + folio_attach_private(dst, folio_detach_private(src)); > + > + if (mode != MIGRATE_SYNC_NO_COPY) > + folio_migrate_copy(dst, src); > + else > + folio_migrate_flags(dst, src); > + return MIGRATEPAGE_SUCCESS; > +} > +EXPORT_SYMBOL_GPL(filemap_migrate_folio); > + > /* > * Writeback a folio to clean the dirty state > */ > -- > 2.35.1 >