The patch titled
Subject: mm/hugetlb.c: fix race when migrating pages
has been removed from the -mm tree. Its filename was
mm-hugetlb-fix-race-when-migrate-pages.patch
This patch was dropped because it was nacked
------------------------------------------------------
From: zhong jiang <zhongjiang@xxxxxxxxxx>
Subject: mm/hugetlb.c: fix race when migrating pages
I hit the following code in huge_pte_alloc when run the database and
online-offline memory in the system.
BUG_ON(pte && !pte_none(*pte) && !pte_huge(*pte));
when pmd share function enable, we may be obtain a shared pmd entry. due
to ongoing offline memory , the pmd entry points to the page will turn
into migrate condition. therefore, the bug will come up.
The patch fixes it by checking the pmd entry when we obtain the lock. if
the shared pmd entry points to page is under migration. we should
allocate a new pmd entry.
Link: http://lkml.kernel.org/r/1468935958-21810-1-git-send-email-zhongjiang@xxxxxxxxxx
Signed-off-by: zhong jiang <zhongjiang@xxxxxxxxxx>
Acked-by: Hillf Danton <hillf.zj@xxxxxxxxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxx>
Cc: Vlastimil Babka <vbabka@xxxxxxx>
Cc: Xishi Qiu <qiuxishi@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/hugetlb.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff -puN mm/hugetlb.c~mm-hugetlb-fix-race-when-migrate-pages mm/hugetlb.c
--- a/mm/hugetlb.c~mm-hugetlb-fix-race-when-migrate-pages
+++ a/mm/hugetlb.c
@@ -4204,7 +4204,7 @@ pte_t *huge_pmd_share(struct mm_struct *
struct vm_area_struct *svma;
unsigned long saddr;
pte_t *spte = NULL;
- pte_t *pte;
+ pte_t *pte, entry;
spinlock_t *ptl;
if (!vma_shareable(vma, addr))
@@ -4230,6 +4230,11 @@ pte_t *huge_pmd_share(struct mm_struct *
ptl = huge_pte_lockptr(hstate_vma(vma), mm, spte);
spin_lock(ptl);
+ entry = huge_ptep_get(spte);
+ if (is_hugetlb_entry_migration(entry) ||
+ is_hugetlb_entry_hwpoisoned(entry)) {
+ goto out_unlock;
+ }
if (pud_none(*pud)) {
pud_populate(mm, pud,
(pmd_t *)((unsigned long)spte & PAGE_MASK));
@@ -4237,6 +4242,8 @@ pte_t *huge_pmd_share(struct mm_struct *
} else {
put_page(virt_to_page(spte));
}
+
+out_unlock:
spin_unlock(ptl);
out:
pte = (pte_t *)pmd_alloc(mm, pud, addr);
_
Patches currently in -mm which might be from zhongjiang@xxxxxxxxxx are
mm-update-the-comment-in-__isolate_free_page.patch
mm-page_owner-align-with-pageblock_nr-pages.patch
mm-walk-the-zone-in-pageblock_nr_pages-steps.patch
kexec-add-restriction-on-kexec_load-segment-sizes.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
