diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-08 03:21:37 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-08 03:21:37 +0000 |
commit | 06343b27411344fc542f4f3a643f8441aa35252d (patch) | |
tree | 66aa45187c93c350bbdf7e6ae4467a70bf3a8f4c /debian/patches-rt/0298-sched-migrate_dis-enable-Use-sleeping_lock-to-annota.patch | |
parent | Merging upstream version 4.19.260. (diff) | |
download | linux-06343b27411344fc542f4f3a643f8441aa35252d.tar.xz linux-06343b27411344fc542f4f3a643f8441aa35252d.zip |
Adding debian version 4.19.260-1.debian/4.19.260-1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches-rt/0298-sched-migrate_dis-enable-Use-sleeping_lock-to-annota.patch')
-rw-r--r-- | debian/patches-rt/0298-sched-migrate_dis-enable-Use-sleeping_lock-to-annota.patch | 58 |
1 files changed, 0 insertions, 58 deletions
diff --git a/debian/patches-rt/0298-sched-migrate_dis-enable-Use-sleeping_lock-to-annota.patch b/debian/patches-rt/0298-sched-migrate_dis-enable-Use-sleeping_lock-to-annota.patch deleted file mode 100644 index 6c1157424..000000000 --- a/debian/patches-rt/0298-sched-migrate_dis-enable-Use-sleeping_lock-to-annota.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 813c54ab7d391f197cafdfef09b14958da328122 Mon Sep 17 00:00:00 2001 -From: Scott Wood <swood@redhat.com> -Date: Tue, 24 Sep 2019 14:36:41 +0200 -Subject: [PATCH 298/347] =?UTF-8?q?sched:=20migrate=5Fdis/enable:=20Use=20?= - =?UTF-8?q?sleeping=5Flock=E2=80=A6()=20to=20annotate=20sleeping=20points?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit -Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/older/patches-4.19.246-rt110.tar.xz - -[ Upstream commit 4230dd3824c3e1785504e6f757ce79a4b55651fa ] - -Without this, rcu_note_context_switch() will complain if an RCU read lock -is held when migrate_enable() calls stop_one_cpu(). Likewise when -migrate_disable() calls pin_current_cpu() which calls __read_rt_lock() -- -which bypasses the part of the mutex code that calls sleeping_lock_inc(). - -Signed-off-by: Scott Wood <swood@redhat.com> -Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org> -[bigeasy: use sleeping_lock_…() ] -Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> ---- - kernel/cpu.c | 2 ++ - kernel/sched/core.c | 3 +++ - 2 files changed, 5 insertions(+) - -diff --git a/kernel/cpu.c b/kernel/cpu.c -index 11f48774b129..c84a93f84164 100644 ---- a/kernel/cpu.c -+++ b/kernel/cpu.c -@@ -309,7 +309,9 @@ void pin_current_cpu(void) - preempt_lazy_enable(); - preempt_enable(); - -+ sleeping_lock_inc(); - __read_rt_lock(cpuhp_pin); -+ sleeping_lock_dec(); - - preempt_disable(); - preempt_lazy_disable(); -diff --git a/kernel/sched/core.c b/kernel/sched/core.c -index 1d4d4780dd79..33c1ae19410e 100644 ---- a/kernel/sched/core.c -+++ b/kernel/sched/core.c -@@ -7366,7 +7366,10 @@ void migrate_enable(void) - unpin_current_cpu(); - preempt_lazy_enable(); - preempt_enable(); -+ -+ sleeping_lock_inc(); - stop_one_cpu(task_cpu(p), migration_cpu_stop, &arg); -+ sleeping_lock_dec(); - tlb_migrate_finish(p->mm); - - return; --- -2.36.1 - |