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

Commit 58f82482 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: Enable preemptirq tracing for msm8998 and sdm660"

parents 6abf20ea f8bcc90a

arch/arm64/configs/msmcortex_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -696,6 +696,7 @@ CONFIG_IPC_LOGGING=y 
CONFIG_QCOM_RTB=y

CONFIG_QCOM_RTB_SEPARATE_CPUS=y

CONFIG_FUNCTION_TRACER=y

CONFIG_PREEMPTIRQ_EVENTS=y

CONFIG_IRQSOFF_TRACER=y

CONFIG_PREEMPT_TRACER=y

CONFIG_BLK_DEV_IO_TRACE=y

arch/arm64/configs/sdm660_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -697,6 +697,7 @@ CONFIG_IPC_LOGGING=y 
CONFIG_QCOM_RTB=y

CONFIG_QCOM_RTB_SEPARATE_CPUS=y

CONFIG_FUNCTION_TRACER=y

CONFIG_PREEMPTIRQ_EVENTS=y

CONFIG_IRQSOFF_TRACER=y

CONFIG_PREEMPT_TRACER=y

CONFIG_BLK_DEV_IO_TRACE=y

include/linux/sched/sysctl.h

+5 −0
Original line number Diff line number Diff line
@@ -85,6 +85,11 @@ extern unsigned int sysctl_sched_short_sleep; 


#endif /* CONFIG_SCHED_HMP */



#if defined(CONFIG_PREEMPT_TRACER) || defined(CONFIG_IRQSOFF_TRACER)

extern unsigned int sysctl_preemptoff_tracing_threshold_ns;

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
@@ -52,6 +52,34 @@ DEFINE_EVENT(preemptirq_template, preempt_enable, 
	     TP_ARGS(ip, parent_ip));

#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:(%pf<-%pf<-%pf<-%pf)", __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
@@ -1436,6 +1436,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:(%pf<-%pf<-%pf<-%pf)",

				__entry->delta, __entry->irqs_disabled,

				__entry->caddr0, __entry->caddr1,

				__entry->caddr2, __entry->caddr3)

);



TRACE_EVENT(sched_contrib_scale_f,



	TP_PROTO(int cpu, unsigned long freq_scale_factor,