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

!8487 [sync] PR-8397: mm/hugetlb: fix missing hugetlb_lock for resv uncharge 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/8397 
 
PR sync from: Jinjiang Tu <tujinjiang@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/CYQB3C3ZY2X6IL46ZILBPHEKEXFSUILN/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9QR5M 
 
Link:https://gitee.com/openeuler/kernel/pulls/8487

 

Reviewed-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 2a330592 58343e77

mm/hugetlb.c

+4 −1
Original line number Diff line number Diff line
@@ -2685,9 +2685,12 @@ struct page *alloc_huge_page(struct vm_area_struct *vma, 


		rsv_adjust = hugepage_subpool_put_pages(spool, 1, info);

		hugetlb_acct_memory(h, -rsv_adjust, info);

		if (deferred_reserve)

		if (deferred_reserve) {

			spin_lock_irq(&hugetlb_lock);

			hugetlb_cgroup_uncharge_page_rsvd(hstate_index(h),

					pages_per_huge_page(h), page);

			spin_unlock_irq(&hugetlb_lock);

		}

	}

	return page;