From: tip-bot for Thomas Gleixner <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: rostedt@goodmis.org, mingo@kernel.org, penberg@kernel.org,
hpa@zytor.com, snitzer@redhat.com, airlied@linux.ie, clm@fb.com,
adobriyan@gmail.com, luto@kernel.org, josef@toxicpanda.com,
tglx@linutronix.de, rppt@linux.vnet.ibm.com,
maarten.lankhorst@linux.intel.com, jpoimboe@redhat.com,
tom.zanussi@linux.intel.com, joonas.lahtinen@linux.intel.com,
hch@lst.de, aryabinin@virtuozzo.com, akinobu.mita@gmail.com,
catalin.marinas@arm.com, dsterba@suse.com, daniel@ffwll.ch,
rientjes@google.com, m.szyprowski@samsung.com, cl@linux.com,
glider@google.com, jani.nikula@linux.intel.com,
linux-kernel@vger.kernel.org, robin.murphy@arm.com,
rodrigo.vivi@intel.com, dvyukov@google.com, mbenes@suse.cz,
akpm@linux-foundation.org, jthumshirn@suse.de, agk@redhat.com
Subject: [tip:core/stacktrace] tracing: Remove the last struct stack_trace usage
Date: Mon, 29 Apr 2019 11:47:06 -0700 [thread overview]
Message-ID: <tip-9f50c91b1195dfffd183d5d8505e45af86623532@git.kernel.org> (raw)
In-Reply-To: <20190425094803.340000461@linutronix.de>
Commit-ID: 9f50c91b1195dfffd183d5d8505e45af86623532
Gitweb: https://git.kernel.org/tip/9f50c91b1195dfffd183d5d8505e45af86623532
Author: Thomas Gleixner <tglx@linutronix.de>
AuthorDate: Thu, 25 Apr 2019 11:45:17 +0200
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitDate: Mon, 29 Apr 2019 12:37:56 +0200
tracing: Remove the last struct stack_trace usage
Simplify the stack retrieval code by using the storage array based
interface.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Reviewed-by: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Alexander Potapenko <glider@google.com>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Christoph Lameter <cl@linux.com>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: linux-mm@kvack.org
Cc: David Rientjes <rientjes@google.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Andrey Ryabinin <aryabinin@virtuozzo.com>
Cc: kasan-dev@googlegroups.com
Cc: Mike Rapoport <rppt@linux.vnet.ibm.com>
Cc: Akinobu Mita <akinobu.mita@gmail.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: iommu@lists.linux-foundation.org
Cc: Robin Murphy <robin.murphy@arm.com>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Johannes Thumshirn <jthumshirn@suse.de>
Cc: David Sterba <dsterba@suse.com>
Cc: Chris Mason <clm@fb.com>
Cc: Josef Bacik <josef@toxicpanda.com>
Cc: linux-btrfs@vger.kernel.org
Cc: dm-devel@redhat.com
Cc: Mike Snitzer <snitzer@redhat.com>
Cc: Alasdair Kergon <agk@redhat.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: intel-gfx@lists.freedesktop.org
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: dri-devel@lists.freedesktop.org
Cc: David Airlie <airlied@linux.ie>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Tom Zanussi <tom.zanussi@linux.intel.com>
Cc: Miroslav Benes <mbenes@suse.cz>
Cc: linux-arch@vger.kernel.org
Link: https://lkml.kernel.org/r/20190425094803.340000461@linutronix.de
---
kernel/trace/trace_stack.c | 37 ++++++++++++++++---------------------
1 file changed, 16 insertions(+), 21 deletions(-)
diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
index 4efda5f75a0f..5d16f73898db 100644
--- a/kernel/trace/trace_stack.c
+++ b/kernel/trace/trace_stack.c
@@ -23,11 +23,7 @@
static unsigned long stack_dump_trace[STACK_TRACE_ENTRIES];
static unsigned stack_trace_index[STACK_TRACE_ENTRIES];
-struct stack_trace stack_trace_max = {
- .max_entries = STACK_TRACE_ENTRIES,
- .entries = &stack_dump_trace[0],
-};
-
+static unsigned int stack_trace_nr_entries;
static unsigned long stack_trace_max_size;
static arch_spinlock_t stack_trace_max_lock =
(arch_spinlock_t)__ARCH_SPIN_LOCK_UNLOCKED;
@@ -44,10 +40,10 @@ static void print_max_stack(void)
pr_emerg(" Depth Size Location (%d entries)\n"
" ----- ---- --------\n",
- stack_trace_max.nr_entries);
+ stack_trace_nr_entries);
- for (i = 0; i < stack_trace_max.nr_entries; i++) {
- if (i + 1 == stack_trace_max.nr_entries)
+ for (i = 0; i < stack_trace_nr_entries; i++) {
+ if (i + 1 == stack_trace_nr_entries)
size = stack_trace_index[i];
else
size = stack_trace_index[i] - stack_trace_index[i+1];
@@ -93,13 +89,12 @@ static void check_stack(unsigned long ip, unsigned long *stack)
stack_trace_max_size = this_size;
- stack_trace_max.nr_entries = 0;
- stack_trace_max.skip = 0;
-
- save_stack_trace(&stack_trace_max);
+ stack_trace_nr_entries = stack_trace_save(stack_dump_trace,
+ ARRAY_SIZE(stack_dump_trace) - 1,
+ 0);
/* Skip over the overhead of the stack tracer itself */
- for (i = 0; i < stack_trace_max.nr_entries; i++) {
+ for (i = 0; i < stack_trace_nr_entries; i++) {
if (stack_dump_trace[i] == ip)
break;
}
@@ -108,7 +103,7 @@ static void check_stack(unsigned long ip, unsigned long *stack)
* Some archs may not have the passed in ip in the dump.
* If that happens, we need to show everything.
*/
- if (i == stack_trace_max.nr_entries)
+ if (i == stack_trace_nr_entries)
i = 0;
/*
@@ -126,13 +121,13 @@ static void check_stack(unsigned long ip, unsigned long *stack)
* loop will only happen once. This code only takes place
* on a new max, so it is far from a fast path.
*/
- while (i < stack_trace_max.nr_entries) {
+ while (i < stack_trace_nr_entries) {
int found = 0;
stack_trace_index[x] = this_size;
p = start;
- for (; p < top && i < stack_trace_max.nr_entries; p++) {
+ for (; p < top && i < stack_trace_nr_entries; p++) {
/*
* The READ_ONCE_NOCHECK is used to let KASAN know that
* this is not a stack-out-of-bounds error.
@@ -163,7 +158,7 @@ static void check_stack(unsigned long ip, unsigned long *stack)
i++;
}
- stack_trace_max.nr_entries = x;
+ stack_trace_nr_entries = x;
if (task_stack_end_corrupted(current)) {
print_max_stack();
@@ -265,7 +260,7 @@ __next(struct seq_file *m, loff_t *pos)
{
long n = *pos - 1;
- if (n >= stack_trace_max.nr_entries)
+ if (n >= stack_trace_nr_entries)
return NULL;
m->private = (void *)n;
@@ -329,7 +324,7 @@ static int t_show(struct seq_file *m, void *v)
seq_printf(m, " Depth Size Location"
" (%d entries)\n"
" ----- ---- --------\n",
- stack_trace_max.nr_entries);
+ stack_trace_nr_entries);
if (!stack_tracer_enabled && !stack_trace_max_size)
print_disabled(m);
@@ -339,10 +334,10 @@ static int t_show(struct seq_file *m, void *v)
i = *(long *)v;
- if (i >= stack_trace_max.nr_entries)
+ if (i >= stack_trace_nr_entries)
return 0;
- if (i + 1 == stack_trace_max.nr_entries)
+ if (i + 1 == stack_trace_nr_entries)
size = stack_trace_index[i];
else
size = stack_trace_index[i] - stack_trace_index[i+1];
next prev parent reply other threads:[~2019-04-29 18:48 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-25 9:44 [patch V3 00/29] stacktrace: Consolidate stack trace usage Thomas Gleixner
2019-04-25 9:44 ` [patch V3 01/29] tracing: Cleanup stack trace code Thomas Gleixner
2019-04-29 18:31 ` [tip:core/stacktrace] " tip-bot for Thomas Gleixner
2019-04-25 9:44 ` [patch V3 02/29] stacktrace: Provide helpers for common stack trace operations Thomas Gleixner
2019-04-29 18:31 ` [tip:core/stacktrace] " tip-bot for Thomas Gleixner
2019-04-25 9:44 ` [patch V3 03/29] lib/stackdepot: Provide functions which operate on plain storage arrays Thomas Gleixner
2019-04-29 18:32 ` [tip:core/stacktrace] " tip-bot for Thomas Gleixner
2019-04-25 9:44 ` [patch V3 04/29] backtrace-test: Simplify stack trace handling Thomas Gleixner
2019-04-29 18:33 ` [tip:core/stacktrace] " tip-bot for Thomas Gleixner
2019-04-25 9:44 ` [patch V3 05/29] proc: Simplify task stack retrieval Thomas Gleixner
2019-04-29 18:34 ` [tip:core/stacktrace] " tip-bot for Thomas Gleixner
2019-04-25 9:44 ` [patch V3 06/29] latency_top: Simplify stack trace handling Thomas Gleixner
2019-04-29 18:34 ` [tip:core/stacktrace] " tip-bot for Thomas Gleixner
2019-04-25 9:45 ` [patch V3 07/29] mm/slub: Simplify stack trace retrieval Thomas Gleixner
2019-04-29 18:35 ` [tip:core/stacktrace] " tip-bot for Thomas Gleixner
2019-04-25 9:45 ` [patch V3 08/29] mm/kmemleak: Simplify stacktrace handling Thomas Gleixner
2019-04-29 18:36 ` [tip:core/stacktrace] " tip-bot for Thomas Gleixner
2019-04-25 9:45 ` [patch V3 09/29] mm/kasan: " Thomas Gleixner
2019-04-29 18:36 ` [tip:core/stacktrace] " tip-bot for Thomas Gleixner
2019-04-25 9:45 ` [patch V3 10/29] mm/page_owner: Simplify stack trace handling Thomas Gleixner
2019-04-29 18:37 ` [tip:core/stacktrace] " tip-bot for Thomas Gleixner
2019-04-25 9:45 ` [patch V3 11/29] fault-inject: Simplify stacktrace retrieval Thomas Gleixner
2019-04-29 18:38 ` [tip:core/stacktrace] " tip-bot for Thomas Gleixner
2019-04-25 9:45 ` [patch V3 12/29] dma/debug: Simplify stracktrace retrieval Thomas Gleixner
2019-04-29 18:39 ` [tip:core/stacktrace] " tip-bot for Thomas Gleixner
2019-04-25 9:45 ` [patch V3 13/29] btrfs: ref-verify: Simplify stack trace retrieval Thomas Gleixner
2019-04-29 18:39 ` [tip:core/stacktrace] " tip-bot for Thomas Gleixner
2019-04-25 9:45 ` [patch V3 14/29] dm bufio: " Thomas Gleixner
2019-04-29 18:40 ` [tip:core/stacktrace] " tip-bot for Thomas Gleixner
2019-04-25 9:45 ` [patch V3 15/29] dm persistent data: Simplify stack trace handling Thomas Gleixner
2019-04-29 18:41 ` [tip:core/stacktrace] " tip-bot for Thomas Gleixner
2019-04-25 9:45 ` [patch V3 16/29] drm: Simplify stacktrace handling Thomas Gleixner
2019-04-29 18:41 ` [tip:core/stacktrace] " tip-bot for Thomas Gleixner
2019-04-25 9:45 ` [patch V3 17/29] lockdep: Remove unused trace argument from print_circular_bug() Thomas Gleixner
2019-04-29 18:42 ` [tip:core/stacktrace] " tip-bot for Thomas Gleixner
2019-04-25 9:45 ` [patch V3 18/29] lockdep: Remove save argument from check_prev_add() Thomas Gleixner
2019-04-25 13:35 ` Peter Zijlstra
2019-04-29 18:43 ` [tip:core/stacktrace] " tip-bot for Thomas Gleixner
2019-04-25 9:45 ` [patch V3 19/29] lockdep: Simplify stack trace handling Thomas Gleixner
2019-04-29 18:43 ` [tip:core/stacktrace] " tip-bot for Thomas Gleixner
2019-04-25 9:45 ` [patch V3 20/29] tracing: Simplify stacktrace retrieval in histograms Thomas Gleixner
2019-04-29 18:44 ` [tip:core/stacktrace] " tip-bot for Thomas Gleixner
2019-04-25 9:45 ` [patch V3 21/29] tracing: Use percpu stack trace buffer more intelligently Thomas Gleixner
2019-04-25 13:29 ` Josh Poimboeuf
2019-04-29 18:45 ` [tip:core/stacktrace] " tip-bot for Thomas Gleixner
2019-04-25 9:45 ` [patch V3 22/29] tracing: Make ftrace_trace_userstack() static and conditional Thomas Gleixner
2019-04-29 18:45 ` [tip:core/stacktrace] " tip-bot for Thomas Gleixner
2019-04-25 9:45 ` [patch V3 23/29] tracing: Simplify stack trace retrieval Thomas Gleixner
2019-04-29 18:46 ` [tip:core/stacktrace] " tip-bot for Thomas Gleixner
2019-04-25 9:45 ` [patch V3 24/29] tracing: Remove the last struct stack_trace usage Thomas Gleixner
2019-04-25 13:30 ` Josh Poimboeuf
2019-04-29 18:47 ` tip-bot for Thomas Gleixner [this message]
2019-04-25 9:45 ` [patch V3 25/29] livepatch: Simplify stack trace retrieval Thomas Gleixner
2019-04-29 18:47 ` [tip:core/stacktrace] " tip-bot for Thomas Gleixner
2019-04-25 9:45 ` [patch V3 26/29] stacktrace: Remove obsolete functions Thomas Gleixner
2019-04-29 18:48 ` [tip:core/stacktrace] " tip-bot for Thomas Gleixner
2019-04-25 9:45 ` [patch V3 27/29] lib/stackdepot: " Thomas Gleixner
2019-04-29 18:49 ` [tip:core/stacktrace] " tip-bot for Thomas Gleixner
2019-04-25 9:45 ` [patch V3 28/29] stacktrace: Provide common infrastructure Thomas Gleixner
2019-04-29 18:49 ` [tip:core/stacktrace] " tip-bot for Thomas Gleixner
2019-04-25 9:45 ` [patch V3 29/29] x86/stacktrace: Use " Thomas Gleixner
2019-04-29 18:50 ` [tip:core/stacktrace] " tip-bot for Thomas Gleixner
2019-04-25 10:09 ` [patch V3 00/29] stacktrace: Consolidate stack trace usage Ingo Molnar
2019-04-25 13:31 ` Josh Poimboeuf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-9f50c91b1195dfffd183d5d8505e45af86623532@git.kernel.org \
--to=tipbot@zytor.com \
--cc=adobriyan@gmail.com \
--cc=agk@redhat.com \
--cc=airlied@linux.ie \
--cc=akinobu.mita@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=aryabinin@virtuozzo.com \
--cc=catalin.marinas@arm.com \
--cc=cl@linux.com \
--cc=clm@fb.com \
--cc=daniel@ffwll.ch \
--cc=dsterba@suse.com \
--cc=dvyukov@google.com \
--cc=glider@google.com \
--cc=hch@lst.de \
--cc=hpa@zytor.com \
--cc=jani.nikula@linux.intel.com \
--cc=joonas.lahtinen@linux.intel.com \
--cc=josef@toxicpanda.com \
--cc=jpoimboe@redhat.com \
--cc=jthumshirn@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=luto@kernel.org \
--cc=m.szyprowski@samsung.com \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mbenes@suse.cz \
--cc=mingo@kernel.org \
--cc=penberg@kernel.org \
--cc=rientjes@google.com \
--cc=robin.murphy@arm.com \
--cc=rodrigo.vivi@intel.com \
--cc=rostedt@goodmis.org \
--cc=rppt@linux.vnet.ibm.com \
--cc=snitzer@redhat.com \
--cc=tglx@linutronix.de \
--cc=tom.zanussi@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).