summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Andrzej Siewior <bigeasy@linutronix.de>2021-08-30 09:34:08 +0200
committerSebastian Andrzej Siewior <bigeasy@linutronix.de>2021-08-30 09:34:08 +0200
commit626fc679894e1386b5951d957d62114338d69372 (patch)
tree683eac2718fad04750dd8cb601565c01ac86800d
parent1435386d2f5291020ac6c59885f625627f2d7122 (diff)
downloadlinux-rt-626fc679894e1386b5951d957d62114338d69372.tar.gz
[ANNOUNCE] v5.14-rt15v5.14-rt15-patches
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
-rw-r--r--patches/Add_localversion_for_-RT_release.patch2
-rw-r--r--patches/sched-Fix-get_push_task-vs-migrate_disable.patch38
-rw-r--r--patches/series1
3 files changed, 1 insertions, 40 deletions
diff --git a/patches/Add_localversion_for_-RT_release.patch b/patches/Add_localversion_for_-RT_release.patch
index a3ac9f9ca746..2361800c1e6b 100644
--- a/patches/Add_localversion_for_-RT_release.patch
+++ b/patches/Add_localversion_for_-RT_release.patch
@@ -15,4 +15,4 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
--- /dev/null
+++ b/localversion-rt
@@ -0,0 +1 @@
-+-rt14
++-rt15
diff --git a/patches/sched-Fix-get_push_task-vs-migrate_disable.patch b/patches/sched-Fix-get_push_task-vs-migrate_disable.patch
deleted file mode 100644
index 2a0edf8fc5fc..000000000000
--- a/patches/sched-Fix-get_push_task-vs-migrate_disable.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
-Date: Thu, 26 Aug 2021 15:37:38 +0200
-Subject: [PATCH] sched: Fix get_push_task() vs migrate_disable()
-
-push_rt_task() attempts to move the currently running task away if the
-next runnable task has migration disabled and therefore is pinned on the
-current CPU.
-
-The current task is retrieved via get_push_task() which only checks for
-nr_cpus_allowed == 1, but does not check whether the task has migration
-disabled and therefore cannot be moved either. The consequence is a
-pointless invocation of the migration thread which correctly observes
-that the task cannot be moved.
-
-Return NULL if the task has migration disabled and cannot be moved to
-another CPU.
-
-Cc: stable-rt@vger.kernel.org
-Fixes: a7c81556ec4d3 ("sched: Fix migrate_disable() vs rt/dl balancing")
-Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
-Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
-Link: https://lkml.kernel.org/r/20210826133738.yiotqbtdaxzjsnfj@linutronix.de
----
- kernel/sched/sched.h | 3 +++
- 1 file changed, 3 insertions(+)
-
---- a/kernel/sched/sched.h
-+++ b/kernel/sched/sched.h
-@@ -2255,6 +2255,9 @@ static inline struct task_struct *get_pu
- if (p->nr_cpus_allowed == 1)
- return NULL;
-
-+ if (p->migration_disabled)
-+ return NULL;
-+
- rq->push_busy = true;
- return get_task_struct(p);
- }
diff --git a/patches/series b/patches/series
index fb2046ef8376..a0e6f2d3edfa 100644
--- a/patches/series
+++ b/patches/series
@@ -79,7 +79,6 @@ printk__Enhance_the_condition_check_of_msleep_in_pr_flush.patch
# Posted
###########################################################################
highmem-Don-t-disable-preemption-on-RT-in-kmap_atomi.patch
-sched-Fix-get_push_task-vs-migrate_disable.patch
sched-Switch-wait_task_inactive-to-HRTIMER_MODE_REL_.patch
sched-Prevent-balance_push-on-remote-runqueues.patch