lib/stackdepot: use fixed-sized slots for stack records

[linux-2.6-microblaze.git] / lib / stackdepot.c

diff --git a/lib/stackdepot.c b/lib/stackdepot.c
index e417139..682497d 100644 (file)
--- a/lib/stackdepot.c
+++ b/lib/stackdepot.c
@@ -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 *entries, int size, u32 hash, void **prealloc)
        if (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;