]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge tag 'linux-kselftest-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 Mar 2016 02:37:08 +0000 (19:37 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 Mar 2016 02:37:08 +0000 (19:37 -0700)
Pull Kselftest updates from Shuah Khan:
 "This update for Kselftest adds:

   - A new feature to create test-specific kconfig fragments.  This
     feature helps configure Kselftests to test specific Kernel
     Configuration options as opposed to defconfig.

   - A new test for Media Controller API

   - A few fixes"

* tag 'linux-kselftest-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  selftests: media_dcevice_test fix usage information
  selftests: media_dcevice_test fix to handle ioctl failure case
  selftests: add missing .gitignore file or entry
  Makefile: add kselftest-merge
  selftests: create test-specific kconfig fragments
  selftests: breakpoint: add step_after_suspend_test
  selftests: add a new test for Media Controller API

21 files changed:
Makefile
tools/testing/selftests/breakpoints/.gitignore
tools/testing/selftests/breakpoints/Makefile
tools/testing/selftests/breakpoints/step_after_suspend_test.c [new file with mode: 0644]
tools/testing/selftests/cpu-hotplug/config [new file with mode: 0644]
tools/testing/selftests/firmware/config [new file with mode: 0644]
tools/testing/selftests/ftrace/config [new file with mode: 0644]
tools/testing/selftests/ipc/.gitignore [new file with mode: 0644]
tools/testing/selftests/ipc/config [new file with mode: 0644]
tools/testing/selftests/media_tests/.gitignore [new file with mode: 0644]
tools/testing/selftests/media_tests/Makefile [new file with mode: 0644]
tools/testing/selftests/media_tests/media_device_test.c [new file with mode: 0644]
tools/testing/selftests/memory-hotplug/config [new file with mode: 0644]
tools/testing/selftests/mount/config [new file with mode: 0644]
tools/testing/selftests/net/config [new file with mode: 0644]
tools/testing/selftests/pstore/config [new file with mode: 0644]
tools/testing/selftests/seccomp/config [new file with mode: 0644]
tools/testing/selftests/static_keys/config [new file with mode: 0644]
tools/testing/selftests/user/config [new file with mode: 0644]
tools/testing/selftests/vm/config [new file with mode: 0644]
tools/testing/selftests/zram/config [new file with mode: 0644]

index 7b3ecdcdc6c1815ca6241a72b1967593a0335b41..6798c6b4775de48c949240dff1b6ac9f061251d4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1087,6 +1087,14 @@ kselftest:
 kselftest-clean:
        $(Q)$(MAKE) -C tools/testing/selftests clean
 
+PHONY += kselftest-merge
+kselftest-merge:
+       $(if $(wildcard $(objtree)/.config),, $(error No .config exists, config your kernel first!))
+       $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh \
+               -m $(objtree)/.config \
+               $(srctree)/tools/testing/selftests/*/config
+       +$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig
+
 # ---------------------------------------------------------------------------
 # Modules
 
@@ -1295,6 +1303,8 @@ help:
        @echo  '                    Build, install, and boot kernel before'
        @echo  '                    running kselftest on it'
        @echo  '  kselftest-clean - Remove all generated kselftest files'
+       @echo  '  kselftest-merge - Merge all the config dependencies of kselftest to existed'
+       @echo  '                    .config.'
        @echo  ''
        @echo  'Kernel packaging:'
        @$(MAKE) $(build)=$(package-dir) help
index 9b3193d06608cdf54c80f4c54859388eef71fe29..a23bb4a6f06c26502a5c5ab8f70c03802f11d2d6 100644 (file)
@@ -1 +1,2 @@
 breakpoint_test
+step_after_suspend_test
index c0d957015f524d7ad7f6ab2a46be1a8d484a8ef9..74e533fd4bc54009d797b99192fb38171d24c005 100644 (file)
@@ -6,9 +6,11 @@ ifeq ($(ARCH),x86)
 TEST_PROGS := breakpoint_test
 endif
 
+TEST_PROGS += step_after_suspend_test
+
 all: $(TEST_PROGS)
 
 include ../lib.mk
 
 clean:
-       rm -fr breakpoint_test
+       rm -fr breakpoint_test step_after_suspend_test
diff --git a/tools/testing/selftests/breakpoints/step_after_suspend_test.c b/tools/testing/selftests/breakpoints/step_after_suspend_test.c
new file mode 100644 (file)
index 0000000..60b8a95
--- /dev/null
@@ -0,0 +1,218 @@
+/*
+ * Copyright (C) 2016 Google, Inc.
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#define _GNU_SOURCE
+
+#include <errno.h>
+#include <fcntl.h>
+#include <sched.h>
+#include <signal.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/ptrace.h>
+#include <sys/stat.h>
+#include <sys/timerfd.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+
+#include "../kselftest.h"
+
+void child(int cpu)
+{
+       cpu_set_t set;
+
+       CPU_ZERO(&set);
+       CPU_SET(cpu, &set);
+       if (sched_setaffinity(0, sizeof(set), &set) != 0) {
+               perror("sched_setaffinity() failed");
+               _exit(1);
+       }
+
+       if (ptrace(PTRACE_TRACEME, 0, NULL, NULL) != 0) {
+               perror("ptrace(PTRACE_TRACEME) failed");
+               _exit(1);
+       }
+
+       if (raise(SIGSTOP) != 0) {
+               perror("raise(SIGSTOP) failed");
+               _exit(1);
+       }
+
+       _exit(0);
+}
+
+bool run_test(int cpu)
+{
+       int status;
+       pid_t pid = fork();
+       pid_t wpid;
+
+       if (pid < 0) {
+               perror("fork() failed");
+               return false;
+       }
+       if (pid == 0)
+               child(cpu);
+
+       wpid = waitpid(pid, &status, __WALL);
+       if (wpid != pid) {
+               perror("waitpid() failed");
+               return false;
+       }
+       if (!WIFSTOPPED(status)) {
+               printf("child did not stop\n");
+               return false;
+       }
+       if (WSTOPSIG(status) != SIGSTOP) {
+               printf("child did not stop with SIGSTOP\n");
+               return false;
+       }
+
+       if (ptrace(PTRACE_SINGLESTEP, pid, NULL, NULL) < 0) {
+               if (errno == EIO) {
+                       printf("ptrace(PTRACE_SINGLESTEP) not supported on this architecture\n");
+                       ksft_exit_skip();
+               }
+               perror("ptrace(PTRACE_SINGLESTEP) failed");
+               return false;
+       }
+
+       wpid = waitpid(pid, &status, __WALL);
+       if (wpid != pid) {
+               perror("waitpid() failed");
+               return false;
+       }
+       if (WIFEXITED(status)) {
+               printf("child did not single-step\n");
+               return false;
+       }
+       if (!WIFSTOPPED(status)) {
+               printf("child did not stop\n");
+               return false;
+       }
+       if (WSTOPSIG(status) != SIGTRAP) {
+               printf("child did not stop with SIGTRAP\n");
+               return false;
+       }
+
+       if (ptrace(PTRACE_CONT, pid, NULL, NULL) < 0) {
+               perror("ptrace(PTRACE_CONT) failed");
+               return false;
+       }
+
+       wpid = waitpid(pid, &status, __WALL);
+       if (wpid != pid) {
+               perror("waitpid() failed");
+               return false;
+       }
+       if (!WIFEXITED(status)) {
+               printf("child did not exit after PTRACE_CONT\n");
+               return false;
+       }
+
+       return true;
+}
+
+void suspend(void)
+{
+       int power_state_fd;
+       struct sigevent event = {};
+       int timerfd;
+       int err;
+       struct itimerspec spec = {};
+
+       power_state_fd = open("/sys/power/state", O_RDWR);
+       if (power_state_fd < 0) {
+               perror("open(\"/sys/power/state\") failed (is this test running as root?)");
+               ksft_exit_fail();
+       }
+
+       timerfd = timerfd_create(CLOCK_BOOTTIME_ALARM, 0);
+       if (timerfd < 0) {
+               perror("timerfd_create() failed");
+               ksft_exit_fail();
+       }
+
+       spec.it_value.tv_sec = 5;
+       err = timerfd_settime(timerfd, 0, &spec, NULL);
+       if (err < 0) {
+               perror("timerfd_settime() failed");
+               ksft_exit_fail();
+       }
+
+       if (write(power_state_fd, "mem", strlen("mem")) != strlen("mem")) {
+               perror("entering suspend failed");
+               ksft_exit_fail();
+       }
+
+       close(timerfd);
+       close(power_state_fd);
+}
+
+int main(int argc, char **argv)
+{
+       int opt;
+       bool do_suspend = true;
+       bool succeeded = true;
+       cpu_set_t available_cpus;
+       int err;
+       int cpu;
+
+       while ((opt = getopt(argc, argv, "n")) != -1) {
+               switch (opt) {
+               case 'n':
+                       do_suspend = false;
+                       break;
+               default:
+                       printf("Usage: %s [-n]\n", argv[0]);
+                       printf("        -n: do not trigger a suspend/resume cycle before the test\n");
+                       return -1;
+               }
+       }
+
+       if (do_suspend)
+               suspend();
+
+       err = sched_getaffinity(0, sizeof(available_cpus), &available_cpus);
+       if (err < 0) {
+               perror("sched_getaffinity() failed");
+               ksft_exit_fail();
+       }
+
+       for (cpu = 0; cpu < CPU_SETSIZE; cpu++) {
+               bool test_success;
+
+               if (!CPU_ISSET(cpu, &available_cpus))
+                       continue;
+
+               test_success = run_test(cpu);
+               printf("CPU %d: ", cpu);
+               if (test_success) {
+                       printf("[OK]\n");
+                       ksft_inc_pass_cnt();
+               } else {
+                       printf("[FAILED]\n");
+                       ksft_inc_fail_cnt();
+                       succeeded = false;
+               }
+       }
+
+       ksft_print_cnts();
+       if (succeeded)
+               ksft_exit_pass();
+       else
+               ksft_exit_fail();
+}
diff --git a/tools/testing/selftests/cpu-hotplug/config b/tools/testing/selftests/cpu-hotplug/config
new file mode 100644 (file)
index 0000000..e6ab090
--- /dev/null
@@ -0,0 +1,2 @@
+CONFIG_NOTIFIER_ERROR_INJECTION=y
+CONFIG_CPU_NOTIFIER_ERROR_INJECT=m
diff --git a/tools/testing/selftests/firmware/config b/tools/testing/selftests/firmware/config
new file mode 100644 (file)
index 0000000..c8137f7
--- /dev/null
@@ -0,0 +1 @@
+CONFIG_TEST_FIRMWARE=y
diff --git a/tools/testing/selftests/ftrace/config b/tools/testing/selftests/ftrace/config
new file mode 100644 (file)
index 0000000..ef82146
--- /dev/null
@@ -0,0 +1 @@
+CONFIG_FTRACE=y
diff --git a/tools/testing/selftests/ipc/.gitignore b/tools/testing/selftests/ipc/.gitignore
new file mode 100644 (file)
index 0000000..84b66a3
--- /dev/null
@@ -0,0 +1 @@
+msgque_test
diff --git a/tools/testing/selftests/ipc/config b/tools/testing/selftests/ipc/config
new file mode 100644 (file)
index 0000000..0702447
--- /dev/null
@@ -0,0 +1,2 @@
+CONFIG_EXPERT=y
+CONFIG_CHECKPOINT_RESTORE=y
diff --git a/tools/testing/selftests/media_tests/.gitignore b/tools/testing/selftests/media_tests/.gitignore
new file mode 100644 (file)
index 0000000..1c07117
--- /dev/null
@@ -0,0 +1 @@
+media_device_test
diff --git a/tools/testing/selftests/media_tests/Makefile b/tools/testing/selftests/media_tests/Makefile
new file mode 100644 (file)
index 0000000..7071bcc
--- /dev/null
@@ -0,0 +1,7 @@
+TEST_PROGS := media_device_test
+all: $(TEST_PROGS)
+
+include ../lib.mk
+
+clean:
+       rm -fr media_device_test
diff --git a/tools/testing/selftests/media_tests/media_device_test.c b/tools/testing/selftests/media_tests/media_device_test.c
new file mode 100644 (file)
index 0000000..cbf53a0
--- /dev/null
@@ -0,0 +1,95 @@
+/*
+ * media_devkref_test.c - Media Controller Device Kref API Test
+ *
+ * Copyright (c) 2016 Shuah Khan <shuahkh@osg.samsung.com>
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ *
+ * This file is released under the GPLv2.
+ */
+
+/*
+ * This file adds a test for Media Controller API.
+ * This test should be run as root and should not be
+ * included in the Kselftest run. This test should be
+ * run when hardware and driver that makes use Media
+ * Controller API are present in the system.
+ *
+ * This test opens user specified Media Device and calls
+ * MEDIA_IOC_DEVICE_INFO ioctl in a loop once every 10
+ * seconds.
+ *
+ * Usage:
+ *     sudo ./media_device_test -d /dev/mediaX
+ *
+ *     While test is running, remove the device and
+ *     ensure there are no use after free errors and
+ *     other Oops in the dmesg. Enable KaSan kernel
+ *     config option for use-after-free error detection.
+*/
+
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <string.h>
+#include <fcntl.h>
+#include <sys/ioctl.h>
+#include <sys/stat.h>
+#include <linux/media.h>
+
+int main(int argc, char **argv)
+{
+       int opt;
+       char media_device[256];
+       int count = 0;
+       struct media_device_info mdi;
+       int ret;
+       int fd;
+
+       if (argc < 2) {
+               printf("Usage: %s [-d </dev/mediaX>]\n", argv[0]);
+               exit(-1);
+       }
+
+       /* Process arguments */
+       while ((opt = getopt(argc, argv, "d:")) != -1) {
+               switch (opt) {
+               case 'd':
+                       strncpy(media_device, optarg, sizeof(media_device) - 1);
+                       media_device[sizeof(media_device)-1] = '\0';
+                       break;
+               default:
+                       printf("Usage: %s [-d </dev/mediaX>]\n", argv[0]);
+                       exit(-1);
+               }
+       }
+
+       if (getuid() != 0) {
+               printf("Please run the test as root - Exiting.\n");
+               exit(-1);
+       }
+
+       /* Open Media device and keep it open */
+       fd = open(media_device, O_RDWR);
+       if (fd == -1) {
+               printf("Media Device open errno %s\n", strerror(errno));
+               exit(-1);
+       }
+
+       printf("\nNote:\n"
+              "While test is running, remove the device and\n"
+              "ensure there are no use after free errors and\n"
+              "other Oops in the dmesg. Enable KaSan kernel\n"
+              "config option for use-after-free error detection.\n\n");
+
+       while (count < 100) {
+               ret = ioctl(fd, MEDIA_IOC_DEVICE_INFO, &mdi);
+               if (ret < 0)
+                       printf("Media Device Info errno %s\n", strerror(errno));
+               else
+                       printf("Media device model %s driver %s\n",
+                               mdi.model, mdi.driver);
+               sleep(10);
+               count++;
+       }
+}
diff --git a/tools/testing/selftests/memory-hotplug/config b/tools/testing/selftests/memory-hotplug/config
new file mode 100644 (file)
index 0000000..2fde301
--- /dev/null
@@ -0,0 +1,4 @@
+CONFIG_MEMORY_HOTPLUG=y
+CONFIG_MEMORY_HOTPLUG_SPARSE=y
+CONFIG_NOTIFIER_ERROR_INJECTION=y
+CONFIG_MEMORY_NOTIFIER_ERROR_INJECT=m
diff --git a/tools/testing/selftests/mount/config b/tools/testing/selftests/mount/config
new file mode 100644 (file)
index 0000000..b5d881e
--- /dev/null
@@ -0,0 +1,2 @@
+CONFIG_USER_NS=y
+CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
diff --git a/tools/testing/selftests/net/config b/tools/testing/selftests/net/config
new file mode 100644 (file)
index 0000000..e57b4ac
--- /dev/null
@@ -0,0 +1,3 @@
+CONFIG_USER_NS=y
+CONFIG_BPF_SYSCALL=y
+CONFIG_TEST_BPF=m
diff --git a/tools/testing/selftests/pstore/config b/tools/testing/selftests/pstore/config
new file mode 100644 (file)
index 0000000..6a8e5a9
--- /dev/null
@@ -0,0 +1,4 @@
+CONFIG_MISC_FILESYSTEMS=y
+CONFIG_PSTORE=y
+CONFIG_PSTORE_PMSG=y
+CONFIG_PSTORE_CONSOLE=y
diff --git a/tools/testing/selftests/seccomp/config b/tools/testing/selftests/seccomp/config
new file mode 100644 (file)
index 0000000..db1e11b
--- /dev/null
@@ -0,0 +1,2 @@
+CONFIG_SECCOMP=y
+CONFIG_SECCOMP_FILTER=y
diff --git a/tools/testing/selftests/static_keys/config b/tools/testing/selftests/static_keys/config
new file mode 100644 (file)
index 0000000..d538fb7
--- /dev/null
@@ -0,0 +1 @@
+CONFIG_TEST_STATIC_KEYS=m
diff --git a/tools/testing/selftests/user/config b/tools/testing/selftests/user/config
new file mode 100644 (file)
index 0000000..784ed84
--- /dev/null
@@ -0,0 +1 @@
+CONFIG_TEST_USER_COPY=m
diff --git a/tools/testing/selftests/vm/config b/tools/testing/selftests/vm/config
new file mode 100644 (file)
index 0000000..698c7ed
--- /dev/null
@@ -0,0 +1 @@
+CONFIG_USERFAULTFD=y
diff --git a/tools/testing/selftests/zram/config b/tools/testing/selftests/zram/config
new file mode 100644 (file)
index 0000000..e0cc47e
--- /dev/null
@@ -0,0 +1,2 @@
+CONFIG_ZSMALLOC=y
+CONFIG_ZRAM=m