Merge branch 'akpm' (final batch from Andrew)

Merge third patch-bumb from Andrew Morton:
 "This wraps me up for -rc1.
   - Lots of misc stuff and things which were deferred/missed from
     patchbombings 1 & 2.
   - ocfs2 things
   - lib/scatterlist
   - hfsplus
   - fatfs
   - documentation
   - signals
   - procfs
   - lockdep
   - coredump
   - seqfile core
   - kexec
   - Tejun's large IDR tree reworkings
   - ipmi
   - partitions
   - nbd
   - random() things
   - kfifo
   - tools/testing/selftests updates
   - Sasha's large and pointless hlist cleanup"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (163 commits)
  hlist: drop the node parameter from iterators
  kcmp: make it depend on CHECKPOINT_RESTORE
  selftests: add a simple doc
  tools/testing/selftests/Makefile: rearrange targets
  selftests/efivarfs: add create-read test
  selftests/efivarfs: add empty file creation test
  selftests: add tests for efivarfs
  kfifo: fix kfifo_alloc() and kfifo_init()
  kfifo: move kfifo.c from kernel/ to lib/
  arch Kconfig: centralise CONFIG_ARCH_NO_VIRT_TO_BUS
  w1: add support for DS2413 Dual Channel Addressable Switch
  memstick: move the dereference below the NULL test
  drivers/pps/clients/pps-gpio.c: use devm_kzalloc
  Documentation/DMA-API-HOWTO.txt: fix typo
  include/linux/eventfd.h: fix incorrect filename is a comment
  mtd: mtd_stresstest: use prandom_bytes()
  mtd: mtd_subpagetest: convert to use prandom library
  mtd: mtd_speedtest: use prandom_bytes
  mtd: mtd_pagetest: convert to use prandom library
  mtd: mtd_oobtest: convert to use prandom library
  ...

7 files changed, 302 insertions, 3 deletions

diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index bc4ad7977438..c8be0fbc5145 100644
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -314,7 +314,6 @@ static int perf_evlist__id_add_fd(struct perf_evlist *evlist,
 struct perf_evsel *perf_evlist__id2evsel(struct perf_evlist *evlist, u64 id)
 {
         struct hlist_head *head;
-        struct hlist_node *pos;
         struct perf_sample_id *sid;
         int hash;
 
@@ -324,7 +323,7 @@ struct perf_evsel *perf_evlist__id2evsel(struct perf_evlist *evlist, u64 id)
         hash = hash_64(id, PERF_EVLIST__HLIST_BITS);
         head = &evlist->heads[hash];
 
-        hlist_for_each_entry(sid, pos, head, node)
+        hlist_for_each_entry(sid, head, node)
                 if (sid->id == id)
                         return sid->evsel;
 
diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile
index 85baf11e2acd..3cc0ad7ae863 100644
--- a/tools/testing/selftests/Makefile
+++ b/tools/testing/selftests/Makefile
@@ -1,4 +1,10 @@
-TARGETS = breakpoints kcmp mqueue vm cpu-hotplug memory-hotplug
+TARGETS = breakpoints
+TARGETS += kcmp
+TARGETS += mqueue
+TARGETS += vm
+TARGETS += cpu-hotplug
+TARGETS += memory-hotplug
+TARGETS += efivarfs
 
 all:
         for TARGET in $(TARGETS); do \
diff --git a/tools/testing/selftests/README.txt b/tools/testing/selftests/README.txt
new file mode 100644
index 000000000000..5e2faf9c55d3
--- /dev/null
+++ b/tools/testing/selftests/README.txt
@@ -0,0 +1,42 @@
+Linux Kernel Selftests
+
+The kernel contains a set of "self tests" under the tools/testing/selftests/
+directory. These are intended to be small unit tests to exercise individual
+code paths in the kernel.
+
+Running the selftests
+=====================
+
+To build the tests:
+
+  $ make -C tools/testing/selftests
+
+
+To run the tests:
+
+  $ make -C tools/testing/selftests run_tests
+
+- note that some tests will require root privileges.
+
+
+To run only tests targetted for a single subsystem:
+
+  $  make -C tools/testing/selftests TARGETS=cpu-hotplug run_tests
+
+See the top-level tools/testing/selftests/Makefile for the list of all possible
+targets.
+
+
+Contributing new tests
+======================
+
+In general, the rules for for selftests are
+
+ * Do as much as you can if you're not root;
+
+ * Don't take too long;
+
+ * Don't break the build on any architecture, and
+
+ * Don't cause the top-level "make run_tests" to fail if your feature is
+   unconfigured.
diff --git a/tools/testing/selftests/efivarfs/Makefile b/tools/testing/selftests/efivarfs/Makefile
new file mode 100644
index 000000000000..29e8c6bc81b0
--- /dev/null
+++ b/tools/testing/selftests/efivarfs/Makefile
@@ -0,0 +1,12 @@
+CC = $(CROSS_COMPILE)gcc
+CFLAGS = -Wall
+
+test_objs = open-unlink create-read
+
+all: $(test_objs)
+
+run_tests: all
+        @/bin/bash ./efivarfs.sh || echo "efivarfs selftests: [FAIL]"
+
+clean:
+        rm -f $(test_objs)
diff --git a/tools/testing/selftests/efivarfs/create-read.c b/tools/testing/selftests/efivarfs/create-read.c
new file mode 100644
index 000000000000..7feef1880968
--- /dev/null
+++ b/tools/testing/selftests/efivarfs/create-read.c
@@ -0,0 +1,38 @@
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <string.h>
+
+int main(int argc, char **argv)
+{
+        const char *path;
+        char buf[4];
+        int fd, rc;
+
+        if (argc < 2) {
+                fprintf(stderr, "usage: %s <path>\n", argv[0]);
+                return EXIT_FAILURE;
+        }
+
+        path = argv[1];
+
+        /* create a test variable */
+        fd = open(path, O_RDWR | O_CREAT, 0600);
+        if (fd < 0) {
+                perror("open(O_WRONLY)");
+                return EXIT_FAILURE;
+        }
+
+        rc = read(fd, buf, sizeof(buf));
+        if (rc != 0) {
+                fprintf(stderr, "Reading a new var should return EOF\n");
+                return EXIT_FAILURE;
+        }
+
+        return EXIT_SUCCESS;
+}
diff --git a/tools/testing/selftests/efivarfs/efivarfs.sh b/tools/testing/selftests/efivarfs/efivarfs.sh
new file mode 100644
index 000000000000..880cdd5dc63f
--- /dev/null
+++ b/tools/testing/selftests/efivarfs/efivarfs.sh
@@ -0,0 +1,139 @@
+#!/bin/bash
+
+efivarfs_mount=/sys/firmware/efi/efivars
+test_guid=210be57c-9849-4fc7-a635-e6382d1aec27
+
+check_prereqs()
+{
+        local msg="skip all tests:"
+
+        if [ $UID != 0 ]; then
+                echo $msg must be run as root >&2
+                exit 0
+        fi
+
+        if ! grep -q "^\S\+ $efivarfs_mount efivarfs" /proc/mounts; then
+                echo $msg efivarfs is not mounted on $efivarfs_mount >&2
+                exit 0
+        fi
+}
+
+run_test()
+{
+        local test="$1"
+
+        echo "--------------------"
+        echo "running $test"
+        echo "--------------------"
+
+        if [ "$(type -t $test)" = 'function' ]; then
+                ( $test )
+        else
+                ( ./$test )
+        fi
+
+        if [ $? -ne 0 ]; then
+                echo "  [FAIL]"
+                rc=1
+        else
+                echo "  [PASS]"
+        fi
+}
+
+test_create()
+{
+        local attrs='\x07\x00\x00\x00'
+        local file=$efivarfs_mount/$FUNCNAME-$test_guid
+
+        printf "$attrs\x00" > $file
+
+        if [ ! -e $file ]; then
+                echo "$file couldn't be created" >&2
+                exit 1
+        fi
+
+        if [ $(stat -c %s $file) -ne 5 ]; then
+                echo "$file has invalid size" >&2
+                exit 1
+        fi
+}
+
+test_create_empty()
+{
+        local file=$efivarfs_mount/$FUNCNAME-$test_guid
+
+        : > $file
+
+        if [ ! -e $file ]; then
+                echo "$file can not be created without writing" >&2
+                exit 1
+        fi
+}
+
+test_create_read()
+{
+        local file=$efivarfs_mount/$FUNCNAME-$test_guid
+        ./create-read $file
+}
+
+test_delete()
+{
+        local attrs='\x07\x00\x00\x00'
+        local file=$efivarfs_mount/$FUNCNAME-$test_guid
+
+        printf "$attrs\x00" > $file
+
+        if [ ! -e $file ]; then
+                echo "$file couldn't be created" >&2
+                exit 1
+        fi
+
+        rm $file
+
+        if [ -e $file ]; then
+                echo "$file couldn't be deleted" >&2
+                exit 1
+        fi
+
+}
+
+# test that we can remove a variable by issuing a write with only
+# attributes specified
+test_zero_size_delete()
+{
+        local attrs='\x07\x00\x00\x00'
+        local file=$efivarfs_mount/$FUNCNAME-$test_guid
+
+        printf "$attrs\x00" > $file
+
+        if [ ! -e $file ]; then
+                echo "$file does not exist" >&2
+                exit 1
+        fi
+
+        printf "$attrs" > $file
+
+        if [ -e $file ]; then
+                echo "$file should have been deleted" >&2
+                exit 1
+        fi
+}
+
+test_open_unlink()
+{
+        local file=$efivarfs_mount/$FUNCNAME-$test_guid
+        ./open-unlink $file
+}
+
+check_prereqs
+
+rc=0
+
+run_test test_create
+run_test test_create_empty
+run_test test_create_read
+run_test test_delete
+run_test test_zero_size_delete
+run_test test_open_unlink
+
+exit $rc
diff --git a/tools/testing/selftests/efivarfs/open-unlink.c b/tools/testing/selftests/efivarfs/open-unlink.c
new file mode 100644
index 000000000000..8c0764407b3c
--- /dev/null
+++ b/tools/testing/selftests/efivarfs/open-unlink.c
@@ -0,0 +1,63 @@
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+int main(int argc, char **argv)
+{
+        const char *path;
+        char buf[5];
+        int fd, rc;
+
+        if (argc < 2) {
+                fprintf(stderr, "usage: %s <path>\n", argv[0]);
+                return EXIT_FAILURE;
+        }
+
+        path = argv[1];
+
+        /* attributes: EFI_VARIABLE_NON_VOLATILE |
+         *              EFI_VARIABLE_BOOTSERVICE_ACCESS |
+         *              EFI_VARIABLE_RUNTIME_ACCESS
+         */
+        *(uint32_t *)buf = 0x7;
+        buf[4] = 0;
+
+        /* create a test variable */
+        fd = open(path, O_WRONLY | O_CREAT);
+        if (fd < 0) {
+                perror("open(O_WRONLY)");
+                return EXIT_FAILURE;
+        }
+
+        rc = write(fd, buf, sizeof(buf));
+        if (rc != sizeof(buf)) {
+                perror("write");
+                return EXIT_FAILURE;
+        }
+
+        close(fd);
+
+        fd = open(path, O_RDONLY);
+        if (fd < 0) {
+                perror("open");
+                return EXIT_FAILURE;
+        }
+
+        if (unlink(path) < 0) {
+                perror("unlink");
+                return EXIT_FAILURE;
+        }
+
+        rc = read(fd, buf, sizeof(buf));
+        if (rc > 0) {
+                fprintf(stderr, "reading from an unlinked variable "
+                                "shouldn't be possible\n");
+                return EXIT_FAILURE;
+        }
+
+        return EXIT_SUCCESS;
+}