UPSTREAM: lib, stackdepot: add helper to print stack entries

To print a stack entries, users of stackdepot, first use stack_depot_fetch
to get a list of stack entries and then use stack_trace_print to print
this list.  Provide a helper in stackdepot to print stack entries based on
stackdepot handle.  Also change above mentioned users to use this helper.

Link: https://lkml.kernel.org/r/20210915014806.3206938-3-imran.f.khan@oracle.com
Signed-off-by: Imran Khan <imran.f.khan@oracle.com>
Suggested-by: Vlastimil Babka <vbabka@suse.cz>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
Reviewed-by: Alexander Potapenko <glider@google.com>
Cc: Andrey Konovalov <andreyknvl@gmail.com>
Cc: Andrey Ryabinin <ryabinin.a.a@gmail.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: David Airlie <airlied@linux.ie>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Maxime Ripard <mripard@kernel.org>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Bug: 254721825
(cherry picked from commit 505be48165fa2f2cb795659b4fc61f35563d105e)
Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
Change-Id: I70e12b6381a908b8c8fd1cffde9d908b6f7691eb
This commit is contained in:
Imran Khan
2021-11-08 18:33:12 -08:00
committed by Todd Kjos
parent 42937de44c
commit e9aa144c45
4 changed files with 27 additions and 21 deletions

View File

@@ -25,6 +25,8 @@ depot_stack_handle_t stack_depot_save(unsigned long *entries,
unsigned int stack_depot_fetch(depot_stack_handle_t handle, unsigned int stack_depot_fetch(depot_stack_handle_t handle,
unsigned long **entries); unsigned long **entries);
void stack_depot_print(depot_stack_handle_t stack);
#ifdef CONFIG_STACKDEPOT #ifdef CONFIG_STACKDEPOT
int stack_depot_init(void); int stack_depot_init(void);
#else #else

View File

@@ -213,6 +213,24 @@ static inline struct stack_record *find_stack(struct stack_record *bucket,
return NULL; return NULL;
} }
/**
* stack_depot_print - print stack entries from a depot
*
* @stack: Stack depot handle which was returned from
* stack_depot_save().
*
*/
void stack_depot_print(depot_stack_handle_t stack)
{
unsigned long *entries;
unsigned int nr_entries;
nr_entries = stack_depot_fetch(stack, &entries);
if (nr_entries > 0)
stack_trace_print(entries, nr_entries, 0);
}
EXPORT_SYMBOL_GPL(stack_depot_print);
/** /**
* stack_depot_fetch - Fetch stack entries from a depot * stack_depot_fetch - Fetch stack entries from a depot
* *

View File

@@ -132,20 +132,11 @@ static void end_report(unsigned long *flags, unsigned long addr)
kasan_enable_current(); kasan_enable_current();
} }
static void print_stack(depot_stack_handle_t stack)
{
unsigned long *entries;
unsigned int nr_entries;
nr_entries = stack_depot_fetch(stack, &entries);
stack_trace_print(entries, nr_entries, 0);
}
static void print_track(struct kasan_track *track, const char *prefix) static void print_track(struct kasan_track *track, const char *prefix)
{ {
pr_err("%s by task %u:\n", prefix, track->pid); pr_err("%s by task %u:\n", prefix, track->pid);
if (track->stack) { if (track->stack) {
print_stack(track->stack); stack_depot_print(track->stack);
} else { } else {
pr_err("(stack is not available)\n"); pr_err("(stack is not available)\n");
} }
@@ -214,12 +205,12 @@ static void describe_object_stacks(struct kmem_cache *cache, void *object,
return; return;
if (alloc_meta->aux_stack[0]) { if (alloc_meta->aux_stack[0]) {
pr_err("Last potentially related work creation:\n"); pr_err("Last potentially related work creation:\n");
print_stack(alloc_meta->aux_stack[0]); stack_depot_print(alloc_meta->aux_stack[0]);
pr_err("\n"); pr_err("\n");
} }
if (alloc_meta->aux_stack[1]) { if (alloc_meta->aux_stack[1]) {
pr_err("Second to last potentially related work creation:\n"); pr_err("Second to last potentially related work creation:\n");
print_stack(alloc_meta->aux_stack[1]); stack_depot_print(alloc_meta->aux_stack[1]);
pr_err("\n"); pr_err("\n");
} }
#endif #endif

View File

@@ -413,8 +413,6 @@ void __dump_page_owner(const struct page *page)
struct page_ext *page_ext = lookup_page_ext(page); struct page_ext *page_ext = lookup_page_ext(page);
struct page_owner *page_owner; struct page_owner *page_owner;
depot_stack_handle_t handle; depot_stack_handle_t handle;
unsigned long *entries;
unsigned int nr_entries;
gfp_t gfp_mask; gfp_t gfp_mask;
int mt; int mt;
@@ -442,20 +440,17 @@ void __dump_page_owner(const struct page *page)
page_owner->pid, page_owner->ts_nsec, page_owner->free_ts_nsec); page_owner->pid, page_owner->ts_nsec, page_owner->free_ts_nsec);
handle = READ_ONCE(page_owner->handle); handle = READ_ONCE(page_owner->handle);
if (!handle) { if (!handle)
pr_alert("page_owner allocation stack trace missing\n"); pr_alert("page_owner allocation stack trace missing\n");
} else { else
nr_entries = stack_depot_fetch(handle, &entries); stack_depot_print(handle);
stack_trace_print(entries, nr_entries, 0);
}
handle = READ_ONCE(page_owner->free_handle); handle = READ_ONCE(page_owner->free_handle);
if (!handle) { if (!handle) {
pr_alert("page_owner free stack trace missing\n"); pr_alert("page_owner free stack trace missing\n");
} else { } else {
nr_entries = stack_depot_fetch(handle, &entries);
pr_alert("page last free stack trace:\n"); pr_alert("page last free stack trace:\n");
stack_trace_print(entries, nr_entries, 0); stack_depot_print(handle);
} }
if (page_owner->last_migrate_reason != -1) if (page_owner->last_migrate_reason != -1)