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

!15605 mm/hugetlb: fix surplus pages in dissolve_free_huge_page() 

Merge Pull Request from: @ci-robot 
 
PR sync from: Jinjiang Tu <tujinjiang@huawei.com>
https://mailweb.openeuler.org/archives/list/kernel@openeuler.org/message/DZ4IKLCCPV47S5FTCY7NO4TPSAIOTYM6/ 
 
https://gitee.com/openeuler/kernel/issues/IBV73U 
 
Link:https://gitee.com/openeuler/kernel/pulls/15605

 

Reviewed-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Reviewed-by: default avatarYuan Can <yuancan@huawei.com>
Signed-off-by: default avatarYuan Can <yuancan@huawei.com>
parents e3fdb6b6 0c052824

mm/hugetlb.c

+4 −1
Original line number Diff line number Diff line
@@ -1823,6 +1823,7 @@ int dissolve_free_huge_page(struct page *page) 
	if (!page_count(page)) {

		struct page *head = compound_head(page);

		struct hstate *h = page_hstate(head);

		bool adjust_surplus = false;

		if (h->free_huge_pages - h->resv_huge_pages == 0)

			goto out;
@@ -1853,7 +1854,9 @@ int dissolve_free_huge_page(struct page *page) 
			SetPageHWPoison(page);

			ClearPageHWPoison(head);

		}

		remove_hugetlb_page(h, head, false);

		if (h->surplus_huge_pages_node[page_to_nid(head)])

			adjust_surplus = true;

		remove_hugetlb_page(h, head, adjust_surplus);

		h->max_huge_pages--;

		spin_unlock_irq(&hugetlb_lock);

		update_and_free_page(h, head);