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

Commit 5b405e62 authored by Satya Durga Srinivasu Prabhala's avatar Satya Durga Srinivasu Prabhala
Browse files

sched: Add snapshot of preemption and IRQs disable callers 



This snapshot is taken from msm-4.14 as of commit 871eac76e6be567
("Merge "msm: pcie: provide option to override maximum GEN speed"").

Change-Id: I8dc6933a1e3a0835f19c7802930f974d442082a8
Signed-off-by: default avatarSatya Durga Srinivasu Prabhala <satyap@codeaurora.org>
parent 1ff44895

include/linux/sched/sysctl.h

+7 −0
Original line number Diff line number Diff line
@@ -52,6 +52,13 @@ walt_proc_update_handler(struct ctl_table *table, int write, 


#endif



#if defined(CONFIG_PREEMPT_TRACER) || defined(CONFIG_DEBUG_PREEMPT)

extern unsigned int sysctl_preemptoff_tracing_threshold_ns;

#endif

#if defined(CONFIG_PREEMPTIRQ_EVENTS) && defined(CONFIG_IRQSOFF_TRACER)

extern unsigned int sysctl_irqsoff_tracing_threshold_ns;

#endif



enum sched_tunable_scaling {

	SCHED_TUNABLESCALING_NONE,

	SCHED_TUNABLESCALING_LOG,

include/trace/events/preemptirq.h

+28 −0
Original line number Diff line number Diff line
@@ -62,6 +62,34 @@ DEFINE_EVENT(preemptirq_template, preempt_enable, 
#define trace_preempt_disable_rcuidle(...)

#endif



TRACE_EVENT(irqs_disable,



	TP_PROTO(u64 delta, unsigned long caddr0, unsigned long caddr1,

				unsigned long caddr2, unsigned long caddr3),



	TP_ARGS(delta, caddr0, caddr1, caddr2, caddr3),



	TP_STRUCT__entry(

		__field(u64, delta)

		__field(void*, caddr0)

		__field(void*, caddr1)

		__field(void*, caddr2)

		__field(void*, caddr3)

	),



	TP_fast_assign(

		__entry->delta = delta;

		__entry->caddr0 = (void *)caddr0;

		__entry->caddr1 = (void *)caddr1;

		__entry->caddr2 = (void *)caddr2;

		__entry->caddr3 = (void *)caddr3;

	),



	TP_printk("delta=%llu(ns) Callers:(%ps<-%ps<-%ps<-%ps)", __entry->delta,

					__entry->caddr0, __entry->caddr1,

					__entry->caddr2, __entry->caddr3)

);



#endif /* _TRACE_PREEMPTIRQ_H */



#include <trace/define_trace.h>

include/trace/events/sched.h

+32 −0
Original line number Diff line number Diff line
@@ -1220,6 +1220,38 @@ TRACE_EVENT(sched_isolate, 
		__entry->time, __entry->isolate)

);



TRACE_EVENT(sched_preempt_disable,



	TP_PROTO(u64 delta, bool irqs_disabled,

			unsigned long caddr0, unsigned long caddr1,

			unsigned long caddr2, unsigned long caddr3),



	TP_ARGS(delta, irqs_disabled, caddr0, caddr1, caddr2, caddr3),



	TP_STRUCT__entry(

		__field(u64, delta)

		__field(bool, irqs_disabled)

		__field(void*, caddr0)

		__field(void*, caddr1)

		__field(void*, caddr2)

		__field(void*, caddr3)

	),



	TP_fast_assign(

		__entry->delta = delta;

		__entry->irqs_disabled = irqs_disabled;

		__entry->caddr0 = (void *)caddr0;

		__entry->caddr1 = (void *)caddr1;

		__entry->caddr2 = (void *)caddr2;

		__entry->caddr3 = (void *)caddr3;

	),



	TP_printk("delta=%llu(ns) irqs_d=%d Callers:(%ps<-%ps<-%ps<-%ps)",

				__entry->delta, __entry->irqs_disabled,

				__entry->caddr0, __entry->caddr1,

				__entry->caddr2, __entry->caddr3)

);



#include "walt.h"



#endif /* CONFIG_SMP */

kernel/sched/core.c

+36 −1
Original line number Diff line number Diff line
@@ -3297,17 +3297,39 @@ static inline void sched_tick_stop(int cpu) { } 


#if defined(CONFIG_PREEMPT) && (defined(CONFIG_DEBUG_PREEMPT) || \

				defined(CONFIG_TRACE_PREEMPT_TOGGLE))

/*

 * preemptoff stack tracing threshold in ns.

 * default: 1ms

 */

unsigned int sysctl_preemptoff_tracing_threshold_ns = 1000000UL;



struct preempt_store {

	u64 ts;

	unsigned long caddr[4];

	bool irqs_disabled;

};



DEFINE_PER_CPU(struct preempt_store, the_ps);

/*

 * If the value passed in is equal to the current preempt count

 * then we just disabled preemption. Start timing the latency.

 */

static inline void preempt_latency_start(int val)

{

	struct preempt_store *ps = &per_cpu(the_ps, raw_smp_processor_id());



	if (preempt_count() == val) {

		unsigned long ip = get_lock_parent_ip();

#ifdef CONFIG_DEBUG_PREEMPT

		current->preempt_disable_ip = ip;

#endif

		ps->ts = sched_clock();

		ps->caddr[0] = CALLER_ADDR0;

		ps->caddr[1] = CALLER_ADDR1;

		ps->caddr[2] = CALLER_ADDR2;

		ps->caddr[3] = CALLER_ADDR3;

		ps->irqs_disabled = irqs_disabled();



		trace_preempt_off(CALLER_ADDR0, ip);

	}

}
@@ -3340,9 +3362,22 @@ NOKPROBE_SYMBOL(preempt_count_add); 
 */

static inline void preempt_latency_stop(int val)

{

	if (preempt_count() == val)

	if (preempt_count() == val) {

		struct preempt_store *ps = &per_cpu(the_ps,

				raw_smp_processor_id());

		u64 delta = sched_clock() - ps->ts;



		/*

		 * Trace preempt disable stack if preemption

		 * is disabled for more than the threshold.

		 */

		if (delta > sysctl_preemptoff_tracing_threshold_ns)

			trace_sched_preempt_disable(delta, ps->irqs_disabled,

						ps->caddr[0], ps->caddr[1],

						ps->caddr[2], ps->caddr[3]);

		trace_preempt_on(CALLER_ADDR0, get_lock_parent_ip());

	}

}



void preempt_count_sub(int val)

{

kernel/sysctl.c

+18 −0
Original line number Diff line number Diff line
@@ -325,6 +325,24 @@ static struct ctl_table kern_table[] = { 
		.mode		= 0644,

		.proc_handler	= proc_dointvec,

	},

#if defined(CONFIG_PREEMPT_TRACER) || defined(CONFIG_DEBUG_PREEMPT)

	{

		.procname       = "preemptoff_tracing_threshold_ns",

		.data           = &sysctl_preemptoff_tracing_threshold_ns,

		.maxlen         = sizeof(unsigned int),

		.mode           = 0644,

		.proc_handler   = proc_dointvec,

	},

#endif

#if defined(CONFIG_IRQSOFF_TRACER) && defined(CONFIG_PREEMPTIRQ_EVENTS)

	{

		.procname       = "irqsoff_tracing_threshold_ns",

		.data           = &sysctl_irqsoff_tracing_threshold_ns,

		.maxlen         = sizeof(unsigned int),

		.mode           = 0644,

		.proc_handler   = proc_dointvec,

	},

#endif

#ifdef CONFIG_SCHED_WALT

	{

		.procname       = "sched_cpu_high_irqload",