Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a497adb4 authored by Steven Rostedt (Red Hat)'s avatar Steven Rostedt (Red Hat) Committed by Steven Rostedt
Browse files

ring-buffer: Add enum names for the context levels 



Instead of having hard coded numbers for the context levels, use
enums to describe them more.

Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent 3c6296f7

kernel/trace/ring_buffer.c

+22 −5
Original line number Original line Diff line number Diff line
@@ -399,6 +399,23 @@ struct rb_irq_work { 
	bool				wakeup_full;

	bool				wakeup_full;

};

};





/*

 * Used for which event context the event is in.

 *  NMI     = 0

 *  IRQ     = 1

 *  SOFTIRQ = 2

 *  NORMAL  = 3

 *

 * See trace_recursive_lock() comment below for more details.

 */

enum {

	RB_CTX_NMI,

	RB_CTX_IRQ,

	RB_CTX_SOFTIRQ,

	RB_CTX_NORMAL,

	RB_CTX_MAX

};



/*

/*

 * head_page == tail_page && head == tail then buffer is empty.

 * head_page == tail_page && head == tail then buffer is empty.

 */

 */
@@ -2173,7 +2190,7 @@ static unsigned rb_calculate_event_length(unsigned length) 




	/* zero length can cause confusions */

	/* zero length can cause confusions */

	if (!length)

	if (!length)

		length = 1;

		length++;





	if (length > RB_MAX_SMALL_DATA || RB_FORCE_8BYTE_ALIGNMENT)

	if (length > RB_MAX_SMALL_DATA || RB_FORCE_8BYTE_ALIGNMENT)

		length += sizeof(event.array[0]);

		length += sizeof(event.array[0]);
@@ -2631,13 +2648,13 @@ trace_recursive_lock(struct ring_buffer_per_cpu *cpu_buffer) 




	if (in_interrupt()) {

	if (in_interrupt()) {

		if (in_nmi())

		if (in_nmi())

			bit = 0;

			bit = RB_CTX_NMI;

		else if (in_irq())

		else if (in_irq())

			bit = 1;

			bit = RB_CTX_IRQ;

		else

		else

			bit = 2;

			bit = RB_CTX_SOFTIRQ;

	} else

	} else

		bit = 3;

		bit = RB_CTX_NORMAL;





	if (unlikely(val & (1 << bit)))

	if (unlikely(val & (1 << bit)))

		return 1;

		return 1;