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

!11552 mm/hugetlb: fix pgtable lock on pmd sharing 

Merge Pull Request from: @ci-robot 
 
PR sync from: Wupeng Ma <mawupeng1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/AQKKZ4RNGPO74OSXNHXJIRBDADD3FRA4/ 
 
https://gitee.com/openeuler/kernel/issues/IAQT9Q 
 
Link:https://gitee.com/openeuler/kernel/pulls/11552

 

Reviewed-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 2468ae4f ec57e94a

mm/hugetlb.c

+2 −3
Original line number Diff line number Diff line
@@ -5907,7 +5907,6 @@ pte_t *huge_pmd_share(struct mm_struct *mm, unsigned long addr, pud_t *pud) 
	unsigned long saddr;

	pte_t *spte = NULL;

	pte_t *pte;

	spinlock_t *ptl;



	if (!vma_shareable(vma, addr))

		return (pte_t *)pmd_alloc(mm, pud, addr);
@@ -5931,7 +5930,7 @@ pte_t *huge_pmd_share(struct mm_struct *mm, unsigned long addr, pud_t *pud) 
	if (!spte)

		goto out;



	ptl = huge_pte_lock(hstate_vma(vma), mm, spte);

	spin_lock(&mm->page_table_lock);

	if (pud_none(*pud)) {

		pud_populate(mm, pud,

				(pmd_t *)((unsigned long)spte & PAGE_MASK));
@@ -5939,7 +5938,7 @@ pte_t *huge_pmd_share(struct mm_struct *mm, unsigned long addr, pud_t *pud) 
	} else {

		put_page(virt_to_page(spte));

	}

	spin_unlock(ptl);

	spin_unlock(&mm->page_table_lock);

out:

	pte = (pte_t *)pmd_alloc(mm, pud, addr);

	return pte;