linux-kselftest-4.19-rc1
This Kselftest update for 4.19-rc1: - adds cgroup core selftests - fixes compile warnings in android ion test - fixes to bugs in exclude and skip paths in vDSO test - removes obsolete config options - adds missing .gitignore file -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEPZKym/RZuOCGeA/kCwJExA0NQxwFAlt7LPsACgkQCwJExA0N QxwiUQ/8D1bMBeiZulHGqzwYEdMYv/Yt+IAxN4LY7TMD75b0XDzc3MArh5zo6/UB C6Hv08kKXSTrGHuOeNGOsvfzuUEaGDUeDGU0ehQIoOAPxuqp8LzhK2aCRH53oVaH kr/JatZaWLuLG/MXe+k8Tp2hR403x2IEYwf8ubVlxIRU7JQNkKyUIKfwcS7OSIcV Ij9FDyJ/Rp21wAFj69JWi9zKbBBCGNwytpaUZo+aPnaOsAutqQ+MVy2M3NVLTBgB E7u43iWO84AD5BX/Hea0MpgqvSwWbv/Qo+SScROwRtrievGe9+dWiR81ImqmzrOb GuBdivXB2zDlmQq2KW4IBKWtZO3wTgXDYgi+cWgK/qq3iJOVe/eI7KXmOwilxgSw r+8Ar3oAyMfHPvt2Yg/SDCAg1UCsjaJ6a90LoNg4hfGIUzP8QX08m9w/IE6bgCDM k9iS0rfUmha2kPM0pJT/D4TVFVacUu5/scI0hColcPB/L/eFgHmxcJYYRD6crPJZ Y/hGqpV8liMsjbFofk2Eo8TbOhZBrPo3Ikoo48BfjCc3wM/tt8m/Ych3d79Xq8vg /7N1jccmqER1mPqaQBPldV4b4Zs7sg4HIV4gsBAbMBvPpAVRHHmiCKQyww3SaLTA n6IhuTW2zJq+7dV09a9WjOB30Koz+ln/GCjtQyvukOwV1fnShtk= =dH5Q -----END PGP SIGNATURE----- Merge tag 'linux-kselftest-4.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest Pull Kselftest update from Shuah Khan: - add cgroup core selftests - fix compile warnings in android ion test - fix to bugs in exclude and skip paths in vDSO test - remove obsolete config options - add missing .gitignore file * tag 'linux-kselftest-4.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest: selftests/ftrace: Fix kprobe string testcase to not probe notrace function selftests: mount: remove no longer needed config option selftests: cgroup: add gitignore file Add cgroup core selftests selftests: vDSO - fix to return KSFT_SKIP when test couldn't be run selftests: vDSO - fix to exclude x86 test on non-x86 platforms selftests/android: initialize heap_type to avoid compiling warninghifive-unleashed-5.1
Linus Torvalds
commit
6b2edf27fe
|
|
@ -51,6 +51,7 @@ int main(int argc, char *argv[])
|
|||
|
||||
heap_size = 0;
|
||||
flags = 0;
|
||||
heap_type = ION_HEAP_TYPE_SYSTEM;
|
||||
|
||||
while ((opt = getopt(argc, argv, "hi:s:")) != -1) {
|
||||
switch (opt) {
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
test_memcontrol
|
||||
|
|
@ -4,7 +4,9 @@ CFLAGS += -Wall
|
|||
all:
|
||||
|
||||
TEST_GEN_PROGS = test_memcontrol
|
||||
TEST_GEN_PROGS += test_core
|
||||
|
||||
include ../lib.mk
|
||||
|
||||
$(OUTPUT)/test_memcontrol: cgroup_util.c
|
||||
$(OUTPUT)/test_core: cgroup_util.c
|
||||
|
|
|
|||
|
|
@ -229,6 +229,14 @@ retry:
|
|||
return ret;
|
||||
}
|
||||
|
||||
int cg_enter_current(const char *cgroup)
|
||||
{
|
||||
char pidbuf[64];
|
||||
|
||||
snprintf(pidbuf, sizeof(pidbuf), "%d", getpid());
|
||||
return cg_write(cgroup, "cgroup.procs", pidbuf);
|
||||
}
|
||||
|
||||
int cg_run(const char *cgroup,
|
||||
int (*fn)(const char *cgroup, void *arg),
|
||||
void *arg)
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@ 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_enter_current(const char *cgroup);
|
||||
extern int cg_run_nowait(const char *cgroup,
|
||||
int (*fn)(const char *cgroup, void *arg),
|
||||
void *arg);
|
||||
|
|
|
|||
|
|
@ -0,0 +1,395 @@
|
|||
/* SPDX-License-Identifier: GPL-2.0 */
|
||||
|
||||
#include <linux/limits.h>
|
||||
#include <sys/types.h>
|
||||
#include <unistd.h>
|
||||
#include <stdio.h>
|
||||
#include <errno.h>
|
||||
|
||||
#include "../kselftest.h"
|
||||
#include "cgroup_util.h"
|
||||
|
||||
/*
|
||||
* A(0) - B(0) - C(1)
|
||||
* \ D(0)
|
||||
*
|
||||
* A, B and C's "populated" fields would be 1 while D's 0.
|
||||
* test that after the one process in C is moved to root,
|
||||
* A,B and C's "populated" fields would flip to "0" and file
|
||||
* modified events will be generated on the
|
||||
* "cgroup.events" files of both cgroups.
|
||||
*/
|
||||
static int test_cgcore_populated(const char *root)
|
||||
{
|
||||
int ret = KSFT_FAIL;
|
||||
char *cg_test_a = NULL, *cg_test_b = NULL;
|
||||
char *cg_test_c = NULL, *cg_test_d = NULL;
|
||||
|
||||
cg_test_a = cg_name(root, "cg_test_a");
|
||||
cg_test_b = cg_name(root, "cg_test_a/cg_test_b");
|
||||
cg_test_c = cg_name(root, "cg_test_a/cg_test_b/cg_test_c");
|
||||
cg_test_d = cg_name(root, "cg_test_a/cg_test_b/cg_test_d");
|
||||
|
||||
if (!cg_test_a || !cg_test_b || !cg_test_c || !cg_test_d)
|
||||
goto cleanup;
|
||||
|
||||
if (cg_create(cg_test_a))
|
||||
goto cleanup;
|
||||
|
||||
if (cg_create(cg_test_b))
|
||||
goto cleanup;
|
||||
|
||||
if (cg_create(cg_test_c))
|
||||
goto cleanup;
|
||||
|
||||
if (cg_create(cg_test_d))
|
||||
goto cleanup;
|
||||
|
||||
if (cg_enter_current(cg_test_c))
|
||||
goto cleanup;
|
||||
|
||||
if (cg_read_strcmp(cg_test_a, "cgroup.events", "populated 1\n"))
|
||||
goto cleanup;
|
||||
|
||||
if (cg_read_strcmp(cg_test_b, "cgroup.events", "populated 1\n"))
|
||||
goto cleanup;
|
||||
|
||||
if (cg_read_strcmp(cg_test_c, "cgroup.events", "populated 1\n"))
|
||||
goto cleanup;
|
||||
|
||||
if (cg_read_strcmp(cg_test_d, "cgroup.events", "populated 0\n"))
|
||||
goto cleanup;
|
||||
|
||||
if (cg_enter_current(root))
|
||||
goto cleanup;
|
||||
|
||||
if (cg_read_strcmp(cg_test_a, "cgroup.events", "populated 0\n"))
|
||||
goto cleanup;
|
||||
|
||||
if (cg_read_strcmp(cg_test_b, "cgroup.events", "populated 0\n"))
|
||||
goto cleanup;
|
||||
|
||||
if (cg_read_strcmp(cg_test_c, "cgroup.events", "populated 0\n"))
|
||||
goto cleanup;
|
||||
|
||||
if (cg_read_strcmp(cg_test_d, "cgroup.events", "populated 0\n"))
|
||||
goto cleanup;
|
||||
|
||||
ret = KSFT_PASS;
|
||||
|
||||
cleanup:
|
||||
if (cg_test_d)
|
||||
cg_destroy(cg_test_d);
|
||||
if (cg_test_c)
|
||||
cg_destroy(cg_test_c);
|
||||
if (cg_test_b)
|
||||
cg_destroy(cg_test_b);
|
||||
if (cg_test_a)
|
||||
cg_destroy(cg_test_a);
|
||||
free(cg_test_d);
|
||||
free(cg_test_c);
|
||||
free(cg_test_b);
|
||||
free(cg_test_a);
|
||||
return ret;
|
||||
}
|
||||
|
||||
/*
|
||||
* A (domain threaded) - B (threaded) - C (domain)
|
||||
*
|
||||
* test that C can't be used until it is turned into a
|
||||
* threaded cgroup. "cgroup.type" file will report "domain (invalid)" in
|
||||
* these cases. Operations which fail due to invalid topology use
|
||||
* EOPNOTSUPP as the errno.
|
||||
*/
|
||||
static int test_cgcore_invalid_domain(const char *root)
|
||||
{
|
||||
int ret = KSFT_FAIL;
|
||||
char *grandparent = NULL, *parent = NULL, *child = NULL;
|
||||
|
||||
grandparent = cg_name(root, "cg_test_grandparent");
|
||||
parent = cg_name(root, "cg_test_grandparent/cg_test_parent");
|
||||
child = cg_name(root, "cg_test_grandparent/cg_test_parent/cg_test_child");
|
||||
if (!parent || !child || !grandparent)
|
||||
goto cleanup;
|
||||
|
||||
if (cg_create(grandparent))
|
||||
goto cleanup;
|
||||
|
||||
if (cg_create(parent))
|
||||
goto cleanup;
|
||||
|
||||
if (cg_create(child))
|
||||
goto cleanup;
|
||||
|
||||
if (cg_write(parent, "cgroup.type", "threaded"))
|
||||
goto cleanup;
|
||||
|
||||
if (cg_read_strcmp(child, "cgroup.type", "domain invalid\n"))
|
||||
goto cleanup;
|
||||
|
||||
if (!cg_enter_current(child))
|
||||
goto cleanup;
|
||||
|
||||
if (errno != EOPNOTSUPP)
|
||||
goto cleanup;
|
||||
|
||||
ret = KSFT_PASS;
|
||||
|
||||
cleanup:
|
||||
cg_enter_current(root);
|
||||
if (child)
|
||||
cg_destroy(child);
|
||||
if (parent)
|
||||
cg_destroy(parent);
|
||||
if (grandparent)
|
||||
cg_destroy(grandparent);
|
||||
free(child);
|
||||
free(parent);
|
||||
free(grandparent);
|
||||
return ret;
|
||||
}
|
||||
|
||||
/*
|
||||
* Test that when a child becomes threaded
|
||||
* the parent type becomes domain threaded.
|
||||
*/
|
||||
static int test_cgcore_parent_becomes_threaded(const char *root)
|
||||
{
|
||||
int ret = KSFT_FAIL;
|
||||
char *parent = NULL, *child = NULL;
|
||||
|
||||
parent = cg_name(root, "cg_test_parent");
|
||||
child = cg_name(root, "cg_test_parent/cg_test_child");
|
||||
if (!parent || !child)
|
||||
goto cleanup;
|
||||
|
||||
if (cg_create(parent))
|
||||
goto cleanup;
|
||||
|
||||
if (cg_create(child))
|
||||
goto cleanup;
|
||||
|
||||
if (cg_write(child, "cgroup.type", "threaded"))
|
||||
goto cleanup;
|
||||
|
||||
if (cg_read_strcmp(parent, "cgroup.type", "domain threaded\n"))
|
||||
goto cleanup;
|
||||
|
||||
ret = KSFT_PASS;
|
||||
|
||||
cleanup:
|
||||
if (child)
|
||||
cg_destroy(child);
|
||||
if (parent)
|
||||
cg_destroy(parent);
|
||||
free(child);
|
||||
free(parent);
|
||||
return ret;
|
||||
|
||||
}
|
||||
|
||||
/*
|
||||
* Test that there's no internal process constrain on threaded cgroups.
|
||||
* You can add threads/processes on a parent with a controller enabled.
|
||||
*/
|
||||
static int test_cgcore_no_internal_process_constraint_on_threads(const char *root)
|
||||
{
|
||||
int ret = KSFT_FAIL;
|
||||
char *parent = NULL, *child = NULL;
|
||||
|
||||
if (cg_read_strstr(root, "cgroup.controllers", "cpu") ||
|
||||
cg_read_strstr(root, "cgroup.subtree_control", "cpu")) {
|
||||
ret = KSFT_SKIP;
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
parent = cg_name(root, "cg_test_parent");
|
||||
child = cg_name(root, "cg_test_parent/cg_test_child");
|
||||
if (!parent || !child)
|
||||
goto cleanup;
|
||||
|
||||
if (cg_create(parent))
|
||||
goto cleanup;
|
||||
|
||||
if (cg_create(child))
|
||||
goto cleanup;
|
||||
|
||||
if (cg_write(parent, "cgroup.type", "threaded"))
|
||||
goto cleanup;
|
||||
|
||||
if (cg_write(child, "cgroup.type", "threaded"))
|
||||
goto cleanup;
|
||||
|
||||
if (cg_write(parent, "cgroup.subtree_control", "+cpu"))
|
||||
goto cleanup;
|
||||
|
||||
if (cg_enter_current(parent))
|
||||
goto cleanup;
|
||||
|
||||
ret = KSFT_PASS;
|
||||
|
||||
cleanup:
|
||||
cg_enter_current(root);
|
||||
cg_enter_current(root);
|
||||
if (child)
|
||||
cg_destroy(child);
|
||||
if (parent)
|
||||
cg_destroy(parent);
|
||||
free(child);
|
||||
free(parent);
|
||||
return ret;
|
||||
}
|
||||
|
||||
/*
|
||||
* Test that you can't enable a controller on a child if it's not enabled
|
||||
* on the parent.
|
||||
*/
|
||||
static int test_cgcore_top_down_constraint_enable(const char *root)
|
||||
{
|
||||
int ret = KSFT_FAIL;
|
||||
char *parent = NULL, *child = NULL;
|
||||
|
||||
parent = cg_name(root, "cg_test_parent");
|
||||
child = cg_name(root, "cg_test_parent/cg_test_child");
|
||||
if (!parent || !child)
|
||||
goto cleanup;
|
||||
|
||||
if (cg_create(parent))
|
||||
goto cleanup;
|
||||
|
||||
if (cg_create(child))
|
||||
goto cleanup;
|
||||
|
||||
if (!cg_write(child, "cgroup.subtree_control", "+memory"))
|
||||
goto cleanup;
|
||||
|
||||
ret = KSFT_PASS;
|
||||
|
||||
cleanup:
|
||||
if (child)
|
||||
cg_destroy(child);
|
||||
if (parent)
|
||||
cg_destroy(parent);
|
||||
free(child);
|
||||
free(parent);
|
||||
return ret;
|
||||
}
|
||||
|
||||
/*
|
||||
* Test that you can't disable a controller on a parent
|
||||
* if it's enabled in a child.
|
||||
*/
|
||||
static int test_cgcore_top_down_constraint_disable(const char *root)
|
||||
{
|
||||
int ret = KSFT_FAIL;
|
||||
char *parent = NULL, *child = NULL;
|
||||
|
||||
parent = cg_name(root, "cg_test_parent");
|
||||
child = cg_name(root, "cg_test_parent/cg_test_child");
|
||||
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, "cgroup.subtree_control", "+memory"))
|
||||
goto cleanup;
|
||||
|
||||
if (!cg_write(parent, "cgroup.subtree_control", "-memory"))
|
||||
goto cleanup;
|
||||
|
||||
ret = KSFT_PASS;
|
||||
|
||||
cleanup:
|
||||
if (child)
|
||||
cg_destroy(child);
|
||||
if (parent)
|
||||
cg_destroy(parent);
|
||||
free(child);
|
||||
free(parent);
|
||||
return ret;
|
||||
}
|
||||
|
||||
/*
|
||||
* Test internal process constraint.
|
||||
* You can't add a pid to a domain parent if a controller is enabled.
|
||||
*/
|
||||
static int test_cgcore_internal_process_constraint(const char *root)
|
||||
{
|
||||
int ret = KSFT_FAIL;
|
||||
char *parent = NULL, *child = NULL;
|
||||
|
||||
parent = cg_name(root, "cg_test_parent");
|
||||
child = cg_name(root, "cg_test_parent/cg_test_child");
|
||||
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_enter_current(parent))
|
||||
goto cleanup;
|
||||
|
||||
ret = KSFT_PASS;
|
||||
|
||||
cleanup:
|
||||
if (child)
|
||||
cg_destroy(child);
|
||||
if (parent)
|
||||
cg_destroy(parent);
|
||||
free(child);
|
||||
free(parent);
|
||||
return ret;
|
||||
}
|
||||
|
||||
#define T(x) { x, #x }
|
||||
struct corecg_test {
|
||||
int (*fn)(const char *root);
|
||||
const char *name;
|
||||
} tests[] = {
|
||||
T(test_cgcore_internal_process_constraint),
|
||||
T(test_cgcore_top_down_constraint_enable),
|
||||
T(test_cgcore_top_down_constraint_disable),
|
||||
T(test_cgcore_no_internal_process_constraint_on_threads),
|
||||
T(test_cgcore_parent_becomes_threaded),
|
||||
T(test_cgcore_invalid_domain),
|
||||
T(test_cgcore_populated),
|
||||
};
|
||||
#undef T
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
char root[PATH_MAX];
|
||||
int i, ret = EXIT_SUCCESS;
|
||||
|
||||
if (cg_find_unified_root(root, sizeof(root)))
|
||||
ksft_exit_skip("cgroup v2 isn't mounted\n");
|
||||
for (i = 0; i < ARRAY_SIZE(tests); i++) {
|
||||
switch (tests[i].fn(root)) {
|
||||
case KSFT_PASS:
|
||||
ksft_test_result_pass("%s\n", tests[i].name);
|
||||
break;
|
||||
case KSFT_SKIP:
|
||||
ksft_test_result_skip("%s\n", tests[i].name);
|
||||
break;
|
||||
default:
|
||||
ret = EXIT_FAILURE;
|
||||
ksft_test_result_fail("%s\n", tests[i].name);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
|
@ -1,2 +1 @@
|
|||
CONFIG_USER_NS=y
|
||||
CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
|
||||
|
|
|
|||
|
|
@ -1,6 +1,14 @@
|
|||
# SPDX-License-Identifier: GPL-2.0
|
||||
include ../lib.mk
|
||||
|
||||
uname_M := $(shell uname -m 2>/dev/null || echo not)
|
||||
ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/x86/ -e s/x86_64/x86/)
|
||||
|
||||
TEST_GEN_PROGS := $(OUTPUT)/vdso_test
|
||||
ifeq ($(ARCH),x86)
|
||||
TEST_GEN_PROGS += $(OUTPUT)/vdso_standalone_test_x86
|
||||
endif
|
||||
|
||||
ifndef CROSS_COMPILE
|
||||
CFLAGS := -std=gnu99
|
||||
CFLAGS_vdso_standalone_test_x86 := -nostdlib -fno-asynchronous-unwind-tables -fno-stack-protector
|
||||
|
|
@ -8,14 +16,11 @@ ifeq ($(CONFIG_X86_32),y)
|
|||
LDLIBS += -lgcc_s
|
||||
endif
|
||||
|
||||
TEST_PROGS := $(OUTPUT)/vdso_test $(OUTPUT)/vdso_standalone_test_x86
|
||||
|
||||
all: $(TEST_PROGS)
|
||||
all: $(TEST_GEN_PROGS)
|
||||
$(OUTPUT)/vdso_test: parse_vdso.c vdso_test.c
|
||||
$(OUTPUT)/vdso_standalone_test_x86: vdso_standalone_test_x86.c parse_vdso.c
|
||||
$(CC) $(CFLAGS) $(CFLAGS_vdso_standalone_test_x86) \
|
||||
vdso_standalone_test_x86.c parse_vdso.c \
|
||||
-o $@
|
||||
|
||||
EXTRA_CLEAN := $(TEST_PROGS)
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -15,6 +15,8 @@
|
|||
#include <sys/auxv.h>
|
||||
#include <sys/time.h>
|
||||
|
||||
#include "../kselftest.h"
|
||||
|
||||
extern void *vdso_sym(const char *version, const char *name);
|
||||
extern void vdso_init_from_sysinfo_ehdr(uintptr_t base);
|
||||
extern void vdso_init_from_auxv(void *auxv);
|
||||
|
|
@ -37,7 +39,7 @@ int main(int argc, char **argv)
|
|||
unsigned long sysinfo_ehdr = getauxval(AT_SYSINFO_EHDR);
|
||||
if (!sysinfo_ehdr) {
|
||||
printf("AT_SYSINFO_EHDR is not present!\n");
|
||||
return 0;
|
||||
return KSFT_SKIP;
|
||||
}
|
||||
|
||||
vdso_init_from_sysinfo_ehdr(getauxval(AT_SYSINFO_EHDR));
|
||||
|
|
@ -48,7 +50,7 @@ int main(int argc, char **argv)
|
|||
|
||||
if (!gtod) {
|
||||
printf("Could not find %s\n", name);
|
||||
return 1;
|
||||
return KSFT_SKIP;
|
||||
}
|
||||
|
||||
struct timeval tv;
|
||||
|
|
@ -59,6 +61,7 @@ int main(int argc, char **argv)
|
|||
(long long)tv.tv_sec, (long long)tv.tv_usec);
|
||||
} else {
|
||||
printf("%s failed\n", name);
|
||||
return KSFT_FAIL;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
|
|
|||
Loading…
Reference in New Issue