Commit ca95bf62 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'linux-kselftest-4.18-rc1' of...

Merge tag 'linux-kselftest-4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest

Pull Kselftest update from Shuah Khan:

 - Work to restructure timers test suite to move PIE out of rtctest from
   Alexandre Belloni.

 - Several minor spelling and bug fixes.

 - New cgroup tests from Roman Gushchin and Mike Rapoport.

 - Kselftest framework changes to handle and report skipped tests
   correctly.

   Prior to these changes, framework treated all non-zero return codes
   from tests as failures. When tests are skipped with non-zero return
   code, due to unmet dependencies and/or unsupported configuration,
   reporting them as failed lead to false negatives on the tests that
   couldn't be run.

 - Fixes to test Makefiles to remove unnecessary RUN_TESTS and
   EMIT_TESTS overrides and use common defines from lib.mk.

 - Fixes to several tests to return correct Kselftest skip code.

 - Changes to improve test output.

* tag 'linux-kselftest-4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest: (55 commits)
  selftests: lib: fix prime_numbers module search and skip logic
  selftests: intel_pstate: notification about privilege required to run intel_pstate testing script
  selftests: cgroup/memcontrol: add basic test for socket accounting
  selftest: intel_pstate: debug support message from aperf.c and return value
  kselftest/cgroup: fix variable dereferenced before check warning
  selftests/intel_pstate: Enhance table printing
  selftests/intel_pstate: Improve test, minor fixes
  selftests: cgroup/memcontrol: add basic test for swap controls
  selftests: cgroup: add memory controller self-tests
  selftests: memfd: split regular and hugetlbfs tests
  selftests: net: return Kselftest Skip code for skipped tests
  selftests: mqueue: return Kselftest Skip code for skipped tests
  selftests: memory-hotplug: return Kselftest Skip code for skipped tests
  selftests: memfd: return Kselftest Skip code for skipped tests
  selftests: membarrier: return Kselftest Skip code for skipped tests
  selftests: media_tests: return Kselftest Skip code for skipped tests
  selftests: locking: return Kselftest Skip code for skipped tests
  selftests: locking: add Makefile for locking test
  selftests: lib: return Kselftest Skip code for skipped tests
  selftests: lib: add prime_numbers.sh test to Makefile
  ...
parents 0ad39cb3 fa321569
...@@ -11935,7 +11935,7 @@ F: include/linux/rtc.h ...@@ -11935,7 +11935,7 @@ F: include/linux/rtc.h
F: include/uapi/linux/rtc.h F: include/uapi/linux/rtc.h
F: include/linux/rtc/ F: include/linux/rtc/
F: include/linux/platform_data/rtc-* F: include/linux/platform_data/rtc-*
F: tools/testing/selftests/timers/rtctest.c F: tools/testing/selftests/rtc/
REALTEK AUDIO CODECS REALTEK AUDIO CODECS
M: Bard Liao <bardliao@realtek.com> M: Bard Liao <bardliao@realtek.com>
......
...@@ -3,6 +3,7 @@ TARGETS = android ...@@ -3,6 +3,7 @@ TARGETS = android
TARGETS += bpf TARGETS += bpf
TARGETS += breakpoints TARGETS += breakpoints
TARGETS += capabilities TARGETS += capabilities
TARGETS += cgroup
TARGETS += cpufreq TARGETS += cpufreq
TARGETS += cpu-hotplug TARGETS += cpu-hotplug
TARGETS += efivarfs TARGETS += efivarfs
...@@ -28,6 +29,7 @@ TARGETS += powerpc ...@@ -28,6 +29,7 @@ TARGETS += powerpc
TARGETS += proc TARGETS += proc
TARGETS += pstore TARGETS += pstore
TARGETS += ptrace TARGETS += ptrace
TARGETS += rtc
TARGETS += seccomp TARGETS += seccomp
TARGETS += sigaltstack TARGETS += sigaltstack
TARGETS += size TARGETS += size
...@@ -134,7 +136,8 @@ ifdef INSTALL_PATH ...@@ -134,7 +136,8 @@ ifdef INSTALL_PATH
echo "else" >> $(ALL_SCRIPT) echo "else" >> $(ALL_SCRIPT)
echo " OUTPUT=/dev/stdout" >> $(ALL_SCRIPT) echo " OUTPUT=/dev/stdout" >> $(ALL_SCRIPT)
echo "fi" >> $(ALL_SCRIPT) echo "fi" >> $(ALL_SCRIPT)
echo "export KSFT_TAP_LEVEL=`echo 1`" >> $(ALL_SCRIPT) echo "export KSFT_TAP_LEVEL=1" >> $(ALL_SCRIPT)
echo "export skip=4" >> $(ALL_SCRIPT)
for TARGET in $(TARGETS); do \ for TARGET in $(TARGETS); do \
BUILD_TARGET=$$BUILD/$$TARGET; \ BUILD_TARGET=$$BUILD/$$TARGET; \
......
...@@ -18,10 +18,6 @@ all: ...@@ -18,10 +18,6 @@ all:
fi \ fi \
done done
override define RUN_TESTS
@cd $(OUTPUT); ./run.sh
endef
override define INSTALL_RULE override define INSTALL_RULE
mkdir -p $(INSTALL_PATH) mkdir -p $(INSTALL_PATH)
install -t $(INSTALL_PATH) $(TEST_PROGS) $(TEST_PROGS_EXTENDED) $(TEST_FILES) install -t $(INSTALL_PATH) $(TEST_PROGS) $(TEST_PROGS_EXTENDED) $(TEST_FILES)
...@@ -33,10 +29,6 @@ override define INSTALL_RULE ...@@ -33,10 +29,6 @@ override define INSTALL_RULE
done; done;
endef endef
override define EMIT_TESTS
echo "./run.sh"
endef
override define CLEAN override define CLEAN
@for DIR in $(SUBDIRS); do \ @for DIR in $(SUBDIRS); do \
BUILD_TARGET=$(OUTPUT)/$$DIR; \ BUILD_TARGET=$(OUTPUT)/$$DIR; \
......
...@@ -4,6 +4,9 @@ heapsize=4096 ...@@ -4,6 +4,9 @@ heapsize=4096
TCID="ion_test.sh" TCID="ion_test.sh"
errcode=0 errcode=0
# Kselftest framework requirement - SKIP code is 4.
ksft_skip=4
run_test() run_test()
{ {
heaptype=$1 heaptype=$1
...@@ -25,7 +28,7 @@ check_root() ...@@ -25,7 +28,7 @@ check_root()
uid=$(id -u) uid=$(id -u)
if [ $uid -ne 0 ]; then if [ $uid -ne 0 ]; then
echo $TCID: must be run as root >&2 echo $TCID: must be run as root >&2
exit 0 exit $ksft_skip
fi fi
} }
...@@ -35,7 +38,7 @@ check_device() ...@@ -35,7 +38,7 @@ check_device()
if [ ! -e $DEVICE ]; then if [ ! -e $DEVICE ]; then
echo $TCID: No $DEVICE device found >&2 echo $TCID: No $DEVICE device found >&2
echo $TCID: May be CONFIG_ION is not set >&2 echo $TCID: May be CONFIG_ION is not set >&2
exit 0 exit $ksft_skip
fi fi
} }
......
...@@ -143,10 +143,14 @@ void suspend(void) ...@@ -143,10 +143,14 @@ void suspend(void)
int err; int err;
struct itimerspec spec = {}; struct itimerspec spec = {};
if (getuid() != 0)
ksft_exit_skip("Please run the test as root - Exiting.\n");
power_state_fd = open("/sys/power/state", O_RDWR); power_state_fd = open("/sys/power/state", O_RDWR);
if (power_state_fd < 0) if (power_state_fd < 0)
ksft_exit_fail_msg( ksft_exit_fail_msg(
"open(\"/sys/power/state\") failed (is this test running as root?)\n"); "open(\"/sys/power/state\") failed %s)\n",
strerror(errno));
timerfd = timerfd_create(CLOCK_BOOTTIME_ALARM, 0); timerfd = timerfd_create(CLOCK_BOOTTIME_ALARM, 0);
if (timerfd < 0) if (timerfd < 0)
......
# SPDX-License-Identifier: GPL-2.0
CFLAGS += -Wall
all:
TEST_GEN_PROGS = test_memcontrol
include ../lib.mk
$(OUTPUT)/test_memcontrol: cgroup_util.c
/* SPDX-License-Identifier: GPL-2.0 */
#define _GNU_SOURCE
#include <errno.h>
#include <fcntl.h>
#include <linux/limits.h>
#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <unistd.h>
#include "cgroup_util.h"
static ssize_t read_text(const char *path, char *buf, size_t max_len)
{
ssize_t len;
int fd;
fd = open(path, O_RDONLY);
if (fd < 0)
return fd;
len = read(fd, buf, max_len - 1);
if (len < 0)
goto out;
buf[len] = 0;
out:
close(fd);
return len;
}
static ssize_t write_text(const char *path, char *buf, size_t len)
{
int fd;
fd = open(path, O_WRONLY | O_APPEND);
if (fd < 0)
return fd;
len = write(fd, buf, len);
if (len < 0) {
close(fd);
return len;
}
close(fd);
return len;
}
char *cg_name(const char *root, const char *name)
{
size_t len = strlen(root) + strlen(name) + 2;
char *ret = malloc(len);
snprintf(ret, len, "%s/%s", root, name);
return ret;
}
char *cg_name_indexed(const char *root, const char *name, int index)
{
size_t len = strlen(root) + strlen(name) + 10;
char *ret = malloc(len);
snprintf(ret, len, "%s/%s_%d", root, name, index);
return ret;
}
int cg_read(const char *cgroup, const char *control, char *buf, size_t len)
{
char path[PATH_MAX];
snprintf(path, sizeof(path), "%s/%s", cgroup, control);
if (read_text(path, buf, len) >= 0)
return 0;
return -1;
}
int cg_read_strcmp(const char *cgroup, const char *control,
const char *expected)
{
size_t size = strlen(expected) + 1;
char *buf;
buf = malloc(size);
if (!buf)
return -1;
if (cg_read(cgroup, control, buf, size))
return -1;
return strcmp(expected, buf);
}
int cg_read_strstr(const char *cgroup, const char *control, const char *needle)
{
char buf[PAGE_SIZE];
if (cg_read(cgroup, control, buf, sizeof(buf)))
return -1;
return strstr(buf, needle) ? 0 : -1;
}
long cg_read_long(const char *cgroup, const char *control)
{
char buf[128];
if (cg_read(cgroup, control, buf, sizeof(buf)))
return -1;
return atol(buf);
}
long cg_read_key_long(const char *cgroup, const char *control, const char *key)
{
char buf[PAGE_SIZE];
char *ptr;
if (cg_read(cgroup, control, buf, sizeof(buf)))
return -1;
ptr = strstr(buf, key);
if (!ptr)
return -1;
return atol(ptr + strlen(key));
}
int cg_write(const char *cgroup, const char *control, char *buf)
{
char path[PATH_MAX];
size_t len = strlen(buf);
snprintf(path, sizeof(path), "%s/%s", cgroup, control);
if (write_text(path, buf, len) == len)
return 0;
return -1;
}
int cg_find_unified_root(char *root, size_t len)
{
char buf[10 * PAGE_SIZE];
char *fs, *mount, *type;
const char delim[] = "\n\t ";
if (read_text("/proc/self/mounts", buf, sizeof(buf)) <= 0)
return -1;
/*
* Example:
* cgroup /sys/fs/cgroup cgroup2 rw,seclabel,noexec,relatime 0 0
*/
for (fs = strtok(buf, delim); fs; fs = strtok(NULL, delim)) {
mount = strtok(NULL, delim);
type = strtok(NULL, delim);
strtok(NULL, delim);
strtok(NULL, delim);
strtok(NULL, delim);
if (strcmp(fs, "cgroup") == 0 &&
strcmp(type, "cgroup2") == 0) {
strncpy(root, mount, len);
return 0;
}
}
return -1;
}
int cg_create(const char *cgroup)
{
return mkdir(cgroup, 0644);
}
static int cg_killall(const char *cgroup)
{
char buf[PAGE_SIZE];
char *ptr = buf;
if (cg_read(cgroup, "cgroup.procs", buf, sizeof(buf)))
return -1;
while (ptr < buf + sizeof(buf)) {
int pid = strtol(ptr, &ptr, 10);
if (pid == 0)
break;
if (*ptr)
ptr++;
else
break;
if (kill(pid, SIGKILL))
return -1;
}
return 0;
}
int cg_destroy(const char *cgroup)
{
int ret;
retry:
ret = rmdir(cgroup);
if (ret && errno == EBUSY) {
ret = cg_killall(cgroup);
if (ret)
return ret;
usleep(100);
goto retry;
}
if (ret && errno == ENOENT)
ret = 0;
return ret;
}
int cg_run(const char *cgroup,
int (*fn)(const char *cgroup, void *arg),
void *arg)
{
int pid, retcode;
pid = fork();
if (pid < 0) {
return pid;
} else if (pid == 0) {
char buf[64];
snprintf(buf, sizeof(buf), "%d", getpid());
if (cg_write(cgroup, "cgroup.procs", buf))
exit(EXIT_FAILURE);
exit(fn(cgroup, arg));
} else {
waitpid(pid, &retcode, 0);
if (WIFEXITED(retcode))
return WEXITSTATUS(retcode);
else
return -1;
}
}
int cg_run_nowait(const char *cgroup,
int (*fn)(const char *cgroup, void *arg),
void *arg)
{
int pid;
pid = fork();
if (pid == 0) {
char buf[64];
snprintf(buf, sizeof(buf), "%d", getpid());
if (cg_write(cgroup, "cgroup.procs", buf))
exit(EXIT_FAILURE);
exit(fn(cgroup, arg));
}
return pid;
}
int get_temp_fd(void)
{
return open(".", O_TMPFILE | O_RDWR | O_EXCL);
}
int alloc_pagecache(int fd, size_t size)
{
char buf[PAGE_SIZE];
struct stat st;
int i;
if (fstat(fd, &st))
goto cleanup;
size += st.st_size;
if (ftruncate(fd, size))
goto cleanup;
for (i = 0; i < size; i += sizeof(buf))
read(fd, buf, sizeof(buf));
return 0;
cleanup:
return -1;
}
int alloc_anon(const char *cgroup, void *arg)
{
size_t size = (unsigned long)arg;
char *buf, *ptr;
buf = malloc(size);
for (ptr = buf; ptr < buf + size; ptr += PAGE_SIZE)
*ptr = 0;
free(buf);
return 0;
}
int is_swap_enabled(void)
{
char buf[PAGE_SIZE];
const char delim[] = "\n";
int cnt = 0;
char *line;
if (read_text("/proc/swaps", buf, sizeof(buf)) <= 0)
return -1;
for (line = strtok(buf, delim); line; line = strtok(NULL, delim))
cnt++;
return cnt > 1;
}
/* SPDX-License-Identifier: GPL-2.0 */
#include <stdlib.h>
#define PAGE_SIZE 4096
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
#define MB(x) (x << 20)
/*
* Checks if two given values differ by less than err% of their sum.
*/
static inline int values_close(long a, long b, int err)
{
return abs(a - b) <= (a + b) / 100 * err;
}
extern int cg_find_unified_root(char *root, size_t len);
extern char *cg_name(const char *root, const char *name);
extern char *cg_name_indexed(const char *root, const char *name, int index);
extern int cg_create(const char *cgroup);
extern int cg_destroy(const char *cgroup);
extern int cg_read(const char *cgroup, const char *control,
char *buf, size_t len);
extern int cg_read_strcmp(const char *cgroup, const char *control,
const char *expected);
extern int cg_read_strstr(const char *cgroup, const char *control,
const char *needle);
extern long cg_read_long(const char *cgroup, const char *control);
long cg_read_key_long(const char *cgroup, const char *control, const char *key);
extern int cg_write(const char *cgroup, const char *control, char *buf);
extern int cg_run(const char *cgroup,
int (*fn)(const char *cgroup, void *arg),
void *arg);
extern int cg_run_nowait(const char *cgroup,
int (*fn)(const char *cgroup, void *arg),
void *arg);
extern int get_temp_fd(void);
extern int alloc_pagecache(int fd, size_t size);
extern int alloc_anon(const char *cgroup, void *arg);
extern int is_swap_enabled(void);
This diff is collapsed.
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
SYSFS= SYSFS=
# Kselftest framework requirement - SKIP code is 4.
ksft_skip=4
prerequisite() prerequisite()
{ {
...@@ -9,7 +11,7 @@ prerequisite() ...@@ -9,7 +11,7 @@ prerequisite()
if [ $UID != 0 ]; then if [ $UID != 0 ]; then
echo $msg must be run as root >&2 echo $msg must be run as root >&2
exit 0 exit $ksft_skip
fi fi
taskset -p 01 $$ taskset -p 01 $$
...@@ -18,12 +20,12 @@ prerequisite() ...@@ -18,12 +20,12 @@ prerequisite()
if [ ! -d "$SYSFS" ]; then if [ ! -d "$SYSFS" ]; then
echo $msg sysfs is not mounted >&2 echo $msg sysfs is not mounted >&2
exit 0 exit $ksft_skip
fi fi
if ! ls $SYSFS/devices/system/cpu/cpu* > /dev/null 2>&1; then if ! ls $SYSFS/devices/system/cpu/cpu* > /dev/null 2>&1; then
echo $msg cpu hotplug is not supported >&2 echo $msg cpu hotplug is not supported >&2
exit 0 exit $ksft_skip
fi fi
echo "CPU online/offline summary:" echo "CPU online/offline summary:"
...@@ -32,7 +34,7 @@ prerequisite() ...@@ -32,7 +34,7 @@ prerequisite()
if [[ "$online_cpus" = "$online_max" ]]; then if [[ "$online_cpus" = "$online_max" ]]; then
echo "$msg: since there is only one cpu: $online_cpus" echo "$msg: since there is only one cpu: $online_cpus"
exit 0 exit $ksft_skip
fi fi
echo -e "\t Cpus in online state: $online_cpus" echo -e "\t Cpus in online state: $online_cpus"
...@@ -237,12 +239,12 @@ prerequisite_extra() ...@@ -237,12 +239,12 @@ prerequisite_extra()
if [ ! -d "$DEBUGFS" ]; then if [ ! -d "$DEBUGFS" ]; then
echo $msg debugfs is not mounted >&2 echo $msg debugfs is not mounted >&2
exit 0 exit $ksft_skip
fi fi
if [ ! -d $NOTIFIER_ERR_INJECT_DIR ]; then if [ ! -d $NOTIFIER_ERR_INJECT_DIR ]; then
echo $msg cpu-notifier-error-inject module is not available >&2 echo $msg cpu-notifier-error-inject module is not available >&2
exit 0 exit $ksft_skip
fi fi
} }
......
...@@ -13,6 +13,9 @@ SYSFS= ...@@ -13,6 +13,9 @@ SYSFS=
CPUROOT= CPUROOT=
CPUFREQROOT= CPUFREQROOT=
# Kselftest framework requirement - SKIP code is 4.
ksft_skip=4
helpme() helpme()
{ {
printf "Usage: $0 [-h] [-todg args] printf "Usage: $0 [-h] [-todg args]
...@@ -38,7 +41,7 @@ prerequisite() ...@@ -38,7 +41,7 @@ prerequisite()
if [ $UID != 0 ]; then if [ $UID != 0 ]; then
echo $msg must be run as root >&2 echo $msg must be run as root >&2
exit 2 exit $ksft_skip
fi fi
taskset -p 01 $$ taskset -p 01 $$
......
...@@ -4,18 +4,21 @@ ...@@ -4,18 +4,21 @@
efivarfs_mount=/sys/firmware/efi/efivars efivarfs_mount=/sys/firmware/efi/efivars
test_guid=210be57c-9849-4fc7-a635-e6382d1aec27 test_guid=210be57c-9849-4fc7-a635-e6382d1aec27
# Kselftest framework requirement - SKIP code is 4.
ksft_skip=4
check_prereqs() check_prereqs()
{ {
local msg="skip all tests:" local msg="skip all tests:"
if [ $UID != 0 ]; then if [ $UID != 0 ]; then
echo $msg must be run as root >&2 echo $msg must be run as root >&2
exit 0 exit $ksft_skip
fi fi
if ! grep -q "^\S\+ $efivarfs_mount efivarfs" /proc/mounts; then if ! grep -q "^\S\+ $efivarfs_mount efivarfs" /proc/mounts; then
echo $msg efivarfs is not mounted on $efivarfs_mount >&2 echo $msg efivarfs is not mounted on $efivarfs_mount >&2
exit 0 exit $ksft_skip
fi fi
} }
......
...@@ -20,6 +20,8 @@ ...@@ -20,6 +20,8 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include "../kselftest.h"
static char longpath[2 * PATH_MAX] = ""; static char longpath[2 * PATH_MAX] = "";
static char *envp[] = { "IN_TEST=yes", NULL, NULL }; static char *envp[] = { "IN_TEST=yes", NULL, NULL };
static char *argv[] = { "execveat", "99", NULL }; static char *argv[] = { "execveat", "99", NULL };
...@@ -249,8 +251,8 @@ static int run_tests(void) ...@@ -249,8 +251,8 @@ static int run_tests(void)
errno = 0; errno = 0;
execveat_(-1, NULL, NULL, NULL, 0); execveat_(-1, NULL, NULL, NULL, 0);
if (errno == ENOSYS) { if (errno == ENOSYS) {
printf("[FAIL] ENOSYS calling execveat - no kernel support?\n"); ksft_exit_skip(
return 1; "ENOSYS calling execveat - no kernel support?\n");
} }
/* Change file position to confirm it doesn't affect anything */ /* Change file position to confirm it doesn't affect anything */
......
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
CFLAGS += -I../../../../usr/include/
TEST_GEN_PROGS := devpts_pts TEST_GEN_PROGS := devpts_pts
TEST_GEN_PROGS_EXTENDED := dnotify_test TEST_GEN_PROGS_EXTENDED := dnotify_test
......
...@@ -8,9 +8,10 @@ ...@@ -8,9 +8,10 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <sys/ioctl.h> #include <asm/ioctls.h>
#include <sys/mount.h> #include <sys/mount.h>
#include <sys/wait.h> #include <sys/wait.h>
#include "../kselftest.h"
static bool terminal_dup2(int duplicate, int original) static bool terminal_dup2(int duplicate, int original)
{ {
...@@ -125,10 +126,12 @@ static int do_tiocgptpeer(char *ptmx, char *expected_procfd_contents) ...@@ -125,10 +126,12 @@ static int do_tiocgptpeer(char *ptmx, char *expected_procfd_contents)
if (errno == EINVAL) { if (errno == EINVAL) {
fprintf(stderr, "TIOCGPTPEER is not supported. " fprintf(stderr, "TIOCGPTPEER is not supported. "
"Skipping test.\n"); "Skipping test.\n");
fret = EXIT_SUCCESS; fret = KSFT_SKIP;
} else {
fprintf(stderr,
"Failed to perform TIOCGPTPEER ioctl\n");
fret = EXIT_FAILURE;
} }
fprintf(stderr, "Failed to perform TIOCGPTPEER ioctl\n");
goto do_cleanup; goto do_cleanup;
} }
...@@ -279,9 +282,9 @@ int main(int argc, char *argv[]) ...@@ -279,9 +282,9 @@ int main(int argc, char *argv[])
int ret; int ret;
if (!isatty(STDIN_FILENO)) { if (!isatty(STDIN_FILENO)) {
fprintf(stderr, "Standard input file desciptor is not attached " fprintf(stderr, "Standard input file descriptor is not attached "
"to a terminal. Skipping test\n"); "to a terminal. Skipping test\n");
exit(EXIT_FAILURE); exit(KSFT_SKIP);
} }
ret = unshare(CLONE_NEWNS); ret = unshare(CLONE_NEWNS);
......
...@@ -74,7 +74,7 @@ load_fw_custom() ...@@ -74,7 +74,7 @@ load_fw_custom()
{ {
if [ ! -e "$DIR"/trigger_custom_fallback ]; then if [ ! -e "$DIR"/trigger_custom_fallback ]; then
echo "$0: custom fallback trigger not present, ignoring test" >&2 echo "$0: custom fallback trigger not present, ignoring test" >&2
return 1 exit $ksft_skip
fi fi
local name="$1" local name="$1"
...@@ -107,7 +107,7 @@ load_fw_custom_cancel() ...@@ -107,7 +107,7 @@ load_fw_custom_cancel()
{ {
if [ ! -e "$DIR"/trigger_custom_fallback ]; then if [ ! -e "$DIR"/trigger_custom_fallback ]; then
echo "$0: canceling custom fallback trigger not present, ignoring test" >&2 echo "$0: canceling custom fallback trigger not present, ignoring test" >&2
return 1 exit $ksft_skip
fi fi
local name="$1" local name="$1"
......
...@@ -30,6 +30,7 @@ fi ...@@ -30,6 +30,7 @@ fi
if [ ! -e "$DIR"/trigger_async_request ]; then if [ ! -e "$DIR"/trigger_async_request ]; then
echo "$0: empty filename: async trigger not present, ignoring test" >&2 echo "$0: empty filename: async trigger not present, ignoring test" >&2
exit $ksft_skip
else else
if printf '\000' >"$DIR"/trigger_async_request 2> /dev/null; then if printf '\000' >"$DIR"/trigger_async_request 2> /dev/null; then
echo "$0: empty filename should not succeed (async)" >&2 echo "$0: empty filename should not succeed (async)" >&2
...@@ -69,6 +70,7 @@ fi ...@@ -69,6 +70,7 @@ fi
# Try the asynchronous version too # Try the asynchronous version too
if [ ! -e "$DIR"/trigger_async_request ]; then if [ ! -e "$DIR"/trigger_async_request ]; then
echo "$0: firmware loading: async trigger not present, ignoring test" >&2 echo "$0: firmware loading: async trigger not present, ignoring test" >&2
exit $ksft_skip
else else
if ! echo -n "$NAME" >"$DIR"/trigger_async_request ; then if ! echo -n "$NAME" >"$DIR"/trigger_async_request ; then
echo "$0: could not trigger async request" >&2 echo "$0: could not trigger async request" >&2
...@@ -89,7 +91,7 @@ test_config_present() ...@@ -89,7 +91,7 @@ test_config_present()
{ {
if [ ! -f $DIR/reset ]; then if [ ! -f $DIR/reset ]; then
echo "Configuration triggers not present, ignoring test" echo "Configuration triggers not present, ignoring test"
exit 0 exit $ksft_skip
fi fi
} }
......
...@@ -9,11 +9,14 @@ DIR=/sys/devices/virtual/misc/test_firmware ...@@ -9,11 +9,14 @@ DIR=/sys/devices/virtual/misc/test_firmware
PROC_CONFIG="/proc/config.gz" PROC_CONFIG="/proc/config.gz"
TEST_DIR=$(dirname $0) TEST_DIR=$(dirname $0)
# Kselftest framework requirement - SKIP code is 4.
ksft_skip=4
print_reqs_exit() print_reqs_exit()
{ {
echo "You must have the following enabled in your kernel:" >&2 echo "You must have the following enabled in your kernel:" >&2
cat $TEST_DIR/config >&2 cat $TEST_DIR/config >&2
exit 1 exit $ksft_skip
} }
test_modprobe() test_modprobe()
...@@ -88,7 +91,7 @@ verify_reqs() ...@@ -88,7 +91,7 @@ verify_reqs()
if [ "$TEST_REQS_FW_SYSFS_FALLBACK" = "yes" ]; then if [ "$TEST_REQS_FW_SYSFS_FALLBACK" = "yes" ]; then
if [ ! "$HAS_FW_LOADER_USER_HELPER" = "yes" ]; then if [ ! "$HAS_FW_LOADER_USER_HELPER" = "yes" ]; then
echo "usermode helper disabled so ignoring test" echo "usermode helper disabled so ignoring test"
exit 0 exit $ksft_skip
fi fi
fi fi
} }
......
...@@ -17,14 +17,6 @@ all: ...@@ -17,14 +17,6 @@ all:
fi \ fi \
done done
override define RUN_TESTS
@export KSFT_TAP_LEVEL=`echo 1`;
@echo "TAP version 13";
@echo "selftests: futex";
@echo "========================================";
@cd $(OUTPUT); ./run.sh
endef
override define INSTALL_RULE override define INSTALL_RULE
mkdir -p $(INSTALL_PATH) mkdir -p $(INSTALL_PATH)
install -t $(INSTALL_PATH) $(TEST_PROGS) $(TEST_PROGS_EXTENDED) $(TEST_FILES) install -t $(INSTALL_PATH) $(TEST_PROGS) $(TEST_PROGS_EXTENDED) $(TEST_FILES)
...@@ -36,10 +28,6 @@ override define INSTALL_RULE ...@@ -36,10 +28,6 @@ override define INSTALL_RULE
done; done;
endef endef
override define EMIT_TESTS
echo "./run.sh"
endef
override define CLEAN override define CLEAN
@for DIR in $(SUBDIRS); do \ @for DIR in $(SUBDIRS); do \
BUILD_TARGET=$(OUTPUT)/$$DIR; \ BUILD_TARGET=$(OUTPUT)/$$DIR; \
......
...@@ -2,10 +2,11 @@ ...@@ -2,10 +2,11 @@
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
#exit status #exit status
#1: run as non-root user #1: Internal error
#2: sysfs/debugfs not mount #2: sysfs/debugfs not mount
#3: insert module fail when gpio-mockup is a module. #3: insert module fail when gpio-mockup is a module.
#4: other reason. #4: Skip test including run as non-root user.
#5: other reason.
SYSFS= SYSFS=
GPIO_SYSFS= GPIO_SYSFS=
...@@ -15,6 +16,9 @@ GPIO_DEBUGFS= ...@@ -15,6 +16,9 @@ GPIO_DEBUGFS=
dev_type= dev_type=
module= module=
# Kselftest framework requirement - SKIP code is 4.
ksft_skip=4
usage() usage()
{ {
echo "Usage:" echo "Usage:"
...@@ -34,7 +38,7 @@ prerequisite() ...@@ -34,7 +38,7 @@ prerequisite()
msg="skip all tests:" msg="skip all tests:"
if [ $UID != 0 ]; then if [ $UID != 0 ]; then
echo $msg must be run as root >&2 echo $msg must be run as root >&2
exit 1 exit $ksft_skip
fi fi
SYSFS=`mount -t sysfs | head -1 | awk '{ print $3 }'` SYSFS=`mount -t sysfs | head -1 | awk '{ print $3 }'`
if [ ! -d "$SYSFS" ]; then if [ ! -d "$SYSFS" ]; then
...@@ -73,7 +77,7 @@ remove_module() ...@@ -73,7 +77,7 @@ remove_module()
die() die()
{ {
remove_module remove_module
exit 4 exit 5
} }
test_chips() test_chips()
......
...@@ -9,6 +9,8 @@ ...@@ -9,6 +9,8 @@
#include <sys/timeb.h> #include <sys/timeb.h>
#include <sched.h> #include <sched.h>
#include <errno.h> #include <errno.h>
#include <string.h>
#include "../kselftest.h"
void usage(char *name) { void usage(char *name) {
printf ("Usage: %s cpunum\n", name); printf ("Usage: %s cpunum\n", name);
...@@ -41,8 +43,8 @@ int main(int argc, char **argv) { ...@@ -41,8 +43,8 @@ int main(int argc, char **argv) {
fd = open(msr_file_name, O_RDONLY); fd = open(msr_file_name, O_RDONLY);
if (fd == -1) { if (fd == -1) {
perror("Failed to open"); printf("/dev/cpu/%d/msr: %s\n", cpu, strerror(errno));
return 1; return KSFT_SKIP;
} }
CPU_ZERO(&cpuset); CPU_ZERO(&cpuset);
......
...@@ -30,9 +30,18 @@ ...@@ -30,9 +30,18 @@
EVALUATE_ONLY=0 EVALUATE_ONLY=0
# Kselftest framework requirement - SKIP code is 4.
ksft_skip=4
if ! uname -m | sed -e s/i.86/x86/ -e s/x86_64/x86/ | grep -q x86; then if ! uname -m | sed -e s/i.86/x86/ -e s/x86_64/x86/ | grep -q x86; then
echo "$0 # Skipped: Test can only run on x86 architectures." echo "$0 # Skipped: Test can only run on x86 architectures."
exit 0 exit $ksft_skip
fi
msg="skip all tests:"
if [ $UID != 0 ] && [ $EVALUATE_ONLY == 0 ]; then
echo $msg please run this as root >&2
exit $ksft_skip
fi fi
max_cpus=$(($(nproc)-1)) max_cpus=$(($(nproc)-1))
...@@ -48,11 +57,12 @@ function run_test () { ...@@ -48,11 +57,12 @@ function run_test () {
echo "sleeping for 5 seconds" echo "sleeping for 5 seconds"
sleep 5 sleep 5
num_freqs=$(cat /proc/cpuinfo | grep MHz | sort -u | wc -l) grep MHz /proc/cpuinfo | sort -u > /tmp/result.freqs
if [ $num_freqs -le 2 ]; then num_freqs=$(wc -l /tmp/result.freqs | awk ' { print $1 } ')
cat /proc/cpuinfo | grep MHz | sort -u | tail -1 > /tmp/result.$1 if [ $num_freqs -ge 2 ]; then
tail -n 1 /tmp/result.freqs > /tmp/result.$1
else else
cat /proc/cpuinfo | grep MHz | sort -u > /tmp/result.$1 cp /tmp/result.freqs /tmp/result.$1
fi fi
./msr 0 >> /tmp/result.$1 ./msr 0 >> /tmp/result.$1
...@@ -82,32 +92,37 @@ _max_freq=$(cpupower frequency-info -l | tail -1 | awk ' { print $2 } ') ...@@ -82,32 +92,37 @@ _max_freq=$(cpupower frequency-info -l | tail -1 | awk ' { print $2 } ')
max_freq=$(($_max_freq / 1000)) max_freq=$(($_max_freq / 1000))
for freq in `seq $max_freq -100 $min_freq` [ $EVALUATE_ONLY -eq 0 ] && for freq in `seq $max_freq -100 $min_freq`
do do
echo "Setting maximum frequency to $freq" echo "Setting maximum frequency to $freq"
cpupower frequency-set -g powersave --max=${freq}MHz >& /dev/null cpupower frequency-set -g powersave --max=${freq}MHz >& /dev/null
[ $EVALUATE_ONLY -eq 0 ] && run_test $freq run_test $freq
done done
echo "==============================================================================" [ $EVALUATE_ONLY -eq 0 ] && cpupower frequency-set -g powersave --max=${max_freq}MHz >& /dev/null
echo "========================================================================"
echo "The marketing frequency of the cpu is $mkt_freq MHz" echo "The marketing frequency of the cpu is $mkt_freq MHz"
echo "The maximum frequency of the cpu is $max_freq MHz" echo "The maximum frequency of the cpu is $max_freq MHz"
echo "The minimum frequency of the cpu is $min_freq MHz" echo "The minimum frequency of the cpu is $min_freq MHz"
cpupower frequency-set -g powersave --max=${max_freq}MHz >& /dev/null
# make a pretty table # make a pretty table
echo "Target Actual Difference MSR(0x199) max_perf_pct" echo "Target Actual Difference MSR(0x199) max_perf_pct" | tr " " "\n" > /tmp/result.tab
for freq in `seq $max_freq -100 $min_freq` for freq in `seq $max_freq -100 $min_freq`
do do
result_freq=$(cat /tmp/result.${freq} | grep "cpu MHz" | awk ' { print $4 } ' | awk -F "." ' { print $1 } ') result_freq=$(cat /tmp/result.${freq} | grep "cpu MHz" | awk ' { print $4 } ' | awk -F "." ' { print $1 } ')
msr=$(cat /tmp/result.${freq} | grep "msr" | awk ' { print $3 } ') msr=$(cat /tmp/result.${freq} | grep "msr" | awk ' { print $3 } ')
max_perf_pct=$(cat /tmp/result.${freq} | grep "max_perf_pct" | awk ' { print $2 } ' ) max_perf_pct=$(cat /tmp/result.${freq} | grep "max_perf_pct" | awk ' { print $2 } ' )
if [ $result_freq -eq $freq ]; then cat >> /tmp/result.tab << EOF
echo " $freq $result_freq 0 $msr $(($max_perf_pct*3300))" $freq
else $result_freq
echo " $freq $result_freq $(($result_freq-$freq)) $msr $(($max_perf_pct*$max_freq))" $((result_freq - freq))
fi $msr
$((max_perf_pct * max_freq))
EOF
done done
# print the table
pr -aTt -5 < /tmp/result.tab
exit 0 exit 0
...@@ -196,10 +196,9 @@ int main(int argc, char **argv) ...@@ -196,10 +196,9 @@ int main(int argc, char **argv)
int msg, pid, err; int msg, pid, err;
struct msgque_data msgque; struct msgque_data msgque;
if (getuid() != 0) { if (getuid() != 0)
printf("Please run the test as root - Exiting.\n"); return ksft_exit_skip(
return ksft_exit_fail(); "Please run the test as root - Exiting.\n");
}
msgque.key = ftok(argv[0], 822155650); msgque.key = ftok(argv[0], 822155650);
if (msgque.key == -1) { if (msgque.key == -1) {
......
...@@ -62,13 +62,16 @@ ALL_TESTS="$ALL_TESTS 0007:5:1" ...@@ -62,13 +62,16 @@ ALL_TESTS="$ALL_TESTS 0007:5:1"
ALL_TESTS="$ALL_TESTS 0008:150:1" ALL_TESTS="$ALL_TESTS 0008:150:1"
ALL_TESTS="$ALL_TESTS 0009:150:1" ALL_TESTS="$ALL_TESTS 0009:150:1"
# Kselftest framework requirement - SKIP code is 4.
ksft_skip=4
test_modprobe() test_modprobe()
{ {
if [ ! -d $DIR ]; then if [ ! -d $DIR ]; then
echo "$0: $DIR not present" >&2 echo "$0: $DIR not present" >&2
echo "You must have the following enabled in your kernel:" >&2 echo "You must have the following enabled in your kernel:" >&2
cat $TEST_DIR/config >&2 cat $TEST_DIR/config >&2
exit 1 exit $ksft_skip
fi fi
} }
...@@ -105,12 +108,12 @@ test_reqs() ...@@ -105,12 +108,12 @@ test_reqs()
{ {
if ! which modprobe 2> /dev/null > /dev/null; then if ! which modprobe 2> /dev/null > /dev/null; then
echo "$0: You need modprobe installed" >&2 echo "$0: You need modprobe installed" >&2
exit 1 exit $ksft_skip
fi fi
if ! which kmod 2> /dev/null > /dev/null; then if ! which kmod 2> /dev/null > /dev/null; then
echo "$0: You need kmod installed" >&2 echo "$0: You need kmod installed" >&2
exit 1 exit $ksft_skip
fi fi
# kmod 19 has a bad bug where it returns 0 when modprobe # kmod 19 has a bad bug where it returns 0 when modprobe
...@@ -124,13 +127,13 @@ test_reqs() ...@@ -124,13 +127,13 @@ test_reqs()
echo "$0: You need at least kmod 20" >&2 echo "$0: You need at least kmod 20" >&2
echo "kmod <= 19 is buggy, for details see:" >&2 echo "kmod <= 19 is buggy, for details see:" >&2
echo "http://git.kernel.org/cgit/utils/kernel/kmod/kmod.git/commit/libkmod/libkmod-module.c?id=fd44a98ae2eb5eb32161088954ab21e58e19dfc4" >&2 echo "http://git.kernel.org/cgit/utils/kernel/kmod/kmod.git/commit/libkmod/libkmod-module.c?id=fd44a98ae2eb5eb32161088954ab21e58e19dfc4" >&2
exit 1 exit $ksft_skip
fi fi
uid=$(id -u) uid=$(id -u)
if [ $uid -ne 0 ]; then if [ $uid -ne 0 ]; then
echo $msg must be run as root >&2 echo $msg must be run as root >&2
exit 0 exit $ksft_skip
fi fi
} }
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#define KSFT_XFAIL 2 #define KSFT_XFAIL 2
#define KSFT_XPASS 3 #define KSFT_XPASS 3
/* Treat skip as pass */ /* Treat skip as pass */
#define KSFT_SKIP KSFT_PASS #define KSFT_SKIP 4
/* counters */ /* counters */
struct ksft_count { struct ksft_count {
......
set_sregs_test
sync_regs_test
vmx_tsc_adjust_test
...@@ -13,6 +13,8 @@ ...@@ -13,6 +13,8 @@
#include <execinfo.h> #include <execinfo.h>
#include <sys/syscall.h> #include <sys/syscall.h>
#include "../../kselftest.h"
/* Dumps the current stack trace to stderr. */ /* Dumps the current stack trace to stderr. */
static void __attribute__((noinline)) test_dump_stack(void); static void __attribute__((noinline)) test_dump_stack(void);
static void test_dump_stack(void) static void test_dump_stack(void)
...@@ -70,8 +72,9 @@ test_assert(bool exp, const char *exp_str, ...@@ -70,8 +72,9 @@ test_assert(bool exp, const char *exp_str,
fprintf(stderr, "==== Test Assertion Failure ====\n" fprintf(stderr, "==== Test Assertion Failure ====\n"
" %s:%u: %s\n" " %s:%u: %s\n"
" pid=%d tid=%d\n", " pid=%d tid=%d - %s\n",
file, line, exp_str, getpid(), gettid()); file, line, exp_str, getpid(), gettid(),
strerror(errno));
test_dump_stack(); test_dump_stack();
if (fmt) { if (fmt) {
fputs(" ", stderr); fputs(" ", stderr);
...@@ -80,6 +83,8 @@ test_assert(bool exp, const char *exp_str, ...@@ -80,6 +83,8 @@ test_assert(bool exp, const char *exp_str,
} }
va_end(ap); va_end(ap);
if (errno == EACCES)
ksft_exit_skip("Access denied - Exiting.\n");
exit(254); exit(254);
} }
......
...@@ -28,6 +28,8 @@ ...@@ -28,6 +28,8 @@
#include <string.h> #include <string.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include "../kselftest.h"
#ifndef MSR_IA32_TSC_ADJUST #ifndef MSR_IA32_TSC_ADJUST
#define MSR_IA32_TSC_ADJUST 0x3b #define MSR_IA32_TSC_ADJUST 0x3b
#endif #endif
......
...@@ -19,25 +19,43 @@ TEST_GEN_FILES := $(patsubst %,$(OUTPUT)/%,$(TEST_GEN_FILES)) ...@@ -19,25 +19,43 @@ TEST_GEN_FILES := $(patsubst %,$(OUTPUT)/%,$(TEST_GEN_FILES))
all: $(TEST_GEN_PROGS) $(TEST_GEN_PROGS_EXTENDED) $(TEST_GEN_FILES) all: $(TEST_GEN_PROGS) $(TEST_GEN_PROGS_EXTENDED) $(TEST_GEN_FILES)
.ONESHELL: .ONESHELL:
define RUN_TEST_PRINT_RESULT
TEST_HDR_MSG="selftests: "`basename $$PWD`:" $$BASENAME_TEST"; \
echo $$TEST_HDR_MSG; \
echo "========================================"; \
if [ ! -x $$TEST ]; then \
echo "$$TEST_HDR_MSG: Warning: file $$BASENAME_TEST is not executable, correct this.";\
echo "not ok 1..$$test_num $$TEST_HDR_MSG [FAIL]"; \
else \
cd `dirname $$TEST` > /dev/null; \
if [ "X$(summary)" != "X" ]; then \
(./$$BASENAME_TEST > /tmp/$$BASENAME_TEST 2>&1 && \
echo "ok 1..$$test_num $$TEST_HDR_MSG [PASS]") || \
(if [ $$? -eq $$skip ]; then \
echo "not ok 1..$$test_num $$TEST_HDR_MSG [SKIP]"; \
else echo "not ok 1..$$test_num $$TEST_HDR_MSG [FAIL]"; \
fi;) \
else \
(./$$BASENAME_TEST && \
echo "ok 1..$$test_num $$TEST_HDR_MSG [PASS]") || \
(if [ $$? -eq $$skip ]; then \
echo "not ok 1..$$test_num $$TEST_HDR_MSG [SKIP]"; \
else echo "not ok 1..$$test_num $$TEST_HDR_MSG [FAIL]"; \
fi;) \
fi; \
cd - > /dev/null; \
fi;
endef
define RUN_TESTS define RUN_TESTS
@export KSFT_TAP_LEVEL=`echo 1`; \ @export KSFT_TAP_LEVEL=`echo 1`; \
test_num=`echo 0`; \ test_num=`echo 0`; \
skip=`echo 4`; \
echo "TAP version 13"; \ echo "TAP version 13"; \
for TEST in $(1); do \ for TEST in $(1); do \
BASENAME_TEST=`basename $$TEST`; \ BASENAME_TEST=`basename $$TEST`; \
test_num=`echo $$test_num+1 | bc`; \ test_num=`echo $$test_num+1 | bc`; \
echo "selftests: $$BASENAME_TEST"; \ $(call RUN_TEST_PRINT_RESULT,$(TEST),$(BASENAME_TEST),$(test_num),$(skip)) \
echo "========================================"; \
if [ ! -x $$TEST ]; then \
echo "selftests: Warning: file $$BASENAME_TEST is not executable, correct this.";\
echo "not ok 1..$$test_num selftests: $$BASENAME_TEST [FAIL]"; \
else \
if [ "X$(summary)" != "X" ]; then \
cd `dirname $$TEST` > /dev/null; (./$$BASENAME_TEST > /tmp/$$BASENAME_TEST 2>&1 && echo "ok 1..$$test_num selftests: $$BASENAME_TEST [PASS]") || echo "not ok 1..$$test_num selftests: $$BASENAME_TEST [FAIL]"; cd - > /dev/null;\
else \
cd `dirname $$TEST` > /dev/null; (./$$BASENAME_TEST && echo "ok 1..$$test_num selftests: $$BASENAME_TEST [PASS]") || echo "not ok 1..$$test_num selftests: $$BASENAME_TEST [FAIL]"; cd - > /dev/null;\
fi; \
fi; \
done; done;
endef endef
...@@ -76,9 +94,18 @@ else ...@@ -76,9 +94,18 @@ else
endif endif
define EMIT_TESTS define EMIT_TESTS
@for TEST in $(TEST_GEN_PROGS) $(TEST_CUSTOM_PROGS) $(TEST_PROGS); do \ @test_num=`echo 0`; \
for TEST in $(TEST_GEN_PROGS) $(TEST_CUSTOM_PROGS) $(TEST_PROGS); do \
BASENAME_TEST=`basename $$TEST`; \ BASENAME_TEST=`basename $$TEST`; \
echo "(./$$BASENAME_TEST >> \$$OUTPUT 2>&1 && echo \"selftests: $$BASENAME_TEST [PASS]\") || echo \"selftests: $$BASENAME_TEST [FAIL]\""; \ test_num=`echo $$test_num+1 | bc`; \
TEST_HDR_MSG="selftests: "`basename $$PWD`:" $$BASENAME_TEST"; \
echo "echo $$TEST_HDR_MSG"; \
if [ ! -x $$TEST ]; then \
echo "echo \"$$TEST_HDR_MSG: Warning: file $$BASENAME_TEST is not executable, correct this.\""; \
echo "echo \"not ok 1..$$test_num $$TEST_HDR_MSG [FAIL]\""; \
else
echo "(./$$BASENAME_TEST >> \$$OUTPUT 2>&1 && echo \"ok 1..$$test_num $$TEST_HDR_MSG [PASS]\") || (if [ \$$? -eq \$$skip ]; then echo \"not ok 1..$$test_num $$TEST_HDR_MSG [SKIP]\"; else echo \"not ok 1..$$test_num $$TEST_HDR_MSG [FAIL]\"; fi;)"; \
fi; \
done; done;
endef endef
......
...@@ -3,6 +3,6 @@ ...@@ -3,6 +3,6 @@
# No binaries, but make sure arg-less "make" doesn't trigger "run_tests" # No binaries, but make sure arg-less "make" doesn't trigger "run_tests"
all: all:
TEST_PROGS := printf.sh bitmap.sh TEST_PROGS := printf.sh bitmap.sh prime_numbers.sh
include ../lib.mk include ../lib.mk
#!/bin/sh #!/bin/sh
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
# Kselftest framework requirement - SKIP code is 4.
ksft_skip=4
# Runs bitmap infrastructure tests using test_bitmap kernel module # Runs bitmap infrastructure tests using test_bitmap kernel module
if ! /sbin/modprobe -q -n test_bitmap; then if ! /sbin/modprobe -q -n test_bitmap; then
echo "bitmap: [SKIP]" echo "bitmap: module test_bitmap is not found [SKIP]"
exit 77 exit $ksft_skip
fi fi
if /sbin/modprobe -q test_bitmap; then if /sbin/modprobe -q test_bitmap; then
......
...@@ -2,9 +2,12 @@ ...@@ -2,9 +2,12 @@
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
# Checks fast/slow prime_number generation for inconsistencies # Checks fast/slow prime_number generation for inconsistencies
if ! /sbin/modprobe -q -r prime_numbers; then # Kselftest framework requirement - SKIP code is 4.
echo "prime_numbers: [SKIP]" ksft_skip=4
exit 77
if ! /sbin/modprobe -q -n prime_numbers; then
echo "prime_numbers: module prime_numbers is not found [SKIP]"
exit $ksft_skip
fi fi
if /sbin/modprobe -q prime_numbers selftest=65536; then if /sbin/modprobe -q prime_numbers selftest=65536; then
......
#!/bin/sh #!/bin/sh
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
# Runs printf infrastructure using test_printf kernel module # Runs printf infrastructure using test_printf kernel module
# Kselftest framework requirement - SKIP code is 4.
ksft_skip=4
if ! /sbin/modprobe -q -n test_printf; then if ! /sbin/modprobe -q -n test_printf; then
echo "printf: [SKIP]" echo "printf: module test_printf is not found [SKIP]"
exit 77 exit $ksft_skip
fi fi
if /sbin/modprobe -q test_printf; then if /sbin/modprobe -q test_printf; then
......
# SPDX-License-Identifier: GPL-2.0
#
# Makefile for locking/ww_mutx selftests
# No binaries, but make sure arg-less "make" doesn't trigger "run_tests"
all:
TEST_PROGS := ww_mutex.sh
include ../lib.mk
#!/bin/sh #!/bin/sh
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
# Kselftest framework requirement - SKIP code is 4.
ksft_skip=4
# Runs API tests for struct ww_mutex (Wait/Wound mutexes) # Runs API tests for struct ww_mutex (Wait/Wound mutexes)
if ! /sbin/modprobe -q -n test-ww_mutex; then
echo "ww_mutex: module test-ww_mutex is not found [SKIP]"
exit $ksft_skip
fi
if /sbin/modprobe -q test-ww_mutex; then if /sbin/modprobe -q test-ww_mutex; then
/sbin/modprobe -q -r test-ww_mutex /sbin/modprobe -q -r test-ww_mutex
......
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
#
CFLAGS += -I../ -I../../../../usr/include/
TEST_GEN_PROGS := media_device_test media_device_open video_device_test TEST_GEN_PROGS := media_device_test media_device_open video_device_test
all: $(TEST_GEN_PROGS)
include ../lib.mk include ../lib.mk
...@@ -34,6 +34,8 @@ ...@@ -34,6 +34,8 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <linux/media.h> #include <linux/media.h>
#include "../kselftest.h"
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
int opt; int opt;
...@@ -61,10 +63,8 @@ int main(int argc, char **argv) ...@@ -61,10 +63,8 @@ int main(int argc, char **argv)
} }
} }
if (getuid() != 0) { if (getuid() != 0)
printf("Please run the test as root - Exiting.\n"); ksft_exit_skip("Please run the test as root - Exiting.\n");
exit(-1);
}
/* Open Media device and keep it open */ /* Open Media device and keep it open */
fd = open(media_device, O_RDWR); fd = open(media_device, O_RDWR);
......
...@@ -39,6 +39,8 @@ ...@@ -39,6 +39,8 @@
#include <time.h> #include <time.h>
#include <linux/media.h> #include <linux/media.h>
#include "../kselftest.h"
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
int opt; int opt;
...@@ -66,10 +68,8 @@ int main(int argc, char **argv) ...@@ -66,10 +68,8 @@ int main(int argc, char **argv)
} }
} }
if (getuid() != 0) { if (getuid() != 0)
printf("Please run the test as root - Exiting.\n"); ksft_exit_skip("Please run the test as root - Exiting.\n");
exit(-1);
}
/* Generate random number of interations */ /* Generate random number of interations */
srand((unsigned int) time(NULL)); srand((unsigned int) time(NULL));
...@@ -88,7 +88,7 @@ int main(int argc, char **argv) ...@@ -88,7 +88,7 @@ int main(int argc, char **argv)
"other Oops in the dmesg. Enable KaSan kernel\n" "other Oops in the dmesg. Enable KaSan kernel\n"
"config option for use-after-free error detection.\n\n"); "config option for use-after-free error detection.\n\n");
printf("Running test for %d iternations\n", count); printf("Running test for %d iterations\n", count);
while (count > 0) { while (count > 0) {
ret = ioctl(fd, MEDIA_IOC_DEVICE_INFO, &mdi); ret = ioctl(fd, MEDIA_IOC_DEVICE_INFO, &mdi);
......
...@@ -293,10 +293,9 @@ static int test_membarrier_query(void) ...@@ -293,10 +293,9 @@ static int test_membarrier_query(void)
} }
ksft_exit_fail_msg("sys_membarrier() failed\n"); ksft_exit_fail_msg("sys_membarrier() failed\n");
} }
if (!(ret & MEMBARRIER_CMD_GLOBAL)) { if (!(ret & MEMBARRIER_CMD_GLOBAL))
ksft_test_result_fail("sys_membarrier() CMD_GLOBAL query failed\n"); ksft_exit_skip(
ksft_exit_fail_msg("sys_membarrier is not supported.\n"); "sys_membarrier unsupported: CMD_GLOBAL not found.\n");
}
ksft_test_result_pass("sys_membarrier available\n"); ksft_test_result_pass("sys_membarrier available\n");
return 0; return 0;
......
...@@ -4,9 +4,9 @@ CFLAGS += -I../../../../include/uapi/ ...@@ -4,9 +4,9 @@ CFLAGS += -I../../../../include/uapi/
CFLAGS += -I../../../../include/ CFLAGS += -I../../../../include/
CFLAGS += -I../../../../usr/include/ CFLAGS += -I../../../../usr/include/
TEST_PROGS := run_tests.sh TEST_GEN_PROGS := memfd_test
TEST_FILES := run_fuse_test.sh TEST_PROGS := run_fuse_test.sh run_hugetlbfs_test.sh
TEST_GEN_FILES := memfd_test fuse_mnt fuse_test TEST_GEN_FILES := fuse_mnt fuse_test
fuse_mnt.o: CFLAGS += $(shell pkg-config fuse --cflags) fuse_mnt.o: CFLAGS += $(shell pkg-config fuse --cflags)
......
#!/bin/bash #!/bin/bash
# please run as root # please run as root
# # Kselftest framework requirement - SKIP code is 4.
# Normal tests requiring no special resources ksft_skip=4
#
./run_fuse_test.sh
./memfd_test
# #
# To test memfd_create with hugetlbfs, there needs to be hpages_test # To test memfd_create with hugetlbfs, there needs to be hpages_test
...@@ -29,12 +26,13 @@ if [ -n "$freepgs" ] && [ $freepgs -lt $hpages_test ]; then ...@@ -29,12 +26,13 @@ if [ -n "$freepgs" ] && [ $freepgs -lt $hpages_test ]; then
nr_hugepgs=`cat /proc/sys/vm/nr_hugepages` nr_hugepgs=`cat /proc/sys/vm/nr_hugepages`
hpages_needed=`expr $hpages_test - $freepgs` hpages_needed=`expr $hpages_test - $freepgs`
if [ $UID != 0 ]; then
echo "Please run memfd with hugetlbfs test as root"
exit $ksft_skip
fi
echo 3 > /proc/sys/vm/drop_caches echo 3 > /proc/sys/vm/drop_caches
echo $(( $hpages_needed + $nr_hugepgs )) > /proc/sys/vm/nr_hugepages echo $(( $hpages_needed + $nr_hugepgs )) > /proc/sys/vm/nr_hugepages
if [ $? -ne 0 ]; then
echo "Please run this test as root"
exit 1
fi
while read name size unit; do while read name size unit; do
if [ "$name" = "HugePages_Free:" ]; then if [ "$name" = "HugePages_Free:" ]; then
freepgs=$size freepgs=$size
...@@ -53,7 +51,7 @@ if [ $freepgs -lt $hpages_test ]; then ...@@ -53,7 +51,7 @@ if [ $freepgs -lt $hpages_test ]; then
fi fi
printf "Not enough huge pages available (%d < %d)\n" \ printf "Not enough huge pages available (%d < %d)\n" \
$freepgs $needpgs $freepgs $needpgs
exit 1 exit $ksft_skip
fi fi
# #
......
...@@ -4,11 +4,8 @@ all: ...@@ -4,11 +4,8 @@ all:
include ../lib.mk include ../lib.mk
TEST_PROGS := mem-on-off-test.sh TEST_PROGS := mem-on-off-test.sh
override RUN_TESTS := @./mem-on-off-test.sh -r 2 && echo "selftests: memory-hotplug [PASS]" || echo "selftests: memory-hotplug [FAIL]"
override EMIT_TESTS := echo "$(subst @,,$(RUN_TESTS))"
run_full_test: run_full_test:
@/bin/bash ./mem-on-off-test.sh && echo "memory-hotplug selftests: [PASS]" || echo "memory-hotplug selftests: [FAIL]" @/bin/bash ./mem-on-off-test.sh -r 10 && echo "memory-hotplug selftests: [PASS]" || echo "memory-hotplug selftests: [FAIL]"
clean: clean:
...@@ -3,30 +3,33 @@ ...@@ -3,30 +3,33 @@
SYSFS= SYSFS=
# Kselftest framework requirement - SKIP code is 4.
ksft_skip=4
prerequisite() prerequisite()
{ {
msg="skip all tests:" msg="skip all tests:"
if [ $UID != 0 ]; then if [ $UID != 0 ]; then
echo $msg must be run as root >&2 echo $msg must be run as root >&2
exit 0 exit $ksft_skip
fi fi
SYSFS=`mount -t sysfs | head -1 | awk '{ print $3 }'` SYSFS=`mount -t sysfs | head -1 | awk '{ print $3 }'`
if [ ! -d "$SYSFS" ]; then if [ ! -d "$SYSFS" ]; then
echo $msg sysfs is not mounted >&2 echo $msg sysfs is not mounted >&2
exit 0 exit $ksft_skip
fi fi
if ! ls $SYSFS/devices/system/memory/memory* > /dev/null 2>&1; then if ! ls $SYSFS/devices/system/memory/memory* > /dev/null 2>&1; then
echo $msg memory hotplug is not supported >&2 echo $msg memory hotplug is not supported >&2
exit 0 exit $ksft_skip
fi fi
if ! grep -q 1 $SYSFS/devices/system/memory/memory*/removable; then if ! grep -q 1 $SYSFS/devices/system/memory/memory*/removable; then
echo $msg no hot-pluggable memory >&2 echo $msg no hot-pluggable memory >&2
exit 0 exit $ksft_skip
fi fi
} }
...@@ -133,7 +136,8 @@ offline_memory_expect_fail() ...@@ -133,7 +136,8 @@ offline_memory_expect_fail()
error=-12 error=-12
priority=0 priority=0
ratio=10 # Run with default of ratio=2 for Kselftest run
ratio=2
retval=0 retval=0
while getopts e:hp:r: opt; do while getopts e:hp:r: opt; do
......
...@@ -3,15 +3,7 @@ ...@@ -3,15 +3,7 @@
CFLAGS = -Wall \ CFLAGS = -Wall \
-O2 -O2
TEST_GEN_PROGS := unprivileged-remount-test TEST_PROGS := run_tests.sh
TEST_GEN_FILES := unprivileged-remount-test
include ../lib.mk include ../lib.mk
override RUN_TESTS := if [ -f /proc/self/uid_map ] ; \
then \
./unprivileged-remount-test ; \
else \
echo "WARN: No /proc/self/uid_map exist, test skipped." ; \
fi
override EMIT_TESTS := echo "$(RUN_TESTS)"
#!/bin/bash
# SPDX-License-Identifier: GPL-2.0
# Kselftest framework requirement - SKIP code is 4.
ksft_skip=4
# Run mount selftests
if [ -f /proc/self/uid_map ] ; then
./unprivileged-remount-test ;
else
echo "WARN: No /proc/self/uid_map exist, test skipped." ;
exit $ksft_skip
fi
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
CFLAGS += -O2 CFLAGS += -O2
LDLIBS = -lrt -lpthread -lpopt LDLIBS = -lrt -lpthread -lpopt
TEST_GEN_PROGS := mq_open_tests mq_perf_tests TEST_GEN_PROGS := mq_open_tests mq_perf_tests
include ../lib.mk include ../lib.mk
override define RUN_TESTS
@$(OUTPUT)/mq_open_tests /test1 || echo "selftests: mq_open_tests [FAIL]"
@$(OUTPUT)/mq_perf_tests || echo "selftests: mq_perf_tests [FAIL]"
endef
override define EMIT_TESTS
echo "./mq_open_tests /test1 || echo \"selftests: mq_open_tests [FAIL]\""
echo "./mq_perf_tests || echo \"selftests: mq_perf_tests [FAIL]\""
endef
...@@ -33,6 +33,8 @@ ...@@ -33,6 +33,8 @@
#include <mqueue.h> #include <mqueue.h>
#include <error.h> #include <error.h>
#include "../kselftest.h"
static char *usage = static char *usage =
"Usage:\n" "Usage:\n"
" %s path\n" " %s path\n"
...@@ -53,6 +55,7 @@ int saved_def_msgs, saved_def_msgsize, saved_max_msgs, saved_max_msgsize; ...@@ -53,6 +55,7 @@ int saved_def_msgs, saved_def_msgsize, saved_max_msgs, saved_max_msgsize;
int cur_def_msgs, cur_def_msgsize, cur_max_msgs, cur_max_msgsize; int cur_def_msgs, cur_def_msgsize, cur_max_msgs, cur_max_msgsize;
FILE *def_msgs, *def_msgsize, *max_msgs, *max_msgsize; FILE *def_msgs, *def_msgsize, *max_msgs, *max_msgsize;
char *queue_path; char *queue_path;
char *default_queue_path = "/test1";
mqd_t queue = -1; mqd_t queue = -1;
static inline void __set(FILE *stream, int value, char *err_msg); static inline void __set(FILE *stream, int value, char *err_msg);
...@@ -238,10 +241,9 @@ int main(int argc, char *argv[]) ...@@ -238,10 +241,9 @@ int main(int argc, char *argv[])
struct mq_attr attr, result; struct mq_attr attr, result;
if (argc != 2) { if (argc != 2) {
fprintf(stderr, "Must pass a valid queue name\n\n"); printf("Using Default queue path - %s\n", default_queue_path);
fprintf(stderr, usage, argv[0]); queue_path = default_queue_path;
exit(1); } else {
}
/* /*
* Although we can create a msg queue with a non-absolute path name, * Although we can create a msg queue with a non-absolute path name,
...@@ -260,13 +262,12 @@ int main(int argc, char *argv[]) ...@@ -260,13 +262,12 @@ int main(int argc, char *argv[])
queue_path[1] = 0; queue_path[1] = 0;
strcat(queue_path, argv[1]); strcat(queue_path, argv[1]);
} }
}
if (getuid() != 0) { if (getuid() != 0)
fprintf(stderr, "Not running as root, but almost all tests " ksft_exit_skip("Not running as root, but almost all tests "
"require root in order to modify\nsystem settings. " "require root in order to modify\nsystem settings. "
"Exiting.\n"); "Exiting.\n");
exit(1);
}
/* Find out what files there are for us to make tweaks in */ /* Find out what files there are for us to make tweaks in */
def_msgs = fopen(DEF_MSGS, "r+"); def_msgs = fopen(DEF_MSGS, "r+");
......
...@@ -39,6 +39,8 @@ ...@@ -39,6 +39,8 @@
#include <popt.h> #include <popt.h>
#include <error.h> #include <error.h>
#include "../kselftest.h"
static char *usage = static char *usage =
"Usage:\n" "Usage:\n"
" %s [-c #[,#..] -f] path\n" " %s [-c #[,#..] -f] path\n"
...@@ -626,12 +628,10 @@ int main(int argc, char *argv[]) ...@@ -626,12 +628,10 @@ int main(int argc, char *argv[])
cpus_to_pin[0] = cpus_online - 1; cpus_to_pin[0] = cpus_online - 1;
} }
if (getuid() != 0) { if (getuid() != 0)
fprintf(stderr, "Not running as root, but almost all tests " ksft_exit_skip("Not running as root, but almost all tests "
"require root in order to modify\nsystem settings. " "require root in order to modify\nsystem settings. "
"Exiting.\n"); "Exiting.\n");
exit(1);
}
max_msgs = fopen(MAX_MSGS, "r+"); max_msgs = fopen(MAX_MSGS, "r+");
max_msgsize = fopen(MAX_MSGSIZE, "r+"); max_msgsize = fopen(MAX_MSGSIZE, "r+");
......
...@@ -5,6 +5,8 @@ ...@@ -5,6 +5,8 @@
# different events. # different events.
ret=0 ret=0
# Kselftest framework requirement - SKIP code is 4.
ksft_skip=4
VERBOSE=${VERBOSE:=0} VERBOSE=${VERBOSE:=0}
PAUSE_ON_FAIL=${PAUSE_ON_FAIL:=no} PAUSE_ON_FAIL=${PAUSE_ON_FAIL:=no}
...@@ -579,18 +581,18 @@ fib_test() ...@@ -579,18 +581,18 @@ fib_test()
if [ "$(id -u)" -ne 0 ];then if [ "$(id -u)" -ne 0 ];then
echo "SKIP: Need root privileges" echo "SKIP: Need root privileges"
exit 0 exit $ksft_skip;
fi fi
if [ ! -x "$(command -v ip)" ]; then if [ ! -x "$(command -v ip)" ]; then
echo "SKIP: Could not run test without ip tool" echo "SKIP: Could not run test without ip tool"
exit 0 exit $ksft_skip
fi fi
ip route help 2>&1 | grep -q fibmatch ip route help 2>&1 | grep -q fibmatch
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "SKIP: iproute2 too old, missing fibmatch" echo "SKIP: iproute2 too old, missing fibmatch"
exit 0 exit $ksft_skip
fi fi
# start clean # start clean
......
...@@ -8,6 +8,9 @@ ...@@ -8,6 +8,9 @@
# if not they probably have failed earlier in the boot process and their logged error will be catched by another test # if not they probably have failed earlier in the boot process and their logged error will be catched by another test
# #
# Kselftest framework requirement - SKIP code is 4.
ksft_skip=4
# this function will try to up the interface # this function will try to up the interface
# if already up, nothing done # if already up, nothing done
# arg1: network interface name # arg1: network interface name
...@@ -18,7 +21,7 @@ kci_net_start() ...@@ -18,7 +21,7 @@ kci_net_start()
ip link show "$netdev" |grep -q UP ip link show "$netdev" |grep -q UP
if [ $? -eq 0 ];then if [ $? -eq 0 ];then
echo "SKIP: $netdev: interface already up" echo "SKIP: $netdev: interface already up"
return 0 return $ksft_skip
fi fi
ip link set "$netdev" up ip link set "$netdev" up
...@@ -61,12 +64,12 @@ kci_net_setup() ...@@ -61,12 +64,12 @@ kci_net_setup()
ip address show "$netdev" |grep '^[[:space:]]*inet' ip address show "$netdev" |grep '^[[:space:]]*inet'
if [ $? -eq 0 ];then if [ $? -eq 0 ];then
echo "SKIP: $netdev: already have an IP" echo "SKIP: $netdev: already have an IP"
return 0 return $ksft_skip
fi fi
# TODO what ipaddr to set ? DHCP ? # TODO what ipaddr to set ? DHCP ?
echo "SKIP: $netdev: set IP address" echo "SKIP: $netdev: set IP address"
return 0 return $ksft_skip
} }
# test an ethtool command # test an ethtool command
...@@ -84,6 +87,7 @@ kci_netdev_ethtool_test() ...@@ -84,6 +87,7 @@ kci_netdev_ethtool_test()
if [ $ret -ne 0 ];then if [ $ret -ne 0 ];then
if [ $ret -eq "$1" ];then if [ $ret -eq "$1" ];then
echo "SKIP: $netdev: ethtool $2 not supported" echo "SKIP: $netdev: ethtool $2 not supported"
return $ksft_skip
else else
echo "FAIL: $netdev: ethtool $2" echo "FAIL: $netdev: ethtool $2"
return 1 return 1
...@@ -104,7 +108,7 @@ kci_netdev_ethtool() ...@@ -104,7 +108,7 @@ kci_netdev_ethtool()
ethtool --version 2>/dev/null >/dev/null ethtool --version 2>/dev/null >/dev/null
if [ $? -ne 0 ];then if [ $? -ne 0 ];then
echo "SKIP: ethtool not present" echo "SKIP: ethtool not present"
return 1 return $ksft_skip
fi fi
TMP_ETHTOOL_FEATURES="$(mktemp)" TMP_ETHTOOL_FEATURES="$(mktemp)"
...@@ -176,13 +180,13 @@ kci_test_netdev() ...@@ -176,13 +180,13 @@ kci_test_netdev()
#check for needed privileges #check for needed privileges
if [ "$(id -u)" -ne 0 ];then if [ "$(id -u)" -ne 0 ];then
echo "SKIP: Need root privileges" echo "SKIP: Need root privileges"
exit 0 exit $ksft_skip
fi fi
ip link show 2>/dev/null >/dev/null ip link show 2>/dev/null >/dev/null
if [ $? -ne 0 ];then if [ $? -ne 0 ];then
echo "SKIP: Could not run test without the ip tool" echo "SKIP: Could not run test without the ip tool"
exit 0 exit $ksft_skip
fi fi
TMP_LIST_NETDEV="$(mktemp)" TMP_LIST_NETDEV="$(mktemp)"
......
...@@ -43,6 +43,9 @@ ...@@ -43,6 +43,9 @@
# that MTU is properly calculated instead when MTU is not configured from # that MTU is properly calculated instead when MTU is not configured from
# userspace # userspace
# Kselftest framework requirement - SKIP code is 4.
ksft_skip=4
tests=" tests="
pmtu_vti6_exception vti6: PMTU exceptions pmtu_vti6_exception vti6: PMTU exceptions
pmtu_vti4_exception vti4: PMTU exceptions pmtu_vti4_exception vti4: PMTU exceptions
...@@ -162,7 +165,7 @@ setup_xfrm6() { ...@@ -162,7 +165,7 @@ setup_xfrm6() {
} }
setup() { setup() {
[ "$(id -u)" -ne 0 ] && echo " need to run as root" && return 1 [ "$(id -u)" -ne 0 ] && echo " need to run as root" && return $ksft_skip
cleanup_done=0 cleanup_done=0
for arg do for arg do
......
...@@ -60,6 +60,8 @@ ...@@ -60,6 +60,8 @@
#include "psock_lib.h" #include "psock_lib.h"
#include "../kselftest.h"
#ifndef bug_on #ifndef bug_on
# define bug_on(cond) assert(!(cond)) # define bug_on(cond) assert(!(cond))
#endif #endif
...@@ -825,7 +827,7 @@ static int test_tpacket(int version, int type) ...@@ -825,7 +827,7 @@ static int test_tpacket(int version, int type)
fprintf(stderr, "test: skip %s %s since user and kernel " fprintf(stderr, "test: skip %s %s since user and kernel "
"space have different bit width\n", "space have different bit width\n",
tpacket_str[version], type_str[type]); tpacket_str[version], type_str[type]);
return 0; return KSFT_SKIP;
} }
sock = pfsocket(version); sock = pfsocket(version);
......
...@@ -7,6 +7,9 @@ ...@@ -7,6 +7,9 @@
devdummy="test-dummy0" devdummy="test-dummy0"
ret=0 ret=0
# Kselftest framework requirement - SKIP code is 4.
ksft_skip=4
# set global exit status, but never reset nonzero one. # set global exit status, but never reset nonzero one.
check_err() check_err()
{ {
...@@ -333,7 +336,7 @@ kci_test_vrf() ...@@ -333,7 +336,7 @@ kci_test_vrf()
ip link show type vrf 2>/dev/null ip link show type vrf 2>/dev/null
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "SKIP: vrf: iproute2 too old" echo "SKIP: vrf: iproute2 too old"
return 0 return $ksft_skip
fi fi
ip link add "$vrfname" type vrf table 10 ip link add "$vrfname" type vrf table 10
...@@ -409,7 +412,7 @@ kci_test_encap_fou() ...@@ -409,7 +412,7 @@ kci_test_encap_fou()
ip fou help 2>&1 |grep -q 'Usage: ip fou' ip fou help 2>&1 |grep -q 'Usage: ip fou'
if [ $? -ne 0 ];then if [ $? -ne 0 ];then
echo "SKIP: fou: iproute2 too old" echo "SKIP: fou: iproute2 too old"
return 1 return $ksft_skip
fi fi
ip netns exec "$testns" ip fou add port 7777 ipproto 47 2>/dev/null ip netns exec "$testns" ip fou add port 7777 ipproto 47 2>/dev/null
...@@ -444,7 +447,7 @@ kci_test_encap() ...@@ -444,7 +447,7 @@ kci_test_encap()
ip netns add "$testns" ip netns add "$testns"
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "SKIP encap tests: cannot add net namespace $testns" echo "SKIP encap tests: cannot add net namespace $testns"
return 1 return $ksft_skip
fi fi
ip netns exec "$testns" ip link set lo up ip netns exec "$testns" ip link set lo up
...@@ -469,7 +472,7 @@ kci_test_macsec() ...@@ -469,7 +472,7 @@ kci_test_macsec()
ip macsec help 2>&1 | grep -q "^Usage: ip macsec" ip macsec help 2>&1 | grep -q "^Usage: ip macsec"
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "SKIP: macsec: iproute2 too old" echo "SKIP: macsec: iproute2 too old"
return 0 return $ksft_skip
fi fi
ip link add link "$devdummy" "$msname" type macsec port 42 encrypt on ip link add link "$devdummy" "$msname" type macsec port 42 encrypt on
...@@ -511,14 +514,14 @@ kci_test_gretap() ...@@ -511,14 +514,14 @@ kci_test_gretap()
ip netns add "$testns" ip netns add "$testns"
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "SKIP gretap tests: cannot add net namespace $testns" echo "SKIP gretap tests: cannot add net namespace $testns"
return 1 return $ksft_skip
fi fi
ip link help gretap 2>&1 | grep -q "^Usage:" ip link help gretap 2>&1 | grep -q "^Usage:"
if [ $? -ne 0 ];then if [ $? -ne 0 ];then
echo "SKIP: gretap: iproute2 too old" echo "SKIP: gretap: iproute2 too old"
ip netns del "$testns" ip netns del "$testns"
return 1 return $ksft_skip
fi fi
# test native tunnel # test native tunnel
...@@ -561,14 +564,14 @@ kci_test_ip6gretap() ...@@ -561,14 +564,14 @@ kci_test_ip6gretap()
ip netns add "$testns" ip netns add "$testns"
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "SKIP ip6gretap tests: cannot add net namespace $testns" echo "SKIP ip6gretap tests: cannot add net namespace $testns"
return 1 return $ksft_skip
fi fi
ip link help ip6gretap 2>&1 | grep -q "^Usage:" ip link help ip6gretap 2>&1 | grep -q "^Usage:"
if [ $? -ne 0 ];then if [ $? -ne 0 ];then
echo "SKIP: ip6gretap: iproute2 too old" echo "SKIP: ip6gretap: iproute2 too old"
ip netns del "$testns" ip netns del "$testns"
return 1 return $ksft_skip
fi fi
# test native tunnel # test native tunnel
...@@ -611,13 +614,13 @@ kci_test_erspan() ...@@ -611,13 +614,13 @@ kci_test_erspan()
ip link help erspan 2>&1 | grep -q "^Usage:" ip link help erspan 2>&1 | grep -q "^Usage:"
if [ $? -ne 0 ];then if [ $? -ne 0 ];then
echo "SKIP: erspan: iproute2 too old" echo "SKIP: erspan: iproute2 too old"
return 1 return $ksft_skip
fi fi
ip netns add "$testns" ip netns add "$testns"
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "SKIP erspan tests: cannot add net namespace $testns" echo "SKIP erspan tests: cannot add net namespace $testns"
return 1 return $ksft_skip
fi fi
# test native tunnel erspan v1 # test native tunnel erspan v1
...@@ -676,13 +679,13 @@ kci_test_ip6erspan() ...@@ -676,13 +679,13 @@ kci_test_ip6erspan()
ip link help ip6erspan 2>&1 | grep -q "^Usage:" ip link help ip6erspan 2>&1 | grep -q "^Usage:"
if [ $? -ne 0 ];then if [ $? -ne 0 ];then
echo "SKIP: ip6erspan: iproute2 too old" echo "SKIP: ip6erspan: iproute2 too old"
return 1 return $ksft_skip
fi fi
ip netns add "$testns" ip netns add "$testns"
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "SKIP ip6erspan tests: cannot add net namespace $testns" echo "SKIP ip6erspan tests: cannot add net namespace $testns"
return 1 return $ksft_skip
fi fi
# test native tunnel ip6erspan v1 # test native tunnel ip6erspan v1
...@@ -762,14 +765,14 @@ kci_test_rtnl() ...@@ -762,14 +765,14 @@ kci_test_rtnl()
#check for needed privileges #check for needed privileges
if [ "$(id -u)" -ne 0 ];then if [ "$(id -u)" -ne 0 ];then
echo "SKIP: Need root privileges" echo "SKIP: Need root privileges"
exit 0 exit $ksft_skip
fi fi
for x in ip tc;do for x in ip tc;do
$x -Version 2>/dev/null >/dev/null $x -Version 2>/dev/null >/dev/null
if [ $? -ne 0 ];then if [ $? -ne 0 ];then
echo "SKIP: Could not run test without the $x tool" echo "SKIP: Could not run test without the $x tool"
exit 0 exit $ksft_skip
fi fi
done done
......
# SPDX-License-Identifier: GPL-2.0
CFLAGS += -O3 -Wl,-no-as-needed -Wall
LDFLAGS += -lrt -lpthread -lm
TEST_GEN_PROGS = rtctest
TEST_GEN_PROGS_EXTENDED = setdate
include ../lib.mk
// SPDX-License-Identifier: GPL-2.0
/*
* Real Time Clock Driver Test Program
*
* Copyright (c) 2018 Alexandre Belloni <alexandre.belloni@bootlin.com>
*/
#include <errno.h>
#include <fcntl.h>
#include <linux/rtc.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/ioctl.h>
#include <sys/time.h>
#include <sys/types.h>
#include <time.h>
#include <unistd.h>
#include "../kselftest_harness.h"
#define NUM_UIE 3
#define ALARM_DELTA 3
static char *rtc_file = "/dev/rtc0";
FIXTURE(rtc) {
int fd;
};
FIXTURE_SETUP(rtc) {
self->fd = open(rtc_file, O_RDONLY);
ASSERT_NE(-1, self->fd);
}
FIXTURE_TEARDOWN(rtc) {
close(self->fd);
}
TEST_F(rtc, date_read) {
int rc;
struct rtc_time rtc_tm;
/* Read the RTC time/date */
rc = ioctl(self->fd, RTC_RD_TIME, &rtc_tm);
ASSERT_NE(-1, rc);
TH_LOG("Current RTC date/time is %02d/%02d/%02d %02d:%02d:%02d.",
rtc_tm.tm_mday, rtc_tm.tm_mon + 1, rtc_tm.tm_year + 1900,
rtc_tm.tm_hour, rtc_tm.tm_min, rtc_tm.tm_sec);
}
TEST_F(rtc, uie_read) {
int i, rc, irq = 0;
unsigned long data;
/* Turn on update interrupts */
rc = ioctl(self->fd, RTC_UIE_ON, 0);
if (rc == -1) {
ASSERT_EQ(EINVAL, errno);
TH_LOG("skip update IRQs not supported.");
return;
}
for (i = 0; i < NUM_UIE; i++) {
/* This read will block */
rc = read(self->fd, &data, sizeof(data));
ASSERT_NE(-1, rc);
irq++;
}
EXPECT_EQ(NUM_UIE, irq);
rc = ioctl(self->fd, RTC_UIE_OFF, 0);
ASSERT_NE(-1, rc);
}
TEST_F(rtc, uie_select) {
int i, rc, irq = 0;
unsigned long data;
/* Turn on update interrupts */
rc = ioctl(self->fd, RTC_UIE_ON, 0);
if (rc == -1) {
ASSERT_EQ(EINVAL, errno);
TH_LOG("skip update IRQs not supported.");
return;
}
for (i = 0; i < NUM_UIE; i++) {
struct timeval tv = { .tv_sec = 2 };
fd_set readfds;
FD_ZERO(&readfds);
FD_SET(self->fd, &readfds);
/* The select will wait until an RTC interrupt happens. */
rc = select(self->fd + 1, &readfds, NULL, NULL, &tv);
ASSERT_NE(-1, rc);
ASSERT_NE(0, rc);
/* This read won't block */
rc = read(self->fd, &data, sizeof(unsigned long));
ASSERT_NE(-1, rc);
irq++;
}
EXPECT_EQ(NUM_UIE, irq);
rc = ioctl(self->fd, RTC_UIE_OFF, 0);
ASSERT_NE(-1, rc);
}
TEST_F(rtc, alarm_alm_set) {
struct timeval tv = { .tv_sec = ALARM_DELTA + 2 };
unsigned long data;
struct rtc_time tm;
fd_set readfds;
time_t secs, new;
int rc;
rc = ioctl(self->fd, RTC_RD_TIME, &tm);
ASSERT_NE(-1, rc);
secs = timegm((struct tm *)&tm) + ALARM_DELTA;
gmtime_r(&secs, (struct tm *)&tm);
rc = ioctl(self->fd, RTC_ALM_SET, &tm);
if (rc == -1) {
ASSERT_EQ(EINVAL, errno);
TH_LOG("skip alarms are not supported.");
return;
}
rc = ioctl(self->fd, RTC_ALM_READ, &tm);
ASSERT_NE(-1, rc);
TH_LOG("Alarm time now set to %02d:%02d:%02d.",
tm.tm_hour, tm.tm_min, tm.tm_sec);
/* Enable alarm interrupts */
rc = ioctl(self->fd, RTC_AIE_ON, 0);
ASSERT_NE(-1, rc);
FD_ZERO(&readfds);
FD_SET(self->fd, &readfds);
rc = select(self->fd + 1, &readfds, NULL, NULL, &tv);
ASSERT_NE(-1, rc);
EXPECT_NE(0, rc);
/* Disable alarm interrupts */
rc = ioctl(self->fd, RTC_AIE_OFF, 0);
ASSERT_NE(-1, rc);
if (rc == 0)
return;
rc = read(self->fd, &data, sizeof(unsigned long));
ASSERT_NE(-1, rc);
TH_LOG("data: %lx", data);
rc = ioctl(self->fd, RTC_RD_TIME, &tm);
ASSERT_NE(-1, rc);
new = timegm((struct tm *)&tm);
ASSERT_EQ(new, secs);
}
TEST_F(rtc, alarm_wkalm_set) {
struct timeval tv = { .tv_sec = ALARM_DELTA + 2 };
struct rtc_wkalrm alarm = { 0 };
struct rtc_time tm;
unsigned long data;
fd_set readfds;
time_t secs, new;
int rc;
rc = ioctl(self->fd, RTC_RD_TIME, &alarm.time);
ASSERT_NE(-1, rc);
secs = timegm((struct tm *)&alarm.time) + ALARM_DELTA;
gmtime_r(&secs, (struct tm *)&alarm.time);
alarm.enabled = 1;
rc = ioctl(self->fd, RTC_WKALM_SET, &alarm);
if (rc == -1) {
ASSERT_EQ(EINVAL, errno);
TH_LOG("skip alarms are not supported.");
return;
}
rc = ioctl(self->fd, RTC_WKALM_RD, &alarm);
ASSERT_NE(-1, rc);
TH_LOG("Alarm time now set to %02d/%02d/%02d %02d:%02d:%02d.",
alarm.time.tm_mday, alarm.time.tm_mon + 1,
alarm.time.tm_year + 1900, alarm.time.tm_hour,
alarm.time.tm_min, alarm.time.tm_sec);
FD_ZERO(&readfds);
FD_SET(self->fd, &readfds);
rc = select(self->fd + 1, &readfds, NULL, NULL, &tv);
ASSERT_NE(-1, rc);
EXPECT_NE(0, rc);
rc = read(self->fd, &data, sizeof(unsigned long));
ASSERT_NE(-1, rc);
rc = ioctl(self->fd, RTC_RD_TIME, &tm);
ASSERT_NE(-1, rc);
new = timegm((struct tm *)&tm);
ASSERT_EQ(new, secs);
}
static void __attribute__((constructor))
__constructor_order_last(void)
{
if (!__constructor_order)
__constructor_order = _CONSTRUCTOR_ORDER_BACKWARD;
}
int main(int argc, char **argv)
{
switch (argc) {
case 2:
rtc_file = argv[1];
/* FALLTHROUGH */
case 1:
break;
default:
fprintf(stderr, "usage: %s [rtcdev]\n", argv[0]);
return 1;
}
return test_harness_run(argc, argv);
}
...@@ -9,7 +9,7 @@ nanosleep ...@@ -9,7 +9,7 @@ nanosleep
nsleep-lat nsleep-lat
posix_timers posix_timers
raw_skew raw_skew
rtctest rtcpie
set-2038 set-2038
set-tai set-tai
set-timer-lat set-timer-lat
...@@ -19,4 +19,3 @@ valid-adjtimex ...@@ -19,4 +19,3 @@ valid-adjtimex
adjtick adjtick
set-tz set-tz
freq-step freq-step
rtctest_setdate
...@@ -5,13 +5,13 @@ LDFLAGS += -lrt -lpthread -lm ...@@ -5,13 +5,13 @@ LDFLAGS += -lrt -lpthread -lm
# these are all "safe" tests that don't modify # these are all "safe" tests that don't modify
# system time or require escalated privileges # system time or require escalated privileges
TEST_GEN_PROGS = posix_timers nanosleep nsleep-lat set-timer-lat mqueue-lat \ TEST_GEN_PROGS = posix_timers nanosleep nsleep-lat set-timer-lat mqueue-lat \
inconsistency-check raw_skew threadtest rtctest inconsistency-check raw_skew threadtest rtcpie
DESTRUCTIVE_TESTS = alarmtimer-suspend valid-adjtimex adjtick change_skew \ DESTRUCTIVE_TESTS = alarmtimer-suspend valid-adjtimex adjtick change_skew \
skew_consistency clocksource-switch freq-step leap-a-day \ skew_consistency clocksource-switch freq-step leap-a-day \
leapcrash set-tai set-2038 set-tz leapcrash set-tai set-2038 set-tz
TEST_GEN_PROGS_EXTENDED = $(DESTRUCTIVE_TESTS) rtctest_setdate TEST_GEN_PROGS_EXTENDED = $(DESTRUCTIVE_TESTS)
include ../lib.mk include ../lib.mk
......
// SPDX-License-Identifier: GPL-2.0
/*
* Real Time Clock Periodic Interrupt test program
*
* Since commit 6610e0893b8bc ("RTC: Rework RTC code to use timerqueue for
* events"), PIE are completely handled using hrtimers, without actually using
* any underlying hardware RTC.
*
*/
#include <stdio.h>
#include <linux/rtc.h>
#include <sys/ioctl.h>
#include <sys/time.h>
#include <sys/types.h>
#include <fcntl.h>
#include <unistd.h>
#include <stdlib.h>
#include <errno.h>
/*
* This expects the new RTC class driver framework, working with
* clocks that will often not be clones of what the PC-AT had.
* Use the command line to specify another RTC if you need one.
*/
static const char default_rtc[] = "/dev/rtc0";
int main(int argc, char **argv)
{
int i, fd, retval, irqcount = 0;
unsigned long tmp, data, old_pie_rate;
const char *rtc = default_rtc;
struct timeval start, end, diff;
switch (argc) {
case 2:
rtc = argv[1];
/* FALLTHROUGH */
case 1:
break;
default:
fprintf(stderr, "usage: rtctest [rtcdev] [d]\n");
return 1;
}
fd = open(rtc, O_RDONLY);
if (fd == -1) {
perror(rtc);
exit(errno);
}
/* Read periodic IRQ rate */
retval = ioctl(fd, RTC_IRQP_READ, &old_pie_rate);
if (retval == -1) {
/* not all RTCs support periodic IRQs */
if (errno == EINVAL) {
fprintf(stderr, "\nNo periodic IRQ support\n");
goto done;
}
perror("RTC_IRQP_READ ioctl");
exit(errno);
}
fprintf(stderr, "\nPeriodic IRQ rate is %ldHz.\n", old_pie_rate);
fprintf(stderr, "Counting 20 interrupts at:");
fflush(stderr);
/* The frequencies 128Hz, 256Hz, ... 8192Hz are only allowed for root. */
for (tmp=2; tmp<=64; tmp*=2) {
retval = ioctl(fd, RTC_IRQP_SET, tmp);
if (retval == -1) {
/* not all RTCs can change their periodic IRQ rate */
if (errno == EINVAL) {
fprintf(stderr,
"\n...Periodic IRQ rate is fixed\n");
goto done;
}
perror("RTC_IRQP_SET ioctl");
exit(errno);
}
fprintf(stderr, "\n%ldHz:\t", tmp);
fflush(stderr);
/* Enable periodic interrupts */
retval = ioctl(fd, RTC_PIE_ON, 0);
if (retval == -1) {
perror("RTC_PIE_ON ioctl");
exit(errno);
}
for (i=1; i<21; i++) {
gettimeofday(&start, NULL);
/* This blocks */
retval = read(fd, &data, sizeof(unsigned long));
if (retval == -1) {
perror("read");
exit(errno);
}
gettimeofday(&end, NULL);
timersub(&end, &start, &diff);
if (diff.tv_sec > 0 ||
diff.tv_usec > ((1000000L / tmp) * 1.10)) {
fprintf(stderr, "\nPIE delta error: %ld.%06ld should be close to 0.%06ld\n",
diff.tv_sec, diff.tv_usec,
(1000000L / tmp));
fflush(stdout);
exit(-1);
}
fprintf(stderr, " %d",i);
fflush(stderr);
irqcount++;
}
/* Disable periodic interrupts */
retval = ioctl(fd, RTC_PIE_OFF, 0);
if (retval == -1) {
perror("RTC_PIE_OFF ioctl");
exit(errno);
}
}
done:
ioctl(fd, RTC_IRQP_SET, old_pie_rate);
fprintf(stderr, "\n\n\t\t\t *** Test complete ***\n");
close(fd);
return 0;
}
/*
* Real Time Clock Driver Test/Example Program
*
* Compile with:
* gcc -s -Wall -Wstrict-prototypes rtctest.c -o rtctest
*
* Copyright (C) 1996, Paul Gortmaker.
*
* Released under the GNU General Public License, version 2,
* included herein by reference.
*
*/
#include <stdio.h>
#include <linux/rtc.h>
#include <sys/ioctl.h>
#include <sys/time.h>
#include <sys/types.h>
#include <fcntl.h>
#include <unistd.h>
#include <stdlib.h>
#include <errno.h>
#ifndef ARRAY_SIZE
# define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
#endif
/*
* This expects the new RTC class driver framework, working with
* clocks that will often not be clones of what the PC-AT had.
* Use the command line to specify another RTC if you need one.
*/
static const char default_rtc[] = "/dev/rtc0";
static struct rtc_time cutoff_dates[] = {
{
.tm_year = 70, /* 1970 -1900 */
.tm_mday = 1,
},
/* signed time_t 19/01/2038 3:14:08 */
{
.tm_year = 138,
.tm_mday = 19,
},
{
.tm_year = 138,
.tm_mday = 20,
},
{
.tm_year = 199, /* 2099 -1900 */
.tm_mday = 1,
},
{
.tm_year = 200, /* 2100 -1900 */
.tm_mday = 1,
},
/* unsigned time_t 07/02/2106 7:28:15*/
{
.tm_year = 205,
.tm_mon = 1,
.tm_mday = 7,
},
{
.tm_year = 206,
.tm_mon = 1,
.tm_mday = 8,
},
/* signed time on 64bit in nanoseconds 12/04/2262 01:47:16*/
{
.tm_year = 362,
.tm_mon = 3,
.tm_mday = 12,
},
{
.tm_year = 362, /* 2262 -1900 */
.tm_mon = 3,
.tm_mday = 13,
},
};
static int compare_dates(struct rtc_time *a, struct rtc_time *b)
{
if (a->tm_year != b->tm_year ||
a->tm_mon != b->tm_mon ||
a->tm_mday != b->tm_mday ||
a->tm_hour != b->tm_hour ||
a->tm_min != b->tm_min ||
((b->tm_sec - a->tm_sec) > 1))
return 1;
return 0;
}
int main(int argc, char **argv)
{
int i, fd, retval, irqcount = 0, dangerous = 0;
unsigned long tmp, data;
struct rtc_time rtc_tm;
const char *rtc = default_rtc;
struct timeval start, end, diff;
switch (argc) {
case 3:
if (*argv[2] == 'd')
dangerous = 1;
case 2:
rtc = argv[1];
/* FALLTHROUGH */
case 1:
break;
default:
fprintf(stderr, "usage: rtctest [rtcdev] [d]\n");
return 1;
}
fd = open(rtc, O_RDONLY);
if (fd == -1) {
perror(rtc);
exit(errno);
}
fprintf(stderr, "\n\t\t\tRTC Driver Test Example.\n\n");
/* Turn on update interrupts (one per second) */
retval = ioctl(fd, RTC_UIE_ON, 0);
if (retval == -1) {
if (errno == EINVAL) {
fprintf(stderr,
"\n...Update IRQs not supported.\n");
goto test_READ;
}
perror("RTC_UIE_ON ioctl");
exit(errno);
}
fprintf(stderr, "Counting 5 update (1/sec) interrupts from reading %s:",
rtc);
fflush(stderr);
for (i=1; i<6; i++) {
/* This read will block */
retval = read(fd, &data, sizeof(unsigned long));
if (retval == -1) {
perror("read");
exit(errno);
}
fprintf(stderr, " %d",i);
fflush(stderr);
irqcount++;
}
fprintf(stderr, "\nAgain, from using select(2) on /dev/rtc:");
fflush(stderr);
for (i=1; i<6; i++) {
struct timeval tv = {5, 0}; /* 5 second timeout on select */
fd_set readfds;
FD_ZERO(&readfds);
FD_SET(fd, &readfds);
/* The select will wait until an RTC interrupt happens. */
retval = select(fd+1, &readfds, NULL, NULL, &tv);
if (retval == -1) {
perror("select");
exit(errno);
}
/* This read won't block unlike the select-less case above. */
retval = read(fd, &data, sizeof(unsigned long));
if (retval == -1) {
perror("read");
exit(errno);
}
fprintf(stderr, " %d",i);
fflush(stderr);
irqcount++;
}
/* Turn off update interrupts */
retval = ioctl(fd, RTC_UIE_OFF, 0);
if (retval == -1) {
perror("RTC_UIE_OFF ioctl");
exit(errno);
}
test_READ:
/* Read the RTC time/date */
retval = ioctl(fd, RTC_RD_TIME, &rtc_tm);
if (retval == -1) {
perror("RTC_RD_TIME ioctl");
exit(errno);
}
fprintf(stderr, "\n\nCurrent RTC date/time is %d-%d-%d, %02d:%02d:%02d.\n",
rtc_tm.tm_mday, rtc_tm.tm_mon + 1, rtc_tm.tm_year + 1900,
rtc_tm.tm_hour, rtc_tm.tm_min, rtc_tm.tm_sec);
/* Set the alarm to 5 sec in the future, and check for rollover */
rtc_tm.tm_sec += 5;
if (rtc_tm.tm_sec >= 60) {
rtc_tm.tm_sec %= 60;
rtc_tm.tm_min++;
}
if (rtc_tm.tm_min == 60) {
rtc_tm.tm_min = 0;
rtc_tm.tm_hour++;
}
if (rtc_tm.tm_hour == 24)
rtc_tm.tm_hour = 0;
retval = ioctl(fd, RTC_ALM_SET, &rtc_tm);
if (retval == -1) {
if (errno == EINVAL) {
fprintf(stderr,
"\n...Alarm IRQs not supported.\n");
goto test_PIE;
}
perror("RTC_ALM_SET ioctl");
exit(errno);
}
/* Read the current alarm settings */
retval = ioctl(fd, RTC_ALM_READ, &rtc_tm);
if (retval == -1) {
if (errno == EINVAL) {
fprintf(stderr,
"\n...EINVAL reading current alarm setting.\n");
goto test_PIE;
}
perror("RTC_ALM_READ ioctl");
exit(errno);
}
fprintf(stderr, "Alarm time now set to %02d:%02d:%02d.\n",
rtc_tm.tm_hour, rtc_tm.tm_min, rtc_tm.tm_sec);
/* Enable alarm interrupts */
retval = ioctl(fd, RTC_AIE_ON, 0);
if (retval == -1) {
if (errno == EINVAL || errno == EIO) {
fprintf(stderr,
"\n...Alarm IRQs not supported.\n");
goto test_PIE;
}
perror("RTC_AIE_ON ioctl");
exit(errno);
}
fprintf(stderr, "Waiting 5 seconds for alarm...");
fflush(stderr);
/* This blocks until the alarm ring causes an interrupt */
retval = read(fd, &data, sizeof(unsigned long));
if (retval == -1) {
perror("read");
exit(errno);
}
irqcount++;
fprintf(stderr, " okay. Alarm rang.\n");
/* Disable alarm interrupts */
retval = ioctl(fd, RTC_AIE_OFF, 0);
if (retval == -1) {
perror("RTC_AIE_OFF ioctl");
exit(errno);
}
test_PIE:
/* Read periodic IRQ rate */
retval = ioctl(fd, RTC_IRQP_READ, &tmp);
if (retval == -1) {
/* not all RTCs support periodic IRQs */
if (errno == EINVAL) {
fprintf(stderr, "\nNo periodic IRQ support\n");
goto test_DATE;
}
perror("RTC_IRQP_READ ioctl");
exit(errno);
}
fprintf(stderr, "\nPeriodic IRQ rate is %ldHz.\n", tmp);
fprintf(stderr, "Counting 20 interrupts at:");
fflush(stderr);
/* The frequencies 128Hz, 256Hz, ... 8192Hz are only allowed for root. */
for (tmp=2; tmp<=64; tmp*=2) {
retval = ioctl(fd, RTC_IRQP_SET, tmp);
if (retval == -1) {
/* not all RTCs can change their periodic IRQ rate */
if (errno == EINVAL) {
fprintf(stderr,
"\n...Periodic IRQ rate is fixed\n");
goto test_DATE;
}
perror("RTC_IRQP_SET ioctl");
exit(errno);
}
fprintf(stderr, "\n%ldHz:\t", tmp);
fflush(stderr);
/* Enable periodic interrupts */
retval = ioctl(fd, RTC_PIE_ON, 0);
if (retval == -1) {
perror("RTC_PIE_ON ioctl");
exit(errno);
}
for (i=1; i<21; i++) {
gettimeofday(&start, NULL);
/* This blocks */
retval = read(fd, &data, sizeof(unsigned long));
if (retval == -1) {
perror("read");
exit(errno);
}
gettimeofday(&end, NULL);
timersub(&end, &start, &diff);
if (diff.tv_sec > 0 ||
diff.tv_usec > ((1000000L / tmp) * 1.10)) {
fprintf(stderr, "\nPIE delta error: %ld.%06ld should be close to 0.%06ld\n",
diff.tv_sec, diff.tv_usec,
(1000000L / tmp));
fflush(stdout);
exit(-1);
}
fprintf(stderr, " %d",i);
fflush(stderr);
irqcount++;
}
/* Disable periodic interrupts */
retval = ioctl(fd, RTC_PIE_OFF, 0);
if (retval == -1) {
perror("RTC_PIE_OFF ioctl");
exit(errno);
}
}
test_DATE:
if (!dangerous)
goto done;
fprintf(stderr, "\nTesting problematic dates\n");
for (i = 0; i < ARRAY_SIZE(cutoff_dates); i++) {
struct rtc_time current;
/* Write the new date in RTC */
retval = ioctl(fd, RTC_SET_TIME, &cutoff_dates[i]);
if (retval == -1) {
perror("RTC_SET_TIME ioctl");
close(fd);
exit(errno);
}
/* Read back */
retval = ioctl(fd, RTC_RD_TIME, &current);
if (retval == -1) {
perror("RTC_RD_TIME ioctl");
exit(errno);
}
if(compare_dates(&cutoff_dates[i], &current)) {
fprintf(stderr,"Setting date %d failed\n",
cutoff_dates[i].tm_year + 1900);
goto done;
}
cutoff_dates[i].tm_sec += 5;
/* Write the new alarm in RTC */
retval = ioctl(fd, RTC_ALM_SET, &cutoff_dates[i]);
if (retval == -1) {
perror("RTC_ALM_SET ioctl");
close(fd);
exit(errno);
}
/* Read back */
retval = ioctl(fd, RTC_ALM_READ, &current);
if (retval == -1) {
perror("RTC_ALM_READ ioctl");
exit(errno);
}
if(compare_dates(&cutoff_dates[i], &current)) {
fprintf(stderr,"Setting alarm %d failed\n",
cutoff_dates[i].tm_year + 1900);
goto done;
}
fprintf(stderr, "Setting year %d is OK \n",
cutoff_dates[i].tm_year + 1900);
}
done:
fprintf(stderr, "\n\n\t\t\t *** Test complete ***\n");
close(fd);
return 0;
}
...@@ -8,6 +8,7 @@ include ../lib.mk ...@@ -8,6 +8,7 @@ include ../lib.mk
UNAME_M := $(shell uname -m) UNAME_M := $(shell uname -m)
CAN_BUILD_I386 := $(shell ./check_cc.sh $(CC) trivial_32bit_program.c -m32) CAN_BUILD_I386 := $(shell ./check_cc.sh $(CC) trivial_32bit_program.c -m32)
CAN_BUILD_X86_64 := $(shell ./check_cc.sh $(CC) trivial_64bit_program.c) CAN_BUILD_X86_64 := $(shell ./check_cc.sh $(CC) trivial_64bit_program.c)
CAN_BUILD_WITH_NOPIE := $(shell ./check_cc.sh $(CC) trivial_program.c -no-pie)
TARGETS_C_BOTHBITS := single_step_syscall sysret_ss_attrs syscall_nt test_mremap_vdso \ TARGETS_C_BOTHBITS := single_step_syscall sysret_ss_attrs syscall_nt test_mremap_vdso \
check_initial_reg_state sigreturn iopl mpx-mini-test ioperm \ check_initial_reg_state sigreturn iopl mpx-mini-test ioperm \
...@@ -31,7 +32,12 @@ BINARIES_64 := $(TARGETS_C_64BIT_ALL:%=%_64) ...@@ -31,7 +32,12 @@ BINARIES_64 := $(TARGETS_C_64BIT_ALL:%=%_64)
BINARIES_32 := $(patsubst %,$(OUTPUT)/%,$(BINARIES_32)) BINARIES_32 := $(patsubst %,$(OUTPUT)/%,$(BINARIES_32))
BINARIES_64 := $(patsubst %,$(OUTPUT)/%,$(BINARIES_64)) BINARIES_64 := $(patsubst %,$(OUTPUT)/%,$(BINARIES_64))
CFLAGS := -O2 -g -std=gnu99 -pthread -Wall -no-pie CFLAGS := -O2 -g -std=gnu99 -pthread -Wall
# call32_from_64 in thunks.S uses absolute addresses.
ifeq ($(CAN_BUILD_WITH_NOPIE),1)
CFLAGS += -no-pie
endif
define gen-target-rule-32 define gen-target-rule-32
$(1) $(1)_32: $(OUTPUT)/$(1)_32 $(1) $(1)_32: $(OUTPUT)/$(1)_32
......
/* Trivial program to check that compilation with certain flags is working. */
#include <stdio.h>
int
main(void)
{
puts("");
return 0;
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment