Commit d589218d authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle) Committed by Nanyong Sun
Browse files

khugepaged: inline hpage_collapse_alloc_folio() 

mainline inclusion
from mainline-v6.10-rc1
commit 4746f5ce0fa52e21b5fe432970fe9516d1a45ebc
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAXCD2

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

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

Patch series "khugepaged folio conversions".

We've been kind of hacking piecemeal at converting khugepaged to use
folios instead of compound pages, and so this patchset is a little larger
than it should be as I undo some of our wrong moves in the past.  In
particular, collapse_file() now consistently uses 'new_folio' for the
freshly allocated folio and 'folio' for the one that's currently in use.

This patch (of 7):

This function has one caller, and the combined function is simpler to
read, reason about and modify.

Link: https://lkml.kernel.org/r/20240403171838.1445826-1-willy@infradead.org
Link: https://lkml.kernel.org/r/20240403171838.1445826-2-willy@infradead.org


Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: default avatarVishal Moola (Oracle) <vishal.moola@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Conflicts:
	mm/khugepaged.c
[Context difference only]
Signed-off-by: default avatarNanyong Sun <sunnanyong@huawei.com>
parent 723be560

mm/khugepaged.c

+4 −15
Original line number Diff line number Diff line
@@ -919,20 +919,6 @@ static int hpage_collapse_find_target_node(struct collapse_control *cc) 
}

#endif



static bool hpage_collapse_alloc_folio(struct folio **folio, gfp_t gfp, int node,

				      nodemask_t *nmask)

{

	*folio = __folio_alloc(gfp, HPAGE_PMD_ORDER, node, nmask);



	if (unlikely(!*folio)) {

		count_vm_event(THP_COLLAPSE_ALLOC_FAILED);

		return false;

	}



	count_vm_event(THP_COLLAPSE_ALLOC);

	return true;

}



/*

 * If mmap_lock temporarily dropped, revalidate vma

 * before taking mmap_lock.
@@ -1098,11 +1084,14 @@ static int alloc_charge_hpage(struct page **hpage, struct mm_struct *mm, 
	if (cc->reliable)

		gfp |= GFP_RELIABLE;



	if (!hpage_collapse_alloc_folio(&folio, gfp, node, &cc->alloc_nmask)) {

	folio = __folio_alloc(gfp, HPAGE_PMD_ORDER, node, &cc->alloc_nmask);

	if (!folio) {

		*hpage = NULL;

		count_vm_event(THP_COLLAPSE_ALLOC_FAILED);

		return SCAN_ALLOC_HUGE_PAGE_FAIL;

	}



	count_vm_event(THP_COLLAPSE_ALLOC);

	if (unlikely(mem_cgroup_charge(folio, mm, gfp))) {

		folio_put(folio);

		*hpage = NULL;