Subject: [merged] mm-memcg-iteration-skip-memcgs-not-yet-fully-initialized.patch removed from -mm tree To: hughd@xxxxxxxxxx,hannes@xxxxxxxxxxx,mhocko@xxxxxxx,stable@xxxxxxxxxxxxxxx,tj@xxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Fri, 24 Jan 2014 10:59:33 -0800 The patch titled Subject: mm/memcg: iteration skip memcgs not yet fully initialized has been removed from the -mm tree. Its filename was mm-memcg-iteration-skip-memcgs-not-yet-fully-initialized.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Hugh Dickins <hughd@xxxxxxxxxx> Subject: mm/memcg: iteration skip memcgs not yet fully initialized It is surprising that the mem_cgroup iterator can return memcgs which have not yet been fully initialized. By accident (or trial and error?) this appears not to present an actual problem; but it may be better to prevent such surprises, by skipping memcgs not yet online. Signed-off-by: Hugh Dickins <hughd@xxxxxxxxxx> Cc: Tejun Heo <tj@xxxxxxxxxx> Acked-by: Michal Hocko <mhocko@xxxxxxx> Cc: Johannes Weiner <hannes@xxxxxxxxxxx> Cc: <stable@xxxxxxxxxxxxxxx> [3.12+] Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/memcontrol.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff -puN mm/memcontrol.c~mm-memcg-iteration-skip-memcgs-not-yet-fully-initialized mm/memcontrol.c --- a/mm/memcontrol.c~mm-memcg-iteration-skip-memcgs-not-yet-fully-initialized +++ a/mm/memcontrol.c @@ -1119,10 +1119,8 @@ skip_node: * protected by css_get and the tree walk is rcu safe. */ if (next_css) { - struct mem_cgroup *mem = mem_cgroup_from_css(next_css); - - if (css_tryget(&mem->css)) - return mem; + if ((next_css->flags & CSS_ONLINE) && css_tryget(next_css)) + return mem_cgroup_from_css(next_css); else { prev_css = next_css; goto skip_node; _ Patches currently in -mm which might be from hughd@xxxxxxxxxx are origin.patch mm-remove-bug_on-from-mlock_vma_page.patch x86-mm-account-for-tlb-flushes-only-when-debugging.patch mm-swap-fix-race-on-swap_info-reuse-between-swapoff-and-swapon.patch mm-swap-fix-race-on-swap_info-reuse-between-swapoff-and-swapon-fix.patch swap-add-a-simple-detector-for-inappropriate-swapin-readahead.patch linux-next.patch zsmalloc-move-it-under-mm.patch zram-promote-zram-from-staging.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