From e3f01360e3b2b35cb85ea88c52a93329a8c91ed0 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 10 Jul 2018 18:49:02 +0200 Subject: [PATCH] 4.14-stable patches added patches: sched-tracing-fix-trace_sched_pi_setprio-for-deboosting.patch --- ...race_sched_pi_setprio-for-deboosting.patch | 59 +++++++++++++++++++ queue-4.14/series | 1 + 2 files changed, 60 insertions(+) create mode 100644 queue-4.14/sched-tracing-fix-trace_sched_pi_setprio-for-deboosting.patch diff --git a/queue-4.14/sched-tracing-fix-trace_sched_pi_setprio-for-deboosting.patch b/queue-4.14/sched-tracing-fix-trace_sched_pi_setprio-for-deboosting.patch new file mode 100644 index 00000000000..f50fbef531f --- /dev/null +++ b/queue-4.14/sched-tracing-fix-trace_sched_pi_setprio-for-deboosting.patch @@ -0,0 +1,59 @@ +From 4ff648decf4712d39f184fc2df3163f43975575a Mon Sep 17 00:00:00 2001 +From: Sebastian Andrzej Siewior +Date: Thu, 24 May 2018 15:26:48 +0200 +Subject: sched, tracing: Fix trace_sched_pi_setprio() for deboosting +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Sebastian Andrzej Siewior + +commit 4ff648decf4712d39f184fc2df3163f43975575a upstream. + +Since the following commit: + + b91473ff6e97 ("sched,tracing: Update trace_sched_pi_setprio()") + +the sched_pi_setprio trace point shows the "newprio" during a deboost: + + |futex sched_pi_setprio: comm=futex_requeue_p pid"34 oldprio˜ newprio=3D98 + |futex sched_switch: prev_comm=futex_requeue_p prev_pid"34 prev_prio=120 + +This patch open codes __rt_effective_prio() in the tracepoint as the +'newprio' to get the old behaviour back / the correct priority: + + |futex sched_pi_setprio: comm=futex_requeue_p pid"20 oldprio˜ newprio=3D120 + |futex sched_switch: prev_comm=futex_requeue_p prev_pid"20 prev_prio=120 + +Peter suggested to open code the new priority so people using tracehook +could get the deadline data out. + +Reported-by: Mansky Christian +Signed-off-by: Sebastian Andrzej Siewior +Signed-off-by: Peter Zijlstra (Intel) +Cc: Linus Torvalds +Cc: Peter Zijlstra +Cc: Steven Rostedt +Cc: Thomas Gleixner +Fixes: b91473ff6e97 ("sched,tracing: Update trace_sched_pi_setprio()") +Link: http://lkml.kernel.org/r/20180524132647.gg6ziuogczdmjjzu@linutronix.de +Signed-off-by: Ingo Molnar +Signed-off-by: Greg Kroah-Hartman + +--- + include/trace/events/sched.h | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +--- a/include/trace/events/sched.h ++++ b/include/trace/events/sched.h +@@ -435,7 +435,9 @@ TRACE_EVENT(sched_pi_setprio, + memcpy(__entry->comm, tsk->comm, TASK_COMM_LEN); + __entry->pid = tsk->pid; + __entry->oldprio = tsk->prio; +- __entry->newprio = pi_task ? pi_task->prio : tsk->prio; ++ __entry->newprio = pi_task ? ++ min(tsk->normal_prio, pi_task->prio) : ++ tsk->normal_prio; + /* XXX SCHED_DEADLINE bits missing */ + ), + diff --git a/queue-4.14/series b/queue-4.14/series index 47e4d9d4630..645c964f2b7 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -49,3 +49,4 @@ mtd-cfi_cmdset_0002-change-erase-functions-to-retry-for-error.patch mtd-cfi_cmdset_0002-change-erase-functions-to-check-chip-good-only.patch netfilter-nf_log-don-t-hold-nf_log_mutex-during-user-access.patch staging-comedi-quatech_daqp_cs-fix-no-op-loop-daqp_ao_insn_write.patch +sched-tracing-fix-trace_sched_pi_setprio-for-deboosting.patch -- 2.47.3