From patchwork Mon Jan 3 04:12:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shakeel Butt X-Patchwork-Id: 12702417 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 B1EF5C433EF for ; Mon, 3 Jan 2022 04:13:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 314B16B0072; Sun, 2 Jan 2022 23:13:13 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 2C43B6B0073; Sun, 2 Jan 2022 23:13:13 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 18C9E6B0074; Sun, 2 Jan 2022 23:13:13 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0236.hostedemail.com [216.40.44.236]) by kanga.kvack.org (Postfix) with ESMTP id 0A4B36B0072 for ; Sun, 2 Jan 2022 23:13:13 -0500 (EST) Received: from smtpin30.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id AD2418249980 for ; Mon, 3 Jan 2022 04:13:12 +0000 (UTC) X-FDA: 78987655824.30.9256E18 Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) by imf30.hostedemail.com (Postfix) with ESMTP id 4CDC780003 for ; Mon, 3 Jan 2022 04:13:12 +0000 (UTC) Received: by mail-pj1-f73.google.com with SMTP id y13-20020a17090a134d00b001b10368d9dcso21658833pjf.7 for ; Sun, 02 Jan 2022 20:13:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:message-id:mime-version:subject:from:to:cc; bh=J9aTg2q8ho8nlKd2CqNm+FPuVckykKn3uxZlvv9q2ak=; b=coIf9+TOHEbp+XchpgnvOTa1hvvpKrDThLnG6uNK8dJrE5l+yINOS3aQszuxAaK5PD AKFzwzVQViOTK8rUkKsIOSYOY9ia7sN8iW8JKcUegq+QQ/Pae0KC5B6u2J3Fbr/fLSgP 0+A5cZCM3KjtRnb+jeo7oDHpJdcsEV6uy3aq/Y4WtUSpyj0tsmmcuncu2rfAvry9WVkj UoybVhRKwqFWRiG+sPdGSNgf736QZ1DAYciOMoV6YB4V8rjKsXe8QX7OnfRlPb/Yboga DWG62oojWxldOw8nVoT3KkiWK2UG2JKt4ip3SYslr/32i4kNbQC3mAIqx/yRX7ujMf3O 6xXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=J9aTg2q8ho8nlKd2CqNm+FPuVckykKn3uxZlvv9q2ak=; b=J1IWYDoL9Th2FKzxRm6Ywizy3dK8d2a0W1XT1nh1vd+IXoxM4ZLrb86dEdpnyqE1uA 5HxE8ZCQErXhPlNhOvs7sxt4U8npzpQekkBiaOlD09TfYH4o7pxN9Ru5Aam8m5eXd2tw UedrhuyqAbQ2oRkbQiSS7mpa15Iy8b92IKn6GrSWstYdzWBcnCNWAxcqcyz8es1Xugkh RNnYT2eXBWmpXx2CD/YkcMKcna+e+VVjlONhmExgO/TaHWLQ24xOdkCUBbfZ+EZRAh64 banJnA/OdKPcQbgHF3Ga9JkxbbxQJ4wvIRb886QtA5nt6hACumBqUFDL/xjIhIwpDjxI e6IQ== X-Gm-Message-State: AOAM530CfhT7nnX0ullbL1E9JL6I04+JgGw1ShXti4OmvVa+WAk6/tyG MXKEvawISuVCY2VDY8ywz1TdD2Gj6KtS1Q== X-Google-Smtp-Source: ABdhPJyw2vsxbvj66mdsaLk1TQqw9ZzFjqHP/n9r3fIOGWN+nOs85+AG28saBH9H0+X8Xf8oeInEcuiLWPEBUw== X-Received: from shakeelb.svl.corp.google.com ([2620:15c:2cd:202:7799:a7c5:d062:a865]) (user=shakeelb job=sendgmr) by 2002:a63:3e8a:: with SMTP id l132mr12917906pga.517.1641183191099; Sun, 02 Jan 2022 20:13:11 -0800 (PST) Date: Sun, 2 Jan 2022 20:12:52 -0800 Message-Id: <20220103041252.3778239-1-shakeelb@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.34.1.448.ga2b2bfdf31-goog Subject: [PATCH v3] memcg: add per-memcg vmalloc stat From: Shakeel Butt To: Johannes Weiner , Michal Hocko , Roman Gushchin , Muchun Song Cc: Andrew Morton , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Shakeel Butt X-Rspamd-Queue-Id: 4CDC780003 X-Stat-Signature: zkw1gti5u6oktjx1u53kg5azw3jxrufo Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=coIf9+TO; spf=pass (imf30.hostedemail.com: domain of 313fSYQgKCCYUJCMGGNDIQQING.EQONKPWZ-OOMXCEM.QTI@flex--shakeelb.bounces.google.com designates 209.85.216.73 as permitted sender) smtp.mailfrom=313fSYQgKCCYUJCMGGNDIQQING.EQONKPWZ-OOMXCEM.QTI@flex--shakeelb.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com X-Rspamd-Server: rspam10 X-HE-Tag: 1641183192-737908 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: The kvmalloc* allocation functions can fallback to vmalloc allocations and more often on long running machines. In addition the kernel does have __GFP_ACCOUNT kvmalloc* calls. So, often on long running machines, the memory.stat does not tell the complete picture which type of memory is charged to the memcg. So add a per-memcg vmalloc stat. Signed-off-by: Shakeel Butt Reviewed-by: Muchun Song Acked-by: Roman Gushchin --- Changes since v2: - remove cast, per Muchun - add area->page[0] check, per Michal Changes since v1: - page_memcg() within rcu lock as suggested by Muchun. Documentation/admin-guide/cgroup-v2.rst | 3 +++ include/linux/memcontrol.h | 21 +++++++++++++++++++++ mm/memcontrol.c | 1 + mm/vmalloc.c | 8 ++++++++ 4 files changed, 33 insertions(+) diff --git a/Documentation/admin-guide/cgroup-v2.rst b/Documentation/admin-guide/cgroup-v2.rst index 82c8dc91b2be..5aa368d165da 100644 --- a/Documentation/admin-guide/cgroup-v2.rst +++ b/Documentation/admin-guide/cgroup-v2.rst @@ -1314,6 +1314,9 @@ PAGE_SIZE multiple when read back. sock (npn) Amount of memory used in network transmission buffers + vmalloc (npn) + Amount of memory used for vmap backed memory. + shmem Amount of cached filesystem data that is swap-backed, such as tmpfs, shm segments, shared anonymous mmap()s diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index d76dad703580..b72d75141e12 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -33,6 +33,7 @@ enum memcg_stat_item { MEMCG_SWAP = NR_VM_NODE_STAT_ITEMS, MEMCG_SOCK, MEMCG_PERCPU_B, + MEMCG_VMALLOC, MEMCG_NR_STAT, }; @@ -944,6 +945,21 @@ static inline void mod_memcg_state(struct mem_cgroup *memcg, local_irq_restore(flags); } +static inline void mod_memcg_page_state(struct page *page, + int idx, int val) +{ + struct mem_cgroup *memcg; + + if (mem_cgroup_disabled()) + return; + + rcu_read_lock(); + memcg = page_memcg(page); + if (memcg) + mod_memcg_state(memcg, idx, val); + rcu_read_unlock(); +} + static inline unsigned long memcg_page_state(struct mem_cgroup *memcg, int idx) { return READ_ONCE(memcg->vmstats.state[idx]); @@ -1399,6 +1415,11 @@ static inline void mod_memcg_state(struct mem_cgroup *memcg, { } +static inline void mod_memcg_page_state(struct page *page, + int idx, int val) +{ +} + static inline unsigned long memcg_page_state(struct mem_cgroup *memcg, int idx) { return 0; diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 101b22a23096..56ed6b5dd328 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -1375,6 +1375,7 @@ static const struct memory_stat memory_stats[] = { { "pagetables", NR_PAGETABLE }, { "percpu", MEMCG_PERCPU_B }, { "sock", MEMCG_SOCK }, + { "vmalloc", MEMCG_VMALLOC }, { "shmem", NR_SHMEM }, { "file_mapped", NR_FILE_MAPPED }, { "file_dirty", NR_FILE_DIRTY }, diff --git a/mm/vmalloc.c b/mm/vmalloc.c index eb6e527a6b77..2809cb696e5c 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include @@ -2626,6 +2627,10 @@ static void __vunmap(const void *addr, int deallocate_pages) unsigned int page_order = vm_area_page_order(area); int i; + if (area->pages[0]) + mod_memcg_page_state(area->pages[0], MEMCG_VMALLOC, + -area->nr_pages); + for (i = 0; i < area->nr_pages; i += 1U << page_order) { struct page *page = area->pages[i]; @@ -2964,6 +2969,9 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask, page_order, nr_small_pages, area->pages); atomic_long_add(area->nr_pages, &nr_vmalloc_pages); + if (area->pages[0]) + mod_memcg_page_state(area->pages[0], MEMCG_VMALLOC, + area->nr_pages); /* * If not enough pages were obtained to accomplish an