Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755370Ab0KILFk (ORCPT ); Tue, 9 Nov 2010 06:05:40 -0500 Received: from zene.cmpxchg.org ([85.214.230.12]:52361 "EHLO zene.cmpxchg.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754857Ab0KILFj (ORCPT ); Tue, 9 Nov 2010 06:05:39 -0500 Date: Tue, 9 Nov 2010 12:05:21 +0100 From: Johannes Weiner To: Andrew Morton Cc: David Rientjes , KAMEZAWA Hiroyuki , Balbir Singh , Daisuke Nishimura , Greg Thelen , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [patch] memcg: fix unit mismatch in memcg oom limit calculation Message-ID: <20101109110521.GS23393@cmpxchg.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1288 Lines: 34 Adding the number of swap pages to the byte limit of a memory control group makes no sense. Convert the pages to bytes before adding them. The only user of this code is the OOM killer, and the way it is used means that the error results in a higher OOM badness value. Since the cgroup limit is the same for all tasks in the cgroup, the error should have no practical impact at the moment. But let's not wait for future or changing users to trip over it. Signed-off-by: Johannes Weiner --- mm/memcontrol.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -1552,8 +1552,9 @@ u64 mem_cgroup_get_limit(struct mem_cgro u64 limit; u64 memsw; - limit = res_counter_read_u64(&memcg->res, RES_LIMIT) + - total_swap_pages; + limit = res_counter_read_u64(&memcg->res, RES_LIMIT); + limit += total_swap_pages << PAGE_SHIFT; + memsw = res_counter_read_u64(&memcg->memsw, RES_LIMIT); /* * If memsw is finite and limits the amount of swap space available -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/