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

Revert "ANDROID: trace: Add trace points for tasklet entry/exit"

Browse Source 
This reverts commit 9889f08de4 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 <clingutla@codeaurora.org>
Cc: J. Avila <elavila@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ibd116aef3140df9a896415e521ef4039c74b4819
This commit is contained in:
Greg Kroah-Hartman
2020-12-18 14:36:51 +01:00
parent 44ede8412e
commit 2cadcbac1a
2 changed files with 2 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/trace/events/irq.h
-45
View File
@@ -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 */
kernel/softirq.c
+2 -7
View File
@@ -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;
}