Merge tag 'linux-kselftest-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
Pull kselftest updates from Shuah Khan:
"This update consists of:
- important fixes for build failures and clean target related
warnings to address regressions introduced in commit 88baa78d1f
("selftests: remove duplicated all and clean target")
- several minor spelling fixes in and log messages and comment
blocks.
- Enabling configs for better test coverage in ftrace, vm, and
cpufreq tests.
- .gitignore changes"
* tag 'linux-kselftest-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest: (26 commits)
selftests: x86: add missing executables to .gitignore
selftests: watchdog: accept multiple params on command line
selftests: create cpufreq kconfig fragments
selftests: x86: override clean in lib.mk to fix warnings
selftests: sync: override clean in lib.mk to fix warnings
selftests: splice: override clean in lib.mk to fix warnings
selftests: gpio: fix clean target to remove all generated files and dirs
selftests: add gpio generated files to .gitignore
selftests: powerpc: override clean in lib.mk to fix warnings
selftests: gpio: override clean in lib.mk to fix warnings
selftests: futex: override clean in lib.mk to fix warnings
selftests: lib.mk: define CLEAN macro to allow Makefiles to override clean
selftests: splice: fix clean target to not remove default_file_splice_read.sh
selftests: gpio: add config fragment for gpio-mockup
selftests: breakpoints: allow to cross-compile for aarch64/arm64
selftests/Makefile: Add missed PHONY targets
selftests/vm/run_vmtests: Fix wrong comment
selftests/Makefile: Add missed closing `"` in comment
selftests/vm/run_vmtests: Polish output text
selftests/timers: fix spelling mistake: "Asynchronous"
...
This commit is contained in:
@@ -1 +1,2 @@
|
||||
CONFIG_SYSVIPC=y
|
||||
CONFIG_USERFAULTFD=y
|
||||
|
@@ -62,7 +62,7 @@ int main(void)
|
||||
void *addr;
|
||||
int ret;
|
||||
|
||||
addr = mmap(ADDR, LENGTH, PROTECTION, FLAGS, 0, 0);
|
||||
addr = mmap(ADDR, LENGTH, PROTECTION, FLAGS, -1, 0);
|
||||
if (addr == MAP_FAILED) {
|
||||
perror("mmap");
|
||||
exit(1);
|
||||
|
@@ -293,7 +293,7 @@ static int test_mlock_lock()
|
||||
unsigned long page_size = getpagesize();
|
||||
|
||||
map = mmap(NULL, 2 * page_size, PROT_READ | PROT_WRITE,
|
||||
MAP_ANONYMOUS | MAP_PRIVATE, 0, 0);
|
||||
MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
|
||||
if (map == MAP_FAILED) {
|
||||
perror("test_mlock_locked mmap");
|
||||
goto out;
|
||||
@@ -402,7 +402,7 @@ static int test_mlock_onfault()
|
||||
unsigned long page_size = getpagesize();
|
||||
|
||||
map = mmap(NULL, 2 * page_size, PROT_READ | PROT_WRITE,
|
||||
MAP_ANONYMOUS | MAP_PRIVATE, 0, 0);
|
||||
MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
|
||||
if (map == MAP_FAILED) {
|
||||
perror("test_mlock_locked mmap");
|
||||
goto out;
|
||||
@@ -445,7 +445,7 @@ static int test_lock_onfault_of_present()
|
||||
uint64_t page1_flags, page2_flags;
|
||||
|
||||
map = mmap(NULL, 2 * page_size, PROT_READ | PROT_WRITE,
|
||||
MAP_ANONYMOUS | MAP_PRIVATE, 0, 0);
|
||||
MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
|
||||
if (map == MAP_FAILED) {
|
||||
perror("test_mlock_locked mmap");
|
||||
goto out;
|
||||
@@ -492,7 +492,7 @@ static int test_munlockall()
|
||||
unsigned long page_size = getpagesize();
|
||||
|
||||
map = mmap(NULL, 2 * page_size, PROT_READ | PROT_WRITE,
|
||||
MAP_ANONYMOUS | MAP_PRIVATE, 0, 0);
|
||||
MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
|
||||
|
||||
if (map == MAP_FAILED) {
|
||||
perror("test_munlockall mmap");
|
||||
@@ -518,7 +518,7 @@ static int test_munlockall()
|
||||
munmap(map, 2 * page_size);
|
||||
|
||||
map = mmap(NULL, 2 * page_size, PROT_READ | PROT_WRITE,
|
||||
MAP_ANONYMOUS | MAP_PRIVATE, 0, 0);
|
||||
MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
|
||||
|
||||
if (map == MAP_FAILED) {
|
||||
perror("test_munlockall second mmap");
|
||||
@@ -573,7 +573,7 @@ static int test_vma_management(bool call_mlock)
|
||||
struct vm_boundaries page3;
|
||||
|
||||
map = mmap(NULL, 3 * page_size, PROT_READ | PROT_WRITE,
|
||||
MAP_ANONYMOUS | MAP_PRIVATE, 0, 0);
|
||||
MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
|
||||
if (map == MAP_FAILED) {
|
||||
perror("mmap()");
|
||||
return ret;
|
||||
|
@@ -26,7 +26,7 @@ static int test_limit(void)
|
||||
}
|
||||
|
||||
map = mmap(NULL, 2 * lims.rlim_max, PROT_READ | PROT_WRITE,
|
||||
MAP_PRIVATE | MAP_ANONYMOUS | MAP_POPULATE, 0, 0);
|
||||
MAP_PRIVATE | MAP_ANONYMOUS | MAP_POPULATE, -1, 0);
|
||||
if (map != MAP_FAILED)
|
||||
printf("mmap should have failed, but didn't\n");
|
||||
else {
|
||||
|
@@ -49,9 +49,9 @@ fi
|
||||
mkdir $mnt
|
||||
mount -t hugetlbfs none $mnt
|
||||
|
||||
echo "--------------------"
|
||||
echo "---------------------"
|
||||
echo "running hugepage-mmap"
|
||||
echo "--------------------"
|
||||
echo "---------------------"
|
||||
./hugepage-mmap
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "[FAIL]"
|
||||
@@ -77,9 +77,9 @@ fi
|
||||
echo $shmmax > /proc/sys/kernel/shmmax
|
||||
echo $shmall > /proc/sys/kernel/shmall
|
||||
|
||||
echo "--------------------"
|
||||
echo "-------------------"
|
||||
echo "running map_hugetlb"
|
||||
echo "--------------------"
|
||||
echo "-------------------"
|
||||
./map_hugetlb
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "[FAIL]"
|
||||
@@ -92,9 +92,9 @@ echo "NOTE: The above hugetlb tests provide minimal coverage. Use"
|
||||
echo " https://github.com/libhugetlbfs/libhugetlbfs.git for"
|
||||
echo " hugetlb regression testing."
|
||||
|
||||
echo "--------------------"
|
||||
echo "-------------------"
|
||||
echo "running userfaultfd"
|
||||
echo "--------------------"
|
||||
echo "-------------------"
|
||||
./userfaultfd anon 128 32
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "[FAIL]"
|
||||
@@ -103,10 +103,10 @@ else
|
||||
echo "[PASS]"
|
||||
fi
|
||||
|
||||
echo "----------------------------"
|
||||
echo "---------------------------"
|
||||
echo "running userfaultfd_hugetlb"
|
||||
echo "----------------------------"
|
||||
# 258MB total huge pages == 128MB src and 128MB dst
|
||||
echo "---------------------------"
|
||||
# 256MB total huge pages == 128MB src and 128MB dst
|
||||
./userfaultfd hugetlb 128 32 $mnt/ufd_test_file
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "[FAIL]"
|
||||
@@ -116,9 +116,9 @@ else
|
||||
fi
|
||||
rm -f $mnt/ufd_test_file
|
||||
|
||||
echo "----------------------------"
|
||||
echo "-------------------------"
|
||||
echo "running userfaultfd_shmem"
|
||||
echo "----------------------------"
|
||||
echo "-------------------------"
|
||||
./userfaultfd shmem 128 32
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "[FAIL]"
|
||||
@@ -143,9 +143,9 @@ else
|
||||
echo "[PASS]"
|
||||
fi
|
||||
|
||||
echo "--------------------"
|
||||
echo "----------------------"
|
||||
echo "running on-fault-limit"
|
||||
echo "--------------------"
|
||||
echo "----------------------"
|
||||
sudo -u nobody ./on-fault-limit
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "[FAIL]"
|
||||
|
@@ -146,7 +146,7 @@ void test_mmap(unsigned long size, unsigned flags)
|
||||
|
||||
before = read_free(size);
|
||||
map = mmap(NULL, size*NUM_PAGES, PROT_READ|PROT_WRITE,
|
||||
MAP_PRIVATE|MAP_ANONYMOUS|MAP_HUGETLB|flags, 0, 0);
|
||||
MAP_PRIVATE|MAP_ANONYMOUS|MAP_HUGETLB|flags, -1, 0);
|
||||
|
||||
if (map == (char *)-1) err("mmap");
|
||||
memset(map, 0xff, size*NUM_PAGES);
|
||||
|
مرجع در شماره جدید
Block a user