From patchwork Fri Dec 14 18:07:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Gushchin X-Patchwork-Id: 10731525 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D6EA86C5 for ; Fri, 14 Dec 2018 18:07:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 158552D912 for ; Fri, 14 Dec 2018 18:07:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0433C2D930; Fri, 14 Dec 2018 18:07:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6E4FC2D912 for ; Fri, 14 Dec 2018 18:07:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 34A428E0200; Fri, 14 Dec 2018 13:07:54 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 2FD018E01DC; Fri, 14 Dec 2018 13:07:54 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1F32B8E0200; Fri, 14 Dec 2018 13:07:54 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) by kanga.kvack.org (Postfix) with ESMTP id C531E8E01DC for ; Fri, 14 Dec 2018 13:07:53 -0500 (EST) Received: by mail-pl1-f200.google.com with SMTP id e68so4115072plb.3 for ; Fri, 14 Dec 2018 10:07:53 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Cu/OfW+cnoBt6sWD0vpNz1lk+tLpOk7IYLf+TPCUhnk=; b=I2fMPqi1VuSBHUQBp0GINSwg2cXEq6pjZRn8/iPUepnku3aARpCJAtFrpJtcLrVaxz qN/2rlLbFuIn3lpJUW8lW4SkK2mQnYh0TgAfs/ir8Rp8vGxmJmyqt1Nvn+9FOKQYP44g Ph5om+JSu/UT3LXIVoiW/TDqk1K9D/P4snfvnwBd1dIESlk6x/Ubns2j5b05niaHuVP4 enVwg0Frlvcdch2xNC6+jdDzbgU7BR5uJvsCGUnqcKfV5qPHXtTAiCUpwEOIA5O1TUKs GelfXDvyVQh+8gC+AYu/0PLqh9rT9KBZo2yECb4nKRp2idWtNDd9jcyLyIZmqdIgsvmL ZYgQ== X-Gm-Message-State: AA+aEWZMhRvEuS9ZQZeOXjYgkOro2t8qYBumQL+qTr8lTPnPwU2zib3V KHdNXjlr9K89IuJmypllEs2FvQWDTB9QAPMK78Gu/u40fs8wuTvss+VqK172k9BR+zU2HQObO7J GHpf2UkB0pSJzxQBmfqvO2B3bLC/n90YCxYWP7221Kaf1tq8kRGDeGARC/HlPChD+TyxWBCcrY2 FGep3FIjCs3we9uXpqj2h446n4U/N/yHj8V+bem7mhOX3roNJDY56nK9R1MhgovJYCy+0pmnFXN B8IqezR+b+jZSe632Ey/oChQHCwbvOCASaqXlsQtXutJ3QCbuMCT+bPspAsTYglL0OeKKT1z9G9 lQK98uQrQahahECBrvu/RWZxbCPbSvjM8lSyM3gyyUT7ZG3O9ZRAFVCP2qKY80C4Ru0FRFUJkoz F X-Received: by 2002:a63:235f:: with SMTP id u31mr3572979pgm.122.1544810873455; Fri, 14 Dec 2018 10:07:53 -0800 (PST) X-Received: by 2002:a63:235f:: with SMTP id u31mr3572927pgm.122.1544810872566; Fri, 14 Dec 2018 10:07:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544810872; cv=none; d=google.com; s=arc-20160816; b=GabTJ3TCfTk8UZznyc8fHbeaoZ4SaRfvh08AIqT46Z/aEPVhnQdkwEvG2WtWaHWP+r THGW3GNzAOaJhy0mOF3MTTZkqXUwMH96j3MEYM0DQaj/K+XYDRyd9s7i8f2N4qXw9TYa mwGk8nmau76dHKRgbeAexGNe4ZFKoFeB6tzO3zCUYcuSVXZxkCXhKIPD78xoI8spmJ6k reURs1PUYOMT0u0vBNFROPYwxyOiTfCcybkPd+5TP+h5yn8In91+1X3leLwYtnCxr4/w UWzpPo9X8pIqBifKBaym5kusrcqlMJ2L+/tT6BOOsVk/D+772etoLzU7DEFQvGuThxf6 ahRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=Cu/OfW+cnoBt6sWD0vpNz1lk+tLpOk7IYLf+TPCUhnk=; b=ekeVQjPIBrz8o8OkSC5xHRXZJ6LJge+c6k3+IhUWprwSbn7eqWOzpjo5dD2yB6gbjx Ndu5SokoWI50G52PpP4TNXV2+A/lMIawDc0GmvX04FEEjNmWeZTlI5I0z4THa0tf/JWx NV6P6vrQ3c5DIehNDIet6xHpmyHDIjopto5HeP9AaLzH4DIrx/NvWq/94tgG5F5nvSAI xS7K4okia21m14UaJSop1/ZrhGBN9HFP8smUVuYIdFNQvdx656omHR0E2tLcHS7mRXpE lMAsPKG5LGWvLPLfRBTJVv4fezdFEP+WTIQrCsvV3q96m/zoF+x+qfwOSDJiKcpdouhH m9Wg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=Pi+CVtWd; spf=pass (google.com: domain of guroan@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=guroan@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id v28sor9504703pfk.14.2018.12.14.10.07.52 for (Google Transport Security); Fri, 14 Dec 2018 10:07:52 -0800 (PST) Received-SPF: pass (google.com: domain of guroan@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=Pi+CVtWd; spf=pass (google.com: domain of guroan@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=guroan@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Cu/OfW+cnoBt6sWD0vpNz1lk+tLpOk7IYLf+TPCUhnk=; b=Pi+CVtWdIbcksx6L8kxgcpi+M3rxFgNK/QeCUI/Lb6gnQuuh1APN+0x7uSAK/HSWTf EfgNsasJujMSFkW4NYTvYyJVID6Q3zI5FKXc74vMFifI7IKRZnfCVHw2HhknVy4+4Vnn dUF9Xpeqbco6SScK8JjkMvinBvR0sDZi2qYHLe7OWD+XzmTM2Hk45tdVQDniDNNpzA9R rW7LMwDL5WIgrmM1qao08ev0nIeO2sBNHos1gqRDYAuUJWYKDwcL5xYlIeX1SDaxXMGb zYjfrECVPywTZbkxwRnUZ0Tvbhx7dVPfuofMfTrvtN2n402iStGfD7z8ebpYIAhn/Ek7 vNuA== X-Google-Smtp-Source: AFSGD/VD0is3Q+pAGp89nOAYixxBISYVqLojxpQohIub8YkqkUnyrB8BTcraPNhySoe4+M8XsGdobg== X-Received: by 2002:a62:f5da:: with SMTP id b87mr3782352pfm.253.1544810872100; Fri, 14 Dec 2018 10:07:52 -0800 (PST) Received: from tower.thefacebook.com ([2620:10d:c090:200::5:3d97]) by smtp.gmail.com with ESMTPSA id r2sm7180856pgo.18.2018.12.14.10.07.50 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 14 Dec 2018 10:07:51 -0800 (PST) From: Roman Gushchin X-Google-Original-From: Roman Gushchin To: linux-mm@kvack.org Cc: Alexey Dobriyan , Johannes Weiner , Michal Hocko , Vlastimil Babka , linux-kernel@vger.kernel.org, kernel-team@fb.com, Roman Gushchin Subject: [RFC 4/4] mm: show number of vmalloc pages in /proc/meminfo Date: Fri, 14 Dec 2018 10:07:20 -0800 Message-Id: <20181214180720.32040-5-guro@fb.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181214180720.32040-1-guro@fb.com> References: <20181214180720.32040-1-guro@fb.com> MIME-Version: 1.0 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: X-Virus-Scanned: ClamAV using ClamSMTP Vmalloc() is getting more and more used these days (kernel stacks, bpf and percpu allocator are new top users), and the total % of memory consumed by vmalloc() can be pretty significant and changes dynamically. /proc/meminfo is the best place to display this information: its top goal is to show top consumers of the memory. Since the VmallocUsed field in /proc/meminfo is not in use for quite a long time (it has been defined to 0 by the commit a5ad88ce8c7f ("mm: get rid of 'vmalloc_info' from /proc/meminfo")), let's reuse it for showing the actual physical memory consumption of vmalloc(). Signed-off-by: Roman Gushchin Acked-by: Johannes Weiner --- fs/proc/meminfo.c | 2 +- include/linux/vmalloc.h | 3 +++ mm/vmalloc.c | 10 ++++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c index 568d90e17c17..465ea0153b2a 100644 --- a/fs/proc/meminfo.c +++ b/fs/proc/meminfo.c @@ -120,7 +120,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v) show_val_kb(m, "Committed_AS: ", committed); seq_printf(m, "VmallocTotal: %8lu kB\n", (unsigned long)VMALLOC_TOTAL >> 10); - show_val_kb(m, "VmallocUsed: ", 0ul); + show_val_kb(m, "VmallocUsed: ", vmalloc_nr_pages()); show_val_kb(m, "VmallocChunk: ", 0ul); show_val_kb(m, "Percpu: ", pcpu_nr_pages()); diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h index 1205f7a03b48..ea3a0fb3a60f 100644 --- a/include/linux/vmalloc.h +++ b/include/linux/vmalloc.h @@ -64,10 +64,12 @@ extern void vm_unmap_aliases(void); #ifdef CONFIG_MMU extern void __init vmalloc_init(void); +extern unsigned long vmalloc_nr_pages(void); #else static inline void vmalloc_init(void) { } +static inline unsigned long vmalloc_nr_pages(void) { return 0; } #endif extern void *vmalloc(unsigned long size); @@ -83,6 +85,7 @@ extern void *__vmalloc_node_range(unsigned long size, unsigned long align, unsigned long start, unsigned long end, gfp_t gfp_mask, pgprot_t prot, unsigned long vm_flags, int node, const void *caller); + #ifndef CONFIG_MMU extern void *__vmalloc_node_flags(unsigned long size, int node, gfp_t flags); static inline void *__vmalloc_node_flags_caller(unsigned long size, int node, diff --git a/mm/vmalloc.c b/mm/vmalloc.c index edd76953c23c..39db12fe8931 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -340,6 +340,13 @@ static unsigned long cached_align; static unsigned long vmap_area_pcpu_hole; +atomic_long_t nr_vmalloc_pages; + +unsigned long vmalloc_nr_pages(void) +{ + return atomic_long_read(&nr_vmalloc_pages); +} + static struct vmap_area *__find_vmap_area(unsigned long addr) { struct rb_node *n = vmap_area_root.rb_node; @@ -1594,6 +1601,7 @@ static void __vunmap(const void *addr, int deallocate_pages) BUG_ON(!page); __free_pages(page, 0); } + atomic_long_sub(area->nr_pages, &nr_vmalloc_pages); if (area->flags & VM_EXT_PAGES) kvfree(area->pages); @@ -1739,12 +1747,14 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask, if (unlikely(!page)) { /* Successfully allocated i pages, free them in __vunmap() */ area->nr_pages = i; + atomic_long_add(area->nr_pages, &nr_vmalloc_pages); goto fail; } area->pages[i] = page; if (gfpflags_allow_blocking(gfp_mask|highmem_mask)) cond_resched(); } + atomic_long_add(area->nr_pages, &nr_vmalloc_pages); if (map_vm_area(area, prot, area->pages)) goto fail;