Commit 784f1258 authored by Hugh Dickins's avatar Hugh Dickins Committed by Liu Shixin
Browse files

mm: add page_rmappable_folio() wrapper 

mainline inclusion
from mainline-v6.7-rc1
commit 23e4883248f0472d806c8b3422ba6257e67bf1a5
category: cleanup
bugzilla: https://gitee.com/openeuler/kernel/issues/I9CXS6
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=23e4883248f0472d806c8b3422ba6257e67bf1a5

--------------------------------

folio_prep_large_rmappable() is being used repeatedly along with a
conversion from page to folio, a check non-NULL, a check order > 1: wrap
it all up into struct folio *page_rmappable_folio(struct page *).

Link: https://lkml.kernel.org/r/8d92c6cf-eebe-748-e29c-c8ab224c741@google.com


Signed-off-by: default avatarHugh Dickins <hughd@google.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Christoph Lameter <cl@linux.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: "Huang, Ying" <ying.huang@intel.com>
Cc: Kefeng Wang <wangkefeng.wang@huawei.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Mel Gorman <mgorman@techsingularity.net>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Mike Kravetz <mike.kravetz@oracle.com>
Cc: Nhat Pham <nphamcs@gmail.com>
Cc: Sidhartha Kumar <sidhartha.kumar@oracle.com>
Cc: Suren Baghdasaryan <surenb@google.com>
Cc: Tejun heo <tj@kernel.org>
Cc: Vishal Moola (Oracle) <vishal.moola@gmail.com>
Cc: Yang Shi <shy828301@gmail.com>
Cc: Yosry Ahmed <yosryahmed@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLiu Shixin <liushixin2@huawei.com>
parent 7b3c13a8

mm/internal.h

+9 −0
Original line number Diff line number Diff line
@@ -508,6 +508,15 @@ static inline void folio_set_order(struct folio *folio, unsigned int order) 


void folio_undo_large_rmappable(struct folio *folio);



static inline struct folio *page_rmappable_folio(struct page *page)

{

	struct folio *folio = (struct folio *)page;



	if (folio && folio_order(folio) > 1)

		folio_prep_large_rmappable(folio);

	return folio;

}



static inline void prep_compound_head(struct page *page, unsigned int order)

{

	struct folio *folio = (struct folio *)page;

mm/mempolicy.c

+3 −14
Original line number Diff line number Diff line
@@ -2211,10 +2211,7 @@ struct folio *vma_alloc_folio(gfp_t gfp, int order, struct vm_area_struct *vma, 
		mpol_cond_put(pol);

		gfp |= __GFP_COMP;

		page = alloc_page_interleave(gfp, order, nid);

		folio = (struct folio *)page;

		if (folio && order > 1)

			folio_prep_large_rmappable(folio);

		goto out;

		return page_rmappable_folio(page);

	}



	if (pol->mode == MPOL_PREFERRED_MANY) {
@@ -2224,10 +2221,7 @@ struct folio *vma_alloc_folio(gfp_t gfp, int order, struct vm_area_struct *vma, 
		gfp |= __GFP_COMP;

		page = alloc_pages_preferred_many(gfp, order, node, pol);

		mpol_cond_put(pol);

		folio = (struct folio *)page;

		if (folio && order > 1)

			folio_prep_large_rmappable(folio);

		goto out;

		return page_rmappable_folio(page);

	}



	if (unlikely(IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE) && hugepage)) {
@@ -2323,12 +2317,7 @@ EXPORT_SYMBOL(alloc_pages); 


struct folio *folio_alloc(gfp_t gfp, unsigned order)

{

	struct page *page = alloc_pages(gfp | __GFP_COMP, order);

	struct folio *folio = (struct folio *)page;



	if (folio && order > 1)

		folio_prep_large_rmappable(folio);

	return folio;

	return page_rmappable_folio(alloc_pages(gfp | __GFP_COMP, order));

}

EXPORT_SYMBOL(folio_alloc);

mm/page_alloc.c

+2 −6
Original line number Diff line number Diff line
@@ -4846,11 +4846,7 @@ struct folio *__folio_alloc(gfp_t gfp, unsigned int order, int preferred_nid, 
{

	struct page *page = __alloc_pages(gfp | __GFP_COMP, order,

					preferred_nid, nodemask);

	struct folio *folio = (struct folio *)page;



	if (folio && order > 1)

		folio_prep_large_rmappable(folio);

	return folio;

	return page_rmappable_folio(page);

}

EXPORT_SYMBOL(__folio_alloc);