From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail144.messagelabs.com (mail144.messagelabs.com [216.82.254.51]) by kanga.kvack.org (Postfix) with ESMTP id A0AB16B008A for ; Sun, 7 Nov 2010 17:15:12 -0500 (EST) From: Johannes Weiner Subject: [patch 2/4] memcg: catch negative per-cpu sums in dirty info Date: Sun, 7 Nov 2010 23:14:37 +0100 Message-Id: <20101107220353.414283590@cmpxchg.org> In-Reply-To: <20101107215030.007259800@cmpxchg.org> References: <20101107215030.007259800@cmpxchg.org> References: <1288973333-7891-1-git-send-email-minchan.kim@gmail.com> <20101106010357.GD23393@cmpxchg.org> <20101107215030.007259800@cmpxchg.org> Content-Disposition: inline; filename=memcg-catch-negative-per-cpu-sums-in-dirty-info.patch Sender: owner-linux-mm@kvack.org To: Greg Thelen Cc: Minchan Kim , Andrew Morton , Dave Young , Andrea Righi , KAMEZAWA Hiroyuki , Daisuke Nishimura , Balbir Singh , Wu Fengguang , linux-mm@kvack.org, linux-kernel@vger.kernel.org List-ID: Folding the per-cpu counters can yield a negative value in case of accounting races between CPUs. When collecting the dirty info, the code would read those sums into an unsigned variable and then check for it being negative, which can not work. Instead, fold the counters into a signed local variable, make the check, and only then assign it. This way, the function signals correctly when there are insane values instead of leaking them out to the caller. Signed-off-by: Johannes Weiner --- mm/memcontrol.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -1261,14 +1261,15 @@ bool mem_cgroup_dirty_info(unsigned long (dirty_param.dirty_background_ratio * available_mem) / 100; - info->nr_reclaimable = - mem_cgroup_page_stat(MEMCG_NR_RECLAIM_PAGES); - if (info->nr_reclaimable < 0) + value = mem_cgroup_page_stat(MEMCG_NR_RECLAIM_PAGES); + if (value < 0) return false; + info->nr_reclaimable = value; - info->nr_writeback = mem_cgroup_page_stat(MEMCG_NR_WRITEBACK); - if (info->nr_writeback < 0) + value = mem_cgroup_page_stat(MEMCG_NR_WRITEBACK); + if (value < 0) return false; + info->nr_writeback = value; return true; } -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Fight unfair telecom policy in Canada: sign http://dissolvethecrtc.ca/ Don't email: email@kvack.org