lib-stackdepot-add-depot_fetch_stack-helper.patch removed from -mm tree
The quilt patch titled
Subject: lib/stackdepot: add depot_fetch_stack helper
has been removed from the -mm tree. Its filename was
lib-stackdepot-add-depot_fetch_stack-helper.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: add depot_fetch_stack helper
Date: Mon, 20 Nov 2023 18:47:03 +0100
Add a helper depot_fetch_stack function that fetches the pointer to a stack record.
With this change, all static depot_* functions now operate on stack pools and the exported stack_depot_* functions operate on the hash table.
---
lib/stackdepot.c | 45 ++++++++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 17 deletions(-)
lib/stackdepot.c renamed from lib/stackdepot.c~lib-stackdepot-add-depot_fetch_stack-helper +28 -17
@@ -310,6 +310,7 @@ depot_alloc_stack(unsigned long *entries stack->handle.extra =0 ;memcpy (stack->entries, entries,flex_array_size (stack, entries, size)); pool_offset += required_size; +/* * Let KMSAN know the stored stack record is initialized. This shall * prevent false positive reports if instrumented code accesses it.
@@ -319,6 +320,32 @@ depot_alloc_stack(unsigned long *entriesreturn stack; } +static struct stack_record *depot_fetch_stack (depot_stack_handle_t handle) +{ +union handle_parts parts = { .handle = handle }; +/* +* READ_ONCE pairs with potential concurrent write in +* depot_alloc_stack(). +*/ +int pool_index_cached =READ_ONCE (pool_index); +void *pool; +size_t offset = parts.offset <<DEPOT_STACK_ALIGN ; +struct stack_record *stack; + +if (parts.pool_index > pool_index_cached) { +WARN (1 ,"pool index %d out of bounds (%d) for stack id %08x\n" , + parts.pool_index, pool_index_cached, handle); +return NULL ; + } + + pool = stack_pools[parts.pool_index]; +if (!pool) +return NULL ; + + stack = pool + offset; +return stack; +} +/* Calculates the hash for a stack. */ static inline u32 hash_stack (unsigned long *entries,unsigned int size) {
@@ -462,14 +489,6 @@ EXPORT_SYMBOL_GPL(stack_depot_save);unsigned int stack_depot_fetch (depot_stack_handle_t handle,unsigned long **entries) { -union handle_parts parts = { .handle = handle }; -/* -* READ_ONCE pairs with potential concurrent write in -* depot_alloc_stack. -*/ -int pool_index_cached =READ_ONCE (pool_index); -void *pool; -size_t offset = parts.offset <<DEPOT_STACK_ALIGN ;struct stack_record *stack; *entries =NULL ;
@@ -482,15 +501,7 @@ unsigned int stack_depot_fetch(depot_staif (!handle || stack_depot_disabled)return 0 ; -if (parts.pool_index > pool_index_cached) { -WARN (1 ,"pool index %d out of bounds (%d) for stack id %08x\n" , - parts.pool_index, pool_index_cached, handle); -return 0 ; - } - pool = stack_pools[parts.pool_index]; -if (!pool) -return 0 ; - stack = pool + offset; + stack =depot_fetch_stack (handle); *entries = stack->entries;return stack->size;
_
Patches currently in -mm which might be from [email protected] are