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 8B117C19F2D for ; Tue, 9 Aug 2022 09:51:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D16276B0071; Tue, 9 Aug 2022 05:51:00 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CC5F66B0072; Tue, 9 Aug 2022 05:51:00 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B8DA08E0001; Tue, 9 Aug 2022 05:51:00 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id A77BB6B0071 for ; Tue, 9 Aug 2022 05:51:00 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 6B0381607BF for ; Tue, 9 Aug 2022 09:51:00 +0000 (UTC) X-FDA: 79779585480.10.D4A645C Received: from relay.virtuozzo.com (relay.virtuozzo.com [130.117.225.111]) by imf01.hostedemail.com (Postfix) with ESMTP id 12BC74001D for ; Tue, 9 Aug 2022 09:50:56 +0000 (UTC) Received: from dev011.ch-qa.sw.ru ([172.29.1.16]) by relay.virtuozzo.com with esmtp (Exim 4.95) (envelope-from ) id 1oLLqu-00ElUd-O7; Tue, 09 Aug 2022 11:49:43 +0200 From: Alexander Atanasov To: Jonathan Corbet , Andrew Morton Cc: kernel@openvz.org, Alexander Atanasov , David Hildenbrand , Wei Liu , Nadav Amit , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-doc@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH v1 1/2] Enable balloon drivers to report inflated memory Date: Tue, 9 Aug 2022 12:49:32 +0300 Message-Id: <20220809094933.2203087-1-alexander.atanasov@virtuozzo.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <7bfac48d-2e50-641b-6523-662ea4df0240@virtuozzo.com> References: <7bfac48d-2e50-641b-6523-662ea4df0240@virtuozzo.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1660038660; a=rsa-sha256; cv=none; b=amH5AWAUbzazqq9AU1vQ9iIqkswQoy9O6nuAX4Ew97v0F71Bc+MD80PDOmdPr/xYcqI9tF PrMHgFMQmOdmYgItu2KxIELLzw55ve1uImKqHSd+/p8PTVjbH64lk/G3Jf60AY8qcDM43W NmHZMy86WUwxYXRcCP3VqKQMBHrkPWk= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=none; spf=pass (imf01.hostedemail.com: domain of alexander.atanasov@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=alexander.atanasov@virtuozzo.com; dmarc=pass (policy=quarantine) header.from=virtuozzo.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1660038660; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=f8pvzO404N5b9MKM4i23cPT5qHd59m+io85PWGsXu4Q=; b=7WdZ/Au8IwgpZ0WrkC4s2GWfhJCVi9NaHpQf4HIf4ozqc6NOTDH08KUMPn9DMAFbPBpAo8 dkZItlrhsVHXk7REqpjzxy0aRmxyky7g2J9gUZT0AM0EwHryZTJ3VljOyGegxdoACYZMPP juB9XFp4QydZKvMGX7VXAsR77BhbCZI= X-Rspamd-Server: rspam06 X-Rspam-User: X-Stat-Signature: 7udfbo48ye3pb63wochqmgwxxhs5r8ae X-Rspamd-Queue-Id: 12BC74001D Authentication-Results: imf01.hostedemail.com; dkim=none; spf=pass (imf01.hostedemail.com: domain of alexander.atanasov@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=alexander.atanasov@virtuozzo.com; dmarc=pass (policy=quarantine) header.from=virtuozzo.com X-HE-Tag: 1660038656-536703 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: Display reported in /proc/meminfo as: Inflated(total) or Inflated(free) depending on the driver. Drivers use the sign bit to indicate where they do account the inflated memory. Amount of inflated memory can be used by: - as a hint for the oom a killer - user space software that monitors memory pressure Cc: David Hildenbrand Cc: Wei Liu Cc: Nadav Amit Signed-off-by: Alexander Atanasov --- Documentation/filesystems/proc.rst | 5 +++++ fs/proc/meminfo.c | 11 +++++++++++ include/linux/mm.h | 4 ++++ mm/page_alloc.c | 4 ++++ 4 files changed, 24 insertions(+) diff --git a/Documentation/filesystems/proc.rst b/Documentation/filesystems/proc.rst index 1bc91fb8c321..064b5b3d5bd8 100644 --- a/Documentation/filesystems/proc.rst +++ b/Documentation/filesystems/proc.rst @@ -986,6 +986,7 @@ Example output. You may not have all of these fields. VmallocUsed: 40444 kB VmallocChunk: 0 kB Percpu: 29312 kB + Inflated(total): 2097152 kB HardwareCorrupted: 0 kB AnonHugePages: 4149248 kB ShmemHugePages: 0 kB @@ -1133,6 +1134,10 @@ VmallocChunk Percpu Memory allocated to the percpu allocator used to back percpu allocations. This stat excludes the cost of metadata. +Inflated(total) or Inflated(free) + Amount of memory that is inflated by the balloon driver. + Due to differences among balloon drivers inflated memory + is either subtracted from TotalRam or from MemFree. HardwareCorrupted The amount of RAM/memory in KB, the kernel identifies as corrupted. diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c index 6e89f0e2fd20..ebbe52ccbb93 100644 --- a/fs/proc/meminfo.c +++ b/fs/proc/meminfo.c @@ -38,6 +38,9 @@ static int meminfo_proc_show(struct seq_file *m, void *v) unsigned long pages[NR_LRU_LISTS]; unsigned long sreclaimable, sunreclaim; int lru; +#ifdef CONFIG_MEMORY_BALLOON + long inflated_kb; +#endif si_meminfo(&i); si_swapinfo(&i); @@ -153,6 +156,14 @@ static int meminfo_proc_show(struct seq_file *m, void *v) global_zone_page_state(NR_FREE_CMA_PAGES)); #endif +#ifdef CONFIG_MEMORY_BALLOON + inflated_kb = atomic_long_read(&mem_balloon_inflated_kb); + if (inflated_kb >= 0) + seq_printf(m, "Inflated(total): %8ld kB\n", inflated_kb); + else + seq_printf(m, "Inflated(free): %8ld kB\n", -inflated_kb); +#endif + hugetlb_report_meminfo(m); arch_report_meminfo(m); diff --git a/include/linux/mm.h b/include/linux/mm.h index 7898e29bcfb5..b190811dc16e 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2582,6 +2582,10 @@ extern int watermark_boost_factor; extern int watermark_scale_factor; extern bool arch_has_descending_max_zone_pfns(void); +#ifdef CONFIG_MEMORY_BALLOON +extern atomic_long_t mem_balloon_inflated_kb; +#endif + /* nommu.c */ extern atomic_long_t mmap_pages_allocated; extern int nommu_shrink_inode_mappings(struct inode *, size_t, size_t); diff --git a/mm/page_alloc.c b/mm/page_alloc.c index b0bcab50f0a3..12359179a3a2 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -194,6 +194,10 @@ EXPORT_SYMBOL(init_on_alloc); DEFINE_STATIC_KEY_MAYBE(CONFIG_INIT_ON_FREE_DEFAULT_ON, init_on_free); EXPORT_SYMBOL(init_on_free); +#ifdef CONFIG_MEMORY_BALLOON +atomic_long_t mem_balloon_inflated_kb = ATOMIC_LONG_INIT(0); +#endif + static bool _init_on_alloc_enabled_early __read_mostly = IS_ENABLED(CONFIG_INIT_ON_ALLOC_DEFAULT_ON); static int __init early_init_on_alloc(char *buf) -- 2.31.1