lib-stackdepot-use-fixed-sized-slots-for-stack-records.patch removed from -mm tree
The quilt patch titled
Subject: lib/stackdepot: use fixed-sized slots for stack records
has been removed from the -mm tree. Its filename was
lib-stackdepot-use-fixed-sized-slots-for-stack-records.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Andrey Konovalov <[email protected]>
Subject: lib/stackdepot: use fixed-sized slots for stack records
Date: Mon, 20 Nov 2023 18:47:04 +0100
Instead of storing stack records in stack depot pools one right after another, use fixed-sized slots.
Add a new Kconfig option STACKDEPOT_MAX_FRAMES that allows to select the size of the slot in frames. Use 64 as the default value, which is the maximum stack trace size both KASAN and KMSAN use right now.
Also add descriptions for other stack depot Kconfig options.
This is preparatory patch for implementing the eviction of stack records from the stack depot.
---
lib/Kconfig | 10 ++++++++++ lib/stackdepot.c | 13 +++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-)
lib/Kconfig renamed from lib/Kconfig~lib-stackdepot-use-fixed-sized-slots-for-stack-records +10 -0
@@ -713,10 +713,20 @@ config ARCH_STACKWALK config STACKDEPOT bool select STACKTRACE + help + Stack depot: stack trace storage that avoids duplication config STACKDEPOT_ALWAYS_INIT bool select STACKDEPOT + help + Always initialize stack depot during early boot + +config STACKDEPOT_MAX_FRAMES + int "Maximum number of frames in trace saved in stack depot" + range 1 256 + default 64 + depends on STACKDEPOT config REF_TRACKER bool
lib/stackdepot.c renamed from lib/stackdepot.c~lib-stackdepot-use-fixed-sized-slots-for-stack-records +9 -4
@@ -58,9 +58,12 @@ struct stack_record {u32 hash;/* Hash in the hash table */ u32 size;/* Number of stored frames */ union handle_parts handle; -unsigned long entries[];/* Variable-sized array of frames */ +unsigned long entries[CONFIG_STACKDEPOT_MAX_FRAMES ];/* Frames */ }; +#define DEPOT_STACK_RECORD_SIZE \ + ALIGN(sizeof(struct stack_record), 1 << DEPOT_STACK_ALIGN) +static bool stack_depot_disabled;static bool __stack_depot_early_init_requested__initdata =IS_ENABLED (CONFIG_STACKDEPOT_ALWAYS_INIT );static bool __stack_depot_early_init_passed__initdata ;
@@ -264,9 +267,7 @@ static struct stack_record * depot_alloc_stack(unsigned long *entries, int size, u32 hash, void **prealloc) { struct stack_record *stack; -size_t required_size =struct_size (stack, entries, size); - - required_size =ALIGN (required_size,1 <<DEPOT_STACK_ALIGN ); +size_t required_size =DEPOT_STACK_RECORD_SIZE ;/* Check if there is not enough space in the current pool. */ if (unlikely (pool_offset + required_size >DEPOT_POOL_SIZE )) {
@@ -301,6 +302,10 @@ depot_alloc_stack(unsigned long *entriesif (stack_pools[pool_index] ==NULL )return NULL ; +/* Limit number of saved frames to CONFIG_STACKDEPOT_MAX_FRAMES. */ +if (size >CONFIG_STACKDEPOT_MAX_FRAMES ) + size =CONFIG_STACKDEPOT_MAX_FRAMES ; +/* Save the stack trace. */ stack = stack_pools[pool_index] + pool_offset; stack->hash = hash;
_
Patches currently in -mm which might be from [email protected] are