diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2019-04-25 05:45:13 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2019-04-29 06:37:54 -0400 |
| commit | e7d916632b528e8cccc8e9ccca81acfc591a5fde (patch) | |
| tree | ab3486c51ace46346b9bda8cead79a29b7945a96 | |
| parent | c120bce78065cbea460a58b1572c215db9c148ba (diff) | |
tracing: Simplify stacktrace retrieval in histograms
The indirection through struct stack_trace is not necessary at all. Use the
storage array based interface.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Reviewed-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Reviewed-by: Josh Poimboeuf <jpoimboe@redhat.com>
Acked-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
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: Miroslav Benes <mbenes@suse.cz>
Cc: linux-arch@vger.kernel.org
Link: https://lkml.kernel.org/r/20190425094802.979089273@linutronix.de
| -rw-r--r-- | kernel/trace/trace_events_hist.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c index 21ceae299f7e..a1d20421f4b0 100644 --- a/kernel/trace/trace_events_hist.c +++ b/kernel/trace/trace_events_hist.c | |||
| @@ -5186,7 +5186,6 @@ static void event_hist_trigger(struct event_trigger_data *data, void *rec, | |||
| 5186 | u64 var_ref_vals[TRACING_MAP_VARS_MAX]; | 5186 | u64 var_ref_vals[TRACING_MAP_VARS_MAX]; |
| 5187 | char compound_key[HIST_KEY_SIZE_MAX]; | 5187 | char compound_key[HIST_KEY_SIZE_MAX]; |
| 5188 | struct tracing_map_elt *elt = NULL; | 5188 | struct tracing_map_elt *elt = NULL; |
| 5189 | struct stack_trace stacktrace; | ||
| 5190 | struct hist_field *key_field; | 5189 | struct hist_field *key_field; |
| 5191 | u64 field_contents; | 5190 | u64 field_contents; |
| 5192 | void *key = NULL; | 5191 | void *key = NULL; |
| @@ -5198,14 +5197,9 @@ static void event_hist_trigger(struct event_trigger_data *data, void *rec, | |||
| 5198 | key_field = hist_data->fields[i]; | 5197 | key_field = hist_data->fields[i]; |
| 5199 | 5198 | ||
| 5200 | if (key_field->flags & HIST_FIELD_FL_STACKTRACE) { | 5199 | if (key_field->flags & HIST_FIELD_FL_STACKTRACE) { |
| 5201 | stacktrace.max_entries = HIST_STACKTRACE_DEPTH; | 5200 | memset(entries, 0, HIST_STACKTRACE_SIZE); |
| 5202 | stacktrace.entries = entries; | 5201 | stack_trace_save(entries, HIST_STACKTRACE_DEPTH, |
| 5203 | stacktrace.nr_entries = 0; | 5202 | HIST_STACKTRACE_SKIP); |
| 5204 | stacktrace.skip = HIST_STACKTRACE_SKIP; | ||
| 5205 | |||
| 5206 | memset(stacktrace.entries, 0, HIST_STACKTRACE_SIZE); | ||
| 5207 | save_stack_trace(&stacktrace); | ||
| 5208 | |||
| 5209 | key = entries; | 5203 | key = entries; |
| 5210 | } else { | 5204 | } else { |
| 5211 | field_contents = key_field->fn(key_field, elt, rbe, rec); | 5205 | field_contents = key_field->fn(key_field, elt, rbe, rec); |
