From mboxrd@z Thu Jan 1 00:00:00 1970 From: Roman Gushchin Subject: Re: [PATCH 1/2] mm: Rename ambiguously named memory.stat counters and functions Date: Wed, 23 Jan 2019 23:59:47 +0000 Message-ID: <20190123235940.GA21563@castle.DHCP.thefacebook.com> References: <20190123223049.GA9149@chrisdown.name> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Return-path: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : cc : subject : date : message-id : references : in-reply-to : content-type : content-id : content-transfer-encoding : mime-version; s=facebook; bh=/9t7OEFvsG0cSpEi+AXxSKwWnZCHSLbY3GJM2iPUcEc=; b=XyhH6SK28loqdEJA5sojB1Ek/ABezwOw84ERvmilVzwHGNfhOdJn1foR2Tbx00gEcjRI pVu+NZjDxKoOoiK+Iq6z5ZSPMfVOhBkWDZVRHlFHzhTai72PTUw1lSdQOZ2xClSaoEJ7 49jD8WODFR3RgmH0wOFsEBB8SWYo4lm3g1Q= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.onmicrosoft.com; s=selector1-fb-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/9t7OEFvsG0cSpEi+AXxSKwWnZCHSLbY3GJM2iPUcEc=; b=XqkR6EjqDS9CGE2Pkptu4JQK5dViUt8lfNSMF5E7kCg2ocivLtbko2YJplItO5L7e9w6TxGjnGP+KtHDXU+TVy+LMRfhJYjWoaA3x/67pR+PSE4aQdeD6kte0MgCF4aryNhxORpeXjRr2Wd12MCCXg4+oZX7l2MQAjw0jLGiLb4= In-Reply-To: <20190123223049.GA9149@chrisdown.name> Content-Language: en-US Content-ID: Sender: linux-kernel-owner@vger.kernel.org List-ID: To: Chris Down Cc: Andrew Morton , Johannes Weiner , Michal Hocko , Tejun Heo , Dennis Zhou , "linux-kernel@vger.kernel.org" , "cgroups@vger.kernel.org" , "linux-mm@kvack.org" , Kernel Team On Wed, Jan 23, 2019 at 05:30:49PM -0500, Chris Down wrote: > I spent literally an hour trying to work out why an earlier version of > my memory.events aggregation code doesn't work properly, only to find > out I was calling memcg->events instead of memcg->memory_events, which > is fairly confusing. >=20 > This naming seems in need of reworking, so make it harder to do the > wrong thing by using vmevents instead of events, which makes it more > clear that these are vm counters rather than memcg-specific counters. >=20 > There are also a few other inconsistent names in both the percpu and > aggregated structs, so these are all cleaned up to be more coherent and > easy to understand. >=20 > This commit contains code cleanup only: there are no logic changes. >=20 > Signed-off-by: Chris Down > Acked-by: Johannes Weiner > To: Andrew Morton s/To/Cc > Cc: Michal Hocko > Cc: Tejun Heo > Cc: Roman Gushchin > Cc: Dennis Zhou > Cc: linux-kernel@vger.kernel.org > Cc: cgroups@vger.kernel.org > Cc: linux-mm@kvack.org > Cc: kernel-team@fb.com > --- > include/linux/memcontrol.h | 24 +++---- > mm/memcontrol.c | 137 +++++++++++++++++++------------------ > 2 files changed, 82 insertions(+), 79 deletions(-) >=20 > diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h > index b0eb29ea0d9c..380a212a8c52 100644 > --- a/include/linux/memcontrol.h > +++ b/include/linux/memcontrol.h > @@ -94,8 +94,8 @@ enum mem_cgroup_events_target { > MEM_CGROUP_NTARGETS, > }; >=20 > -struct mem_cgroup_stat_cpu { > - long count[MEMCG_NR_STAT]; > +struct memcg_vmstats_percpu { > + long stat[MEMCG_NR_STAT]; I'd personally go with memcg_vmstat_percpu. Not insisting, but you end up using both vmstat and vmstats, which isn't very consistent. Other than that looks good to me. Please, feel free to add Acked-by: Roman Gushchin Thanks!