Subject: + mm-fold-mlocked_vma_newpage-into-its-only-call-site.patch added to -mm tree To: nasa4836@xxxxxxxxx,akpm@xxxxxxxxxxxxxxxxxxxx,hughd@xxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Mon, 12 May 2014 13:50:54 -0700 The patch titled Subject: mm: fold mlocked_vma_newpage() into its only call site has been added to the -mm tree. Its filename is mm-fold-mlocked_vma_newpage-into-its-only-call-site.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/mm-fold-mlocked_vma_newpage-into-its-only-call-site.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/mm-fold-mlocked_vma_newpage-into-its-only-call-site.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: Jianyu Zhan <nasa4836@xxxxxxxxx> Subject: mm: fold mlocked_vma_newpage() into its only call site In previous commit(mm: use the light version __mod_zone_page_state in mlocked_vma_newpage()) a irq-unsafe __mod_zone_page_state is used. And as suggested by Andrew, to reduce the risks that new call sites incorrectly using mlocked_vma_newpage() without knowing they are adding racing, this patch folds mlocked_vma_newpage() into its only call site, page_add_new_anon_rmap, to make it open-cocded for people to know what is going on. Suggested-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Suggested-by: Hugh Dickins <hughd@xxxxxxxxxx> Signed-off-by: Jianyu Zhan <nasa4836@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/internal.h | 29 ----------------------------- mm/rmap.c | 20 +++++++++++++++++--- 2 files changed, 17 insertions(+), 32 deletions(-) diff -puN mm/internal.h~mm-fold-mlocked_vma_newpage-into-its-only-call-site mm/internal.h --- a/mm/internal.h~mm-fold-mlocked_vma_newpage-into-its-only-call-site +++ a/mm/internal.h @@ -189,31 +189,6 @@ static inline void munlock_vma_pages_all } /* - * Called only in fault path, to determine if a new page is being - * mapped into a LOCKED vma. If it is, mark page as mlocked. - */ -static inline int mlocked_vma_newpage(struct vm_area_struct *vma, - struct page *page) -{ - VM_BUG_ON_PAGE(PageLRU(page), page); - - if (likely((vma->vm_flags & (VM_LOCKED | VM_SPECIAL)) != VM_LOCKED)) - return 0; - - if (!TestSetPageMlocked(page)) { - /* - * We use the irq-unsafe __mod_zone_page_stat because - * this counter is not modified from interrupt context, and the - * pte lock is held(spinlock), which implies preemption disabled. - */ - __mod_zone_page_state(page_zone(page), NR_MLOCK, - hpage_nr_pages(page)); - count_vm_event(UNEVICTABLE_PGMLOCKED); - } - return 1; -} - -/* * must be called with vma's mmap_sem held for read or write, and page locked. */ extern void mlock_vma_page(struct page *page); @@ -255,10 +230,6 @@ extern unsigned long vma_address(struct struct vm_area_struct *vma); #endif #else /* !CONFIG_MMU */ -static inline int mlocked_vma_newpage(struct vm_area_struct *v, struct page *p) -{ - return 0; -} static inline void clear_page_mlock(struct page *page) { } static inline void mlock_vma_page(struct page *page) { } static inline void mlock_migrate_page(struct page *new, struct page *old) { } diff -puN mm/rmap.c~mm-fold-mlocked_vma_newpage-into-its-only-call-site mm/rmap.c --- a/mm/rmap.c~mm-fold-mlocked_vma_newpage-into-its-only-call-site +++ a/mm/rmap.c @@ -1025,11 +1025,25 @@ void page_add_new_anon_rmap(struct page __mod_zone_page_state(page_zone(page), NR_ANON_PAGES, hpage_nr_pages(page)); __page_set_anon_rmap(page, vma, address, 1); - if (!mlocked_vma_newpage(vma, page)) { + + VM_BUG_ON_PAGE(PageLRU(page), page); + if (likely((vma->vm_flags & (VM_LOCKED | VM_SPECIAL)) != VM_LOCKED)) { SetPageActive(page); lru_cache_add(page); - } else - add_page_to_unevictable_list(page); + return; + } + + if (!TestSetPageMlocked(page)) { + /* + * We use the irq-unsafe __mod_zone_page_stat because + * this counter is not modified from interrupt context, and the + * pte lock is held(spinlock), which implies preemption disabled. + */ + __mod_zone_page_state(page_zone(page), NR_MLOCK, + hpage_nr_pages(page)); + count_vm_event(UNEVICTABLE_PGMLOCKED); + } + add_page_to_unevictable_list(page); } /** _ Patches currently in -mm which might be from nasa4836@xxxxxxxxx are mm-swapc-clean-up-lru_cache_add-functions.patch mm-swapc-introduce-put_refcounted_compound_page-helpers-for-spliting-put_compound_page.patch mm-swapc-split-put_compound_page-function.patch mm-introdule-compound_head_by_tail.patch mm-memcontrol-clean-up-memcg-zoneinfo-lookup.patch mm-memcontrol-remove-unnecessary-memcg-argument-from-soft-limit-functions.patch mm-use-the-light-version-__mod_zone_page_state-in-mlocked_vma_newpage.patch mm-fold-mlocked_vma_newpage-into-its-only-call-site.patch mm-use-a-light-weight-__mod_zone_page_state-in-mlocked_vma_newpage-checkpatch-fixes.patch linux-next.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