From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965066AbbJ0QX5 (ORCPT ); Tue, 27 Oct 2015 12:23:57 -0400 Received: from gum.cmpxchg.org ([85.214.110.215]:40296 "EHLO gum.cmpxchg.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964980AbbJ0QXz (ORCPT ); Tue, 27 Oct 2015 12:23:55 -0400 Date: Tue, 27 Oct 2015 09:23:31 -0700 From: Johannes Weiner To: mhocko@kernel.org Cc: Andrew Morton , Shaohua Li , Ben Hutchings , Vladimir Davydov , linux-mm@kvack.org, LKML , Michal Hocko , stable@vger.kernel.org Subject: Re: [PATCH] memcg: Fix thresholds for 32b architectures. Message-ID: <20151027162331.GA7749@cmpxchg.org> References: <1445942234-11175-1-git-send-email-mhocko@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1445942234-11175-1-git-send-email-mhocko@kernel.org> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Oct 27, 2015 at 11:37:14AM +0100, mhocko@kernel.org wrote: > From: Michal Hocko > > 424cdc141380 ("memcg: convert threshold to bytes") has fixed a > regression introduced by 3e32cb2e0a12 ("mm: memcontrol: lockless page > counters") where thresholds were silently converted to use page units > rather than bytes when interpreting the user input. > > The fix is not complete, though, as properly pointed out by Ben > Hutchings during stable backport review. The page count is converted > to bytes but unsigned long is used to hold the value which would > be obviously not sufficient for 32b systems with more than 4G > thresholds. The same applies to usage as taken from mem_cgroup_usage > which might overflow. > > Let's remove this bytes vs. pages internal tracking differences and > handle thresholds in page units internally. Chage mem_cgroup_usage() > to return the value in page units and revert 424cdc141380 because this > should be sufficient for the consistent handling. > mem_cgroup_read_u64 as the only users of mem_cgroup_usage outside of > the threshold handling code is converted to give the proper in bytes > result. It is doing that already for page_counter output so this is > more consistent as well. > > The value presented to the userspace is still in bytes units. > > Fixes: 424cdc141380 ("memcg: convert threshold to bytes") > Fixes: 3e32cb2e0a12 ("mm: memcontrol: lockless page counters") > CC: stable@vger.kernel.org > Reported-by: Ben Hutchings > Signed-off-by: Michal Hocko Acked-by: Johannes Weiner > +++ b/mm/memcontrol.c > @@ -2802,7 +2802,7 @@ static unsigned long tree_stat(struct mem_cgroup *memcg, > return val; > } > > -static inline u64 mem_cgroup_usage(struct mem_cgroup *memcg, bool swap) > +static inline unsigned long mem_cgroup_usage(struct mem_cgroup *memcg, bool swap) > { > u64 val; Minor nit, but this should probably be unsigned long now.