linux-kselftest-4.19-rc5
This Kselftest fixes update for 4.9-rc5 consists of: -- fixes to build failures -- fixes to add missing config files to increase test coverage -- fixes to cgroup test and a new cgroup test for memory.oom.group -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEPZKym/RZuOCGeA/kCwJExA0NQxwFAluerlwACgkQCwJExA0N QxzFbA//Xk32yqgo16SNN8uovPJo+Oi5TICblNZTI5d2LlmI/H6+773EALa+m0zC 2tMvZ1A/SSWymsGTyEAFEuzhwnYqcLZc9InoK8W+hZjKd3XqyjvTp1ZGnA2iJb89 3wP0VgbEuqhtnyhIAAp6dQuaVBK3kJEmC47IPy1qziVwupotN8xJuj/1/9WiWn5X MqIEfmBo4Bi0Ugn8xpOEIBU9bEi3ZNO2iA/3V5j//jzKZzOvbkLSexIQdtcay4Rj eLY03Sw5VEKNN5btpf5dpOojmAb2ipOUfQh3RKGpZMmqMqcHm71+GxXxQyjOAZrc kFsUjLvKoyEUuVKC84jAhuim8aZIbNxxiKFGBlZFFIcrF/yJt8PX4zo1mpWrlpa/ Yh5gP+xMMq7p0CaTVTksnqy051bfjCVKyTqwSTTFo5pimCA7JHxAsFvRtSrxgXHf DFWXF2n4Jxonn+urc9sdhggdocUTHoqO3c0ImbO897CaDYiOGrmhBuxeaZi6y/0I Y9PUAt17IGsB8sp/1C+LMBKkIjxYCBuX53LK/QIvLDNMUcWI6laAYx0etyH0xVPe /HMhsDnpyQc0khhDB3XZ5HC3EB3g2S1t2wOl9VRPN3MqJvVlffNHb7psXxG2k99J Z/dIaYVuksP6JGM3I/Y30BGpwhdQ/hyzxRpiX065XpDPttUO1XY= =79Fh -----END PGP SIGNATURE----- Merge tag 'linux-kselftest-4.19-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest Pulled kselftest fixes from Shuah: "This Kselftest fixes update for 4.9-rc5 consists of: -- fixes to build failures -- fixes to add missing config files to increase test coverage -- fixes to cgroup test and a new cgroup test for memory.oom.group"
This commit is contained in:
Greg Kroah-Hartman
commit
c0747ad363
14
Makefile
14
Makefile
|
|
@ -299,19 +299,7 @@ KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)
|
|||
KERNELVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION)
|
||||
export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION
|
||||
|
||||
# SUBARCH tells the usermode build what the underlying arch is. That is set
|
||||
# first, and if a usermode build is happening, the "ARCH=um" on the command
|
||||
# line overrides the setting of ARCH below. If a native build is happening,
|
||||
# then ARCH is assigned, getting whatever value it gets normally, and
|
||||
# SUBARCH is subsequently ignored.
|
||||
|
||||
SUBARCH := $(shell uname -m | sed -e s/i.86/x86/ -e s/x86_64/x86/ \
|
||||
-e s/sun4u/sparc64/ \
|
||||
-e s/arm.*/arm/ -e s/sa110/arm/ \
|
||||
-e s/s390x/s390/ -e s/parisc64/parisc/ \
|
||||
-e s/ppc.*/powerpc/ -e s/mips.*/mips/ \
|
||||
-e s/sh[234].*/sh/ -e s/aarch64.*/arm64/ \
|
||||
-e s/riscv.*/riscv/)
|
||||
include scripts/subarch.include
|
||||
|
||||
# Cross compiling and selecting different set of gcc/bin-utils
|
||||
# ---------------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -0,0 +1,13 @@
|
|||
# SUBARCH tells the usermode build what the underlying arch is. That is set
|
||||
# first, and if a usermode build is happening, the "ARCH=um" on the command
|
||||
# line overrides the setting of ARCH below. If a native build is happening,
|
||||
# then ARCH is assigned, getting whatever value it gets normally, and
|
||||
# SUBARCH is subsequently ignored.
|
||||
|
||||
SUBARCH := $(shell uname -m | sed -e s/i.86/x86/ -e s/x86_64/x86/ \
|
||||
-e s/sun4u/sparc64/ \
|
||||
-e s/arm.*/arm/ -e s/sa110/arm/ \
|
||||
-e s/s390x/s390/ -e s/parisc64/parisc/ \
|
||||
-e s/ppc.*/powerpc/ -e s/mips.*/mips/ \
|
||||
-e s/sh[234].*/sh/ -e s/aarch64.*/arm64/ \
|
||||
-e s/riscv.*/riscv/)
|
||||
|
|
@ -6,7 +6,7 @@ TEST_PROGS := run.sh
|
|||
|
||||
include ../lib.mk
|
||||
|
||||
all:
|
||||
all: khdr
|
||||
@for DIR in $(SUBDIRS); do \
|
||||
BUILD_TARGET=$(OUTPUT)/$$DIR; \
|
||||
mkdir $$BUILD_TARGET -p; \
|
||||
|
|
|
|||
|
|
@ -10,6 +10,8 @@ $(TEST_GEN_FILES): ipcsocket.c ionutils.c
|
|||
|
||||
TEST_PROGS := ion_test.sh
|
||||
|
||||
KSFT_KHDR_INSTALL := 1
|
||||
top_srcdir = ../../../../..
|
||||
include ../../lib.mk
|
||||
|
||||
$(OUTPUT)/ionapp_export: ionapp_export.c ipcsocket.c ionutils.c
|
||||
|
|
|
|||
|
|
@ -1 +1,2 @@
|
|||
test_memcontrol
|
||||
test_core
|
||||
|
|
|
|||
|
|
@ -89,17 +89,28 @@ int cg_read(const char *cgroup, const char *control, char *buf, size_t len)
|
|||
int cg_read_strcmp(const char *cgroup, const char *control,
|
||||
const char *expected)
|
||||
{
|
||||
size_t size = strlen(expected) + 1;
|
||||
size_t size;
|
||||
char *buf;
|
||||
int ret;
|
||||
|
||||
/* Handle the case of comparing against empty string */
|
||||
if (!expected)
|
||||
size = 32;
|
||||
else
|
||||
size = strlen(expected) + 1;
|
||||
|
||||
buf = malloc(size);
|
||||
if (!buf)
|
||||
return -1;
|
||||
|
||||
if (cg_read(cgroup, control, buf, size))
|
||||
if (cg_read(cgroup, control, buf, size)) {
|
||||
free(buf);
|
||||
return -1;
|
||||
}
|
||||
|
||||
return strcmp(expected, buf);
|
||||
ret = strcmp(expected, buf);
|
||||
free(buf);
|
||||
return ret;
|
||||
}
|
||||
|
||||
int cg_read_strstr(const char *cgroup, const char *control, const char *needle)
|
||||
|
|
@ -337,3 +348,24 @@ int is_swap_enabled(void)
|
|||
|
||||
return cnt > 1;
|
||||
}
|
||||
|
||||
int set_oom_adj_score(int pid, int score)
|
||||
{
|
||||
char path[PATH_MAX];
|
||||
int fd, len;
|
||||
|
||||
sprintf(path, "/proc/%d/oom_score_adj", pid);
|
||||
|
||||
fd = open(path, O_WRONLY | O_APPEND);
|
||||
if (fd < 0)
|
||||
return fd;
|
||||
|
||||
len = dprintf(fd, "%d", score);
|
||||
if (len < 0) {
|
||||
close(fd);
|
||||
return len;
|
||||
}
|
||||
|
||||
close(fd);
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,3 +40,4 @@ 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);
|
||||
extern int set_oom_adj_score(int pid, int score);
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
#define _GNU_SOURCE
|
||||
|
||||
#include <linux/limits.h>
|
||||
#include <linux/oom.h>
|
||||
#include <fcntl.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
|
@ -202,6 +203,36 @@ static int alloc_pagecache_50M_noexit(const char *cgroup, void *arg)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int alloc_anon_noexit(const char *cgroup, void *arg)
|
||||
{
|
||||
int ppid = getppid();
|
||||
|
||||
if (alloc_anon(cgroup, arg))
|
||||
return -1;
|
||||
|
||||
while (getppid() == ppid)
|
||||
sleep(1);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Wait until processes are killed asynchronously by the OOM killer
|
||||
* If we exceed a timeout, fail.
|
||||
*/
|
||||
static int cg_test_proc_killed(const char *cgroup)
|
||||
{
|
||||
int limit;
|
||||
|
||||
for (limit = 10; limit > 0; limit--) {
|
||||
if (cg_read_strcmp(cgroup, "cgroup.procs", "") == 0)
|
||||
return 0;
|
||||
|
||||
usleep(100000);
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
/*
|
||||
* First, this test creates the following hierarchy:
|
||||
* A memory.min = 50M, memory.max = 200M
|
||||
|
|
@ -964,6 +995,177 @@ cleanup:
|
|||
return ret;
|
||||
}
|
||||
|
||||
/*
|
||||
* This test disables swapping and tries to allocate anonymous memory
|
||||
* up to OOM with memory.group.oom set. Then it checks that all
|
||||
* processes in the leaf (but not the parent) were killed.
|
||||
*/
|
||||
static int test_memcg_oom_group_leaf_events(const char *root)
|
||||
{
|
||||
int ret = KSFT_FAIL;
|
||||
char *parent, *child;
|
||||
|
||||
parent = cg_name(root, "memcg_test_0");
|
||||
child = cg_name(root, "memcg_test_0/memcg_test_1");
|
||||
|
||||
if (!parent || !child)
|
||||
goto cleanup;
|
||||
|
||||
if (cg_create(parent))
|
||||
goto cleanup;
|
||||
|
||||
if (cg_create(child))
|
||||
goto cleanup;
|
||||
|
||||
if (cg_write(parent, "cgroup.subtree_control", "+memory"))
|
||||
goto cleanup;
|
||||
|
||||
if (cg_write(child, "memory.max", "50M"))
|
||||
goto cleanup;
|
||||
|
||||
if (cg_write(child, "memory.swap.max", "0"))
|
||||
goto cleanup;
|
||||
|
||||
if (cg_write(child, "memory.oom.group", "1"))
|
||||
goto cleanup;
|
||||
|
||||
cg_run_nowait(parent, alloc_anon_noexit, (void *) MB(60));
|
||||
cg_run_nowait(child, alloc_anon_noexit, (void *) MB(1));
|
||||
cg_run_nowait(child, alloc_anon_noexit, (void *) MB(1));
|
||||
if (!cg_run(child, alloc_anon, (void *)MB(100)))
|
||||
goto cleanup;
|
||||
|
||||
if (cg_test_proc_killed(child))
|
||||
goto cleanup;
|
||||
|
||||
if (cg_read_key_long(child, "memory.events", "oom_kill ") <= 0)
|
||||
goto cleanup;
|
||||
|
||||
if (cg_read_key_long(parent, "memory.events", "oom_kill ") != 0)
|
||||
goto cleanup;
|
||||
|
||||
ret = KSFT_PASS;
|
||||
|
||||
cleanup:
|
||||
if (child)
|
||||
cg_destroy(child);
|
||||
if (parent)
|
||||
cg_destroy(parent);
|
||||
free(child);
|
||||
free(parent);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
/*
|
||||
* This test disables swapping and tries to allocate anonymous memory
|
||||
* up to OOM with memory.group.oom set. Then it checks that all
|
||||
* processes in the parent and leaf were killed.
|
||||
*/
|
||||
static int test_memcg_oom_group_parent_events(const char *root)
|
||||
{
|
||||
int ret = KSFT_FAIL;
|
||||
char *parent, *child;
|
||||
|
||||
parent = cg_name(root, "memcg_test_0");
|
||||
child = cg_name(root, "memcg_test_0/memcg_test_1");
|
||||
|
||||
if (!parent || !child)
|
||||
goto cleanup;
|
||||
|
||||
if (cg_create(parent))
|
||||
goto cleanup;
|
||||
|
||||
if (cg_create(child))
|
||||
goto cleanup;
|
||||
|
||||
if (cg_write(parent, "memory.max", "80M"))
|
||||
goto cleanup;
|
||||
|
||||
if (cg_write(parent, "memory.swap.max", "0"))
|
||||
goto cleanup;
|
||||
|
||||
if (cg_write(parent, "memory.oom.group", "1"))
|
||||
goto cleanup;
|
||||
|
||||
cg_run_nowait(parent, alloc_anon_noexit, (void *) MB(60));
|
||||
cg_run_nowait(child, alloc_anon_noexit, (void *) MB(1));
|
||||
cg_run_nowait(child, alloc_anon_noexit, (void *) MB(1));
|
||||
|
||||
if (!cg_run(child, alloc_anon, (void *)MB(100)))
|
||||
goto cleanup;
|
||||
|
||||
if (cg_test_proc_killed(child))
|
||||
goto cleanup;
|
||||
if (cg_test_proc_killed(parent))
|
||||
goto cleanup;
|
||||
|
||||
ret = KSFT_PASS;
|
||||
|
||||
cleanup:
|
||||
if (child)
|
||||
cg_destroy(child);
|
||||
if (parent)
|
||||
cg_destroy(parent);
|
||||
free(child);
|
||||
free(parent);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
/*
|
||||
* This test disables swapping and tries to allocate anonymous memory
|
||||
* up to OOM with memory.group.oom set. Then it checks that all
|
||||
* processes were killed except those set with OOM_SCORE_ADJ_MIN
|
||||
*/
|
||||
static int test_memcg_oom_group_score_events(const char *root)
|
||||
{
|
||||
int ret = KSFT_FAIL;
|
||||
char *memcg;
|
||||
int safe_pid;
|
||||
|
||||
memcg = cg_name(root, "memcg_test_0");
|
||||
|
||||
if (!memcg)
|
||||
goto cleanup;
|
||||
|
||||
if (cg_create(memcg))
|
||||
goto cleanup;
|
||||
|
||||
if (cg_write(memcg, "memory.max", "50M"))
|
||||
goto cleanup;
|
||||
|
||||
if (cg_write(memcg, "memory.swap.max", "0"))
|
||||
goto cleanup;
|
||||
|
||||
if (cg_write(memcg, "memory.oom.group", "1"))
|
||||
goto cleanup;
|
||||
|
||||
safe_pid = cg_run_nowait(memcg, alloc_anon_noexit, (void *) MB(1));
|
||||
if (set_oom_adj_score(safe_pid, OOM_SCORE_ADJ_MIN))
|
||||
goto cleanup;
|
||||
|
||||
cg_run_nowait(memcg, alloc_anon_noexit, (void *) MB(1));
|
||||
if (!cg_run(memcg, alloc_anon, (void *)MB(100)))
|
||||
goto cleanup;
|
||||
|
||||
if (cg_read_key_long(memcg, "memory.events", "oom_kill ") != 3)
|
||||
goto cleanup;
|
||||
|
||||
if (kill(safe_pid, SIGKILL))
|
||||
goto cleanup;
|
||||
|
||||
ret = KSFT_PASS;
|
||||
|
||||
cleanup:
|
||||
if (memcg)
|
||||
cg_destroy(memcg);
|
||||
free(memcg);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
#define T(x) { x, #x }
|
||||
struct memcg_test {
|
||||
int (*fn)(const char *root);
|
||||
|
|
@ -978,6 +1180,9 @@ struct memcg_test {
|
|||
T(test_memcg_oom_events),
|
||||
T(test_memcg_swap_max),
|
||||
T(test_memcg_sock),
|
||||
T(test_memcg_oom_group_leaf_events),
|
||||
T(test_memcg_oom_group_parent_events),
|
||||
T(test_memcg_oom_group_score_events),
|
||||
};
|
||||
#undef T
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
CONFIG_EFIVAR_FS=y
|
||||
|
|
@ -18,6 +18,7 @@ TEST_GEN_FILES := \
|
|||
|
||||
TEST_PROGS := run.sh
|
||||
|
||||
top_srcdir = ../../../../..
|
||||
include ../../lib.mk
|
||||
|
||||
$(TEST_GEN_FILES): $(HEADERS)
|
||||
|
|
|
|||
|
|
@ -21,11 +21,8 @@ endef
|
|||
CFLAGS += -O2 -g -std=gnu99 -Wall -I../../../../usr/include/
|
||||
LDLIBS += -lmount -I/usr/include/libmount
|
||||
|
||||
$(BINARIES): ../../../gpio/gpio-utils.o ../../../../usr/include/linux/gpio.h
|
||||
$(BINARIES):| khdr
|
||||
$(BINARIES): ../../../gpio/gpio-utils.o
|
||||
|
||||
../../../gpio/gpio-utils.o:
|
||||
make ARCH=$(ARCH) CROSS_COMPILE=$(CROSS_COMPILE) -C ../../../gpio
|
||||
|
||||
../../../../usr/include/linux/gpio.h:
|
||||
make -C ../../../.. headers_install INSTALL_HDR_PATH=$(shell pwd)/../../../../usr/
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@
|
|||
#define KSFT_FAIL 1
|
||||
#define KSFT_XFAIL 2
|
||||
#define KSFT_XPASS 3
|
||||
/* Treat skip as pass */
|
||||
#define KSFT_SKIP 4
|
||||
|
||||
/* counters */
|
||||
|
|
|
|||
|
|
@ -37,9 +37,6 @@ $(LIBKVM_OBJ): $(OUTPUT)/%.o: %.c
|
|||
$(OUTPUT)/libkvm.a: $(LIBKVM_OBJ)
|
||||
$(AR) crs $@ $^
|
||||
|
||||
$(LINUX_HDR_PATH):
|
||||
make -C $(top_srcdir) headers_install
|
||||
|
||||
all: $(STATIC_LIBS) $(LINUX_HDR_PATH)
|
||||
all: $(STATIC_LIBS)
|
||||
$(TEST_GEN_PROGS): $(STATIC_LIBS)
|
||||
$(TEST_GEN_PROGS) $(LIBKVM_OBJ): | $(LINUX_HDR_PATH)
|
||||
$(STATIC_LIBS):| khdr
|
||||
|
|
|
|||
|
|
@ -16,8 +16,20 @@ TEST_GEN_PROGS := $(patsubst %,$(OUTPUT)/%,$(TEST_GEN_PROGS))
|
|||
TEST_GEN_PROGS_EXTENDED := $(patsubst %,$(OUTPUT)/%,$(TEST_GEN_PROGS_EXTENDED))
|
||||
TEST_GEN_FILES := $(patsubst %,$(OUTPUT)/%,$(TEST_GEN_FILES))
|
||||
|
||||
top_srcdir ?= ../../../..
|
||||
include $(top_srcdir)/scripts/subarch.include
|
||||
ARCH ?= $(SUBARCH)
|
||||
|
||||
all: $(TEST_GEN_PROGS) $(TEST_GEN_PROGS_EXTENDED) $(TEST_GEN_FILES)
|
||||
|
||||
.PHONY: khdr
|
||||
khdr:
|
||||
make ARCH=$(ARCH) -C $(top_srcdir) headers_install
|
||||
|
||||
ifdef KSFT_KHDR_INSTALL
|
||||
$(TEST_GEN_PROGS) $(TEST_GEN_PROGS_EXTENDED) $(TEST_GEN_FILES):| khdr
|
||||
endif
|
||||
|
||||
.ONESHELL:
|
||||
define RUN_TEST_PRINT_RESULT
|
||||
TEST_HDR_MSG="selftests: "`basename $$PWD`:" $$BASENAME_TEST"; \
|
||||
|
|
|
|||
|
|
@ -2,3 +2,4 @@ CONFIG_MEMORY_HOTPLUG=y
|
|||
CONFIG_MEMORY_HOTPLUG_SPARSE=y
|
||||
CONFIG_NOTIFIER_ERROR_INJECTION=y
|
||||
CONFIG_MEMORY_NOTIFIER_ERROR_INJECT=m
|
||||
CONFIG_MEMORY_HOTREMOVE=y
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@ TEST_GEN_FILES += udpgso udpgso_bench_tx udpgso_bench_rx
|
|||
TEST_GEN_PROGS = reuseport_bpf reuseport_bpf_cpu reuseport_bpf_numa
|
||||
TEST_GEN_PROGS += reuseport_dualstack reuseaddr_conflict tls
|
||||
|
||||
KSFT_KHDR_INSTALL := 1
|
||||
include ../lib.mk
|
||||
|
||||
$(OUTPUT)/reuseport_bpf_numa: LDFLAGS += -lnuma
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ TEST_PROGS := hwtstamp_config rxtimestamp timestamping txtimestamp
|
|||
|
||||
all: $(TEST_PROGS)
|
||||
|
||||
top_srcdir = ../../../../..
|
||||
include ../../lib.mk
|
||||
|
||||
clean:
|
||||
|
|
|
|||
|
|
@ -26,10 +26,6 @@ TEST_PROGS := run_vmtests
|
|||
|
||||
include ../lib.mk
|
||||
|
||||
$(OUTPUT)/userfaultfd: ../../../../usr/include/linux/kernel.h
|
||||
$(OUTPUT)/userfaultfd: LDLIBS += -lpthread
|
||||
|
||||
$(OUTPUT)/mlock-random-test: LDLIBS += -lcap
|
||||
|
||||
../../../../usr/include/linux/kernel.h:
|
||||
make -C ../../../.. headers_install
|
||||
|
|
|
|||
Loading…
Reference in New Issue