Merge tag 'trace-v6.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux...

[sfrench/cifs-2.6.git] / Documentation / admin-guide / kernel-parameters.txt

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 479ff1737c2fd6f779c48109cd9026307c401746..bb884c14b2f679dba3a36ba89755a1eca2fe6db2 100644 (file)
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -1572,12 +1572,28 @@
                        The above will cause the "foo" tracing instance to trigger
                        a snapshot at the end of boot up.
 
-       ftrace_dump_on_oops[=orig_cpu]
+       ftrace_dump_on_oops[=2(orig_cpu) | =<instance>][,<instance> |
+                         ,<instance>=2(orig_cpu)]
                        [FTRACE] will dump the trace buffers on oops.
-                       If no parameter is passed, ftrace will dump
-                       buffers of all CPUs, but if you pass orig_cpu, it will
-                       dump only the buffer of the CPU that triggered the
-                       oops.
+                       If no parameter is passed, ftrace will dump global
+                       buffers of all CPUs, if you pass 2 or orig_cpu, it
+                       will dump only the buffer of the CPU that triggered
+                       the oops, or the specific instance will be dumped if
+                       its name is passed. Multiple instance dump is also
+                       supported, and instances are separated by commas. Each
+                       instance supports only dump on CPU that triggered the
+                       oops by passing 2 or orig_cpu to it.
+
+                       ftrace_dump_on_oops=foo=orig_cpu
+
+                       The above will dump only the buffer of "foo" instance
+                       on CPU that triggered the oops.
+
+                       ftrace_dump_on_oops,foo,bar=orig_cpu
+
+                       The above will dump global buffer on all CPUs, the
+                       buffer of "foo" instance on all CPUs and the buffer
+                       of "bar" instance on CPU that triggered the oops.
 
        ftrace_filter=[function-list]
                        [FTRACE] Limit the functions traced by the function
@@ -4211,6 +4227,7 @@
                        bit 4: print ftrace buffer
                        bit 5: print all printk messages in buffer
                        bit 6: print all CPUs backtrace (if available in the arch)
+                       bit 7: print only tasks in uninterruptible (blocked) state
                        *Be aware* that this option may print a _lot_ of lines,
                        so there are risks of losing older messages in the log.
                        Use this option carefully, maybe worth to setup a