Unverified Commit 97ba28f6 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!5024 v2 vmemmap optimize bugfix 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yuan Can <yuancan@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/5CDB233HAXZAP3SNDGJ77HMTXBSITKDN/ 
Yuan Can (2):
  mm: hugetlb_vmemmap: fix hugetlb page number decrease failed on
    movable nodes
  mm: hugetlb_vmemmap: allow alloc vmemmap pages fallback to other nodes


-- 
2.17.1
 
https://gitee.com/openeuler/kernel/issues/I96CYK 
 
Link:https://gitee.com/openeuler/kernel/pulls/5024

 

Reviewed-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents 477a4de6 56cde66d

mm/hugetlb_vmemmap.c

+2 −3
Original line number Diff line number Diff line
@@ -320,8 +320,7 @@ static int vmemmap_remap_free(unsigned long start, unsigned long end, 
		.vmemmap_pages	= &vmemmap_pages,

	};

	int nid = page_to_nid((struct page *)reuse);

	gfp_t gfp_mask = GFP_KERNEL | __GFP_THISNODE | __GFP_NORETRY |

			__GFP_NOWARN;

	gfp_t gfp_mask = GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN;



	/*

	 * Allocate a new head vmemmap page to avoid breaking a contiguous
@@ -381,7 +380,7 @@ static int vmemmap_remap_free(unsigned long start, unsigned long end, 
static int alloc_vmemmap_page_list(unsigned long start, unsigned long end,

				   struct list_head *list)

{

	gfp_t gfp_mask = GFP_KERNEL | __GFP_RETRY_MAYFAIL | __GFP_THISNODE;

	gfp_t gfp_mask = GFP_KERNEL | __GFP_RETRY_MAYFAIL;

	unsigned long nr_pages = (end - start) >> PAGE_SHIFT;

	int nid = page_to_nid((struct page *)start);

	struct page *page, *next;