[LTP] [PATCH v6] kill01: New case cgroup kill

Wei Gao via ltp
2023-03-18T04:55:02Z

Signed-off-by: Wei Gao <wegao@suse.com>
---
lib/tst_cgroup.c | 55 ++++---
runtest/controllers | 1 +
.../kernel/controllers/cgroup/kill/.gitignore | 1 +
.../kernel/controllers/cgroup/kill/Makefile | 6 +
.../kernel/controllers/cgroup/kill/kill01.c | 149 ++++++++++++++++++
5 files changed, 193 insertions(+), 19 deletions(-)
create mode 100644 testcases/kernel/controllers/cgroup/kill/.gitignore
create mode 100644 testcases/kernel/controllers/cgroup/kill/Makefile
create mode 100644 testcases/kernel/controllers/cgroup/kill/kill01.c

diff --git a/lib/tst_cgroup.c b/lib/tst_cgroup.c
index 50699bc63..ff1c734d1 100644
--- a/lib/tst_cgroup.c
+++ b/lib/tst_cgroup.c
@@ -94,9 +94,10 @@ enum cgroup_ctrl_indx {
CTRL_MISC,
CTRL_PERFEVENT,
CTRL_DEBUG,
- CTRL_RDMA
+ CTRL_RDMA,
+ CTRL_PSEUDO
};
-#define CTRLS_MAX CTRL_RDMA
+#define CTRLS_MAX CTRL_PSEUDO

/* At most we can have one cgroup V1 tree for each controller and one
* (empty) v2 tree.
@@ -166,6 +167,7 @@ static const struct cgroup_file cgroup_ctrl_files[] = {
{ "cgroup.controllers", NULL, 0 },
{ "cgroup.subtree_control", NULL, 0 },
{ "cgroup.clone_children", "cgroup.clone_children", 0 },
+ { "cgroup.kill", NULL, 0 },
{ }
};

@@ -258,6 +260,10 @@ static const struct cgroup_file rdma_ctrl_files[] = {
{ }
};

+static const struct cgroup_file cgroup_pseudo_ctrl_files[] = {
+ { }
+};
+
#define CTRL_NAME_MAX 31
#define CGROUP_CTRL_MEMBER(x, y)[y] = { .ctrl_name = #x, .files = \
x ## _ctrl_files, .ctrl_indx = y, NULL, 0 }
@@ -281,6 +287,7 @@ static struct cgroup_ctrl controllers[] = {
CGROUP_CTRL_MEMBER(perf_event, CTRL_PERFEVENT),
CGROUP_CTRL_MEMBER(debug, CTRL_DEBUG),
CGROUP_CTRL_MEMBER(rdma, CTRL_RDMA),
+ CGROUP_CTRL_MEMBER(cgroup_pseudo, CTRL_PSEUDO),
{ }
};

@@ -826,6 +833,10 @@ void tst_cg_require(const char *const ctrl_name,
if (options->needs_ver != TST_CG_V2)
cgroup_mount_v1(ctrl);

+ if (!strcmp(ctrl->ctrl_name, "cgroup_pseudo")) {
+ ctrl->ctrl_root = roots;
+ }
+
if (!ctrl->ctrl_root) {
tst_brk(TCONF,
"'%s' controller required, but not available",
@@ -848,13 +859,15 @@ mkdirs:
ctrl->ctrl_name);
}

- if (cgroup_ctrl_on_v2(ctrl)) {
- if (root->we_mounted_it) {
- SAFE_FILE_PRINTFAT(root->mnt_dir.dir_fd,
- cgsc, "+%s", ctrl->ctrl_name);
- } else {
- tst_file_printfat(root->mnt_dir.dir_fd,
- cgsc, "+%s", ctrl->ctrl_name);
+ if (strcmp(ctrl->ctrl_name,"cgroup_pseudo")) {
+ if (cgroup_ctrl_on_v2(ctrl)) {
+ if (root->we_mounted_it) {
+ SAFE_FILE_PRINTFAT(root->mnt_dir.dir_fd,
+ cgsc, "+%s", ctrl->ctrl_name);
+ } else {
+ tst_file_printfat(root->mnt_dir.dir_fd,
+ cgsc, "+%s", ctrl->ctrl_name);
+ }
}
}

@@ -863,15 +876,17 @@ mkdirs:
else
root->ltp_dir.ctrl_field |= root->mnt_dir.ctrl_field;

- if (cgroup_ctrl_on_v2(ctrl)) {
- SAFE_FILE_PRINTFAT(root->ltp_dir.dir_fd,
- cgsc, "+%s", ctrl->ctrl_name);
- } else {
- SAFE_FILE_PRINTFAT(root->ltp_dir.dir_fd,
- "cgroup.clone_children", "%d", 1);
+ if (strcmp(ctrl->ctrl_name,"cgroup_pseudo")) {
+ if (cgroup_ctrl_on_v2(ctrl)) {
+ SAFE_FILE_PRINTFAT(root->ltp_dir.dir_fd,
+ cgsc, "+%s", ctrl->ctrl_name);
+ } else {
+ SAFE_FILE_PRINTFAT(root->ltp_dir.dir_fd,
+ "cgroup.clone_children", "%d", 1);

- if (ctrl->ctrl_indx == CTRL_CPUSET)
- cgroup_copy_cpuset(root);
+ if (ctrl->ctrl_indx == CTRL_CPUSET)
+ cgroup_copy_cpuset(root);
+ }
}

cgroup_dir_mk(&root->ltp_dir, cgroup_ltp_drain_dir, &root->drain_dir);
@@ -1049,8 +1064,10 @@ static void cgroup_group_add_dir(const struct tst_cg_group *const parent,
if (!parent || dir->dir_root->ver == TST_CG_V1)
continue;

- SAFE_CG_PRINTF(parent, "cgroup.subtree_control",
- "+%s", ctrl->ctrl_name);
+ if (strcmp(ctrl->ctrl_name, "cgroup_pseudo")) {
+ SAFE_CG_PRINTF(parent, "cgroup.subtree_control",
+ "+%s", ctrl->ctrl_name);
+ }
}

for (i = 0; cg->dirs[i]; i++)
diff --git a/runtest/controllers b/runtest/controllers
index 8d1b936bf..2f69a8ec2 100644
--- a/runtest/controllers
+++ b/runtest/controllers
@@ -23,6 +23,7 @@ memcontrol01 memcontrol01
memcontrol02 memcontrol02
memcontrol03 memcontrol03
memcontrol04 memcontrol04
+kill01 kill01

cgroup_fj_function_debug cgroup_fj_function.sh debug
cgroup_fj_function_cpuset cgroup_fj_function.sh cpuset
diff --git a/testcases/kernel/controllers/cgroup/kill/.gitignore b/testcases/kernel/controllers/cgroup/kill/.gitignore
new file mode 100644
index 000000000..4f9649e27
--- /dev/null
+++ b/testcases/kernel/controllers/cgroup/kill/.gitignore
@@ -0,0 +1 @@
+/kill01
diff --git a/testcases/kernel/controllers/cgroup/kill/Makefile b/testcases/kernel/controllers/cgroup/kill/Makefile
new file mode 100644
index 000000000..bf5aea9e7
--- /dev/null
+++ b/testcases/kernel/controllers/cgroup/kill/Makefile
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+top_srcdir ?= ../../../../../
+
+include $(top_srcdir)/include/mk/testcases.mk
+include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/kernel/controllers/cgroup/kill/kill01.c b/testcases/kernel/controllers/cgroup/kill/kill01.c
new file mode 100644
index 000000000..0da6de350
--- /dev/null
+++ b/testcases/kernel/controllers/cgroup/kill/kill01.c
@@ -0,0 +1,149 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) 2012 Christian Brauner <brauner-AT-kernel.org>
+ * Copyright (c) 2023 SUSE LLC <wegao@suse.com>
+ */
+
+/*\
+ * [Description]
+ *
+ * This test is copied from kernel self test case
+ * tools/testing/selftests/cgroup/test_kill.c
+ *
+ */
+
+#include <errno.h>
+#include <linux/limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <sys/wait.h>
+
+#include "lapi/syscalls.h"
+#include "tst_test.h"
+
+#define MAX_PID_NUM 100
+#define pid_num MIN(MAX_PID_NUM, (tst_ncpus_available() + 1))
+#define buf_len (20 * pid_num)
+
+static int *data_ptr;
+static char *buf;
+static struct tst_cg_group *cg_child_test_simple;
+
+static int wait_for_pid(pid_t pid)
+{
+ int status, ret;
+
+again:
+ ret = waitpid(pid, &status, 0);
+ if (ret == -1) {
+ if (errno == EINTR)
+ goto again;
+
+ return -1;
+ }
+
+ if (WIFSIGNALED(status))
+ return 0;
+
+ return -1;
+}
+
+/*
+ * A simple process running in a sleep loop until being
+ * re-parented.
+ */
+static void child_fn(void)
+{
+ int ppid = getppid();
+
+ while (getppid() == ppid)
+ usleep(1000);
+
+}
+
+static int cg_run_nowait(const struct tst_cg_group *const cg,
+ void (*fn)(void))
+{
+ int pid;
+
+ pid = SAFE_FORK();
+ if (pid == 0) {
+ SAFE_CG_PRINTF(cg, "cgroup.procs", "%d", getpid());
+ tst_atomic_inc(data_ptr);
+ if (tst_atomic_load(data_ptr) == pid_num)
+ TST_CHECKPOINT_WAKE(0);
+ fn();
+ }
+
+ return pid;
+}
+
+static int cg_wait_for_proc_count(const struct tst_cg_group *cg, int count)
+{
+ char *ptr;
+
+ int nr = 0;
+
+ SAFE_CG_READ(cg, "cgroup.procs", buf, buf_len);
+
+ for (ptr = buf; *ptr; ptr++)
+ if (*ptr == '\n')
+ nr++;
+
+ if (nr >= count)
+ return 0;
+
+ tst_res(TINFO, "Expect process num is %d but get %d", count, nr);
+
+ return -1;
+}
+
+static void run(void)
+{
+ pid_t pids[MAX_PID_NUM];
+ int i;
+ *data_ptr = 0;
+
+ cg_child_test_simple = tst_cg_group_mk(tst_cg, "cg_test_simple");
+
+ memset(buf, 0, buf_len);
+
+ for (i = 0; i < pid_num; i++)
+ pids[i] = cg_run_nowait(cg_child_test_simple, child_fn);
+
+ TST_CHECKPOINT_WAIT(0);
+ TST_EXP_PASS(cg_wait_for_proc_count(cg_child_test_simple, pid_num));
+ SAFE_CG_PRINTF(cg_child_test_simple, "cgroup.kill", "%d", 1);
+
+ for (i = 0; i < pid_num; i++)
+ TST_EXP_PASS_SILENT(wait_for_pid(pids[i]));
+
+ cg_child_test_simple = tst_cg_group_rm(cg_child_test_simple);
+}
+
+static void setup(void)
+{
+ buf = tst_alloc(buf_len);
+ data_ptr = SAFE_MMAP(NULL, sizeof(uintptr_t), PROT_READ | PROT_WRITE,
+ MAP_SHARED | MAP_ANONYMOUS, -1, 0);
+}
+
+static void cleanup(void)
+{
+ if (data_ptr)
+ SAFE_MUNMAP(data_ptr, sizeof(uintptr_t));
+}
+
+static struct tst_test test = {
+ .test_all = run,
+ .setup = setup,
+ .cleanup = cleanup,
+ .forks_child = 1,
+ .max_runtime = 20,
+ .needs_cgroup_ctrls = (const char *const []){ "cgroup_pseudo", NULL },
+ .needs_cgroup_ver = TST_CG_V2,
+ .needs_checkpoints = 1,
+};
--
2.35.3