The patch titled mm: wrap follow_pte() using __cond_lock() has been added to the -mm tree. Its filename is mm-wrap-follow_pte-using-__cond_lock.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 *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: mm: wrap follow_pte() using __cond_lock() From: Namhyung Kim <namhyung@xxxxxxxxx> The follow_pte() conditionally grabs *@ptlp in case of returning 0. Rename and wrap it using __cond_lock() removes following warnings: mm/memory.c:2337:9: warning: context imbalance in 'do_wp_page' - unexpected unlock mm/memory.c:3142:19: warning: context imbalance in 'handle_mm_fault' - different lock contexts for basic block Signed-off-by: Namhyung Kim <namhyung@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/memory.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff -puN mm/memory.c~mm-wrap-follow_pte-using-__cond_lock mm/memory.c --- a/mm/memory.c~mm-wrap-follow_pte-using-__cond_lock +++ a/mm/memory.c @@ -3345,7 +3345,7 @@ int in_gate_area_no_task(unsigned long a #endif /* __HAVE_ARCH_GATE_AREA */ -static int follow_pte(struct mm_struct *mm, unsigned long address, +static int __follow_pte(struct mm_struct *mm, unsigned long address, pte_t **ptepp, spinlock_t **ptlp) { pgd_t *pgd; @@ -3382,6 +3382,17 @@ out: return -EINVAL; } +static inline int follow_pte(struct mm_struct *mm, unsigned long address, + pte_t **ptepp, spinlock_t **ptlp) +{ + int res; + + /* (void) is needed to make gcc happy */ + (void) __cond_lock(*ptlp, + !(res = __follow_pte(mm, address, ptepp, ptlp))); + return res; +} + /** * follow_pfn - look up PFN at a user virtual address * @vma: memory mapping _ Patches currently in -mm which might be from namhyung@xxxxxxxxx are origin.patch linux-next.patch vfs-remove-a-warning-on-open_fmode.patch vfs-add-__fmode_exec.patch mm-cleanup-gfp_zone-fix-sparse-warnings.patch mm-remove-temporary-variable-on-generic_file_direct_write.patch mm-add-casts-to-from-gfp_t-in-gfp_to_alloc_flags.patch mm-wrap-get_locked_pte-using-__cond_lock.patch mm-add-lock-release-annotation-on-do_wp_page.patch mm-wrap-follow_pte-using-__cond_lock.patch rmap-annotate-lock-context-change-on-page_lock_anon_vma.patch rmap-wrap-page_check_address-using-__cond_lock.patch rmap-make-anon_vma_free-static.patch vmalloc-rename-temporary-variable-in-__insert_vmap_area.patch vmalloc-annotate-lock-context-change-on-s_start-stop.patch mm-declare-some-external-symbols.patch vmstat-include-compactionh-when-config_compaction.patch vmstat-include-compactionh-when-config_compaction-fix.patch init-mark-__user-address-space-on-string-literals.patch kernel-userc-add-lock-release-annotation-on-free_user.patch printk-fixup-declaration-of-kmsg_reasons.patch printk-add-lock-context-annotation.patch printk-change-type-of-boot_delay-to-int.patch printk-declare-printk_ratelimit_state-in-ratelimith.patch printk-declare-printk_ratelimit_state-in-ratelimith-fix.patch ptrace-annotate-lock-context-change-on-exit_ptrace.patch ptrace-change-signature-of-sys_ptrace-and-friends.patch ptrace-cleanup-ptrace_request.patch ptrace-change-signature-of-arch_ptrace.patch ptrace-cleanup-arch_ptrace-on-x86.patch ptrace-cleanup-arch_ptrace-on-arm.patch ptrace-cleanup-arch_ptrace-on-avr32.patch ptrace-cleanup-arch_ptrace-and-friends-on-blackfin.patch ptrace-cleanup-arch_ptrace-on-cris.patch ptrace-cleanup-arch_ptrace-on-frv.patch ptrace-cleanup-arch_ptrace-on-h8300.patch ptrace-cleanup-arch_ptrace-on-m32r.patch ptrace-cleanup-arch_ptrace-on-m68k.patch ptrace-cleanup-arch_ptrace-on-m68knommu.patch ptrace-cleanup-arch_ptrace-on-microblaze.patch ptrace-cleanup-arch_ptrace-on-mips.patch ptrace-cleanup-arch_ptrace-on-mn10300.patch ptrace-cleanup-arch_ptrace-on-parisc.patch ptrace-cleanup-arch_ptrace-on-powerpc.patch ptrace-cleanup-arch_ptrace-on-score.patch ptrace-cleanup-arch_ptrace-on-sh.patch ptrace-cleanup-arch_ptrace-on-sparc.patch ptrace-cleanup-arch_ptrace-on-tile.patch ptrace-cleanup-arch_ptrace-on-um.patch ptrace-cleanup-arch_ptrace-on-xtensa.patch signals-annotate-lock_task_sighand.patch signals-annotate-lock-context-change-on-ptrace_stop.patch exit-add-lock-context-annotation-on-find_new_reaper.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