Merge branch 'master' into kconfig

9 files changed, 434 insertions, 29 deletions

diff --git a/kernel-devel/kernel-debugging/pres_kernel-debugging_en.tex b/kernel-devel/kernel-debugging/pres_kernel-debugging_en.tex
index cc1824f..82dc25b 100644
--- a/kernel-devel/kernel-debugging/pres_kernel-debugging_en.tex
+++ b/kernel-devel/kernel-debugging/pres_kernel-debugging_en.tex
@@ -2,6 +2,73 @@
 
 \title{Kernel-Debugging}
 \maketitle
+
+\section{Kernel Configuration}
+\begin{frame}
+\frametitle{Kernel hacking / printk and dmesg options}
+\begin{itemize}
+\item Show timing information on printks
+\item Default message log level (1-7)
+\item Enable dynamic printk() support
+\end{itemize}
+\end{frame}
+
+\begin{frame}
+\frametitle{Kernel hacking / Compile-time checks and compiler options}
+\begin{itemize}
+\item Compile the kernel with debug info
+\item Debug Filesystem
+\end{itemize}
+\end{frame}
+
+\begin{frame}
+\frametitle{Kernel hacking / Memory Debugging}
+\begin{itemize}
+\item Kernel memory leak detector
+\end{itemize}
+reports leaks in /sys/kernel/debug/kmemleak
+
+see also: Documentation/kmemleak.txt
+\end{frame}
+
+\begin{frame}
+\frametitle{Kernel hacking / Debug Lockups and Hangs}
+\begin{itemize}
+\item Debug Lockups and Hangs
+\begin{description}
+\item[Softlockup] loop in kernel mode
+\item[Hardlockup] CPU loop in kernel mode without letting IRQs run
+\item[Hung task] task is uninterruptible (D state)
+\end{description}
+\end{itemize}
+stack trace is printed on detection
+\end{frame}
+
+\begin{frame}
+\frametitle{Kernel hacking / Lock Debugging}
+\begin{itemize}
+\item RT Mutex debugging, deadlock detection
+\item Lock debugging: prove locking correctness, see Documentation/lockdep-design.txt.
+\end{itemize}
+\end{frame}
+
+\begin{frame}
+\frametitle{Kernel hacking / Tracing}
+\begin{itemize}
+\item Kernel Function (Graph) Tracer
+\item Scheduling Latency Tracer
+\item Enable [k/u]probes-based dynamic events
+\item enable/disable function tracing dynamically
+\item Ring buffer benchmark stress tester (!!don't use it!!)
+\end{itemize}
+\end{frame}
+
+\begin{frame}
+\frametitle{Kernel hacking}
+\begin{description}
+\item[Remote debugging over FireWire] Documentation/debugging-via-ohci1394.txt
+\end{description}
+\end{frame}
 \section{printk}
 \begin{frame}[fragile]
 \frametitle{printk is your friend!!}
@@ -38,6 +105,25 @@ $ cat /proc/sys/kernel/printk
 \end{verbatim}
 \end{frame}
 
+\section{dynamic printk}
+\begin{frame}
+\frametitle{dynamic printk}
+controlled by debugfs: dynamic\_debug/control
+
+format: filename:lineno [module]function flags format
+\begin{description}
+\item[filename] source file of the debug statement
+\item[lineno] line number of the debug statement
+\item[module] module that contains the debug statement
+\item[function] function that contains the debug statement
+\item[flags] '=p' means the line is turned 'on' for printing
+\item[format] the format used for the debug statement
+\end{description}
+Use pr\_debug() and dev\_dbg() in your code.
+
+see also: Documentation/dynamic-debug-howto.txt
+\end{frame}
+
 \section{Logging messages}
 \begin{frame}[fragile]
 \frametitle{Serial Console}
diff --git a/kernel-devel/kernel-perf/Makefile b/kernel-devel/kernel-perf/Makefile
new file mode 100644
index 0000000..d641258
--- /dev/null
+++ b/kernel-devel/kernel-perf/Makefile
@@ -0,0 +1,9 @@
+all:
+	for pdf in `ls -1 *.tex` ; do \
+		TEXINPUTS=`pwd`/../..:.:..:$(TEXINPUTS) pdflatex $$pdf; \
+		TEXINPUTS=`pwd`/../..:.:..:$(TEXINPUTS) pdflatex $$pdf; \
+	done
+
+clean:
+	rm -f *.aux *.log *.pdf *.log *.snm *.toc *.vrb *.nav *.out
+
diff --git a/kernel-devel/kernel-perf/pres_kernel-perf_en.tex b/kernel-devel/kernel-perf/pres_kernel-perf_en.tex
new file mode 100644
index 0000000..b6edfc0
--- /dev/null
+++ b/kernel-devel/kernel-perf/pres_kernel-perf_en.tex
@@ -0,0 +1,135 @@
+\input{configpres}
+
+\title{perf}
+\section{Performance Analyzation}
+\maketitle
+
+\begin{frame}
+\frametitle{What is perf?}
+Perf is a profiler tool for Linux 2.6+ based systems.
+\begin{itemize}
+\item perf\_events interface of the Linux kernel
+\item perf userspace tool
+\item access perf events from own applications
+\end{itemize}
+Perf is an event counter, no tracer.
+\end{frame}
+
+\begin{frame}
+\frametitle{perf events}
+\begin{itemize}
+\item hardware performance counters (PMU of Host CPU)
+\item tracepoint events (from ftrace)
+\item dynamic probes (e.g. kprobes or uprobes)
+\end{itemize}
+\end{frame}
+
+\begin{frame}
+\frametitle{perf subcommands I}
+\begin{description}
+\item[list]     list available events
+\item[stat]     measure total event count for single program or for system, for
+                  some time
+\item[top]      top-like dynamic view of hottest functions
+\item[record]   measure and save sampling data for single program
+\item[report]   analyze file generated by perf record;
+                  can generate flat, or graph profile
+\item[diff]     Read two perf.data files and display the differential profile
+\end{description}
+\end{frame}
+
+\begin{frame}
+\frametitle{perf subcommands II}
+\begin{description}
+\item[sched]    tracing/measuring of scheduler actions and latencies
+\item[lock]     analyze lock events
+\item[timechart]tool to visualize total system behavior during a workload
+\end{description}
+\end{frame}
+
+
+\begin{frame}
+\frametitle{selecting events}
+\begin{description}
+\item[-e] use the specified event
+\item[-f] filter events, e.g. -e irq:irq\_handler\_entry --filter irq==18
+\end{description}
+\end{frame}
+
+\begin{frame}[fragile]
+\frametitle{Example: live-view of page-fault event}
+\begin{lstlisting}
+# perf stat chromium
+ Performance counter stats for 'chromium':
+
+       3733.112825 task-clock                #    0.716 CPUs utilized
+             8,696 context-switches          #    0.002 M/sec
+             1,063 cpu-migrations            #    0.285 K/sec
+           134,686 page-faults               #    0.036 M/sec
+     9,102,760,996 cycles                    #    2.438 GHz
+[83.59%]
+     6,217,623,412 stalled-cycles-frontend   #   68.30% frontend cycles idle
+[83.32%]
+     4,755,104,208 stalled-cycles-backend    #   52.24% backend  cycles idle
+[67.20%]
+     7,262,564,269 instructions              #    0.80  insns per cycle
+                                             #    0.86  stalled cycles per insn
+[83.72%]
+     1,495,191,394 branches                  #  400.521 M/sec
+[83.38%]
+        26,037,805 branch-misses             #    1.74% of all branches
+[83.04%]
+
+       5.214978731 seconds time elapsed
+\end{lstlisting}
+\end{frame}
+
+\begin{frame}[fragile]
+\frametitle{Example: live-view of page-fault event}
+\begin{lstlisting}
+# sudo perf top -e page-faults
+Samples: 562  of event 'page-faults', Event count (approx.): 4557
+ 62.32%  libc-2.17.so              [.] __memcpy_ssse3_back
+ 20.36%  libc-2.17.so              [.] _int_malloc
+  3.16%  module.so                 [.] evas_gl_common_context_font_push
+  2.83%  libevas.so.1.7.7          [.] 0x0000000000083237
+  2.37%  libdricore9.0.2.so.1.0.0  [.] 0x0000000000126050
+  1.80%  libxul.so (deleted)       [.] 0x000000000182e48f
+  1.12%  [kernel]                  [k] file_read_actor
+  0.92%  libfontconfig.so.1.6.2    [.] 0x000000000001bd43
+  0.88%  libdrm_intel.so.1.0.0     [.] 0x0000000000008503
+  0.79%  libc-2.17.so              [.] __memset_sse2
+  0.75%  libeet.so.1.7.7           [.] eet_data_image_header_decode_cipher
+  0.61%  module.so                 [.] evas_gl_common_context_image_push
+  0.42%  libfreetype.so.6.10.0     [.] FT_Stream_ReadFields
+  0.42%  libecore_x.so.1.7.7       [.] ecore_x_netwm_icons_set
+  0.24%  libelementary.so.1.7.7    [.] 0x000000000005ae60
+\end{lstlisting}
+\end{frame}
+
+
+\begin{frame}[fragile]
+\frametitle{Example: count CPU cycles of a ls call}
+\begin{lstlisting}
+# perf record -e cpu-cycles ls
+<output of ls>
+[ perf record: Woken up 1 times to write data ]
+[ perf record: Captured and wrote 0.008 MB perf.data (~334 samples) ]
+# perf report
+Samples: 24  of event 'cpu-cycles', Event count (approx.): 12333055
+ 21.67%  ls  [kernel.kallsyms]  [k] get_unmapped_area
+ 20.77%  ls  ld-2.17.so         [.] _dl_map_object_deps
+ 17.21%  ls  [kernel.kallsyms]  [k] __slab_free
+ 15.73%  ls  [kernel.kallsyms]  [k] tty_insert_flip_string_fixed_flag
+ 12.65%  ls  [kernel.kallsyms]  [k] unlock_page
+  6.94%  ls  libc-2.17.so       [.] __strlen_sse2
+  3.41%  ls  [kernel.kallsyms]  [k] count.isra.17.constprop.28
+  1.02%  ls  [kernel.kallsyms]  [k] get_pageblock_flags_group
+  0.41%  ls  [kernel.kallsyms]  [k] perf_event_context_sched_in
+  0.13%  ls  [kernel.kallsyms]  [k] perf_ctx_unlock
+  0.07%  ls  [kernel.kallsyms]  [k] native_write_msr_safe
+\end{lstlisting}
+\end{frame}
+
+
+\input{tailpres}
diff --git a/kernel-devel/kernel-tracing/pres_kernel-tracing_en.tex b/kernel-devel/kernel-tracing/pres_kernel-tracing_en.tex
index d73a10f..f185e58 100644
--- a/kernel-devel/kernel-tracing/pres_kernel-tracing_en.tex
+++ b/kernel-devel/kernel-tracing/pres_kernel-tracing_en.tex
@@ -7,7 +7,7 @@
 \frametitle{Kerneltracing: Overview}
 \begin{itemize}
 \item DebugFS interface
-\item Different tracers: function, function\_graph, sched\_switch, ...
+\item Different tracers: function, function\_graph, wakeup, wakeup\_rt, \dots
 \item Custom trace events
 \item Graphical frontend (kernelshark)
 \end{itemize}
@@ -62,18 +62,24 @@ wnck-2022  [003]  5766.659918: kfree <-skb
 \frametitle{Tracer: function / latency\_format}
 \begin{verbatim}
 $ echo 1 > options/latency_format
-$ less trace
-#                  _------=> CPU#            
-#                 / _-----=> irqs-off        
-#                | / _----=> need-resched    
-#                || / _---=> hardirq/softirq 
-#                ||| / _--=> preempt-depth   
-#                |||| /_--=> lock-depth       
-#                |||||/     delay             
-#  cmd     pid   |||||| time  |   caller      
-#     \   /      ||||||   \   |   /           
-wnck-app-2022    3..... 1237702us : skb_relea
-wnck-app-2022    3..... 1237703us : sock_wfre
+# tracer: function
+#
+# function latency trace v1.1.5 on 3.9.4-x1-00124-g0bfd8ff
+# --------------------------------------------------------------------
+# latency: 0 us, #204955/25306195, CPU#0 | (M:desktop VP:0, KP:0, SP:0 HP:0 #P:4)
+#    -----------------
+#    | task: -0 (uid:0 nice:0 policy:0 rt_prio:0)
+#    -----------------
+#
+#                  _------=> CPU#
+#                 / _-----=> irqs-off
+#                | / _----=> need-resched
+#                || / _---=> hardirq/softirq
+#                ||| / _--=> preempt-depth
+#                |||| /     delay
+#  cmd     pid   ||||| time  |   caller
+#     \   /      |||||  \    |   /
+terminol-11964   1.... 11639243us : ep_read_events_proc <-ep_scan_ready_list.isra.8
 \end{verbatim}
 \end{frame} 
 
@@ -95,22 +101,6 @@ $ less trace
 \end{frame}
 
 \begin{frame}[fragile]
-\frametitle{Tracer: sched\_switch}
-\tiny
-\begin{verbatim}
-# tracer: sched_switch
-#
-#  TASK-PID    CPU#    TIMESTAMP  FUNCTION
-#    | |       |          |         |
-  bash-4328  [003]  78.553966: 4328:120:S   + [003]  4328:120:S bash
-  bash-4328  [003]  78.553979: 4328:120:S ==> [003]     0:120:R <idle>
-<idle>-0     [003]  78.553986:    0:120:R   + [003]    13:120:R ksoftirqd/3
-<idle>-0     [003]  78.553988:    0:120:R ==> [003]    13:120:R ksoftirqd/3
-
-\end{verbatim}
-\end{frame}
-
-\begin{frame}[fragile]
 \frametitle{Tracer: wakeup\_rt}
 \tiny
 \begin{verbatim}
diff --git a/kernel-devel/kexec-and-crash-kernel/Makefile b/kernel-devel/kexec-and-crash-kernel/Makefile
new file mode 100644
index 0000000..d641258
--- /dev/null
+++ b/kernel-devel/kexec-and-crash-kernel/Makefile
@@ -0,0 +1,9 @@
+all:
+	for pdf in `ls -1 *.tex` ; do \
+		TEXINPUTS=`pwd`/../..:.:..:$(TEXINPUTS) pdflatex $$pdf; \
+		TEXINPUTS=`pwd`/../..:.:..:$(TEXINPUTS) pdflatex $$pdf; \
+	done
+
+clean:
+	rm -f *.aux *.log *.pdf *.log *.snm *.toc *.vrb *.nav *.out
+
diff --git a/kernel-devel/kexec-and-crash-kernel/crashkernel_patches/crashkernel.diff b/kernel-devel/kexec-and-crash-kernel/crashkernel_patches/crashkernel.diff
new file mode 100644
index 0000000..1d3e082
--- /dev/null
+++ b/kernel-devel/kexec-and-crash-kernel/crashkernel_patches/crashkernel.diff
@@ -0,0 +1,65 @@
+From: Magnus Damm <damm at opensource.se>
+
+Update the copy_oldmem_page() function to ioremap() only
+when accessing memory that is outside the regular range
+of system memory that is managed by the kernel.
+
+Without this patch a warning is triggered in the ARM-specific
+ioremap implementation, see WARN_ON(pfn_valid()) in ioremap.c
+
+The copy_oldmem_page() function is used by the secondary crash
+kernel to access memory using the /proc/vmcore code implemented
+in fs/proc/vmcore.c. To pass information from the first kernel
+to the secondary crash kernel a kernel command line option is
+used to point out where the elf core hdr is located.
+
+The crash kernel is loaded through kexec-tools which also contains
+code that reserves memory for the elfcorehdr= option. This memory
+block is reserved _inside_ the main system memory of the secondary
+kernel. The /proc/vmcore code in the secondary kernel is however
+using copy_oldmem_page() to access both this elfcorehdr area and
+the rest of the memory used by the the first kernel.
+
+So the copy_oldmem_page() function is used to access data that
+may be located in system memory, or it may be outside. Always
+using ioremap will not work, so this patch makes it conditional
+based on pfn_valid().
+
+For more details please look at the sh7372-based example here:
+http://permalink.gmane.org/gmane.linux.ports.sh.devel/11502
+
+Signed-off-by: Magnus Damm <damm at opensource.se>
+---
+
+ arch/arm/kernel/crash_dump.c |   14 ++++++++++----
+ 1 file changed, 10 insertions(+), 4 deletions(-)
+
+--- 0001/arch/arm/kernel/crash_dump.c
++++ work/arch/arm/kernel/crash_dump.c	2011-06-18 20:59:49.000000000 +0900
+@@ -39,9 +39,13 @@ ssize_t copy_oldmem_page(unsigned long p
+ 	if (!csize)
+ 		return 0;
+ 
+-	vaddr = ioremap(pfn << PAGE_SHIFT, PAGE_SIZE);
+-	if (!vaddr)
+-		return -ENOMEM;
++	if (pfn_valid(pfn)) {
++		vaddr = phys_to_virt(pfn << PAGE_SHIFT);
++	} else {
++		vaddr = ioremap(pfn << PAGE_SHIFT, PAGE_SIZE);
++		if (!vaddr)
++			return -ENOMEM;
++	}
+ 
+ 	if (userbuf) {
+ 		if (copy_to_user(buf, vaddr + offset, csize)) {
+@@ -52,6 +56,8 @@ ssize_t copy_oldmem_page(unsigned long p
+ 		memcpy(buf, vaddr + offset, csize);
+ 	}
+ 
+-	iounmap(vaddr);
++	if (!pfn_valid(pfn))
++		iounmap(vaddr);
++
+ 	return csize;
+ }
diff --git a/kernel-devel/kexec-and-crash-kernel/crashkernel_patches/kexec_fix_arm_braindamage.diff b/kernel-devel/kexec-and-crash-kernel/crashkernel_patches/kexec_fix_arm_braindamage.diff
new file mode 100644
index 0000000..877f5ea
--- /dev/null
+++ b/kernel-devel/kexec-and-crash-kernel/crashkernel_patches/kexec_fix_arm_braindamage.diff
@@ -0,0 +1,28 @@
+Index: kexec-tools-2.0.3/kexec/arch/arm/crashdump-arm.c
+===================================================================
+--- kexec-tools-2.0.3.orig/kexec/arch/arm/crashdump-arm.c	2011-10-03 00:56:38.000000000 +0200
++++ kexec-tools-2.0.3/kexec/arch/arm/crashdump-arm.c	2013-07-06 17:26:13.410309437 +0200
+@@ -204,12 +204,12 @@
+  * @cmdline. Note that @cmdline must be at least %COMMAND_LINE_SIZE bytes long
+  * (including %NUL).
+  */
+-static void cmdline_add_mem(char *cmdline, unsigned long size)
++static void cmdline_add_mem(char *cmdline, unsigned long size, unsigned long offset)
+ {
+ 	char buf[COMMAND_LINE_SIZE];
+ 	int buflen;
+ 
+-	buflen = snprintf(buf, sizeof(buf), "%s mem=%ldK", cmdline, size >> 10);
++	buflen = snprintf(buf, sizeof(buf), "%s mem=%ldK@0x%X", cmdline, size >> 10, offset);
+ 	if (buflen < 0)
+ 		die("Failed to construct mem= command line parameter\n");
+ 	if (buflen >= sizeof(buf))
+@@ -301,7 +301,7 @@
+ 	 * prevents the dump capture kernel from using any other memory regions
+ 	 * which belong to the primary kernel.
+ 	 */
+-	cmdline_add_mem(mod_cmdline, elfcorehdr - crash_reserved_mem.start);
++	cmdline_add_mem(mod_cmdline, elfcorehdr - crash_reserved_mem.start, crash_reserved_mem.start);
+ 
+ 	dump_memory_ranges();
+ 	dbgprintf("kernel command line: \"%s\"\n", mod_cmdline);
diff --git a/kernel-devel/kexec-and-crash-kernel/crashkernel_patches/zreladdr.diff b/kernel-devel/kexec-and-crash-kernel/crashkernel_patches/zreladdr.diff
new file mode 100644
index 0000000..867e13a
--- /dev/null
+++ b/kernel-devel/kexec-and-crash-kernel/crashkernel_patches/zreladdr.diff
@@ -0,0 +1,13 @@
+Index: linux-3.2/arch/arm/mach-omap2/Makefile.boot
+===================================================================
+--- linux-3.2.orig/arch/arm/mach-omap2/Makefile.boot	2012-01-05 00:55:44.000000000 +0100
++++ linux-3.2/arch/arm/mach-omap2/Makefile.boot	2013-07-06 17:00:18.718516198 +0200
+@@ -1,3 +1,8 @@
++ifeq ($(CONFIG_CRASH_DUMP),y)
++  zreladdr-y		+= 0x84008000
++params_phys-y		:= 0x84000100
++else
+   zreladdr-y		+= 0x80008000
+ params_phys-y		:= 0x80000100
++endif
+ initrd_phys-y		:= 0x80800000
diff --git a/kernel-devel/kexec-and-crash-kernel/pres_kexec_and_crashkernel_en.tex b/kernel-devel/kexec-and-crash-kernel/pres_kexec_and_crashkernel_en.tex
new file mode 100644
index 0000000..1791267
--- /dev/null
+++ b/kernel-devel/kexec-and-crash-kernel/pres_kexec_and_crashkernel_en.tex
@@ -0,0 +1,70 @@
+\input{configpres}
+
+\title{Kexec and Crashkernels}
+\maketitle
+\begin{frame}
+\frametitle{What is kexec?}
+Kexec is a mechanism to boot Linux from within Linux,
+without going through the BIOS / the Bootloader.
+\end{frame}
+
+\begin{frame}
+\frametitle{kexec-tools}
+http://horms.net/projects/kexec/
+\end{frame}
+
+\begin{frame}[fragile]
+\frametitle{Using kexec: Kernel configuration}
+\begin{verbatim}
+Boot options -->
+[*] Kexec system call
+\end{verbatim}
+\end{frame}
+
+\begin{frame}[fragile]
+\frametitle{Using kexec: Booting the new kernel}
+\begin{verbatim}
+# Load the kernel image and set the commandline
+$ kexec -l uImage --append=$(cat /proc/cmdline)
+# Start the new kernel
+$ kexec -e
+\end{verbatim}
+\end{frame}
+
+\begin{frame}[fragile]
+\frametitle{Using kexec: Crashkernel}
+\begin{itemize}
+\item Build production kernel (enable kexec system call!)
+\item Build ''crash kernel'' (enable kexec system call and crash dump kernel):
+\begin{verbatim}
+Boot options -->
+[*] Kexec system call
+[*] Build kdump crash kernel
+\end{verbatim}
+\item The crash kernel option should automatically select /proc/vmcore
+\end{itemize}
+\end{frame}
+
+
+\begin{frame}[fragile]
+\frametitle{Using kexec: Crashkernel}
+\begin{itemize}
+\item Boot production kernel (Commandline: crashkernel=256M@0x84000000)
+\item Check if crashkernel memory was reserved: 
+\begin{verbatim}
+cat /proc/iomem | grep Crash
+   84000000-93ffffff : Crash kernel
+\end{verbatim}
+\item Load crash kernel and let the system crash ;-)
+\begin{verbatim}
+kexec -p uImage-crash \
+  --append="$(cat /proc/cmdline | \
+    sed 's/crashkernel/bla/')"
+echo c > /proc/sysrq-trigger
+\end{verbatim}
+\item After crashing the crash kernel should boot up!
+\item Within the crashkernel the core file for the production kernel is available in /proc/vmcore
+\end{itemize}
+\end{frame}
+
+\input{tailpres}