From b8333d22a345c1f1d4e60484576bfc50227f4db6 Mon Sep 17 00:00:00 2001 From: Sai Harshini Nimmala Date: Mon, 31 Jul 2023 16:37:28 -0700 Subject: [PATCH] ANDROID: tracing: Add restricted vendor hooks for preemptirq events We have debug infrastructure built on top of preempt/irq disable/enable events. This requires modifications to the kernel tracing code. Since this is not feasible with GKI, we started with registering to the existing preemptirq trace events. However the performance of wide variety of use cases are regressed as the rate of preemptirq events is super high and generic trace events are slow. Since GKI allows optimized trace events via restricted trace hooks, add the same for preemptirq event. This patch reverts commit d94fa9dcf5ba9d35ae76e6c25aaca7cc947eadb4, which itself was a revert, effectively bringing back the original change (Ic8d3cdd1c1aa6a9267d0b755694fedffa2ea8e36) Bug: 174541725 Signed-off-by: Pavankumar Kondeti Signed-off-by: Sai Harshini Nimmala Change-Id: I24a3cdf17abf41e7512438516b2cfe561802c666 [jstultz: Reworked commit message] Signed-off-by: John Stultz --- drivers/android/vendor_hooks.c | 5 +++++ include/trace/hooks/preemptirq.h | 31 +++++++++++++++++++++++++++++++ kernel/trace/trace_preemptirq.c | 24 ++++++++++++++++++++++++ 3 files changed, 60 insertions(+) create mode 100644 include/trace/hooks/preemptirq.h diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index 87d0e4e6d901..524fe476546b 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include @@ -78,6 +79,10 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_cpufreq_online); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_cpufreq_resolve_freq); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_cpufreq_fast_switch); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_cpufreq_target); +EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_preempt_disable); +EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_preempt_enable); +EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_irqs_disable); +EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_irqs_enable); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_cpu_cgroup_attach); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_cpu_cgroup_online); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_ufs_fill_prdt); diff --git a/include/trace/hooks/preemptirq.h b/include/trace/hooks/preemptirq.h new file mode 100644 index 000000000000..52308c882acb --- /dev/null +++ b/include/trace/hooks/preemptirq.h @@ -0,0 +1,31 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#undef TRACE_SYSTEM +#define TRACE_SYSTEM preemptirq + +#undef TRACE_INCLUDE_PATH +#define TRACE_INCLUDE_PATH trace/hooks + +#if !defined(_TRACE_HOOK_PREEMPTIRQ_H) || defined(TRACE_HEADER_MULTI_READ) +#define _TRACE_HOOK_PREEMPTIRQ_H + +#include + +DECLARE_RESTRICTED_HOOK(android_rvh_preempt_disable, + TP_PROTO(unsigned long ip, unsigned long parent_ip), + TP_ARGS(ip, parent_ip), 1); + +DECLARE_RESTRICTED_HOOK(android_rvh_preempt_enable, + TP_PROTO(unsigned long ip, unsigned long parent_ip), + TP_ARGS(ip, parent_ip), 1); + +DECLARE_RESTRICTED_HOOK(android_rvh_irqs_disable, + TP_PROTO(unsigned long ip, unsigned long parent_ip), + TP_ARGS(ip, parent_ip), 1); + +DECLARE_RESTRICTED_HOOK(android_rvh_irqs_enable, + TP_PROTO(unsigned long ip, unsigned long parent_ip), + TP_ARGS(ip, parent_ip), 1); + +#endif /* _TRACE_HOOK_PREEMPTIRQ_H */ +/* This part must be outside protection */ +#include diff --git a/kernel/trace/trace_preemptirq.c b/kernel/trace/trace_preemptirq.c index e37446f7916e..2e6ab37e5dca 100644 --- a/kernel/trace/trace_preemptirq.c +++ b/kernel/trace/trace_preemptirq.c @@ -14,6 +14,8 @@ #define CREATE_TRACE_POINTS #include +#undef CREATE_TRACE_POINTS +#include /* * Use regular trace points on architectures that implement noinstr @@ -43,6 +45,10 @@ void trace_hardirqs_on_prepare(void) { if (this_cpu_read(tracing_irq_cpu)) { trace(irq_enable)(CALLER_ADDR0, CALLER_ADDR1); + if (!in_nmi()) { + trace_android_rvh_irqs_enable(CALLER_ADDR0, + CALLER_ADDR1); + } tracer_hardirqs_on(CALLER_ADDR0, CALLER_ADDR1); this_cpu_write(tracing_irq_cpu, 0); } @@ -54,6 +60,10 @@ void trace_hardirqs_on(void) { if (this_cpu_read(tracing_irq_cpu)) { trace(irq_enable)(CALLER_ADDR0, CALLER_ADDR1); + if (!in_nmi()) { + trace_android_rvh_irqs_enable(CALLER_ADDR0, + CALLER_ADDR1); + } tracer_hardirqs_on(CALLER_ADDR0, CALLER_ADDR1); this_cpu_write(tracing_irq_cpu, 0); } @@ -76,6 +86,10 @@ void trace_hardirqs_off_finish(void) this_cpu_write(tracing_irq_cpu, 1); tracer_hardirqs_off(CALLER_ADDR0, CALLER_ADDR1); trace(irq_disable)(CALLER_ADDR0, CALLER_ADDR1); + if (!in_nmi()) { + trace_android_rvh_irqs_disable(CALLER_ADDR0, + CALLER_ADDR1); + } } } @@ -90,6 +104,10 @@ void trace_hardirqs_off(void) this_cpu_write(tracing_irq_cpu, 1); tracer_hardirqs_off(CALLER_ADDR0, CALLER_ADDR1); trace(irq_disable)(CALLER_ADDR0, CALLER_ADDR1); + if (!in_nmi()) { + trace_android_rvh_irqs_disable(CALLER_ADDR0, + CALLER_ADDR1); + } } } EXPORT_SYMBOL(trace_hardirqs_off); @@ -101,12 +119,18 @@ NOKPROBE_SYMBOL(trace_hardirqs_off); void trace_preempt_on(unsigned long a0, unsigned long a1) { trace(preempt_enable)(a0, a1); + if (!in_nmi()) { + trace_android_rvh_preempt_enable(a0, a1); + } tracer_preempt_on(a0, a1); } void trace_preempt_off(unsigned long a0, unsigned long a1) { trace(preempt_disable)(a0, a1); + if (!in_nmi()) { + trace_android_rvh_preempt_disable(a0, a1); + } tracer_preempt_off(a0, a1); } #endif