Merge branch 'akpm' (Andrew's patch-bomb)

Merge Andrew's first set of patches:
 "Non-MM patches:

   - lots of misc bits

   - tree-wide have_clk() cleanups

   - quite a lot of printk tweaks.  I draw your attention to "printk:
     convert the format for KERN_<LEVEL> to a 2 byte pattern" which
     looks a bit scary.  But afaict it's solid.

   - backlight updates

   - lib/ feature work (notably the addition and use of memweight())

   - checkpatch updates

   - rtc updates

   - nilfs updates

   - fatfs updates (partial, still waiting for acks)

   - kdump, proc, fork, IPC, sysctl, taskstats, pps, etc

   - new fault-injection feature work"

* Merge emailed patches from Andrew Morton <akpm@linux-foundation.org>: (128 commits)
  drivers/misc/lkdtm.c: fix missing allocation failure check
  lib/scatterlist: do not re-write gfp_flags in __sg_alloc_table()
  fault-injection: add tool to run command with failslab or fail_page_alloc
  fault-injection: add selftests for cpu and memory hotplug
  powerpc: pSeries reconfig notifier error injection module
  memory: memory notifier error injection module
  PM: PM notifier error injection module
  cpu: rewrite cpu-notifier-error-inject module
  fault-injection: notifier error injection
  c/r: fcntl: add F_GETOWNER_UIDS option
  resource: make sure requested range is included in the root range
  include/linux/aio.h: cpp->C conversions
  fs: cachefiles: add support for large files in filesystem caching
  pps: return PTR_ERR on error in device_create
  taskstats: check nla_reserve() return
  sysctl: suppress kmemleak messages
  ipc: use Kconfig options for __ARCH_WANT_[COMPAT_]IPC_PARSE_VERSION
  ipc: compat: use signed size_t types for msgsnd and msgrcv
  ipc: allow compat IPC version field parsing if !ARCH_WANT_OLD_COMPAT_IPC
  ipc: add COMPAT_SHMLBA support
  ...

1 files changed, 219 insertions, 0 deletions

diff --git a/tools/testing/fault-injection/failcmd.sh b/tools/testing/fault-injection/failcmd.sh
new file mode 100644
index 000000000000..1776e924b202
--- /dev/null
+++ b/tools/testing/fault-injection/failcmd.sh
@@ -0,0 +1,219 @@
+#!/bin/bash
+#
+# NAME
+#       failcmd.sh - run a command with injecting slab/page allocation failures
+#
+# SYNOPSIS
+#       failcmd.sh --help
+#       failcmd.sh [<options>] command [arguments]
+#
+# DESCRIPTION
+#       Run command with injecting slab/page allocation failures by fault
+#       injection.
+#
+#       NOTE: you need to run this script as root.
+#
+
+usage()
+{
+        cat >&2 <<EOF
+Usage: $0 [options] command [arguments]
+
+OPTIONS
+        -p percent
+        --probability=percent
+                likelihood of failure injection, in percent.
+                Default value is 1
+
+        -t value
+        --times=value
+                specifies how many times failures may happen at most.
+                Default value is 1
+
+        --oom-kill-allocating-task=value
+                set /proc/sys/vm/oom_kill_allocating_task to specified value
+                before running the command.
+                Default value is 1
+
+        -h, --help
+                Display a usage message and exit
+
+        --interval=value, --space=value, --verbose=value, --task-filter=value,
+        --stacktrace-depth=value, --require-start=value, --require-end=value,
+        --reject-start=value, --reject-end=value, --ignore-gfp-wait=value
+                See Documentation/fault-injection/fault-injection.txt for more
+                information
+
+        failslab options:
+        --cache-filter=value
+
+        fail_page_alloc options:
+        --ignore-gfp-highmem=value, --min-order=value
+
+ENVIRONMENT
+        FAILCMD_TYPE
+                The following values for FAILCMD_TYPE are recognized:
+
+                failslab
+                        inject slab allocation failures
+                fail_page_alloc
+                        inject page allocation failures
+
+                If FAILCMD_TYPE is not defined, then failslab is used.
+EOF
+}
+
+if [ $UID != 0 ]; then
+        echo must be run as root >&2
+        exit 1
+fi
+
+DEBUGFS=`mount -t debugfs | head -1 | awk '{ print $3}'`
+
+if [ ! -d "$DEBUGFS" ]; then
+        echo debugfs is not mounted >&2
+        exit 1
+fi
+
+FAILCMD_TYPE=${FAILCMD_TYPE:-failslab}
+FAULTATTR=$DEBUGFS/$FAILCMD_TYPE
+
+if [ ! -d $FAULTATTR ]; then
+        echo $FAILCMD_TYPE is not available >&2
+        exit 1
+fi
+
+LONGOPTS=probability:,interval:,times:,space:,verbose:,task-filter:
+LONGOPTS=$LONGOPTS,stacktrace-depth:,require-start:,require-end:
+LONGOPTS=$LONGOPTS,reject-start:,reject-end:,oom-kill-allocating-task:,help
+
+if [ $FAILCMD_TYPE = failslab ]; then
+        LONGOPTS=$LONGOPTS,ignore-gfp-wait:,cache-filter:
+elif [ $FAILCMD_TYPE = fail_page_alloc ]; then
+        LONGOPTS=$LONGOPTS,ignore-gfp-wait:,ignore-gfp-highmem:,min-order:
+fi
+
+TEMP=`getopt -o p:i:t:s:v:h --long $LONGOPTS -n 'failcmd.sh' -- "$@"`
+
+if [ $? != 0 ]; then
+        usage
+        exit 1
+fi
+
+eval set -- "$TEMP"
+
+fault_attr_default()
+{
+        echo N > $FAULTATTR/task-filter
+        echo 0 > $FAULTATTR/probability
+        echo 1 > $FAULTATTR/times
+}
+
+fault_attr_default
+
+oom_kill_allocating_task_saved=`cat /proc/sys/vm/oom_kill_allocating_task`
+
+restore_values()
+{
+        fault_attr_default
+        echo $oom_kill_allocating_task_saved \
+                > /proc/sys/vm/oom_kill_allocating_task
+}
+
+#
+# Default options
+#
+declare -i oom_kill_allocating_task=1
+declare task_filter=Y
+declare -i probability=1
+declare -i times=1
+
+while true; do
+        case "$1" in
+        -p|--probability)
+                probability=$2
+                shift 2
+                ;;
+        -i|--interval)
+                echo $2 > $FAULTATTR/interval
+                shift 2
+                ;;
+        -t|--times)
+                times=$2
+                shift 2
+                ;;
+        -s|--space)
+                echo $2 > $FAULTATTR/space
+                shift 2
+                ;;
+        -v|--verbose)
+                echo $2 > $FAULTATTR/verbose
+                shift 2
+                ;;
+        --task-filter)
+                task_filter=$2
+                shift 2
+                ;;
+        --stacktrace-depth)
+                echo $2 > $FAULTATTR/stacktrace-depth
+                shift 2
+                ;;
+        --require-start)
+                echo $2 > $FAULTATTR/require-start
+                shift 2
+                ;;
+        --require-end)
+                echo $2 > $FAULTATTR/require-end
+                shift 2
+                ;;
+        --reject-start)
+                echo $2 > $FAULTATTR/reject-start
+                shift 2
+                ;;
+        --reject-end)
+                echo $2 > $FAULTATTR/reject-end
+                shift 2
+                ;;
+        --oom-kill-allocating-task)
+                oom_kill_allocating_task=$2
+                shift 2
+                ;;
+        --ignore-gfp-wait)
+                echo $2 > $FAULTATTR/ignore-gfp-wait
+                shift 2
+                ;;
+        --cache-filter)
+                echo $2 > $FAULTATTR/cache_filter
+                shift 2
+                ;;
+        --ignore-gfp-highmem)
+                echo $2 > $FAULTATTR/ignore-gfp-highmem
+                shift 2
+                ;;
+        --min-order)
+                echo $2 > $FAULTATTR/min-order
+                shift 2
+                ;;
+        -h|--help)
+                usage
+                exit 0
+                shift
+                ;;
+        --)
+                shift
+                break
+                ;;
+        esac
+done
+
+[ -z "$@" ] && exit 0
+
+echo $oom_kill_allocating_task > /proc/sys/vm/oom_kill_allocating_task
+echo $task_filter > $FAULTATTR/task-filter
+echo $probability > $FAULTATTR/probability
+echo $times > $FAULTATTR/times
+
+trap "restore_values" SIGINT SIGTERM EXIT
+
+cmd="echo 1 > /proc/self/make-it-fail && exec $@"
+bash -c "$cmd"