Commit 75e55d8a authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Matthew Wilcox (Oracle)
Browse files

mm: move free_devmap_managed_page to memremap.c 

free_devmap_managed_page has nothing to do with the code in swap.c,
move it to live with the rest of the code for devmap handling.

Link: https://lkml.kernel.org/r/20220210072828.2930359-5-hch@lst.de


Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarLogan Gunthorpe <logang@deltatee.com>
Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Reviewed-by: default avatarMuchun Song <songmuchun@bytedance.com>
Reviewed-by: default avatarDan Williams <dan.j.williams@intel.com>
Tested-by: default avatar"Sierra Guiza, Alejandro (Alex)" <alex.sierra@amd.com>

Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: Alistair Popple <apopple@nvidia.com>
Cc: Ben Skeggs <bskeggs@redhat.com>
Cc: Christian Knig <christian.koenig@amd.com>
Cc: Felix Kuehling <Felix.Kuehling@amd.com>
Cc: Karol Herbst <kherbst@redhat.com>
Cc: Lyude Paul <lyude@redhat.com>
Cc: Miaohe Lin <linmiaohe@huawei.com>
Cc: "Pan, Xinhui" <Xinhui.Pan@amd.com>
Cc: Ralph Campbell <rcampbell@nvidia.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
parent 730ff521

include/linux/mm.h

+0 −1
Original line number Diff line number Diff line
@@ -1092,7 +1092,6 @@ static inline bool is_zone_movable_page(const struct page *page) 
}



#ifdef CONFIG_DEV_PAGEMAP_OPS

void free_devmap_managed_page(struct page *page);

DECLARE_STATIC_KEY_FALSE(devmap_managed_key);



static inline bool page_is_devmap_managed(struct page *page)

mm/memremap.c

+21 −0
Original line number Diff line number Diff line
@@ -501,4 +501,25 @@ void free_devmap_managed_page(struct page *page) 
	page->mapping = NULL;

	page->pgmap->ops->page_free(page);

}



void put_devmap_managed_page(struct page *page)

{

	int count;



	if (WARN_ON_ONCE(!page_is_devmap_managed(page)))

		return;



	count = page_ref_dec_return(page);



	/*

	 * devmap page refcounts are 1-based, rather than 0-based: if

	 * refcount is 1, then the page is free and the refcount is

	 * stable because nobody holds a reference on the page.

	 */

	if (count == 1)

		free_devmap_managed_page(page);

	else if (!count)

		__put_page(page);

}

EXPORT_SYMBOL(put_devmap_managed_page);

#endif /* CONFIG_DEV_PAGEMAP_OPS */

mm/swap.c

+0 −23
Original line number Diff line number Diff line
@@ -1154,26 +1154,3 @@ void __init swap_setup(void) 
	 * _really_ don't want to cluster much more

	 */

}
 


#ifdef CONFIG_DEV_PAGEMAP_OPS

void put_devmap_managed_page(struct page *page)

{

	int count;



	if (WARN_ON_ONCE(!page_is_devmap_managed(page)))

		return;



	count = page_ref_dec_return(page);



	/*

	 * devmap page refcounts are 1-based, rather than 0-based: if

	 * refcount is 1, then the page is free and the refcount is

	 * stable because nobody holds a reference on the page.

	 */

	if (count == 1)

		free_devmap_managed_page(page);

	else if (!count)

		__put_page(page);

}

EXPORT_SYMBOL(put_devmap_managed_page);

#endif