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 9D3D7C433EF for ; Mon, 25 Apr 2022 03:39:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8F42C6B00B4; Sun, 24 Apr 2022 23:39:51 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 75FCD6B00B5; Sun, 24 Apr 2022 23:39:51 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 625446B00B6; Sun, 24 Apr 2022 23:39:51 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (relay.hostedemail.com [64.99.140.26]) by kanga.kvack.org (Postfix) with ESMTP id 505B46B00B4 for ; Sun, 24 Apr 2022 23:39:51 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 2489822E0 for ; Mon, 25 Apr 2022 03:39:51 +0000 (UTC) X-FDA: 79393997382.14.C0B19DF Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by imf02.hostedemail.com (Postfix) with ESMTP id 148C58003D for ; Mon, 25 Apr 2022 03:39:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1650857990; x=1682393990; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=UW/BHigZ6spgrKRAqG9bWiHedWVnA5vrB2UptEivfzc=; b=lZ1VlKZ3IcsMNcTi0REsQEHmqpt46RlFJFOel13qQO6qzR06F+oJiRiC mdkaEEc1nx4G/bv9krdwovhA9gfA73iaXun94+munhjVczUpcHT84zxIK 3SfZh/0FdN6QribOueY1j4vF2avj1WNm2MB6sYecerPdUxuHEeNHMjlLg IbUON/nyTp4t/1TDG8he63W+wXYcFH4ZPtQy72ncO8oaHduRjd3RrkNQt HTnnRudkwEq0+fayq3DJZsthzSxI5ynxIAUxTpbL/MXZvS4PWTpE90Oom z5uN9UDIg6c35bCrb18KAHGd/0/gQpKN1NJU8ziTm53+7+3ma4n847ozE w==; X-IronPort-AV: E=McAfee;i="6400,9594,10327"; a="351576538" X-IronPort-AV: E=Sophos;i="5.90,287,1643702400"; d="scan'208";a="351576538" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Apr 2022 20:39:49 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.90,287,1643702400"; d="scan'208";a="659959901" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga002.fm.intel.com with ESMTP; 24 Apr 2022 20:39:43 -0700 Received: by black.fi.intel.com (Postfix, from userid 1000) id 288BC7E0; Mon, 25 Apr 2022 06:39:36 +0300 (EEST) From: "Kirill A. Shutemov" To: Borislav Petkov , Andy Lutomirski , Sean Christopherson , Andrew Morton , Joerg Roedel , Ard Biesheuvel Cc: Andi Kleen , Kuppuswamy Sathyanarayanan , David Rientjes , Vlastimil Babka , Tom Lendacky , Thomas Gleixner , Peter Zijlstra , Paolo Bonzini , Ingo Molnar , Varad Gautam , Dario Faggioli , Dave Hansen , Brijesh Singh , Mike Rapoport , David Hildenbrand , x86@kernel.org, linux-mm@kvack.org, linux-coco@lists.linux.dev, linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org, "Kirill A. Shutemov" Subject: [PATCHv5 12/12] x86/mm: Report unaccepted memory in /proc/meminfo Date: Mon, 25 Apr 2022 06:39:34 +0300 Message-Id: <20220425033934.68551-13-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220425033934.68551-1-kirill.shutemov@linux.intel.com> References: <20220425033934.68551-1-kirill.shutemov@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=lZ1VlKZ3; dmarc=pass (policy=none) header.from=intel.com; spf=none (imf02.hostedemail.com: domain of kirill.shutemov@linux.intel.com has no SPF policy when checking 192.55.52.43) smtp.mailfrom=kirill.shutemov@linux.intel.com X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 148C58003D X-Rspam-User: X-Stat-Signature: ei1j4osccbqxgfccsexybqxwx8sqjz6d X-HE-Tag: 1650857987-790779 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: Track amount of unaccepted memory and report it in /proc/meminfo. Signed-off-by: Kirill A. Shutemov --- arch/x86/include/asm/set_memory.h | 2 ++ arch/x86/include/asm/unaccepted_memory.h | 9 ++++++ arch/x86/mm/init.c | 8 ++++++ arch/x86/mm/pat/set_memory.c | 2 +- arch/x86/mm/unaccepted_memory.c | 36 +++++++++++++++++++++++- 5 files changed, 55 insertions(+), 2 deletions(-) diff --git a/arch/x86/include/asm/set_memory.h b/arch/x86/include/asm/set_memory.h index 78ca53512486..e467f3941d22 100644 --- a/arch/x86/include/asm/set_memory.h +++ b/arch/x86/include/asm/set_memory.h @@ -86,6 +86,8 @@ bool kernel_page_present(struct page *page); extern int kernel_set_to_readonly; +void direct_map_meminfo(struct seq_file *m); + #ifdef CONFIG_X86_64 /* * Prevent speculative access to the page by either unmapping diff --git a/arch/x86/include/asm/unaccepted_memory.h b/arch/x86/include/asm/unaccepted_memory.h index a59264ee0ab3..7c93661152a9 100644 --- a/arch/x86/include/asm/unaccepted_memory.h +++ b/arch/x86/include/asm/unaccepted_memory.h @@ -3,7 +3,10 @@ #ifndef _ASM_X86_UNACCEPTED_MEMORY_H #define _ASM_X86_UNACCEPTED_MEMORY_H +#include + struct boot_params; +struct seq_file; void process_unaccepted_memory(struct boot_params *params, u64 start, u64 num); @@ -12,5 +15,11 @@ void process_unaccepted_memory(struct boot_params *params, u64 start, u64 num); void accept_memory(phys_addr_t start, phys_addr_t end); bool memory_is_unaccepted(phys_addr_t start, phys_addr_t end); +void unaccepted_meminfo(struct seq_file *m); + +#else + +static inline void unaccepted_meminfo(struct seq_file *m) {} + #endif #endif diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c index d8cfce221275..7e92a9d93994 100644 --- a/arch/x86/mm/init.c +++ b/arch/x86/mm/init.c @@ -1065,3 +1065,11 @@ unsigned long max_swapfile_size(void) return pages; } #endif + +#ifdef CONFIG_PROC_FS +void arch_report_meminfo(struct seq_file *m) +{ + direct_map_meminfo(m); + unaccepted_meminfo(m); +} +#endif diff --git a/arch/x86/mm/pat/set_memory.c b/arch/x86/mm/pat/set_memory.c index abf5ed76e4b7..2880ba01451c 100644 --- a/arch/x86/mm/pat/set_memory.c +++ b/arch/x86/mm/pat/set_memory.c @@ -105,7 +105,7 @@ static void split_page_count(int level) direct_pages_count[level - 1] += PTRS_PER_PTE; } -void arch_report_meminfo(struct seq_file *m) +void direct_map_meminfo(struct seq_file *m) { seq_printf(m, "DirectMap4k: %8lu kB\n", direct_pages_count[PG_LEVEL_4K] << 2); diff --git a/arch/x86/mm/unaccepted_memory.c b/arch/x86/mm/unaccepted_memory.c index 65cd49b93c50..66a6c529bf31 100644 --- a/arch/x86/mm/unaccepted_memory.c +++ b/arch/x86/mm/unaccepted_memory.c @@ -3,14 +3,17 @@ #include #include #include +#include +#include #include #include #include #include -/* Protects unaccepted memory bitmap */ +/* Protects unaccepted memory bitmap and nr_unaccepted */ static DEFINE_SPINLOCK(unaccepted_memory_lock); +static unsigned long nr_unaccepted; void accept_memory(phys_addr_t start, phys_addr_t end) { @@ -39,6 +42,12 @@ void accept_memory(phys_addr_t start, phys_addr_t end) bitmap_clear(unaccepted_memory, range_start, len); count_vm_events(ACCEPT_MEMORY, len * PMD_SIZE / PAGE_SIZE); + + /* In early boot nr_unaccepted is not yet initialized */ + if (nr_unaccepted) { + WARN_ON(nr_unaccepted < len); + nr_unaccepted -= len; + } } spin_unlock_irqrestore(&unaccepted_memory_lock, flags); } @@ -62,3 +71,28 @@ bool memory_is_unaccepted(phys_addr_t start, phys_addr_t end) return ret; } + +void unaccepted_meminfo(struct seq_file *m) +{ + seq_printf(m, "UnacceptedMem: %8lu kB\n", + (READ_ONCE(nr_unaccepted) * PMD_SIZE) >> 10); +} + +static int __init unaccepted_meminfo_init(void) +{ + unsigned long *unaccepted_memory; + unsigned long flags, bitmap_size; + + if (!boot_params.unaccepted_memory) + return 0; + + bitmap_size = e820__end_of_ram_pfn() * PAGE_SIZE / PMD_SIZE; + unaccepted_memory = __va(boot_params.unaccepted_memory); + + spin_lock_irqsave(&unaccepted_memory_lock, flags); + nr_unaccepted = bitmap_weight(unaccepted_memory, bitmap_size); + spin_unlock_irqrestore(&unaccepted_memory_lock, flags); + + return 0; +} +fs_initcall(unaccepted_meminfo_init); -- 2.35.1