A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-08 12:58:12 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "sched/preemptirq: Use restricted trace hooks"

Browse source
This commit is contained in:
qctecmdr 2020-08-31 03:20:23 -07:00 • committed by Gerrit - the friendly Code Review server
commit dd24581938
5 changed files with 89 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/trace/events/preemptirq.h
View file

@ -3,6 +3,9 @@
#undef TRACE_SYSTEM
#define TRACE_SYSTEM preemptirq
#undef TRACE_INCLUDE_PATH
#define TRACE_INCLUDE_PATH trace/events
#if !defined(_TRACE_PREEMPTIRQ_H) || defined(TRACE_HEADER_MULTI_READ)
#define _TRACE_PREEMPTIRQ_H

3
include/trace/events/preemptirq_long.h
View file

@ -6,6 +6,9 @@
#undef TRACE_SYSTEM
#define TRACE_SYSTEM preemptirq_long
#undef TRACE_INCLUDE_PATH
#define TRACE_INCLUDE_PATH trace/events
#if !defined(_TRACE_PREEMPTIRQ_LONG_H) || defined(TRACE_HEADER_MULTI_READ)
#define _TRACE_PREEMPTIRQ_LONG_H

56
include/trace/hooks/restricted_preemptirq.h Normal file
View file

@ -0,0 +1,56 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Copyright (c) 2020, The Linux Foundation. All rights reserved.
*/
#if !defined(_TRACE_RESTRICTED_PREEMPTIRQ_H) || defined(TRACE_HEADER_MULTI_READ)
#define _TRACE_RESTRICTED_PREEMPTIRQ_H
#ifdef CONFIG_PREEMPTIRQ_TRACEPOINTS
#undef TRACE_SYSTEM
#define TRACE_SYSTEM restricted_preemptirq
#undef TRACE_INCLUDE_PATH
#define TRACE_INCLUDE_PATH trace/hooks
#include <linux/tracepoint.h>
#include <trace/hooks/vendor_hooks.h>
#ifdef CONFIG_TRACE_IRQFLAGS
DECLARE_RESTRICTED_HOOK(restricted_irq_disable,
TP_PROTO(unsigned long ip, unsigned long parent_ip),
TP_ARGS(ip, parent_ip), 1);
DECLARE_RESTRICTED_HOOK(restricted_irq_enable,
TP_PROTO(unsigned long ip, unsigned long parent_ip),
TP_ARGS(ip, parent_ip), 1);
#else
#define trace_restricted_irq_enable(ip, parent_ip)
#define trace_restricted_irq_disable(ip, parent_ip)
#endif /* CONFIG_TRACE_IRQFLAGS */
#ifdef CONFIG_TRACE_PREEMPT_TOGGLE
DECLARE_RESTRICTED_HOOK(restricted_preempt_disable,
TP_PROTO(unsigned long ip, unsigned long parent_ip),
TP_ARGS(ip, parent_ip), 1);
DECLARE_RESTRICTED_HOOK(restricted_preempt_enable,
TP_PROTO(unsigned long ip, unsigned long parent_ip),
TP_ARGS(ip, parent_ip), 1);
#else
#define trace_restricted_preempt_enable(ip, parent_ip)
#define trace_restricted_preempt_disable(ip, parent_ip)
#endif /* CONFIG_TRACE_PREEMPT_TOGGLE */
#include <trace/define_trace.h>
#else /* ! CONFIG_PREEMPTIRQ_TRACEPOINTS */
#define trace_restricted_irq_enable(...)
#define trace_restricted_irq_disable(...)
#define trace_restricted_preempt_enable(...)
#define trace_restricted_preempt_disable(...)
#endif /* ! CONFIG_PREEMPTIRQ_TRACEPOINTS */
#endif /* TRACE_RESTRICTED_PREEMPTIRQ_H || TRACE_HEADER_MULTI_READ */

16
kernel/trace/preemptirq_long.c
View file

@ -9,11 +9,9 @@
#include <linux/sysctl.h>
#include <linux/printk.h>
#include <linux/sched/clock.h>
#include <trace/events/preemptirq.h>
#include <trace/events/sched.h>
#define CREATE_TRACE_POINTS
#include <trace/hooks/restricted_preemptirq.h>
#include <trace/events/preemptirq_long.h>
#define IRQSOFF_SENTINEL 0x0fffDEAD
@ -151,13 +149,13 @@ static int preemptirq_long_init(void)
return -EPERM;
}
register_trace_irq_disable(note_irq_disable, NULL);
register_trace_irq_enable(test_irq_disable_long, NULL);
register_trace_preempt_disable(note_preempt_disable, NULL);
register_trace_preempt_enable(test_preempt_disable_long, NULL);
register_trace_restricted_irq_disable(note_irq_disable, NULL);
register_trace_restricted_irq_enable(test_irq_disable_long, NULL);
register_trace_restricted_preempt_disable(note_preempt_disable, NULL);
register_trace_restricted_preempt_enable(test_preempt_disable_long,
NULL);
register_trace_sched_switch(note_context_switch, NULL);
return 0;
}

27
kernel/trace/trace_preemptirq.c
View file

@ -11,7 +11,7 @@
#include <linux/ftrace.h>
#include <linux/kprobes.h>
#include "trace.h"
#include <trace/hooks/restricted_preemptirq.h>
#define CREATE_TRACE_POINTS
#include <trace/events/preemptirq.h>
@ -22,8 +22,10 @@ static DEFINE_PER_CPU(int, tracing_irq_cpu);
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_restricted_irq_enable(CALLER_ADDR0, CALLER_ADDR1);
}
tracer_hardirqs_on(CALLER_ADDR0, CALLER_ADDR1);
this_cpu_write(tracing_irq_cpu, 0);
}
@ -38,8 +40,11 @@ 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_restricted_irq_disable(CALLER_ADDR0,
CALLER_ADDR1);
}
}
lockdep_hardirqs_off(CALLER_ADDR0);
@ -50,8 +55,10 @@ 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_restricted_irq_enable(CALLER_ADDR0, caller_addr);
}
tracer_hardirqs_on(CALLER_ADDR0, caller_addr);
this_cpu_write(tracing_irq_cpu, 0);
}
@ -66,8 +73,10 @@ __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_restricted_irq_disable(CALLER_ADDR0, caller_addr);
}
}
lockdep_hardirqs_off(CALLER_ADDR0);
@ -80,15 +89,19 @@ 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_restricted_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_restricted_preempt_disable(a0, a1);
}
tracer_preempt_off(a0, a1);
}
#endif