From patchwork Wed Nov 29 03:21:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yosry Ahmed X-Patchwork-Id: 13472158 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 EA8BFC4167B for ; Wed, 29 Nov 2023 03:22:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7C9F86B0398; Tue, 28 Nov 2023 22:22:07 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 77A7C6B0399; Tue, 28 Nov 2023 22:22:07 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 61A106B039A; Tue, 28 Nov 2023 22:22:07 -0500 (EST) 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 4BE616B0398 for ; Tue, 28 Nov 2023 22:22:07 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 21314A03F1 for ; Wed, 29 Nov 2023 03:22:07 +0000 (UTC) X-FDA: 81509543094.11.02829A3 Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) by imf11.hostedemail.com (Postfix) with ESMTP id 6C4A140007 for ; Wed, 29 Nov 2023 03:22:05 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=tYGOe7QM; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf11.hostedemail.com: domain of 3XK5mZQoKCIU7x107jqvnmpxxpun.lxvurw36-vvt4jlt.x0p@flex--yosryahmed.bounces.google.com designates 209.85.128.201 as permitted sender) smtp.mailfrom=3XK5mZQoKCIU7x107jqvnmpxxpun.lxvurw36-vvt4jlt.x0p@flex--yosryahmed.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1701228125; 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=dkGBNY4lxNmyHcFXPaFanJxG5Xvmyz6hflPyUWhCGXY=; b=Ta6+D5qN0EtszdE2KkNZOdywuxeB5f1iSrUqbaUgr0KOo7J+g4imtt1lvkOGpHd2Usb4tw r7ME4WjZ6kns5zNmu+/kURf7+X4R9siUE56ND5g3g1P3/tALrk+V33SitkS92vpTG3y3g5 aZsV2DOnWhRagID6LzrS57s0cr/a7rM= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=tYGOe7QM; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf11.hostedemail.com: domain of 3XK5mZQoKCIU7x107jqvnmpxxpun.lxvurw36-vvt4jlt.x0p@flex--yosryahmed.bounces.google.com designates 209.85.128.201 as permitted sender) smtp.mailfrom=3XK5mZQoKCIU7x107jqvnmpxxpun.lxvurw36-vvt4jlt.x0p@flex--yosryahmed.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1701228125; a=rsa-sha256; cv=none; b=CKd/iuUDccNndGMG2b543ITyBH5eMq61+VLxZaY8HvabEbq2r69uMGPTG/Aafi6gbYzmNO cN+D6tag3vEgGxX/ZlJm0b8gCdS//2jvmC3k1LwsBQ9Y0ktFXc8JfbHT7mHhcR5mOwSmXr +ke4Og+A2+FRg17WLlKeIXbPgUuBz8I= Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-5cd573c2cccso4105107b3.1 for ; Tue, 28 Nov 2023 19:22:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1701228124; x=1701832924; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=dkGBNY4lxNmyHcFXPaFanJxG5Xvmyz6hflPyUWhCGXY=; b=tYGOe7QMbsFNKKpGBQbLqg3GomXE4O+QCVydWEK9JBQ9/uMs5X9p1+tV2fFomz8a+r LDm9URf+txjq+YcctlVc+sKeBgOrc89nGSR3Fr6sSMyDVpSrfhvJ8+V2cKgro0jDsbzH oatHujefALnUiWKIQmPmTjZLCkRbNWTE/owlEWqvTfmYuEvI+QBgMWwQt5RKOk0wsWCX tomC0RkXc1eYIXms7pLV2YvpZL3mVK40WpTBZAm4R3WMOpeiQEjjuOoUwXe/etU/L7DI m1nDu5evdd8IsLeKyNPJrp6TdE6hzVBMrtTL7UbdAR2DTpd1l8jaDMt8IQdAY7ZKhlhP hK6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701228124; x=1701832924; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=dkGBNY4lxNmyHcFXPaFanJxG5Xvmyz6hflPyUWhCGXY=; b=KuWw4ZosDT7tRbZKyV4NBJ/RbqC4m4DWc69lhvC8xua/EVTMAPVE93kBVasz3evStw 0HO+rymIMDO4+uegXIFlavomM64fr+bBDtYeX10i3WQQQfbX5g7vXiOnio6f3ohnaV7Z r4kwUyqgA/sEJ67+Lyw9xdRf991xY7aDchzlUDLUpnAi7cJYaftZMzOa9w88UlKEWmJl tiUja66oBxwn99KNDbyZOy+TlsPdqnSopTMzTaeJ73kRb4NaPcXYkTaGmauWVLIuoLku BktrSrkAgaJ95VykokNpVY95RblLmw/PK8lE5i2FmGKgDA6orCTxbiQzLe7ejvL4rPU1 lj5g== X-Gm-Message-State: AOJu0Yw7VnJT8rG4djFjBhLYpBFqT96McXCDHdWTbOZywxk0kGjvpOp+ 3racrlDNNBshtt8K1uBxJQwgbjPMAbPPanTr X-Google-Smtp-Source: AGHT+IGgU2pugrxnPiU5pgzoPzMJYEV1VVlpcCDjt+l6Df6QyQjrSFotV7ovT+35/w/aqiFCJqQcbTtkApU+OqYQ X-Received: from yosry.c.googlers.com ([fda3:e722:ac3:cc00:20:ed76:c0a8:29b4]) (user=yosryahmed job=sendgmr) by 2002:a05:690c:3692:b0:5d1:6732:25a0 with SMTP id fu18-20020a05690c369200b005d1673225a0mr197147ywb.4.1701228124565; Tue, 28 Nov 2023 19:22:04 -0800 (PST) Date: Wed, 29 Nov 2023 03:21:50 +0000 In-Reply-To: <20231129032154.3710765-1-yosryahmed@google.com> Mime-Version: 1.0 References: <20231129032154.3710765-1-yosryahmed@google.com> X-Mailer: git-send-email 2.43.0.rc1.413.gea7ed67945-goog Message-ID: <20231129032154.3710765-3-yosryahmed@google.com> Subject: [mm-unstable v4 2/5] mm: memcg: move vmstats structs definition above flushing code From: Yosry Ahmed To: Andrew Morton Cc: Johannes Weiner , Michal Hocko , Roman Gushchin , Shakeel Butt , Muchun Song , Ivan Babrou , Tejun Heo , " =?utf-8?q?Michal_Koutn=C3=BD?= " , Waiman Long , kernel-team@cloudflare.com, Wei Xu , Greg Thelen , Domenico Cerasuolo , linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, Yosry Ahmed X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 6C4A140007 X-Stat-Signature: 8q7bzi8jagf3xnncy458wmmmmxxqkye9 X-HE-Tag: 1701228125-757485 X-HE-Meta: U2FsdGVkX1+nyMoy57JbV3a+vMp9SIRVwyx+ULMF9k8R9jBsVZ1dOMOTf/zPjMY3adByaos7vaznwMYVy/NdahNcLrc2W9KS4PG5h2YKR4R+dkJKQB+aIaCW572rnylFGd8aHNNHxP1pEhJHLkn+hL0WeS4LdknmrrmSxKJIJsmzfkv5ZVOB/S1F3XC0hAkyRMNdNInS1NWKgcsNVm+F25xnpO6eXpiUCvDJldkQn0d1NxG6XVAp+TP9cpA9b7ci2DLbuZxZKBZa+C7HxvAWOKbnFUq53hK7e0NAvQqD9s7TzvKMGFkgyN3tWv0k6qckvfn5aSI7xUNzEw8TqSLctu22oVlvwYR6UuNcST4udj5pvCFhI36Oz+d1qHIOw4J9zvny+gVEC0xTKcJ1QX2e1mE360013zWdjM9TwFljyawqupLgG62NBS0Z2UeGr5fAuTEW+3p3KK0TSt/EXAJAZNwggl2U3IfKQm8NXmQOfSc5r7PRTUWFFjNDdz++f10QMRGBuWun2puMW4qm4V1kwMSU+LA2rXi7pXK4TePr8nXBRl7qXE2Nwc78TJ7iAj3uEY3jYvT0dgY1PgPDxkoMX2qvmeTkuqKLS2rBbJU5S9ztMH/F5GDECjnmDNh/J22fzkGV+GTWj9G1LSF7SGbTas1QFvFvAQqLNxus8FzrNR5jrAvQkFNpAdJylV9aYAtS2TQkmp7KpVxjI2jbcp9cPFsC20DbxRZUK/z5Aq5uJLRMgE2Md0ZvuYzCosyiVwF3DhB3Bo41YWs0Ch2bzgdPEhCcL7YWgTifBFPkSBMBZwJy/xeFT1ZffBjB3EMmXUQdeVg39fzUEHdxGjnjgZiasgTO6lNO8unPiQPcnZr0ufjOMYAZ4mJIDCR+l8nlGf/4RS04hMkTD48uMY8h1THeeaUt+Cdf0o/+oEjVNc2GlA0yGoGyTaDBkgMGCWlIoQN7vrpxDP7I3Em9o+gZmt9 0l19DT6K IFArlfCcs6KS2bjOAzjof3NleSZHQHwz9h1posCX8QV/J/gzKNz/wW2kJtQVtPw2CEDKKNSUTNxlS+7M1Ut1eZxyF7iMoEBWoF9jc0bUH9J1ZkJ559fCVgWwzXzinomSvTI4St0RGK8LL4YDAsnd91N5D2aOyfTxKCmSFeL/PH4LRkPZNtjxEHsU7sFJxAX5gILmytFG5Fwn3sjCStdN4jOrbrP3ZbqlK41SNRB58NhnypqQ23NaDUbuVJt5rkq+u/eEqHi6y5gbqVk7U6eXQqTorziLoeavUDriXt4ZI/Jnle7Msqkn8hUVVz1/Gkj1U7AFoREbGZPHEtzpRRdBnnjOPdvadIKe+RTYucY78IX6LEksAa3gA4Q0fDLgMEUeQ30zQl6M65UMOMRjNThlcp1AnbaB7I3oYwrCsjh5tSu+DOh8t2YUZ9cRQyr5OwOx4km1mgYam3L16/6dERRF+qv+tUT0fL/5lf4EvRNaf8wcdKY9BuKxlj4+7VtbslcyNaRBu8o6XZNgju0R4/JYIkf1L3D8T2yaOjIbPTCQBcvhdlRAZ9daX7q3v61Rygk7YY0XADd1+RFLEl5C1XGHXMV6zD3AMNwaDAzEi4mNjhHzinHFj6ga2jtxFiehRxY29T8gtMOQl5N+qcz2rG2aFI8VMNUDgK+fLofXZ 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: The following patch will make use of those structs in the flushing code, so move their definitions (and a few other dependencies) a little bit up to reduce the diff noise in the following patch. No functional change intended. Signed-off-by: Yosry Ahmed Tested-by: Domenico Cerasuolo Acked-by: Shakeel Butt --- mm/memcontrol.c | 148 ++++++++++++++++++++++++------------------------ 1 file changed, 74 insertions(+), 74 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 61435bd037cb4..cf05b97c1e824 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -573,6 +573,80 @@ mem_cgroup_largest_soft_limit_node(struct mem_cgroup_tree_per_node *mctz) return mz; } +/* Subset of vm_event_item to report for memcg event stats */ +static const unsigned int memcg_vm_event_stat[] = { + PGPGIN, + PGPGOUT, + PGSCAN_KSWAPD, + PGSCAN_DIRECT, + PGSCAN_KHUGEPAGED, + PGSTEAL_KSWAPD, + PGSTEAL_DIRECT, + PGSTEAL_KHUGEPAGED, + PGFAULT, + PGMAJFAULT, + PGREFILL, + PGACTIVATE, + PGDEACTIVATE, + PGLAZYFREE, + PGLAZYFREED, +#if defined(CONFIG_MEMCG_KMEM) && defined(CONFIG_ZSWAP) + ZSWPIN, + ZSWPOUT, + ZSWP_WB, +#endif +#ifdef CONFIG_TRANSPARENT_HUGEPAGE + THP_FAULT_ALLOC, + THP_COLLAPSE_ALLOC, + THP_SWPOUT, + THP_SWPOUT_FALLBACK, +#endif +}; + +#define NR_MEMCG_EVENTS ARRAY_SIZE(memcg_vm_event_stat) +static int mem_cgroup_events_index[NR_VM_EVENT_ITEMS] __read_mostly; + +static void init_memcg_events(void) +{ + int i; + + for (i = 0; i < NR_MEMCG_EVENTS; ++i) + mem_cgroup_events_index[memcg_vm_event_stat[i]] = i + 1; +} + +static inline int memcg_events_index(enum vm_event_item idx) +{ + return mem_cgroup_events_index[idx] - 1; +} + +struct memcg_vmstats_percpu { + /* Local (CPU and cgroup) page state & events */ + long state[MEMCG_NR_STAT]; + unsigned long events[NR_MEMCG_EVENTS]; + + /* Delta calculation for lockless upward propagation */ + long state_prev[MEMCG_NR_STAT]; + unsigned long events_prev[NR_MEMCG_EVENTS]; + + /* Cgroup1: threshold notifications & softlimit tree updates */ + unsigned long nr_page_events; + unsigned long targets[MEM_CGROUP_NTARGETS]; +}; + +struct memcg_vmstats { + /* Aggregated (CPU and subtree) page state & events */ + long state[MEMCG_NR_STAT]; + unsigned long events[NR_MEMCG_EVENTS]; + + /* Non-hierarchical (CPU aggregated) page state & events */ + long state_local[MEMCG_NR_STAT]; + unsigned long events_local[NR_MEMCG_EVENTS]; + + /* Pending child counts during tree propagation */ + long state_pending[MEMCG_NR_STAT]; + unsigned long events_pending[NR_MEMCG_EVENTS]; +}; + /* * memcg and lruvec stats flushing * @@ -684,80 +758,6 @@ static void flush_memcg_stats_dwork(struct work_struct *w) queue_delayed_work(system_unbound_wq, &stats_flush_dwork, FLUSH_TIME); } -/* Subset of vm_event_item to report for memcg event stats */ -static const unsigned int memcg_vm_event_stat[] = { - PGPGIN, - PGPGOUT, - PGSCAN_KSWAPD, - PGSCAN_DIRECT, - PGSCAN_KHUGEPAGED, - PGSTEAL_KSWAPD, - PGSTEAL_DIRECT, - PGSTEAL_KHUGEPAGED, - PGFAULT, - PGMAJFAULT, - PGREFILL, - PGACTIVATE, - PGDEACTIVATE, - PGLAZYFREE, - PGLAZYFREED, -#if defined(CONFIG_MEMCG_KMEM) && defined(CONFIG_ZSWAP) - ZSWPIN, - ZSWPOUT, - ZSWP_WB, -#endif -#ifdef CONFIG_TRANSPARENT_HUGEPAGE - THP_FAULT_ALLOC, - THP_COLLAPSE_ALLOC, - THP_SWPOUT, - THP_SWPOUT_FALLBACK, -#endif -}; - -#define NR_MEMCG_EVENTS ARRAY_SIZE(memcg_vm_event_stat) -static int mem_cgroup_events_index[NR_VM_EVENT_ITEMS] __read_mostly; - -static void init_memcg_events(void) -{ - int i; - - for (i = 0; i < NR_MEMCG_EVENTS; ++i) - mem_cgroup_events_index[memcg_vm_event_stat[i]] = i + 1; -} - -static inline int memcg_events_index(enum vm_event_item idx) -{ - return mem_cgroup_events_index[idx] - 1; -} - -struct memcg_vmstats_percpu { - /* Local (CPU and cgroup) page state & events */ - long state[MEMCG_NR_STAT]; - unsigned long events[NR_MEMCG_EVENTS]; - - /* Delta calculation for lockless upward propagation */ - long state_prev[MEMCG_NR_STAT]; - unsigned long events_prev[NR_MEMCG_EVENTS]; - - /* Cgroup1: threshold notifications & softlimit tree updates */ - unsigned long nr_page_events; - unsigned long targets[MEM_CGROUP_NTARGETS]; -}; - -struct memcg_vmstats { - /* Aggregated (CPU and subtree) page state & events */ - long state[MEMCG_NR_STAT]; - unsigned long events[NR_MEMCG_EVENTS]; - - /* Non-hierarchical (CPU aggregated) page state & events */ - long state_local[MEMCG_NR_STAT]; - unsigned long events_local[NR_MEMCG_EVENTS]; - - /* Pending child counts during tree propagation */ - long state_pending[MEMCG_NR_STAT]; - unsigned long events_pending[NR_MEMCG_EVENTS]; -}; - unsigned long memcg_page_state(struct mem_cgroup *memcg, int idx) { long x = READ_ONCE(memcg->vmstats->state[idx]);