diff options
author | Will Deacon <will@kernel.org> | 2020-05-28 18:03:40 +0100 |
---|---|---|
committer | Will Deacon <will@kernel.org> | 2020-05-28 18:03:40 +0100 |
commit | 082af5ec5080b028f7d0846a6c27cbb87f288205 (patch) | |
tree | 9b34b36586c9453628849fc5acee655012cb7b1e /fs/proc | |
parent | c350717ec7de67daad26d996efe7f3d97d95aa9c (diff) | |
parent | 258c3d628fe9e7512d98a0000709773457c66ef1 (diff) | |
download | linux-stable-082af5ec5080b028f7d0846a6c27cbb87f288205.tar.gz linux-stable-082af5ec5080b028f7d0846a6c27cbb87f288205.tar.bz2 linux-stable-082af5ec5080b028f7d0846a6c27cbb87f288205.zip |
Merge branch 'for-next/scs' into for-next/core
Support for Clang's Shadow Call Stack in the kernel
(Sami Tolvanen and Will Deacon)
* for-next/scs:
arm64: entry-ftrace.S: Update comment to indicate that x18 is live
scs: Move DEFINE_SCS macro into core code
scs: Remove references to asm/scs.h from core code
scs: Move scs_overflow_check() out of architecture code
arm64: scs: Use 'scs_sp' register alias for x18
scs: Move accounting into alloc/free functions
arm64: scs: Store absolute SCS stack pointer value in thread_info
efi/libstub: Disable Shadow Call Stack
arm64: scs: Add shadow stacks for SDEI
arm64: Implement Shadow Call Stack
arm64: Disable SCS for hypervisor code
arm64: vdso: Disable Shadow Call Stack
arm64: efi: Restore register x18 if it was corrupted
arm64: Preserve register x18 when CPU is suspended
arm64: Reserve register x18 from general allocation with SCS
scs: Disable when function graph tracing is enabled
scs: Add support for stack usage debugging
scs: Add page accounting for shadow call stack allocations
scs: Add support for Clang's Shadow Call Stack (SCS)
Diffstat (limited to 'fs/proc')
-rw-r--r-- | fs/proc/meminfo.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c index 8c1f1bb1a5ce..09cd51c8d23d 100644 --- a/fs/proc/meminfo.c +++ b/fs/proc/meminfo.c @@ -103,6 +103,10 @@ static int meminfo_proc_show(struct seq_file *m, void *v) show_val_kb(m, "SUnreclaim: ", sunreclaim); seq_printf(m, "KernelStack: %8lu kB\n", global_zone_page_state(NR_KERNEL_STACK_KB)); +#ifdef CONFIG_SHADOW_CALL_STACK + seq_printf(m, "ShadowCallStack:%8lu kB\n", + global_zone_page_state(NR_KERNEL_SCS_KB)); +#endif show_val_kb(m, "PageTables: ", global_zone_page_state(NR_PAGETABLE)); |