Commit 3515572d authored by Steven Rostedt's avatar Steven Rostedt Committed by Steven Rostedt (Google)
Browse files

tracing: Allow backup to save persistent ring buffer before it starts 

When the persistent ring buffer was first introduced, it did not make
sense to start tracing for it on the kernel command line. That's because
if there was a crash, the start of events would invalidate the events from
the previous boot that had the crash.

But now that there's a "backup" instance that can take a snapshot of the
persistent ring buffer when boot starts, it is possible to have the
persistent ring buffer start events at boot up and not lose the old events.

Update the code where the boot events start after all boot time instances
are created. This will allow the backup instance to copy the persistent
ring buffer from the previous boot, and allow the persistent ring buffer
to start tracing new events for the current boot.

  reserve_mem=100M:12M:trace trace_instance=boot_mapped^@trace,sched trace_instance=backup=boot_mapped

The above will create a boot_mapped persistent ring buffer and enabled the
scheduler events. If there's a crash, a "backup" instance will be created
holding the events of the persistent ring buffer from the previous boot,
while the persistent ring buffer will once again start tracing scheduler
events of the current boot.

Now the user doesn't have to remember to start the persistent ring buffer.
It will always have the events started at each boot.

Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: John Stultz <jstultz@google.com>
Link: https://patch.msgid.link/20260331163924.6ccb3896@gandalf.local.home


Signed-off-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
parent e53ba177

kernel/trace/trace.c

+22 −0
Original line number Diff line number Diff line
@@ -10865,9 +10865,31 @@ __init static void enable_instances(void) 
			tr->range_name = no_free_ptr(rname);

		}



		/*

		 * Save the events to start and enabled them after all boot instances

		 * have been created.

		 */

		tr->boot_events = curr_str;

	}



	/* Enable the events after all boot instances have been created */

	list_for_each_entry(tr, &ftrace_trace_arrays, list) {



		if (!tr->boot_events || !(*tr->boot_events)) {

			tr->boot_events = NULL;

			continue;

		}



		curr_str = tr->boot_events;



		/* Clear the instance if this is a persistent buffer */

		if (tr->flags & TRACE_ARRAY_FL_LAST_BOOT)

			update_last_data(tr);



		while ((tok = strsep(&curr_str, ","))) {

			early_enable_events(tr, tok, true);

		}

		tr->boot_events = NULL;

	}

}

kernel/trace/trace.h

+4 −1
Original line number Diff line number Diff line
@@ -405,7 +405,10 @@ struct trace_array { 
	unsigned char		trace_flags_index[TRACE_FLAGS_MAX_SIZE];

	unsigned int		flags;

	raw_spinlock_t		start_lock;

	union {

		const char	*system_names;

		char		*boot_events;

	};

	struct list_head	err_log;

	struct dentry		*dir;

	struct dentry		*options;