From 06fab437d7af410333a78052a583abd79e07ccbc Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 28 Aug 2023 15:30:56 +0000 Subject: [PATCH] Revert "tracing: Fix sleeping while atomic in kdb ftdump" This reverts commit 426656e8dd03ded47112e5e1488f0975a1f0d806 which is commit 495fcec8648cdfb483b5b9ab310f3839f07cb3b8 upstream. It breaks the Android kernel abi, and is not needed for any Android devices at this time. If it is needed in the future, it can be brought back in an abi-safe way. Bug: 161946584 Change-Id: Iafb5d7fa1dd6f80b941f28a2b9e6d56adc6ceb17 Signed-off-by: Greg Kroah-Hartman --- kernel/trace/trace.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 53f8b9b10f72..80af015a21e7 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -9445,12 +9445,6 @@ void trace_init_global_iter(struct trace_iterator *iter) /* Output in nanoseconds only if we are using a clock in nanoseconds. */ if (trace_clocks[iter->tr->clock_id].in_ns) iter->iter_flags |= TRACE_FILE_TIME_IN_NS; - - /* Can not use kmalloc for iter.temp and iter.fmt */ - iter->temp = static_temp_buf; - iter->temp_size = STATIC_TEMP_BUF_SIZE; - iter->fmt = static_fmt_buf; - iter->fmt_size = STATIC_FMT_BUF_SIZE; } void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) @@ -9486,6 +9480,11 @@ void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) /* Simulate the iterator */ trace_init_global_iter(&iter); + /* Can not use kmalloc for iter.temp and iter.fmt */ + iter.temp = static_temp_buf; + iter.temp_size = STATIC_TEMP_BUF_SIZE; + iter.fmt = static_fmt_buf; + iter.fmt_size = STATIC_FMT_BUF_SIZE; for_each_tracing_cpu(cpu) { atomic_inc(&per_cpu_ptr(iter.array_buffer->data, cpu)->disabled);