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

khugepaged: pass a folio to __collapse_huge_page_copy() 

mainline inclusion
from mainline-v6.10-rc1
commit 8eca68e2cfdf863e98dc3c2cc8b2be9cac46b9d6
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=8eca68e2cfdf863e98dc3c2cc8b2be9cac46b9d6

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

Simplify the body of __collapse_huge_page_copy() while I'm looking at
it.

Link: https://lkml.kernel.org/r/20240403171838.1445826-5-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
[return val conflict for copy_mc_user_highpage, which is introduced
by commit 681be068 ("mm/hwpoison: return -EFAULT when copy fail
in copy_mc_[user]_highpage()")]
Signed-off-by: default avatarNanyong Sun <sunnanyong@huawei.com>
parent b8e6025a

mm/khugepaged.c

+16 −20
Original line number Diff line number Diff line
@@ -794,7 +794,7 @@ static void __collapse_huge_page_copy_failed(pte_t *pte, 
 * Returns SCAN_SUCCEED if copying succeeds, otherwise returns SCAN_COPY_MC.

 *

 * @pte: starting of the PTEs to copy from

 * @page: the new hugepage to copy contents to

 * @folio: the new hugepage to copy contents to

 * @pmd: pointer to the new hugepage's PMD

 * @orig_pmd: the original raw pages' PMD

 * @vma: the original raw pages' virtual memory area
@@ -802,33 +802,29 @@ static void __collapse_huge_page_copy_failed(pte_t *pte, 
 * @ptl: lock on raw pages' PTEs

 * @compound_pagelist: list that stores compound pages

 */

static int __collapse_huge_page_copy(pte_t *pte,

				     struct page *page,

				     pmd_t *pmd,

				     pmd_t orig_pmd,

				     struct vm_area_struct *vma,

				     unsigned long address,

				     spinlock_t *ptl,

static int __collapse_huge_page_copy(pte_t *pte, struct folio *folio,

		pmd_t *pmd, pmd_t orig_pmd, struct vm_area_struct *vma,

		unsigned long address, spinlock_t *ptl,

		struct list_head *compound_pagelist)

{

	struct page *src_page;

	pte_t *_pte;

	pte_t pteval;

	unsigned long _address;

	unsigned int i;

	int result = SCAN_SUCCEED;



	/*

	 * Copying pages' contents is subject to memory poison at any iteration.

	 */

	for (_pte = pte, _address = address; _pte < pte + HPAGE_PMD_NR;

	     _pte++, page++, _address += PAGE_SIZE) {

		pteval = ptep_get(_pte);

	for (i = 0; i < HPAGE_PMD_NR; i++) {

		pte_t pteval = ptep_get(pte + i);

		struct page *page = folio_page(folio, i);

		unsigned long src_addr = address + i * PAGE_SIZE;

		struct page *src_page;



		if (pte_none(pteval) || is_zero_pfn(pte_pfn(pteval))) {

			clear_user_highpage(page, _address);

			clear_user_highpage(page, src_addr);

			continue;

		}

		src_page = pte_page(pteval);

		if (copy_mc_user_highpage(page, src_page, _address, vma)) {

		if (copy_mc_user_highpage(page, src_page, src_addr, vma)) {

			result = SCAN_COPY_MC;

			break;

		}
@@ -1224,7 +1220,7 @@ static int collapse_huge_page(struct mm_struct *mm, unsigned long address, 
	 */

	anon_vma_unlock_write(vma->anon_vma);



	result = __collapse_huge_page_copy(pte, &folio->page, pmd, _pmd,

	result = __collapse_huge_page_copy(pte, folio, pmd, _pmd,

					   vma, address, pte_ptl,

					   &compound_pagelist);

	pte_unmap(pte);