From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7903AC2BD09 for ; Sat, 29 Jun 2024 00:49:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EB5476B0098; Fri, 28 Jun 2024 20:49:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E64D86B009A; Fri, 28 Jun 2024 20:49:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D2D036B009B; Fri, 28 Jun 2024 20:49:03 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id B494F6B0098 for ; Fri, 28 Jun 2024 20:49:03 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 5E058C08FA for ; Sat, 29 Jun 2024 00:49:03 +0000 (UTC) X-FDA: 82282091766.10.D568589 Received: from out-176.mta0.migadu.com (out-176.mta0.migadu.com [91.218.175.176]) by imf30.hostedemail.com (Postfix) with ESMTP id 56A8180002 for ; Sat, 29 Jun 2024 00:49:00 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=JLn7TnAK; spf=pass (imf30.hostedemail.com: domain of shakeel.butt@linux.dev designates 91.218.175.176 as permitted sender) smtp.mailfrom=shakeel.butt@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1719622121; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=8jXXMqnvS0Z7opNE0y7FN2J4/pi2QNPt5ck9cYfm2ws=; b=0sJ2+7gdureoUiCYjsDFvdAaVJ3geGLHq+UQm9J1CEa7F7u1uJ3wTZGpBmc7+VMuy2qT4j Y1aneW1sk4l2lb2qMzl5l6sUTR85qwB5YCHaKUqJr4AhWvEZDEeiTcdxaGcX+hIfxAxEIP p/NSt2lmX8CuLT4mOZv9VWShq1HhZ6A= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1719622121; a=rsa-sha256; cv=none; b=cPlSsHtIAIzA58DeSmVV/0lhmVN6zbJV+7lJAnz6jDkRZ+yWXMbgTcAYV3IZCd5WLx82ZZ QDcDEuaWagSOig48l18XieHQS9e5gnp0ZjdJkeeSZdYsjDpe0V9akq8KZQDVgmAmKKEhJt OFCFgRHjh6YqnJbo/wXXD+l1NxfZTjM= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=JLn7TnAK; spf=pass (imf30.hostedemail.com: domain of shakeel.butt@linux.dev designates 91.218.175.176 as permitted sender) smtp.mailfrom=shakeel.butt@linux.dev; dmarc=pass (policy=none) header.from=linux.dev X-Envelope-To: roman.gushchin@linux.dev DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1719622138; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=8jXXMqnvS0Z7opNE0y7FN2J4/pi2QNPt5ck9cYfm2ws=; b=JLn7TnAKiBYfzhCQPFb08zPiNv6Nnv9RDrF2Xl6gfO+npQ5zGZuS4C3jqjhi+iF3rpNrzC ATmE2IgOxotZK3Ws7u0vShIwl+WBbvGppAUU+Gf01VBd5COEgVihWLPdvqWKsDO/QmyXVT AMbQDwvHCPu8hVIszBNXV8ZExgez5Lo= X-Envelope-To: akpm@linux-foundation.org X-Envelope-To: linux-mm@kvack.org X-Envelope-To: linux-kernel@vger.kernel.org X-Envelope-To: hannes@cmpxchg.org X-Envelope-To: mhocko@kernel.org X-Envelope-To: muchun.song@linux.dev Date: Fri, 28 Jun 2024 17:48:54 -0700 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Shakeel Butt To: Roman Gushchin Cc: Andrew Morton , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Johannes Weiner , Michal Hocko , Muchun Song Subject: Re: [PATCH v1 6/9] mm: memcg: put memcg1-specific struct mem_cgroup's members under CONFIG_MEMCG_V1 Message-ID: References: <20240628210317.272856-1-roman.gushchin@linux.dev> <20240628210317.272856-7-roman.gushchin@linux.dev> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240628210317.272856-7-roman.gushchin@linux.dev> X-Migadu-Flow: FLOW_OUT X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 56A8180002 X-Stat-Signature: ya3nez5zk9id35xuhxeqxw5o4bsptop1 X-HE-Tag: 1719622140-632698 X-HE-Meta: U2FsdGVkX18UNfFkQ97lJ1Az85msMbFeLhhnmec0qdEsW1ZdypGcG/u/LT+vutknAyMimbZDU6NUZr7FD/ms/R1MbnnqQ0GWe2VPq7jB6WFOkRLv+1V5QhX2ckVq0+ySl7pNjs7yB6ez5OYbtc5iwbwk5qysfTeg9MU1iz4x+MUigkvVfIaw3+0OEBMeQ9nCl+sEWdO2qbY4ZSIBMaPiyGUSWxagR5QaA8zgavQX6m6qVMpPMF0ounbEEB0GQCYunhkA1OSfUgVwL++wKVAMqP/654yclfe5aYIkLGp2kxOuXbaCeGX+O740WLARTwcr7qepU0aphQcLiHDd67ukgwJDHgD6f0nhr2VH6+inaCkgHAnHuCnXade4vWzIm1zq4B+H0VUHjz5V1heOYeHhCqdD1CI8TODEERZJLEN1xFvzw0prheP1b4oulMxibyKJt8lJ3nTFzKaKAdu9SP8rwWSD8VO3RPh7ZZeBYNSXPQrqGb3htqu5H499iWnEVfwzWpVBI522NtBzEIg+MY3uWTwzgq6MaefLpQEMvVWyzUCogdNrpBXSL5DSlDTIl3IC4dVdnq932CIbZzXsxrzf+BXADxHgR+kJlqTPdUDLCB8eGLWkX1xVTt9j3a/10jNGyk05VHM4+brSCwLSdDYpP+jOGv5jQSU/aCAeSgf5KP1KM+9VXk3AGbTxeqlORevi6cX2lkPNxMQvNyiyc8J2M3lR7nzNZh/Ckl6OGGt1k+8wD7S0pmqHu7HwURdfxBUuq314xj+CPcVnE8crgK+8bVkf+i0J156+Juxm/JZvdScFYZ1Owy7ol5KBuDjDdjBEVGB+/YPNCtJ8fCPjWOWzhDU1weFG0WZE5BLWtx/myb/5CzWFdj9kA99FOARfS8RMvvg99yNeEjkjsGVPUyDKNMkuSO8rlZYStrSOjJfmqvcAC4jeS7/jjm8HVtVOLBuwBHtoZ9xHGkHBzxQhrYw BKxLF2OP yS2dTTLrV6ezhCJI7FwWsvGt2F33otCjAweL5wYjSRpBfumWq3mmUQW5gkEHFxsnu9JwK3H5yKtlzfKnvq2n7REkIZggcoXVRmmRFlKT5TJlSKnneKpt0AeIxVtXDSQIrOndvB78RGYfMKDvPBicZNie5zbS28NKhVfSWR47/m2Ujyak= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On Fri, Jun 28, 2024 at 09:03:14PM GMT, Roman Gushchin wrote: > Put memcg1-specific members of struct mem_cgroup under the > CONFIG_MEMCG_V1 config option. Also group them close to the end > of struct mem_cgroup just before the dynamic per-node part. > > Signed-off-by: Roman Gushchin > --- > include/linux/memcontrol.h | 103 +++++++++++++++++++------------------ > 1 file changed, 53 insertions(+), 50 deletions(-) > > diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h > index 44ab6394c9ed..107b0c5d6eab 100644 > --- a/include/linux/memcontrol.h > +++ b/include/linux/memcontrol.h > @@ -188,10 +188,6 @@ struct mem_cgroup { > struct page_counter memsw; /* v1 only */ > }; > > - /* Legacy consumer-oriented counters */ > - struct page_counter kmem; /* v1 only */ > - struct page_counter tcpmem; /* v1 only */ > - > /* Range enforcement for interrupt charges */ > struct work_struct high_work; > > @@ -205,8 +201,6 @@ struct mem_cgroup { > bool zswap_writeback; > #endif > > - unsigned long soft_limit; > - > /* vmpressure notifications */ > struct vmpressure vmpressure; > > @@ -215,13 +209,7 @@ struct mem_cgroup { > */ > bool oom_group; > > - /* protected by memcg_oom_lock */ > - bool oom_lock; > - int under_oom; > - > - int swappiness; > - /* OOM-Killer disable */ > - int oom_kill_disable; > + int swappiness; > > /* memory.events and memory.events.local */ > struct cgroup_file events_file; > @@ -230,27 +218,6 @@ struct mem_cgroup { > /* handle for "memory.swap.events" */ > struct cgroup_file swap_events_file; > > - /* protect arrays of thresholds */ > - struct mutex thresholds_lock; > - > - /* thresholds for memory usage. RCU-protected */ > - struct mem_cgroup_thresholds thresholds; > - > - /* thresholds for mem+swap usage. RCU-protected */ > - struct mem_cgroup_thresholds memsw_thresholds; > - > - /* For oom notifier event fd */ > - struct list_head oom_notify; > - > - /* > - * Should we move charges of a task when a task is moved into this > - * mem_cgroup ? And what type of charges should we move ? > - */ > - unsigned long move_charge_at_immigrate; > - /* taken only while moving_account > 0 */ > - spinlock_t move_lock; > - unsigned long move_lock_flags; > - > CACHELINE_PADDING(_pad1_); Let's also remove these _pad1_ and also _pad2_ as well as this rearrangement nullifies the reasons behind these paddings. We need to run some perf benchmarks to identify the newer false cache sharing ields.