Commit 12768c1e authored by Linus Torvalds's avatar Linus Torvalds

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

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

Pull kselftest updates from Shuah Khan:
 "This 14 patch update:

   - adds a new test for intel_pstate driver
   - adds empty string and async test cases to firmware class tests
   - fixes and cleans up several existing tests"

* tag 'linux-kselftest-4.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  selftests: firmware: add empty string and async tests
  firmware: actually return NULL on failed request_firmware_nowait()
  test: firmware_class: add asynchronous request trigger
  test: firmware_class: use kstrndup() where appropriate
  test: firmware_class: report errors properly on failure
  selftests/seccomp: fix 32-bit build warnings
  add breakpoints/.gitignore
  add ptrace/.gitignore
  update .gitignore in selftests/timers
  update .gitignore in selftests/vm
  tools, testing, add test for intel_pstate driver
  selftest/ipc: actually test it
  selftests/capabilities: actually test it
  selftests/capabilities: clean up for Makefile
parents a4eff16c 1b1fe542
......@@ -1118,15 +1118,17 @@ static int
_request_firmware(const struct firmware **firmware_p, const char *name,
struct device *device, unsigned int opt_flags)
{
struct firmware *fw;
struct firmware *fw = NULL;
long timeout;
int ret;
if (!firmware_p)
return -EINVAL;
if (!name || name[0] == '\0')
return -EINVAL;
if (!name || name[0] == '\0') {
ret = -EINVAL;
goto out;
}
ret = _request_firmware_prepare(&fw, name, device);
if (ret <= 0) /* error or already assigned */
......
......@@ -12,6 +12,7 @@
#include <linux/init.h>
#include <linux/module.h>
#include <linux/printk.h>
#include <linux/completion.h>
#include <linux/firmware.h>
#include <linux/device.h>
#include <linux/fs.h>
......@@ -54,10 +55,9 @@ static ssize_t trigger_request_store(struct device *dev,
int rc;
char *name;
name = kzalloc(count + 1, GFP_KERNEL);
name = kstrndup(buf, count, GFP_KERNEL);
if (!name)
return -ENOSPC;
memcpy(name, buf, count);
pr_info("loading '%s'\n", name);
......@@ -65,17 +65,73 @@ static ssize_t trigger_request_store(struct device *dev,
release_firmware(test_firmware);
test_firmware = NULL;
rc = request_firmware(&test_firmware, name, dev);
if (rc)
if (rc) {
pr_info("load of '%s' failed: %d\n", name, rc);
pr_info("loaded: %zu\n", test_firmware ? test_firmware->size : 0);
goto out;
}
pr_info("loaded: %zu\n", test_firmware->size);
rc = count;
out:
mutex_unlock(&test_fw_mutex);
kfree(name);
return count;
return rc;
}
static DEVICE_ATTR_WO(trigger_request);
static DECLARE_COMPLETION(async_fw_done);
static void trigger_async_request_cb(const struct firmware *fw, void *context)
{
test_firmware = fw;
complete(&async_fw_done);
}
static ssize_t trigger_async_request_store(struct device *dev,
struct device_attribute *attr,
const char *buf, size_t count)
{
int rc;
char *name;
name = kstrndup(buf, count, GFP_KERNEL);
if (!name)
return -ENOSPC;
pr_info("loading '%s'\n", name);
mutex_lock(&test_fw_mutex);
release_firmware(test_firmware);
test_firmware = NULL;
rc = request_firmware_nowait(THIS_MODULE, 1, name, dev, GFP_KERNEL,
NULL, trigger_async_request_cb);
if (rc) {
pr_info("async load of '%s' failed: %d\n", name, rc);
kfree(name);
goto out;
}
/* Free 'name' ASAP, to test for race conditions */
kfree(name);
wait_for_completion(&async_fw_done);
if (test_firmware) {
pr_info("loaded: %zu\n", test_firmware->size);
rc = count;
} else {
pr_err("failed to async load firmware\n");
rc = -ENODEV;
}
out:
mutex_unlock(&test_fw_mutex);
return rc;
}
static DEVICE_ATTR_WO(trigger_async_request);
static int __init test_firmware_init(void)
{
int rc;
......@@ -92,9 +148,20 @@ static int __init test_firmware_init(void)
goto dereg;
}
rc = device_create_file(test_fw_misc_device.this_device,
&dev_attr_trigger_async_request);
if (rc) {
pr_err("could not create async sysfs interface: %d\n", rc);
goto remove_file;
}
pr_warn("interface ready\n");
return 0;
remove_file:
device_remove_file(test_fw_misc_device.this_device,
&dev_attr_trigger_async_request);
dereg:
misc_deregister(&test_fw_misc_device);
return rc;
......@@ -105,6 +172,8 @@ module_init(test_firmware_init);
static void __exit test_firmware_exit(void)
{
release_firmware(test_firmware);
device_remove_file(test_fw_misc_device.this_device,
&dev_attr_trigger_async_request);
device_remove_file(test_fw_misc_device.this_device,
&dev_attr_trigger_request);
misc_deregister(&test_fw_misc_device);
......
TARGETS = breakpoints
TARGETS += capabilities
TARGETS += cpu-hotplug
TARGETS += efivarfs
TARGETS += exec
TARGETS += firmware
TARGETS += ftrace
TARGETS += futex
TARGETS += ipc
TARGETS += kcmp
TARGETS += lib
TARGETS += membarrier
......
all:
include ../lib.mk
.PHONY: all clean
TARGETS := validate_cap test_execve
TEST_FILES := validate_cap
TEST_PROGS := test_execve
CFLAGS := -O2 -g -std=gnu99 -Wall -lcap-ng
BINARIES := $(TEST_FILES) $(TEST_PROGS)
all: $(TARGETS)
CFLAGS += -O2 -g -std=gnu99 -Wall
LDLIBS += -lcap-ng -lrt -ldl
all: $(BINARIES)
clean:
$(RM) $(TARGETS)
$(RM) $(BINARIES)
include ../lib.mk
$(TARGETS): %: %.c
$(CC) -o $@ $(CFLAGS) $(EXTRA_CFLAGS) $^ -lrt -ldl
......@@ -48,8 +48,21 @@ echo "ABCD0123" >"$FW"
NAME=$(basename "$FW")
if printf '\000' >"$DIR"/trigger_request; then
echo "$0: empty filename should not succeed" >&2
exit 1
fi
if printf '\000' >"$DIR"/trigger_async_request; then
echo "$0: empty filename should not succeed (async)" >&2
exit 1
fi
# Request a firmware that doesn't exist, it should fail.
echo -n "nope-$NAME" >"$DIR"/trigger_request
if echo -n "nope-$NAME" >"$DIR"/trigger_request; then
echo "$0: firmware shouldn't have loaded" >&2
exit 1
fi
if diff -q "$FW" /dev/test_firmware >/dev/null ; then
echo "$0: firmware was not expected to match" >&2
exit 1
......@@ -74,4 +87,18 @@ else
echo "$0: filesystem loading works"
fi
# Try the asynchronous version too
if ! echo -n "$NAME" >"$DIR"/trigger_async_request ; then
echo "$0: could not trigger async request" >&2
exit 1
fi
# Verify the contents are what we expect.
if ! diff -q "$FW" /dev/test_firmware >/dev/null ; then
echo "$0: firmware was not loaded (async)" >&2
exit 1
else
echo "$0: async filesystem loading works"
fi
exit 0
CC := $(CROSS_COMPILE)gcc
CFLAGS := $(CFLAGS) -Wall -D_GNU_SOURCE
LDFLAGS := $(LDFLAGS) -lm
TARGETS := msr aperf
TEST_PROGS := $(TARGETS) run.sh
.PHONY: all clean
all: $(TARGETS)
$(TARGETS): $(HEADERS)
clean:
rm -f $(TARGETS)
#include <math.h>
#include <unistd.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <sys/timeb.h>
#include <sched.h>
#include <errno.h>
void usage(char *name) {
printf ("Usage: %s cpunum\n", name);
}
int main(int argc, char **argv) {
int i, cpu, fd;
char msr_file_name[64];
long long tsc, old_tsc, new_tsc;
long long aperf, old_aperf, new_aperf;
long long mperf, old_mperf, new_mperf;
struct timeb before, after;
long long int start, finish, total;
cpu_set_t cpuset;
if (argc != 2) {
usage(argv[0]);
return 1;
}
errno = 0;
cpu = strtol(argv[1], (char **) NULL, 10);
if (errno) {
usage(argv[0]);
return 1;
}
sprintf(msr_file_name, "/dev/cpu/%d/msr", cpu);
fd = open(msr_file_name, O_RDONLY);
if (fd == -1) {
perror("Failed to open");
return 1;
}
CPU_ZERO(&cpuset);
CPU_SET(cpu, &cpuset);
if (sched_setaffinity(0, sizeof(cpu_set_t), &cpuset)) {
perror("Failed to set cpu affinity");
return 1;
}
ftime(&before);
pread(fd, &old_tsc, sizeof(old_tsc), 0x10);
pread(fd, &old_aperf, sizeof(old_mperf), 0xe7);
pread(fd, &old_mperf, sizeof(old_aperf), 0xe8);
for (i=0; i<0x8fffffff; i++) {
sqrt(i);
}
ftime(&after);
pread(fd, &new_tsc, sizeof(new_tsc), 0x10);
pread(fd, &new_aperf, sizeof(new_mperf), 0xe7);
pread(fd, &new_mperf, sizeof(new_aperf), 0xe8);
tsc = new_tsc-old_tsc;
aperf = new_aperf-old_aperf;
mperf = new_mperf-old_mperf;
start = before.time*1000 + before.millitm;
finish = after.time*1000 + after.millitm;
total = finish - start;
printf("runTime: %4.2f\n", 1.0*total/1000);
printf("freq: %7.0f\n", tsc / (1.0*aperf / (1.0 * mperf)) / total);
return 0;
}
#include <math.h>
#include <unistd.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <sys/timeb.h>
#include <sched.h>
#include <errno.h>
int main(int argc, char **argv) {
int cpu, fd;
long long msr;
char msr_file_name[64];
if (argc != 2)
return 1;
errno = 0;
cpu = strtol(argv[1], (char **) NULL, 10);
if (errno)
return 1;
sprintf(msr_file_name, "/dev/cpu/%d/msr", cpu);
fd = open(msr_file_name, O_RDONLY);
if (fd == -1) {
perror("Failed to open");
return 1;
}
pread(fd, &msr, sizeof(msr), 0x199);
printf("msr 0x199: 0x%llx\n", msr);
return 0;
}
#!/bin/bash
#
# This test runs on Intel x86 based hardware which support the intel_pstate
# driver. The test checks the frequency settings from the maximum turbo
# state to the minimum supported frequency, in decrements of 100MHz. The
# test runs the aperf.c program to put load on each processor.
#
# The results are displayed in a table which indicate the "Target" state,
# or the requested frequency in MHz, the Actual frequency, as read from
# /proc/cpuinfo, the difference between the Target and Actual frequencies,
# and the value of MSR 0x199 (MSR_IA32_PERF_CTL) which indicates what
# pstate the cpu is in, and the value of
# /sys/devices/system/cpu/intel_pstate/max_perf_pct X maximum turbo state
#
# Notes: In some cases several frequency values may be placed in the
# /tmp/result.X files. This is done on purpose in order to catch cases
# where the pstate driver may not be working at all. There is the case
# where, for example, several "similar" frequencies are in the file:
#
#
#/tmp/result.3100:1:cpu MHz : 2899.980
#/tmp/result.3100:2:cpu MHz : 2900.000
#/tmp/result.3100:3:msr 0x199: 0x1e00
#/tmp/result.3100:4:max_perf_pct 94
#
# and the test will error out in those cases. The result.X file can be checked
# for consistency and modified to remove the extra MHz values. The result.X
# files can be re-evaluated by setting EVALUATE_ONLY to 1 below.
EVALUATE_ONLY=0
max_cpus=$(($(nproc)-1))
# compile programs
gcc -o aperf aperf.c -lm
[ $? -ne 0 ] && echo "Problem compiling aperf.c." && exit 1
gcc -o msr msr.c -lm
[ $? -ne 0 ] && echo "Problem compiling msr.c." && exit 1
function run_test () {
file_ext=$1
for cpu in `seq 0 $max_cpus`
do
echo "launching aperf load on $cpu"
./aperf $cpu &
done
echo "sleeping for 5 seconds"
sleep 5
num_freqs=$(cat /proc/cpuinfo | grep MHz | sort -u | wc -l)
if [ $num_freqs -le 2 ]; then
cat /proc/cpuinfo | grep MHz | sort -u | tail -1 > /tmp/result.$1
else
cat /proc/cpuinfo | grep MHz | sort -u > /tmp/result.$1
fi
./msr 0 >> /tmp/result.$1
max_perf_pct=$(cat /sys/devices/system/cpu/intel_pstate/max_perf_pct)
echo "max_perf_pct $max_perf_pct" >> /tmp/result.$1
for job in `jobs -p`
do
echo "waiting for job id $job"
wait $job
done
}
#
# MAIN (ALL UNITS IN MHZ)
#
# Get the marketing frequency
_mkt_freq=$(cat /proc/cpuinfo | grep -m 1 "model name" | awk '{print $NF}')
_mkt_freq=$(echo $_mkt_freq | tr -d [:alpha:][:punct:])
mkt_freq=${_mkt_freq}0
# Get the ranges from cpupower
_min_freq=$(cpupower frequency-info -l | tail -1 | awk ' { print $1 } ')
min_freq=$(($_min_freq / 1000))
_max_freq=$(cpupower frequency-info -l | tail -1 | awk ' { print $2 } ')
max_freq=$(($_max_freq / 1000))
for freq in `seq $max_freq -100 $min_freq`
do
echo "Setting maximum frequency to $freq"
cpupower frequency-set -g powersave --max=${freq}MHz >& /dev/null
[ $EVALUATE_ONLY -eq 0 ] && run_test $freq
done
echo "=============================================================================="
echo "The marketing frequency of the cpu is $mkt_freq MHz"
echo "The maximum frequency of the cpu is $max_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
echo "Target Actual Difference MSR(0x199) max_perf_pct"
for freq in `seq $max_freq -100 $min_freq`
do
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 } ')
max_perf_pct=$(cat /tmp/result.${freq} | grep "max_perf_pct" | awk ' { print $2 } ' )
if [ $result_freq -eq $freq ]; then
echo " $freq $result_freq 0 $msr $(($max_perf_pct*3300))"
else
echo " $freq $result_freq $(($result_freq-$freq)) $msr $(($max_perf_pct*$max_freq))"
fi
done
exit 0
......@@ -42,6 +42,7 @@
#define TEST_HARNESS_H_
#define _GNU_SOURCE
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
......@@ -370,8 +371,8 @@
__typeof__(_expected) __exp = (_expected); \
__typeof__(_seen) __seen = (_seen); \
if (!(__exp _t __seen)) { \
unsigned long long __exp_print = (unsigned long long)__exp; \
unsigned long long __seen_print = (unsigned long long)__seen; \
unsigned long long __exp_print = (uintptr_t)__exp; \
unsigned long long __seen_print = (uintptr_t)__seen; \
__TH_LOG("Expected %s (%llu) %s %s (%llu)", \
#_expected, __exp_print, #_t, \
#_seen, __seen_print); \
......
......@@ -16,3 +16,4 @@ set-timer-lat
skew_consistency
threadtest
valid-adjtimex
adjtick
......@@ -2,3 +2,8 @@ hugepage-mmap
hugepage-shm
map_hugetlb
thuge-gen
compaction_test
mlock2-tests
on-fault-limit
transhuge-stress
userfaultfd
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