From: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
To: Borislav Petkov <bp@alien8.de>, Andy Lutomirski <luto@kernel.org>,
Sean Christopherson <seanjc@google.com>,
Andrew Morton <akpm@linux-foundation.org>,
Joerg Roedel <jroedel@suse.de>, Ard Biesheuvel <ardb@kernel.org>
Cc: Andi Kleen <ak@linux.intel.com>,
Kuppuswamy Sathyanarayanan
<sathyanarayanan.kuppuswamy@linux.intel.com>,
David Rientjes <rientjes@google.com>,
Vlastimil Babka <vbabka@suse.cz>,
Tom Lendacky <thomas.lendacky@amd.com>,
Thomas Gleixner <tglx@linutronix.de>,
Peter Zijlstra <peterz@infradead.org>,
Paolo Bonzini <pbonzini@redhat.com>,
Ingo Molnar <mingo@redhat.com>,
Varad Gautam <varad.gautam@suse.com>,
Dario Faggioli <dfaggioli@suse.com>,
Dave Hansen <dave.hansen@intel.com>,
Brijesh Singh <brijesh.singh@amd.com>,
Mike Rapoport <rppt@kernel.org>,
David Hildenbrand <david@redhat.com>,
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" <kirill.shutemov@linux.intel.com>
Subject: [PATCHv5 12/12] x86/mm: Report unaccepted memory in /proc/meminfo
Date: Mon, 25 Apr 2022 06:39:34 +0300 [thread overview]
Message-ID: <20220425033934.68551-13-kirill.shutemov@linux.intel.com> (raw)
In-Reply-To: <20220425033934.68551-1-kirill.shutemov@linux.intel.com>
Track amount of unaccepted memory and report it in /proc/meminfo.
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
---
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 <linux/types.h>
+
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 <linux/mm.h>
#include <linux/pfn.h>
#include <linux/spinlock.h>
+#include <linux/seq_file.h>
+#include <asm/e820/api.h>
#include <asm/io.h>
#include <asm/setup.h>
#include <asm/shared/tdx.h>
#include <asm/unaccepted_memory.h>
-/* 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
prev parent reply other threads:[~2022-04-25 3:41 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-25 3:39 [PATCHv5 00/12] mm, x86/cc: Implement support for unaccepted memory Kirill A. Shutemov
2022-04-25 3:39 ` [PATCHv5 01/12] x86/boot/: Centralize __pa()/__va() definitions Kirill A. Shutemov
2022-04-25 7:37 ` David Hildenbrand
2022-04-25 7:52 ` Mike Rapoport
2022-04-25 3:39 ` [PATCHv5 02/12] mm: Add support for unaccepted memory Kirill A. Shutemov
2022-04-28 10:05 ` Borislav Petkov
2022-05-03 20:21 ` David Hildenbrand
2022-05-06 0:54 ` Kirill A. Shutemov
2022-04-25 3:39 ` [PATCHv5 03/12] efi/x86: Get full memory map in allocate_e820() Kirill A. Shutemov
2022-04-27 20:25 ` Borislav Petkov
2022-04-27 23:48 ` Kirill A. Shutemov
2022-04-28 10:02 ` Borislav Petkov
2022-04-25 3:39 ` [PATCHv5 04/12] x86/boot: Add infrastructure required for unaccepted memory support Kirill A. Shutemov
2022-04-29 10:58 ` Wander Lairson Costa
2022-05-02 13:38 ` Kirill A. Shutemov
2022-04-25 3:39 ` [PATCHv5 05/12] efi/x86: Implement support for unaccepted memory Kirill A. Shutemov
2022-04-29 10:53 ` Borislav Petkov
2022-05-02 13:40 ` Kirill A. Shutemov
2022-04-25 3:39 ` [PATCHv5 06/12] x86/boot/compressed: Handle " Kirill A. Shutemov
2022-04-27 0:17 ` Michael Roth
2022-04-27 14:19 ` Kirill A. Shutemov
2022-05-03 14:15 ` Borislav Petkov
2022-04-29 13:10 ` Wander Lairson Costa
2022-05-03 14:12 ` Borislav Petkov
2022-05-06 15:30 ` Kirill A. Shutemov
2022-05-10 11:03 ` Borislav Petkov
2022-05-13 5:34 ` Dionna Amalie Glaze
2022-05-13 9:01 ` Borislav Petkov
2022-05-13 14:45 ` Kirill A. Shutemov
2022-05-16 6:46 ` Xu, Min M
2022-05-31 22:40 ` Dionna Amalie Glaze
2022-06-01 15:49 ` Gupta, Pankaj
2022-06-01 16:20 ` Dionna Amalie Glaze
2022-06-01 19:34 ` Randy Dunlap
2022-06-01 21:19 ` Gupta, Pankaj
2022-06-02 12:51 ` Gupta, Pankaj
2022-06-02 15:31 ` Dionna Amalie Glaze
2022-06-07 17:28 ` Dionna Amalie Glaze
2022-06-07 18:15 ` Gupta, Pankaj
2022-04-25 3:39 ` [PATCHv5 07/12] x86/mm: Reserve unaccepted memory bitmap Kirill A. Shutemov
2022-04-29 13:19 ` Wander Lairson Costa
2022-05-04 11:04 ` Borislav Petkov
2022-04-25 3:39 ` [PATCHv5 08/12] x86/mm: Provide helpers for unaccepted memory Kirill A. Shutemov
2022-05-04 11:12 ` Borislav Petkov
2022-05-06 16:13 ` Kirill A. Shutemov
2022-05-10 18:32 ` Borislav Petkov
2022-05-11 1:15 ` Kirill A. Shutemov
2022-05-11 9:07 ` Borislav Petkov
2022-04-25 3:39 ` [PATCHv5 09/12] x86/tdx: Make _tdx_hypercall() and __tdx_module_call() available in boot stub Kirill A. Shutemov
2022-04-25 3:39 ` [PATCHv5 10/12] x86/tdx: Unaccepted memory support Kirill A. Shutemov
2022-05-05 10:12 ` Borislav Petkov
2022-05-06 20:44 ` Kirill A. Shutemov
2022-05-11 1:19 ` Kirill A. Shutemov
2022-05-11 9:13 ` Borislav Petkov
2022-04-25 3:39 ` [PATCHv5 11/12] mm/vmstat: Add counter for memory accepting Kirill A. Shutemov
2022-04-25 3:39 ` Kirill A. Shutemov [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220425033934.68551-13-kirill.shutemov@linux.intel.com \
--to=kirill.shutemov@linux.intel.com \
--cc=ak@linux.intel.com \
--cc=akpm@linux-foundation.org \
--cc=ardb@kernel.org \
--cc=bp@alien8.de \
--cc=brijesh.singh@amd.com \
--cc=dave.hansen@intel.com \
--cc=david@redhat.com \
--cc=dfaggioli@suse.com \
--cc=jroedel@suse.de \
--cc=linux-coco@lists.linux.dev \
--cc=linux-efi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=luto@kernel.org \
--cc=mingo@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peterz@infradead.org \
--cc=rientjes@google.com \
--cc=rppt@kernel.org \
--cc=sathyanarayanan.kuppuswamy@linux.intel.com \
--cc=seanjc@google.com \
--cc=tglx@linutronix.de \
--cc=thomas.lendacky@amd.com \
--cc=varad.gautam@suse.com \
--cc=vbabka@suse.cz \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).