From patchwork Wed Sep 7 04:35:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shakeel Butt X-Patchwork-Id: 12968431 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 8FCF5C38145 for ; Wed, 7 Sep 2022 04:36:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 34E748D0005; Wed, 7 Sep 2022 00:36:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2FE7D6B0073; Wed, 7 Sep 2022 00:36:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1C6058D0005; Wed, 7 Sep 2022 00:36:19 -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 0F9776B0072 for ; Wed, 7 Sep 2022 00:36:19 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id E14BB1A098B for ; Wed, 7 Sep 2022 04:36:18 +0000 (UTC) X-FDA: 79884027636.06.10F92F5 Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) by imf24.hostedemail.com (Postfix) with ESMTP id A21C4180099 for ; Wed, 7 Sep 2022 04:36:18 +0000 (UTC) Received: by mail-yb1-f202.google.com with SMTP id l12-20020a25ad4c000000b006a8e04c284dso6748903ybe.11 for ; Tue, 06 Sep 2022 21:36:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date; bh=7xWB4XnyIc05hqp29+Ov/me4j17Vvs2h2ECTnGXauQA=; b=SDmUz9LkUVm/33cr2fKGG4SmxGsrw9fW609UlO1Lh2n9kJAvfCfnCBYoBieiLK1YI4 MPXnoJKs7HxJOBMeo211kZrqk641hONA1Abc3kl7lVLPSE2aHCTST/ZAGe/af7Ia1j+Y HSkzyUCEB5QeLvw41TwrGd/TwUv4YIM4WP861pR3jQm7dOBwu7Q0zlxU3M2K1wwpBOpB CpJIkspZw9r5LITpRw9Xg679OMVQjNafq6M/iV99mdZ3p+Qr3ZpmS2S+7O4Mi0TM+q+w DxfU/ss15LI61VWwYkkQPDsa/qz7JkfaqkZ89EbLkvsgKRetTJhSaS1Vm/9WvgNffImX t82A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date; bh=7xWB4XnyIc05hqp29+Ov/me4j17Vvs2h2ECTnGXauQA=; b=Z+PluvADz/S0j5tXEFz5lZ2GdB57SosEiATL1FjUunaWxPckw9VgRMfdvlNBtab3am Aao+oUkmTyjyN2AbFOPplzFI3lER5W6dqXSN1icjhj0xYvvpN4AovKUgXxByzesTQdC2 Y7R3TovEoUpFW+0FPrdmpIshc+A0gIjR5tzusE0eAg+0wpZPO5ZctHeXQFqURzj5HcwO e4jeb2i8PSEZ2ltXYNJO+Vpli3/l7OmEY07HJzAdxlcaFWK5ANwCpsRokVSqQI6k7wcO Q/KtCSES/UUIbsq38xlPi4ZgfoJNMbdhrif7I0NOQPLbNi3hB2/kWzgnd0CF8Zl165gg SCTA== X-Gm-Message-State: ACgBeo0yN+vQR9pxNf6RBb55yYa/xug2bNQkH8nGn8sBYUsxJT8P/dkK ylKGCWud7QVmv1BW/sfcfRAyFmj0yQV1DQ== X-Google-Smtp-Source: AA6agR41qApOeAsNTHvyqJlEKDWWr4jqOOSYR9bBI0ISwpTGkM58sXdfS6K35j4AxALrx//Yb7zv/515y/Evow== X-Received: from shakeelb.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:262e]) (user=shakeelb job=sendgmr) by 2002:a25:bb44:0:b0:677:24c:308f with SMTP id b4-20020a25bb44000000b00677024c308fmr1554313ybk.433.1662525377841; Tue, 06 Sep 2022 21:36:17 -0700 (PDT) Date: Wed, 7 Sep 2022 04:35:36 +0000 In-Reply-To: <20220907043537.3457014-1-shakeelb@google.com> Mime-Version: 1.0 References: <20220907043537.3457014-1-shakeelb@google.com> X-Mailer: git-send-email 2.37.2.789.g6183377224-goog Message-ID: <20220907043537.3457014-3-shakeelb@google.com> Subject: [PATCH 2/3] memcg: rearrange code From: Shakeel Butt To: Johannes Weiner , Michal Hocko , Roman Gushchin , Muchun Song Cc: Andrew Morton , cgroups@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Shakeel Butt ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1662525378; a=rsa-sha256; cv=none; b=WgKC+qHdgphh0ZXITd78yVO79kmC3JhFLBvVskzq6NW4EzJOASzb69B3VI/0lIihYX7QlU vjRTPQwLgIMNZMIxCJiLuybNsh7iHj/Um7cQAH4N/c7bEq27T0j8X3Bm3eXlGX9iylyjCI hSj3udpx358lqtFy98rmLfNrMLieeMY= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=SDmUz9Lk; spf=pass (imf24.hostedemail.com: domain of 3wR8YYwgKCIAwleoiipfksskpi.gsqpmry1-qqozego.svk@flex--shakeelb.bounces.google.com designates 209.85.219.202 as permitted sender) smtp.mailfrom=3wR8YYwgKCIAwleoiipfksskpi.gsqpmry1-qqozego.svk@flex--shakeelb.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1662525378; 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=7xWB4XnyIc05hqp29+Ov/me4j17Vvs2h2ECTnGXauQA=; b=FqLMrpGmMu3lP/LiTrjiLnYbexoDa411XMhPv3slMh+iIGEDr9JVlQQl6G1+RumfbOfUmP kiuU+RBzlhu0+kxuOPqCAG1e+jG+MUgeXikX6nnaTbS2Mb+dgQLWN40m2HUrJky8KIXFeY u87l2K40zYESJygGlnCs9QpqjERfepA= X-Stat-Signature: 91y8z9wtsxedkr8y8ippd8po5qhyi8ms X-Rspamd-Queue-Id: A21C4180099 Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=SDmUz9Lk; spf=pass (imf24.hostedemail.com: domain of 3wR8YYwgKCIAwleoiipfksskpi.gsqpmry1-qqozego.svk@flex--shakeelb.bounces.google.com designates 209.85.219.202 as permitted sender) smtp.mailfrom=3wR8YYwgKCIAwleoiipfksskpi.gsqpmry1-qqozego.svk@flex--shakeelb.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com X-Rspamd-Server: rspam11 X-Rspam-User: X-HE-Tag: 1662525378-137795 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: This is a preparatory patch for easing the review of the follow up patch which will reduce the memory overhead of memory cgroups. Signed-off-by: Shakeel Butt --- mm/memcontrol.c | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index b195d4ca2a72..d0ccc16ed416 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -669,6 +669,29 @@ 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[] = { + PGSCAN_KSWAPD, + PGSCAN_DIRECT, + PGSTEAL_KSWAPD, + PGSTEAL_DIRECT, + PGFAULT, + PGMAJFAULT, + PGREFILL, + PGACTIVATE, + PGDEACTIVATE, + PGLAZYFREE, + PGLAZYFREED, +#if defined(CONFIG_MEMCG_KMEM) && defined(CONFIG_ZSWAP) + ZSWPIN, + ZSWPOUT, +#endif +#ifdef CONFIG_TRANSPARENT_HUGEPAGE + THP_FAULT_ALLOC, + THP_COLLAPSE_ALLOC, +#endif +}; + struct memcg_vmstats_percpu { /* Local (CPU and cgroup) page state & events */ long state[MEMCG_NR_STAT]; @@ -1501,29 +1524,6 @@ static inline unsigned long memcg_page_state_output(struct mem_cgroup *memcg, return memcg_page_state(memcg, item) * memcg_page_state_unit(item); } -/* Subset of vm_event_item to report for memcg event stats */ -static const unsigned int memcg_vm_event_stat[] = { - PGSCAN_KSWAPD, - PGSCAN_DIRECT, - PGSTEAL_KSWAPD, - PGSTEAL_DIRECT, - PGFAULT, - PGMAJFAULT, - PGREFILL, - PGACTIVATE, - PGDEACTIVATE, - PGLAZYFREE, - PGLAZYFREED, -#if defined(CONFIG_MEMCG_KMEM) && defined(CONFIG_ZSWAP) - ZSWPIN, - ZSWPOUT, -#endif -#ifdef CONFIG_TRANSPARENT_HUGEPAGE - THP_FAULT_ALLOC, - THP_COLLAPSE_ALLOC, -#endif -}; - static void memory_stat_format(struct mem_cgroup *memcg, char *buf, int bufsize) { struct seq_buf s;