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

!14953 mm: khugepaged: fix call hpage_collapse_scan_file() for anonymous vma 

Merge Pull Request from: @ci-robot 
 
PR sync from: Liu Shixin <liushixin2@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/Z76PD3OH5K6BT7QI2VA6DTUV3XJLCD4X/ 
 
https://gitee.com/openeuler/kernel/issues/IBHBSQ 
 
Link:https://gitee.com/openeuler/kernel/pulls/14953

 

Reviewed-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents e9340cc4 5b038979

mm/khugepaged.c

+2 −2
Original line number Diff line number Diff line
@@ -2426,7 +2426,7 @@ static unsigned int khugepaged_scan_mm_slot(unsigned int pages, int *result, 
			VM_BUG_ON(khugepaged_scan.address < hstart ||

				  khugepaged_scan.address + HPAGE_PMD_SIZE >

				  hend);

			if (IS_ENABLED(CONFIG_SHMEM) && vma->vm_file) {

			if (IS_ENABLED(CONFIG_SHMEM) && !vma_is_anonymous(vma)) {

				struct file *file = get_file(vma->vm_file);

				pgoff_t pgoff = linear_page_index(vma,

						khugepaged_scan.address);
@@ -2776,7 +2776,7 @@ int madvise_collapse(struct vm_area_struct *vma, struct vm_area_struct **prev, 
		memset(cc->node_load, 0, sizeof(cc->node_load));

		nodes_clear(cc->alloc_nmask);

		cc->reliable = false;

		if (IS_ENABLED(CONFIG_SHMEM) && vma->vm_file) {

		if (IS_ENABLED(CONFIG_SHMEM) && !vma_is_anonymous(vma)) {

			struct file *file = get_file(vma->vm_file);

			pgoff_t pgoff = linear_page_index(vma, addr);