| Message ID | 20230916021835.never.147-kees@kernel.org (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | x86/mm/dump_pagetables: Add SLAB_VIRTUAL knowledge | expand |
On Sat, 16 Sept 2023 at 04:18, Kees Cook <keescook@chromium.org> wrote: > > Add the markings for the SLAB_VIRTUAL area. > > Feel free to collapse this into the x86 patch from the above series. Thanks! I will add it to the next revision of the series. -- Matteo
diff --git a/arch/x86/mm/dump_pagetables.c b/arch/x86/mm/dump_pagetables.c index e1b599ecbbc2..b1fa68669e61 100644 --- a/arch/x86/mm/dump_pagetables.c +++ b/arch/x86/mm/dump_pagetables.c @@ -64,6 +64,9 @@ enum address_markers_idx { KASAN_SHADOW_END_NR, #endif CPU_ENTRY_AREA_NR, +#ifdef CONFIG_SLAB_VIRTUAL + SLAB_AREA_NR, +#endif #ifdef CONFIG_X86_ESPFIX64 ESPFIX_START_NR, #endif @@ -95,6 +98,9 @@ static struct addr_marker address_markers[] = { [LDT_NR] = { 0UL, "LDT remap" }, #endif [CPU_ENTRY_AREA_NR] = { CPU_ENTRY_AREA_BASE,"CPU entry Area" }, +#ifdef CONFIG_SLAB_VIRTUAL + [SLAB_AREA_NR] = { SLAB_BASE_ADDR, "Slab Area" }, +#endif #ifdef CONFIG_X86_ESPFIX64 [ESPFIX_START_NR] = { ESPFIX_BASE_ADDR, "ESPfix Area", 16 }, #endif
Add the markings for the SLAB_VIRTUAL area. Cc: Matteo Rizzo <matteorizzo@google.com> Cc: Jann Horn <jannh@google.com> Cc: Dave Hansen <dave.hansen@linux.intel.com> Cc: Andy Lutomirski <luto@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: Borislav Petkov <bp@alien8.de> Cc: x86@kernel.org Cc: "H. Peter Anvin" <hpa@zytor.com> Signed-off-by: Kees Cook <keescook@chromium.org> --- This is on top of the SLAB_VIRTUAL series: https://lore.kernel.org/all/20230915105933.495735-11-matteorizzo@google.com/ Feel free to collapse this into the x86 patch from the above series. FYI, as expected, the kernel page table entries get way longer with SLAB_VIRTUAL. :) Without SLAB_VIRTUAL: # wc -l /sys/kernel/debug/page_tables/kernel 1501 /sys/kernel/debug/page_tables/kernel With SLAB_VIRTUAL: # wc -l /sys/kernel/debug/page_tables/kernel 7549 /sys/kernel/debug/page_tables/kernel --- arch/x86/mm/dump_pagetables.c | 6 ++++++ 1 file changed, 6 insertions(+)