diff options
| author | Sami Tolvanen <samitolvanen@google.com> | 2020-04-27 18:00:08 +0200 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2020-05-15 17:35:49 +0200 |
| commit | 628d06a48f57c36abdc2a024930212e654a501b7 (patch) | |
| tree | de784916db6c4bc3c63a99efc825e0726dd4b930 /drivers/base | |
| parent | scs: Add support for Clang's Shadow Call Stack (SCS) (diff) | |
| download | linux-628d06a48f57c36abdc2a024930212e654a501b7.tar.xz linux-628d06a48f57c36abdc2a024930212e654a501b7.zip | |
scs: Add page accounting for shadow call stack allocations
This change adds accounting for the memory allocated for shadow stacks.
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Acked-by: Will Deacon <will@kernel.org>
Signed-off-by: Will Deacon <will@kernel.org>
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/node.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/base/node.c b/drivers/base/node.c index 10d7e818e118..50b8c0d43859 100644 --- a/drivers/base/node.c +++ b/drivers/base/node.c @@ -415,6 +415,9 @@ static ssize_t node_read_meminfo(struct device *dev, "Node %d AnonPages: %8lu kB\n" "Node %d Shmem: %8lu kB\n" "Node %d KernelStack: %8lu kB\n" +#ifdef CONFIG_SHADOW_CALL_STACK + "Node %d ShadowCallStack:%8lu kB\n" +#endif "Node %d PageTables: %8lu kB\n" "Node %d NFS_Unstable: %8lu kB\n" "Node %d Bounce: %8lu kB\n" @@ -438,6 +441,9 @@ static ssize_t node_read_meminfo(struct device *dev, nid, K(node_page_state(pgdat, NR_ANON_MAPPED)), nid, K(i.sharedram), nid, sum_zone_node_page_state(nid, NR_KERNEL_STACK_KB), +#ifdef CONFIG_SHADOW_CALL_STACK + nid, sum_zone_node_page_state(nid, NR_KERNEL_SCS_KB), +#endif nid, K(sum_zone_node_page_state(nid, NR_PAGETABLE)), nid, K(node_page_state(pgdat, NR_UNSTABLE_NFS)), nid, K(sum_zone_node_page_state(nid, NR_BOUNCE)), |