From 2cadcbac1a4167978a1caa98d990025f1a46eba6 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 18 Dec 2020 14:36:51 +0100 Subject: [PATCH] Revert "ANDROID: trace: Add trace points for tasklet entry/exit" This reverts commit 9889f08de4a1c81f8ba50e26b6d94bed921b3daf as the softirq code is rewritten in 5.11-rc1 and massive merge conflicts are happening. If this change is still needed, please work with upstream to get the patches accepted so they can then come into this tree automatically. Bug: 168521633 Cc: Lingutla Chandrasekhar Cc: J. Avila Signed-off-by: Greg Kroah-Hartman Change-Id: Ibd116aef3140df9a896415e521ef4039c74b4819 --- include/trace/events/irq.h | 45 -------------------------------------- kernel/softirq.c | 9 ++------ 2 files changed, 2 insertions(+), 52 deletions(-) diff --git a/include/trace/events/irq.h b/include/trace/events/irq.h index bb70f46656b2..eeceafaaea4c 100644 --- a/include/trace/events/irq.h +++ b/include/trace/events/irq.h @@ -160,51 +160,6 @@ DEFINE_EVENT(softirq, softirq_raise, TP_ARGS(vec_nr) ); -DECLARE_EVENT_CLASS(tasklet, - - TP_PROTO(void *func), - - TP_ARGS(func), - - TP_STRUCT__entry( - __field( void *, func) - ), - - TP_fast_assign( - __entry->func = func; - ), - - TP_printk("function=%ps", __entry->func) -); - -DEFINE_EVENT(tasklet, tasklet_entry, - - TP_PROTO(void *func), - - TP_ARGS(func) -); - -DEFINE_EVENT(tasklet, tasklet_exit, - - TP_PROTO(void *func), - - TP_ARGS(func) -); - -DEFINE_EVENT(tasklet, tasklet_hi_entry, - - TP_PROTO(void *func), - - TP_ARGS(func) -); - -DEFINE_EVENT(tasklet, tasklet_hi_exit, - - TP_PROTO(void *func), - - TP_ARGS(func) -); - #endif /* _TRACE_IRQ_H */ /* This part must be outside protection */ diff --git a/kernel/softirq.c b/kernel/softirq.c index f0fa261746fa..a04000169623 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c @@ -562,15 +562,10 @@ static void tasklet_action_common(struct softirq_action *a, if (!test_and_clear_bit(TASKLET_STATE_SCHED, &t->state)) BUG(); - if (t->use_callback) { - trace_tasklet_entry(t->callback); + if (t->use_callback) t->callback(t); - trace_tasklet_exit(t->callback); - } else { - trace_tasklet_entry(t->func); + else t->func(t->data); - trace_tasklet_exit(t->func); - } tasklet_unlock(t); continue; }