From: Ebru Akagunduz Date: Tue, 26 Jul 2016 22:25:09 +0000 (-0700) Subject: mm, thp: fix locking inconsistency in collapse_huge_page X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8024ee2a09c6135102505bab4105e1410c279832;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git mm, thp: fix locking inconsistency in collapse_huge_page After creating revalidate vma function, locking inconsistency occured due to directing the code path to wrong label. This patch directs to correct label and fix the inconsistency. Related commit that caused inconsistency: http://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/?id=da4360877094368f6dfe75bbe804b0f0a5d575b0 Link: http://lkml.kernel.org/r/1464956884-4644-1-git-send-email-ebru.akagunduz@gmail.com Link: http://lkml.kernel.org/r/1466021202-61880-4-git-send-email-kirill.shutemov@linux.intel.com Signed-off-by: Ebru Akagunduz Cc: Vlastimil Babka Cc: Sergey Senozhatsky Cc: Kirill A. Shutemov Cc: Stephen Rothwell Cc: Rik van Riel Cc: Andrea Arcangeli Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/mm/huge_memory.c b/mm/huge_memory.c index b54559058d30..1841e0ceac23 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2483,13 +2483,18 @@ static void collapse_huge_page(struct mm_struct *mm, down_read(&mm->mmap_sem); result = hugepage_vma_revalidate(mm, address); - if (result) - goto out; + if (result) { + mem_cgroup_cancel_charge(new_page, memcg, true); + up_read(&mm->mmap_sem); + goto out_nolock; + } pmd = mm_find_pmd(mm, address); if (!pmd) { result = SCAN_PMD_NULL; - goto out; + mem_cgroup_cancel_charge(new_page, memcg, true); + up_read(&mm->mmap_sem); + goto out_nolock; } /* @@ -2498,8 +2503,9 @@ static void collapse_huge_page(struct mm_struct *mm, * Continuing to collapse causes inconsistency. */ if (!__collapse_huge_page_swapin(mm, vma, address, pmd)) { + mem_cgroup_cancel_charge(new_page, memcg, true); up_read(&mm->mmap_sem); - goto out; + goto out_nolock; } up_read(&mm->mmap_sem);