Skip to content

Commit 8e99cf9

Browse files
committed
tracing: Do not allocate buffer in trace_find_next_entry() in atomic
When dumping out the trace data in latency format, a check is made to peek at the next event to compare its timestamp to the current one, and if the delta is of a greater size, it will add a marker showing so. But to do this, it needs to save the current event otherwise peeking at the next event will remove the current event. To save the event, a temp buffer is used, and if the event is bigger than the temp buffer, the temp buffer is freed and a bigger buffer is allocated. This allocation is a problem when called in atomic context. The only way this gets called via atomic context is via ftrace_dump(). Thus, use a static buffer of 128 bytes (which covers most events), and if the event is bigger than that, simply return NULL. The callers of trace_find_next_entry() need to handle a NULL case, as that's what would happen if the allocation failed. Link: https://lore.kernel.org/r/20200326091256.GR11705@shao2-debian Fixes: ff89510 ("tracing: Save off entry when peeking at next entry") Reported-by: kernel test robot <rong.a.chen@intel.com> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
1 parent 2ab2a09 commit 8e99cf9

File tree

1 file changed

+20
-1
lines changed

1 file changed

+20
-1
lines changed

kernel/trace/trace.c

+20-1
Original file line numberDiff line numberDiff line change
@@ -3472,6 +3472,9 @@ __find_next_entry(struct trace_iterator *iter, int *ent_cpu,
34723472
return next;
34733473
}
34743474

3475+
#define STATIC_TEMP_BUF_SIZE 128
3476+
static char static_temp_buf[STATIC_TEMP_BUF_SIZE];
3477+
34753478
/* Find the next real entry, without updating the iterator itself */
34763479
struct trace_entry *trace_find_next_entry(struct trace_iterator *iter,
34773480
int *ent_cpu, u64 *ent_ts)
@@ -3480,13 +3483,26 @@ struct trace_entry *trace_find_next_entry(struct trace_iterator *iter,
34803483
int ent_size = iter->ent_size;
34813484
struct trace_entry *entry;
34823485

3486+
/*
3487+
* If called from ftrace_dump(), then the iter->temp buffer
3488+
* will be the static_temp_buf and not created from kmalloc.
3489+
* If the entry size is greater than the buffer, we can
3490+
* not save it. Just return NULL in that case. This is only
3491+
* used to add markers when two consecutive events' time
3492+
* stamps have a large delta. See trace_print_lat_context()
3493+
*/
3494+
if (iter->temp == static_temp_buf &&
3495+
STATIC_TEMP_BUF_SIZE < ent_size)
3496+
return NULL;
3497+
34833498
/*
34843499
* The __find_next_entry() may call peek_next_entry(), which may
34853500
* call ring_buffer_peek() that may make the contents of iter->ent
34863501
* undefined. Need to copy iter->ent now.
34873502
*/
34883503
if (iter->ent && iter->ent != iter->temp) {
3489-
if (!iter->temp || iter->temp_size < iter->ent_size) {
3504+
if ((!iter->temp || iter->temp_size < iter->ent_size) &&
3505+
!WARN_ON_ONCE(iter->temp == static_temp_buf)) {
34903506
kfree(iter->temp);
34913507
iter->temp = kmalloc(iter->ent_size, GFP_KERNEL);
34923508
if (!iter->temp)
@@ -9203,6 +9219,9 @@ void ftrace_dump(enum ftrace_dump_mode oops_dump_mode)
92039219

92049220
/* Simulate the iterator */
92059221
trace_init_global_iter(&iter);
9222+
/* Can not use kmalloc for iter.temp */
9223+
iter.temp = static_temp_buf;
9224+
iter.temp_size = STATIC_TEMP_BUF_SIZE;
92069225

92079226
for_each_tracing_cpu(cpu) {
92089227
atomic_inc(&per_cpu_ptr(iter.array_buffer->data, cpu)->disabled);

0 commit comments

Comments
 (0)