The patch titled Subject: mm: memcontrol: reword obsolete comment of mem_cgroup_unmark_under_oom() has been added to the -mm tree. Its filename is mm-memcontrol-reword-obsolete-comment-of-mem_cgroup_unmark_under_oom.patch This patch should soon appear at https://ozlabs.org/~akpm/mmots/broken-out/mm-memcontrol-reword-obsolete-comment-of-mem_cgroup_unmark_under_oom.patch and later at https://ozlabs.org/~akpm/mmotm/broken-out/mm-memcontrol-reword-obsolete-comment-of-mem_cgroup_unmark_under_oom.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/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Miaohe Lin <linmiaohe@xxxxxxxxxx> Subject: mm: memcontrol: reword obsolete comment of mem_cgroup_unmark_under_oom() Since commit 79dfdaccd1d5 ("memcg: make oom_lock 0 and 1 based rather than counter"), the mem_cgroup_unmark_under_oom() is added and the comment of the mem_cgroup_oom_unlock() is moved here. But this comment make no sense here because mem_cgroup_oom_lock() does not operate on under_oom field. So we reword the comment as this would be helpful. [Thanks Michal Hocko for rewording this comment.] Link: https://lkml.kernel.org/r/20200930095336.21323-1-linmiaohe@xxxxxxxxxx Signed-off-by: Miaohe Lin <linmiaohe@xxxxxxxxxx> Acked-by: Michal Hocko <mhocko@xxxxxxxx> Cc: Johannes Weiner <hannes@xxxxxxxxxxx> Cc: Vladimir Davydov <vdavydov.dev@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/memcontrol.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/mm/memcontrol.c~mm-memcontrol-reword-obsolete-comment-of-mem_cgroup_unmark_under_oom +++ a/mm/memcontrol.c @@ -1826,8 +1826,8 @@ static void mem_cgroup_unmark_under_oom( struct mem_cgroup *iter; /* - * When a new child is created while the hierarchy is under oom, - * mem_cgroup_oom_lock() may not be called. Watch for underflow. + * Be careful about under_oom underflows becase a child memcg + * could have been added after mem_cgroup_mark_under_oom. */ spin_lock(&memcg_oom_lock); for_each_mem_cgroup_tree(iter, memcg) _ Patches currently in -mm which might be from linmiaohe@xxxxxxxxxx are mm-swap-fix-confusing-comment-in-release_pages.patch mm-swap_slotsc-remove-always-zero-and-unused-return-value-of-enable_swap_slots_cache.patch mm-remove-useless-out-label-in-__swap_writepage.patch mm-fix-incomplete-comment-in-lru_cache_add_inactive_or_unevictable.patch mm-remove-unnecessary-goto-out-in-_swap_info_get.patch mm-fix-potential-memory-leak-in-sys_swapon.patch mm-memcontrol-correct-the-comment-of-mem_cgroup_iter.patch mm-page_counter-correct-the-obsolete-func-name-in-the-comment-of-page_counter_try_charge.patch mm-memcontrol-reword-obsolete-comment-of-mem_cgroup_unmark_under_oom.patch mm-use-helper-function-mapping_allow_writable.patch mm-mmap-use-helper-function-allow_write_access-in-__remove_shared_vm_struct.patch mm-mempool-add-else-to-split-mutually-exclusive-case.patch mm-vmstat-use-helper-macro-abs.patch mm-fix-some-broken-comments.patch mm-use-helper-function-put_write_access.patch percpu_counter-use-helper-macro-abs.patch mm-migrate-avoid-possible-unnecessary-process-right-check-in-kernel_move_pages.patch