3 files changed, 105 insertions, 4 deletions

diff --git a/Documentation/trace/kprobetrace.txt b/Documentation/trace/kprobetrace.txt
index c83bd6b4e6e..d0d0bb9e3e2 100644
--- a/Documentation/trace/kprobetrace.txt
+++ b/Documentation/trace/kprobetrace.txt
@@ -22,14 +22,15 @@ current_tracer. Instead of that, add probe points via
 
 Synopsis of kprobe_events
 -------------------------
-  p[:[GRP/]EVENT] SYMBOL[+offs]|MEMADDR [FETCHARGS]     : Set a probe
-  r[:[GRP/]EVENT] SYMBOL[+0] [FETCHARGS]                : Set a return probe
+  p[:[GRP/]EVENT] [MOD:]SYM[+offs]|MEMADDR [FETCHARGS]  : Set a probe
+  r[:[GRP/]EVENT] [MOD:]SYM[+0] [FETCHARGS]             : Set a return probe
   -:[GRP/]EVENT                                         : Clear a probe
 
  GRP            : Group name. If omitted, use "kprobes" for it.
  EVENT          : Event name. If omitted, the event name is generated
-                  based on SYMBOL+offs or MEMADDR.
- SYMBOL[+offs]  : Symbol+offset where the probe is inserted.
+                  based on SYM+offs or MEMADDR.
+ MOD            : Module name which has given SYM.
+ SYM[+offs]     : Symbol+offset where the probe is inserted.
  MEMADDR        : Address where the probe is inserted.
 
  FETCHARGS      : Arguments. Each probe can have up to 128 args.
diff --git a/Documentation/trace/tracedump.txt b/Documentation/trace/tracedump.txt
new file mode 100644
index 00000000000..cba0decc3fc
--- /dev/null
+++ b/Documentation/trace/tracedump.txt
@@ -0,0 +1,58 @@
+                             Tracedump
+
+                Documentation written by Alon Farchy
+
+1. Overview
+============
+
+The tracedump module provides additional mechanisms to retrieve tracing data.
+It can be used to retrieve traces after a kernel panic or while the system
+is running in either binary format or plaintext. The dumped data is compressed
+with zlib to conserve space.
+
+2. Configuration Options
+========================
+
+CONFIG_TRACEDUMP - enable the tracedump module.
+CONFIG_TRACEDUMP_PANIC - dump to console on kernel panic
+CONFIG_TRACEDUMP_PROCFS - add file /proc/tracedump for userspace access.
+
+3. Module Parameters
+====================
+
+format_ascii
+
+        If 1, data will dump in human-readable format, ordered by time.
+        If 0, data will be dumped as raw pages from the ring buffer,
+        ordered by CPU, followed by the saved cmdlines so that the
+        raw data can be decoded. Default: 0
+
+panic_size
+
+        Maximum amount of compressed data to dump during a kernel panic
+        in kilobytes. This only applies if format_ascii == 1. In this case,
+        tracedump will compress the data, check the size, and if it is too big
+        toss out some data, compress again, etc, until the size is below
+        panic_size. Default: 512KB
+
+compress_level
+
+        Determines the compression level that zlib will use. Available levels
+        are 0-9, with 0 as no compression and 9 as maximum compression.
+        Default: 9.
+
+4. Usage
+========
+
+If configured with CONFIG_TRACEDUMP_PROCFS, the tracing data can be pulled
+by reading from /proc/tracedump. For example:
+
+        # cat /proc/tracedump > my_tracedump
+
+Tracedump will surround the dump with a magic word (TRACEDUMP). Between the
+magic words is the compressed data, which can be decompressed with a standard
+zlib implementation. After decompression, if format_ascii == 1, then the
+output should be readable.
+
+If format_ascii == 0, the output should be in binary form, delimited by
+CPU_END. After the last CPU should be the saved cmdlines, delimited by |.
diff --git a/Documentation/trace/tracelevel.txt b/Documentation/trace/tracelevel.txt
new file mode 100644
index 00000000000..b282dd2b329
--- /dev/null
+++ b/Documentation/trace/tracelevel.txt
@@ -0,0 +1,42 @@
+                         Tracelevel
+
+                Documentation by Alon Farchy
+
+1. Overview
+===========
+
+Tracelevel allows subsystem authors to add trace priorities to
+their tracing events. High priority traces will be enabled
+automatically at boot time.
+
+This module is configured with CONFIG_TRACELEVEL.
+
+2. Usage
+=========
+
+To give an event a priority, use the function tracelevel_register
+at any time.
+
+        tracelevel_register(my_event, level);
+
+my_event corresponds directly to the event name as defined in the
+event header file. Available levels are:
+
+        TRACELEVEL_ERR 3
+        TRACELEVEL_WARN 2
+        TRACELEVEL_INFO 1
+        TRACELEVEL_DEBUG 0
+
+Any event registered at boot time as TRACELEVEL_ERR will be enabled
+by default. The header also exposes the function tracelevel_set_level
+to change the trace level at runtime. Any trace event registered with the
+specified level or higher will be enabled with this call.
+
+A userspace handle to tracelevel_set_level is available via the module
+parameter 'level'. For example,
+
+        echo 1 > /sys/module/tracelevel/parameters/level
+
+Is logically equivalent to:
+
+        tracelevel_set_level(TRACELEVEL_INFO);