fixes for 5.2

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-5.2/rcu-tree-fix-sched_fifo-params.patch b/queue-5.2/rcu-tree-fix-sched_fifo-params.patch
new file mode 100644 (file)
index 0000000..f97fa84
--- /dev/null
+++ b/queue-5.2/rcu-tree-fix-sched_fifo-params.patch
@@ -0,0 +1,45 @@
+From 16458fc5bba952ce2e2803d19d8949c06c5e1a8c Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Thu, 1 Aug 2019 12:42:06 +0200
+Subject: rcu/tree: Fix SCHED_FIFO params
+
+From: Peter Zijlstra <peterz@infradead.org>
+
+[ Upstream commit 130d9c331bc59a8733b47c58ef197a2b1fa3ed43 ]
+
+A rather embarrasing mistake had us call sched_setscheduler() before
+initializing the parameters passed to it.
+
+Fixes: 1a763fd7c633 ("rcu/tree: Call setschedule() gp ktread to SCHED_FIFO outside of atomic region")
+Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
+Reviewed-by: Paul E. McKenney <paulmck@linux.ibm.com>
+Cc: Juri Lelli <juri.lelli@redhat.com>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ kernel/rcu/tree.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
+index 32ea75acba144..affa7aae758f3 100644
+--- a/kernel/rcu/tree.c
++++ b/kernel/rcu/tree.c
+@@ -3123,13 +3123,13 @@ static int __init rcu_spawn_gp_kthread(void)
+       t = kthread_create(rcu_gp_kthread, NULL, "%s", rcu_state.name);
+       if (WARN_ONCE(IS_ERR(t), "%s: Could not start grace-period kthread, OOM is now expected behavior\n", __func__))
+               return 0;
+-      if (kthread_prio)
++      if (kthread_prio) {
++              sp.sched_priority = kthread_prio;
+               sched_setscheduler_nocheck(t, SCHED_FIFO, &sp);
++      }
+       rnp = rcu_get_root();
+       raw_spin_lock_irqsave_rcu_node(rnp, flags);
+       rcu_state.gp_kthread = t;
+-      if (kthread_prio)
+-              sp.sched_priority = kthread_prio;
+       raw_spin_unlock_irqrestore_rcu_node(rnp, flags);
+       wake_up_process(t);
+       rcu_spawn_nocb_kthreads();
+-- 
+2.20.1
+

diff --git a/queue-5.2/series b/queue-5.2/series
index 460095a9160101e8e7acdb63f3e9649346833558..2647cf8728bea7da14a04d69efa069f7befe5a26 100644 (file)
--- a/queue-5.2/series
+++ b/queue-5.2/series
@@ -225,3 +225,4 @@ ib-hfi1-do-not-update-hcrc-for-a-kdeth-packet-during-fault-injection.patch
 rdma-fix-double-free-in-srq-creation-error-flow.patch
 randstruct-check-member-structs-in-is_pure_ops_struct.patch
 arm-dts-am3517-evm-fix-missing-video.patch
+rcu-tree-fix-sched_fifo-params.patch