Commit aa067682 authored by Steven Rostedt (Google)'s avatar Steven Rostedt (Google)
Browse files

tracing: Update snapshot order along with main buffer order 

When updating the order of the sub buffers for the main buffer, make sure
that if the snapshot buffer exists, that it gets its order updated as
well.

Link: https://lore.kernel.org/linux-trace-kernel/20231219185630.054668186@goodmis.org



Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Tzvetomir Stoyanov <tz.stoyanov@gmail.com>
Cc: Vincent Donnefort <vdonnefort@google.com>
Cc: Kent Overstreet <kent.overstreet@gmail.com>
Signed-off-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
parent 4e958db3

kernel/trace/trace.c

+43 −2
Original line number Diff line number Diff line
@@ -1263,10 +1263,17 @@ static void set_buffer_entries(struct array_buffer *buf, unsigned long val); 


int tracing_alloc_snapshot_instance(struct trace_array *tr)

{

	int order;

	int ret;



	if (!tr->allocated_snapshot) {



		/* Make the snapshot buffer have the same order as main buffer */

		order = ring_buffer_subbuf_order_get(tr->array_buffer.buffer);

		ret = ring_buffer_subbuf_order_set(tr->max_buffer.buffer, order);

		if (ret < 0)

			return ret;



		/* allocate spare buffer */

		ret = resize_buffer_duplicate_size(&tr->max_buffer,

				   &tr->array_buffer, RING_BUFFER_ALL_CPUS);
@@ -1286,6 +1293,7 @@ static void free_snapshot(struct trace_array *tr) 
	 * The max_tr ring buffer has some state (e.g. ring->clock) and

	 * we want preserve it.

	 */

	ring_buffer_subbuf_order_set(tr->max_buffer.buffer, 0);

	ring_buffer_resize(tr->max_buffer.buffer, 1, RING_BUFFER_ALL_CPUS);

	set_buffer_entries(&tr->max_buffer, 1);

	tracing_reset_online_cpus(&tr->max_buffer);
@@ -9393,6 +9401,7 @@ buffer_order_write(struct file *filp, const char __user *ubuf, 
{

	struct trace_array *tr = filp->private_data;

	unsigned long val;

	int old_order;

	int ret;



	ret = kstrtoul_from_user(ubuf, cnt, 10, &val);
@@ -9403,12 +9412,44 @@ buffer_order_write(struct file *filp, const char __user *ubuf, 
	if (val < 0 || val > 7)

		return -EINVAL;



	old_order = ring_buffer_subbuf_order_get(tr->array_buffer.buffer);

	if (old_order == val)

		return 0;



	ret = ring_buffer_subbuf_order_set(tr->array_buffer.buffer, val);

	if (ret)

		return ret;

		return 0;



	(*ppos)++;

#ifdef CONFIG_TRACER_MAX_TRACE



	if (!tr->allocated_snapshot)

		goto out_max;



	ret = ring_buffer_subbuf_order_set(tr->max_buffer.buffer, val);

	if (ret) {

		/* Put back the old order */

		cnt = ring_buffer_subbuf_order_set(tr->array_buffer.buffer, old_order);

		if (WARN_ON_ONCE(cnt)) {

			/*

			 * AARGH! We are left with different orders!

			 * The max buffer is our "snapshot" buffer.

			 * When a tracer needs a snapshot (one of the

			 * latency tracers), it swaps the max buffer

			 * with the saved snap shot. We succeeded to

			 * update the order of the main buffer, but failed to

			 * update the order of the max buffer. But when we tried

			 * to reset the main buffer to the original size, we

			 * failed there too. This is very unlikely to

			 * happen, but if it does, warn and kill all

			 * tracing.

			 */

			tracing_disabled = 1;

		}

		return ret;

	}

 out_max:

#endif

	(*ppos)++;

	return cnt;

}