Merge tag 'x86-boot-2020-06-01' of git://git.kernel.org/pub/scm/linux/kernel/git...

[tomoyo/tomoyo-test1.git] / Documentation / admin-guide / kernel-parameters.txt

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index a441b4f..69ff5c4 100644 (file)
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -4217,12 +4217,24 @@
                        Duration of CPU stall (s) to test RCU CPU stall
                        warnings, zero to disable.
 
+       rcutorture.stall_cpu_block= [KNL]
+                       Sleep while stalling if set.  This will result
+                       in warnings from preemptible RCU in addition
+                       to any other stall-related activity.
+
        rcutorture.stall_cpu_holdoff= [KNL]
                        Time to wait (s) after boot before inducing stall.
 
        rcutorture.stall_cpu_irqsoff= [KNL]
                        Disable interrupts while stalling if set.
 
+       rcutorture.stall_gp_kthread= [KNL]
+                       Duration (s) of forced sleep within RCU
+                       grace-period kthread to test RCU CPU stall
+                       warnings, zero to disable.  If both stall_cpu
+                       and stall_gp_kthread are specified, the
+                       kthread is starved first, then the CPU.
+
        rcutorture.stat_interval= [KNL]
                        Time (s) between statistics printk()s.
 
@@ -4293,6 +4305,13 @@
                        only normal grace-period primitives.  No effect
                        on CONFIG_TINY_RCU kernels.
 
+       rcupdate.rcu_task_ipi_delay= [KNL]
+                       Set time in jiffies during which RCU tasks will
+                       avoid sending IPIs, starting with the beginning
+                       of a given grace period.  Setting a large
+                       number avoids disturbing real-time workloads,
+                       but lengthens grace periods.
+
        rcupdate.rcu_task_stall_timeout= [KNL]
                        Set timeout in jiffies for RCU task stall warning
                        messages.  Disable with a value less than or equal