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

!12082 userfaultfd: don't BUG_ON() if khugepaged yanks our page table 

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

 

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

mm/userfaultfd.c

+4 −3
Original line number Diff line number Diff line
@@ -724,9 +724,10 @@ static __always_inline ssize_t mfill_atomic(struct mm_struct *dst_mm, 
			err = -EFAULT;

			break;

		}



		BUG_ON(pmd_none(*dst_pmd));

		BUG_ON(pmd_trans_huge(*dst_pmd));

		/*

		 * For shmem mappings, khugepaged is allowed to remove page

		 * tables under us; pte_offset_map_lock() will deal with that.

		 */



#ifdef CONFIG_USERSWAP

		if (static_branch_unlikely(&userswap_enabled) &&