Subject: + mm-consolidate-code-to-call-vm_ops-page_mkwrite-fix.patch added to -mm tree To: kirill.shutemov@xxxxxxxxxxxxxxx,ak@xxxxxxxxxxxxxxx,dave.hansen@xxxxxxxxxxxxxxx,matthew.r.wilcox@xxxxxxxxx,mgorman@xxxxxxx,n-horiguchi@xxxxxxxxxxxxx,riel@xxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Tue, 18 Feb 2014 13:58:02 -0800 The patch titled Subject: mm-consolidate-code-to-call-vm_ops-page_mkwrite-fix has been added to the -mm tree. Its filename is mm-consolidate-code-to-call-vm_ops-page_mkwrite-fix.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/mm-consolidate-code-to-call-vm_ops-page_mkwrite-fix.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/mm-consolidate-code-to-call-vm_ops-page_mkwrite-fix.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: "Kirill A. Shutemov" <kirill.shutemov@xxxxxxxxxxxxxxx> Subject: mm-consolidate-code-to-call-vm_ops-page_mkwrite-fix I forgot to set VM_FAULT_LOCKED bit in do_page_mkwrite() return code, if we lock the page in do_page_mkwrite(). It triggers deadlock, if ->page_mkwrite doesn't take page lock on its own. Signed-off-by: Kirill A. Shutemov <kirill.shutemov@xxxxxxxxxxxxxxx> Cc: Mel Gorman <mgorman@xxxxxxx> Cc: Rik van Riel <riel@xxxxxxxxxx> Cc: Andi Kleen <ak@xxxxxxxxxxxxxxx> Cc: Matthew Wilcox <matthew.r.wilcox@xxxxxxxxx> Cc: Dave Hansen <dave.hansen@xxxxxxxxxxxxxxx> Cc: Naoya Horiguchi <n-horiguchi@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/memory.c | 1 + 1 file changed, 1 insertion(+) diff -puN mm/memory.c~mm-consolidate-code-to-call-vm_ops-page_mkwrite-fix mm/memory.c --- a/mm/memory.c~mm-consolidate-code-to-call-vm_ops-page_mkwrite-fix +++ a/mm/memory.c @@ -2612,6 +2612,7 @@ static int do_page_mkwrite(struct vm_are unlock_page(page); return 0; /* retry */ } + ret |= VM_FAULT_LOCKED; } else VM_BUG_ON_PAGE(!PageLocked(page), page); return ret; _ Patches currently in -mm which might be from kirill.shutemov@xxxxxxxxxxxxxxx are mm-hwpoison-release-page-on-pagehwpoison-in-__do_fault.patch mm-thp-fix-infinite-loop-on-memcg-oom.patch memcg-change-oom_info_lock-to-mutex.patch mm-close-pagetail-race.patch mm-page_alloc-make-first_page-visible-before-pagetail.patch pagewalk-update-page-table-walker-core.patch pagewalk-add-walk_page_vma.patch smaps-redefine-callback-functions-for-page-table-walker.patch clear_refs-redefine-callback-functions-for-page-table-walker.patch pagemap-redefine-callback-functions-for-page-table-walker.patch numa_maps-redefine-callback-functions-for-page-table-walker.patch memcg-redefine-callback-functions-for-page-table-walker.patch madvise-redefine-callback-functions-for-page-table-walker.patch arch-powerpc-mm-subpage-protc-use-walk_page_vma-instead-of-walk_page_range.patch pagewalk-remove-argument-hmask-from-hugetlb_entry.patch mempolicy-apply-page-table-walker-on-queue_pages_range.patch mm-rename-__do_fault-do_fault.patch mm-do_fault-extract-to-call-vm_ops-do_fault-to-separate-function.patch mm-introduce-do_read_fault.patch mm-introduce-do_cow_fault.patch mm-introduce-do_shared_fault-and-drop-do_fault.patch mm-consolidate-code-to-call-vm_ops-page_mkwrite.patch mm-consolidate-code-to-call-vm_ops-page_mkwrite-fix.patch mm-consolidate-code-to-setup-pte.patch mm-thp-drop-do_huge_pmd_wp_zero_page_fallback.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