From: Paul E. McKenney <paulmck@kernel.org>
Date: Thu, 7 May 2020 17:18:32 +0000 (-0700)
Subject: Merge branches 'fixes.2020.04.27a', 'kfree_rcu.2020.04.27a', 'rcu-tasks.2020.04.27a... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f736e0f1a55a88cb258b73da77463573739e9ac9;p=linux.git

Merge branches 'fixes.2020.04.27a', 'kfree_rcu.2020.04.27a', 'rcu-tasks.2020.04.27a', 'stall.2020.04.27a' and 'torture.2020.05.07a' into HEAD

fixes.2020.04.27a:  Miscellaneous fixes.
kfree_rcu.2020.04.27a:  Changes related to kfree_rcu().
rcu-tasks.2020.04.27a:  Addition of new RCU-tasks flavors.
stall.2020.04.27a:  RCU CPU stall-warning updates.
torture.2020.05.07a:  Torture-test updates.
---

f736e0f1a55a88cb258b73da77463573739e9ac9
diff --cc kernel/rcu/tree_stall.h
index 3a7bc99e78e38,4dede00e29363,e1c68a74574f7,535762b075436,119ed6afd20fe..ae76bd3295829
--- a/kernel/rcu/tree_stall.h
+++ b/kernel/rcu/tree_stall.h
@@@@@@ -421,13 -453,13 -455,13 -435,11 -421,13 +501,11 @@@@@@ static void print_other_cpu_stall(unsig
     			pr_err("INFO: Stall ended before state dump start\n");
     		} else {
     			j = jiffies;
 ----			gpa = READ_ONCE(rcu_state.gp_activity);
 ++++			gpa = data_race(rcu_state.gp_activity);
     			pr_err("All QSes seen, last %s kthread activity %ld (%ld-%ld), jiffies_till_next_fqs=%ld, root ->qsmask %#lx\n",
     			       rcu_state.name, j - gpa, j, gpa,
 ----			       READ_ONCE(jiffies_till_next_fqs),
 ++++			       data_race(jiffies_till_next_fqs),
     			       rcu_get_root()->qsmask);
--- -			/* In this case, the current CPU might be at fault. */
--- -			sched_show_task(current);
     		}
     	}
     	/* Rewrite if needed in case of slow consoles. */