tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "ANDROID: tracing: Add restricted vendor hooks for preemptirq events"

Browse Source 
This reverts commit 2e14f01dc4.

It conflicts with changes in the tracing code in this file in 6.3-rc1.
If this is still needed, it can be brought back after 6.3-rc1 is merged.

Bug: 174541725
Cc: Pavankumar Kondeti <pkondeti@codeaurora.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I105e9b31647431a4a0fb8fa865ca5115ce4ac4a3
This commit is contained in:
Greg Kroah-Hartman
2023-03-02 11:40:08 +00:00
parent 1a052a9ed0
commit d94fa9dcf5
3 changed files with 8 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/android/vendor_hooks.c
-5
View File
@@ -19,7 +19,6 @@
#include <trace/hooks/printk.h>
#include <trace/hooks/epoch.h>
#include <trace/hooks/cpufreq.h>
#include <trace/hooks/preemptirq.h>
#include <trace/hooks/ufshcd.h>
#include <trace/hooks/cgroup.h>
#include <trace/hooks/sys.h>
@@ -54,10 +53,6 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_printk_hotplug);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_show_suspend_epoch_val);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_show_resume_epoch_val);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_freq_table_limits);
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);
include/trace/hooks/preemptirq.h
-31
View File
@@ -1,31 +0,0 @@
/* 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 <trace/hooks/vendor_hooks.h>
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 <trace/define_trace.h>
kernel/trace/trace_preemptirq.c
+8 -32
View File
@@ -14,8 +14,6 @@
#define CREATE_TRACE_POINTS
#include <trace/events/preemptirq.h>
#undef CREATE_TRACE_POINTS
#include <trace/hooks/preemptirq.h>
#ifdef CONFIG_TRACE_IRQFLAGS
/* Per-cpu variable to prevent redundant calls when IRQs already off */
@@ -30,11 +28,8 @@ static DEFINE_PER_CPU(int, tracing_irq_cpu);
void trace_hardirqs_on_prepare(void)
{
if (this_cpu_read(tracing_irq_cpu)) {
if (!in_nmi()) {
if (!in_nmi())
trace_irq_enable(CALLER_ADDR0, CALLER_ADDR1);
trace_android_rvh_irqs_enable(CALLER_ADDR0,
CALLER_ADDR1);
}
tracer_hardirqs_on(CALLER_ADDR0, CALLER_ADDR1);
this_cpu_write(tracing_irq_cpu, 0);
}
@@ -45,11 +40,8 @@ NOKPROBE_SYMBOL(trace_hardirqs_on_prepare);
void trace_hardirqs_on(void)
{
if (this_cpu_read(tracing_irq_cpu)) {
if (!in_nmi()) {
if (!in_nmi())
trace_irq_enable_rcuidle(CALLER_ADDR0, CALLER_ADDR1);
trace_android_rvh_irqs_enable(CALLER_ADDR0,
CALLER_ADDR1);
}
tracer_hardirqs_on(CALLER_ADDR0, CALLER_ADDR1);
this_cpu_write(tracing_irq_cpu, 0);
}
@@ -71,11 +63,8 @@ void trace_hardirqs_off_finish(void)
if (!this_cpu_read(tracing_irq_cpu)) {
this_cpu_write(tracing_irq_cpu, 1);
tracer_hardirqs_off(CALLER_ADDR0, CALLER_ADDR1);
if (!in_nmi()) {
if (!in_nmi())
trace_irq_disable(CALLER_ADDR0, CALLER_ADDR1);
trace_android_rvh_irqs_disable(CALLER_ADDR0,
CALLER_ADDR1);
}
}
}
@@ -89,11 +78,8 @@ void trace_hardirqs_off(void)
if (!this_cpu_read(tracing_irq_cpu)) {
this_cpu_write(tracing_irq_cpu, 1);
tracer_hardirqs_off(CALLER_ADDR0, CALLER_ADDR1);
if (!in_nmi()) {
if (!in_nmi())
trace_irq_disable_rcuidle(CALLER_ADDR0, CALLER_ADDR1);
trace_android_rvh_irqs_disable(CALLER_ADDR0,
CALLER_ADDR1);
}
}
}
EXPORT_SYMBOL(trace_hardirqs_off);
@@ -102,11 +88,8 @@ NOKPROBE_SYMBOL(trace_hardirqs_off);
__visible void trace_hardirqs_on_caller(unsigned long caller_addr)
{
if (this_cpu_read(tracing_irq_cpu)) {
if (!in_nmi()) {
if (!in_nmi())
trace_irq_enable_rcuidle(CALLER_ADDR0, caller_addr);
trace_android_rvh_irqs_enable(CALLER_ADDR0,
caller_addr);
}
tracer_hardirqs_on(CALLER_ADDR0, caller_addr);
this_cpu_write(tracing_irq_cpu, 0);
}
@@ -124,11 +107,8 @@ __visible void trace_hardirqs_off_caller(unsigned long caller_addr)
if (!this_cpu_read(tracing_irq_cpu)) {
this_cpu_write(tracing_irq_cpu, 1);
tracer_hardirqs_off(CALLER_ADDR0, caller_addr);
if (!in_nmi()) {
if (!in_nmi())
trace_irq_disable_rcuidle(CALLER_ADDR0, caller_addr);
trace_android_rvh_irqs_enable(CALLER_ADDR0,
caller_addr);
}
}
}
EXPORT_SYMBOL(trace_hardirqs_off_caller);
@@ -139,19 +119,15 @@ NOKPROBE_SYMBOL(trace_hardirqs_off_caller);
void trace_preempt_on(unsigned long a0, unsigned long a1)
{
if (!in_nmi()) {
if (!in_nmi())
trace_preempt_enable_rcuidle(a0, a1);
trace_android_rvh_preempt_enable(a0, a1);
}
tracer_preempt_on(a0, a1);
}
void trace_preempt_off(unsigned long a0, unsigned long a1)
{
if (!in_nmi()) {
if (!in_nmi())
trace_preempt_disable_rcuidle(a0, a1);
trace_android_rvh_preempt_disable(a0, a1);
}
tracer_preempt_off(a0, a1);
}
#endif