[LTP] [PATCH v3] clone3: Add clone3's clone_args cgroup
Wei Gao
wegao@suse.com
Sat Apr 22 03:42:16 CEST 2023
Signed-off-by: Wei Gao <wegao@suse.com>
---
include/lapi/sched.h | 8 ++
include/tst_cgroup.h | 3 +
include/tst_clone.h | 1 +
lib/tst_cgroup.c | 6 ++
lib/tst_clone.c | 1 +
runtest/syscalls | 1 +
testcases/kernel/syscalls/clone3/.gitignore | 1 +
testcases/kernel/syscalls/clone3/clone303.c | 94 +++++++++++++++++++++
8 files changed, 115 insertions(+)
create mode 100644 testcases/kernel/syscalls/clone3/clone303.c
diff --git a/include/lapi/sched.h b/include/lapi/sched.h
index 1065665d1..ac766efc5 100644
--- a/include/lapi/sched.h
+++ b/include/lapi/sched.h
@@ -13,6 +13,7 @@
#include <inttypes.h>
#include "config.h"
#include "lapi/syscalls.h"
+#include "lapi/sched.h"
struct sched_attr {
uint32_t size;
@@ -54,6 +55,9 @@ struct clone_args {
uint64_t __attribute__((aligned(8))) stack;
uint64_t __attribute__((aligned(8))) stack_size;
uint64_t __attribute__((aligned(8))) tls;
+ uint64_t __attribute__((aligned(8))) set_tid;
+ uint64_t __attribute__((aligned(8))) set_tid_size;
+ uint64_t __attribute__((aligned(8))) cgroup;
};
static inline int clone3(struct clone_args *args, size_t size)
@@ -133,4 +137,8 @@ static inline int getcpu(unsigned *cpu, unsigned *node)
# define CLONE_NEWTIME 0x00000080
#endif
+#ifndef CLONE_INTO_CGROUP
+# define CLONE_INTO_CGROUP 0x200000000ULL
+#endif
+
#endif /* LAPI_SCHED_H__ */
diff --git a/include/tst_cgroup.h b/include/tst_cgroup.h
index 2826ddad1..d8e621962 100644
--- a/include/tst_cgroup.h
+++ b/include/tst_cgroup.h
@@ -157,6 +157,9 @@ const char *
tst_cg_group_name(const struct tst_cg_group *const cg)
__attribute__ ((nonnull, warn_unused_result));
+int tst_cg_group_dir_fd(const struct tst_cg_group *const cg)
+ __attribute__ ((nonnull, warn_unused_result));
+
/* Remove a descendant CGroup */
struct tst_cg_group *
tst_cg_group_rm(struct tst_cg_group *const cg)
diff --git a/include/tst_clone.h b/include/tst_clone.h
index 9ffdc68d1..7b278dfa7 100644
--- a/include/tst_clone.h
+++ b/include/tst_clone.h
@@ -11,6 +11,7 @@
struct tst_clone_args {
uint64_t flags;
uint64_t exit_signal;
+ uint64_t cgroup;
};
/* clone3 with fallbacks to clone when possible. Be aware that it
diff --git a/lib/tst_cgroup.c b/lib/tst_cgroup.c
index 50699bc63..c63d04c67 100644
--- a/lib/tst_cgroup.c
+++ b/lib/tst_cgroup.c
@@ -166,6 +166,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 },
{ }
};
@@ -1093,6 +1094,11 @@ const char *tst_cg_group_name(const struct tst_cg_group *const cg)
return cg->group_name;
}
+int tst_cg_group_dir_fd(const struct tst_cg_group *const cg)
+{
+ return cg->dirs[0]->dir_fd;
+}
+
struct tst_cg_group *tst_cg_group_rm(struct tst_cg_group *const cg)
{
struct cgroup_dir **dir;
diff --git a/lib/tst_clone.c b/lib/tst_clone.c
index ecc84408c..2aa00beb1 100644
--- a/lib/tst_clone.c
+++ b/lib/tst_clone.c
@@ -15,6 +15,7 @@ pid_t tst_clone(const struct tst_clone_args *tst_args)
struct clone_args args = {
.flags = tst_args->flags,
.exit_signal = tst_args->exit_signal,
+ .cgroup = tst_args->cgroup,
};
int flags;
pid_t pid = -1;
diff --git a/runtest/syscalls b/runtest/syscalls
index 9c23a4248..0b6adfd7f 100644
--- a/runtest/syscalls
+++ b/runtest/syscalls
@@ -117,6 +117,7 @@ clone09 clone09
clone301 clone301
clone302 clone302
+clone303 clone303
close01 close01
close02 close02
diff --git a/testcases/kernel/syscalls/clone3/.gitignore b/testcases/kernel/syscalls/clone3/.gitignore
index 604cb903e..10369954b 100644
--- a/testcases/kernel/syscalls/clone3/.gitignore
+++ b/testcases/kernel/syscalls/clone3/.gitignore
@@ -1,2 +1,3 @@
clone301
clone302
+clone303
diff --git a/testcases/kernel/syscalls/clone3/clone303.c b/testcases/kernel/syscalls/clone3/clone303.c
new file mode 100644
index 000000000..e35cc8def
--- /dev/null
+++ b/testcases/kernel/syscalls/clone3/clone303.c
@@ -0,0 +1,94 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) 2023 SUSE LLC <wegao@suse.com>
+ */
+
+/*\
+ * [Description]
+ *
+ * This test case check clone3 CLONE_INTO_CGROUP flag
+ *
+ */
+
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/wait.h>
+
+#include "tst_test.h"
+#include "lapi/sched.h"
+#include "lapi/pidfd.h"
+
+#define BUF_LEN 20
+
+static struct tst_cg_group *cg_child_test_simple;
+static struct clone_args *args;
+
+static pid_t clone_into_cgroup(int cgroup_fd)
+{
+ pid_t pid;
+
+ args->flags = CLONE_INTO_CGROUP;
+ args->exit_signal = SIGCHLD;
+ args->cgroup = cgroup_fd;
+
+ pid = clone3(args, sizeof(*args));
+
+ if (pid < 0)
+ tst_res(TFAIL | TTERRNO, "clone3() failed !");
+
+ return pid;
+}
+
+static void run(void)
+{
+ int fd;
+ pid_t pid;
+
+ cg_child_test_simple = tst_cg_group_mk(tst_cg, "cg_test_simple");
+ fd = tst_cg_group_dir_fd(cg_child_test_simple);
+
+ pid = clone_into_cgroup(fd);
+
+ if (!pid) {
+ TST_CHECKPOINT_WAIT(0);
+ return;
+ }
+
+ char buf[BUF_LEN];
+
+ SAFE_CG_READ(cg_child_test_simple, "cgroup.procs", buf, BUF_LEN);
+
+ int x = atoi(buf);
+
+ if (x == pid)
+ tst_res(TPASS, "clone3 case pass!");
+ else
+ tst_brk(TFAIL | TTERRNO, "clone3() failed !");
+
+ TST_CHECKPOINT_WAKE(0);
+
+ SAFE_WAITPID(pid, NULL, 0);
+
+ cg_child_test_simple = tst_cg_group_rm(cg_child_test_simple);
+}
+
+static void setup(void)
+{
+ clone3_supported_by_kernel();
+}
+
+static struct tst_test test = {
+ .test_all = run,
+ .setup = setup,
+ .forks_child = 1,
+ .max_runtime = 20,
+ .needs_cgroup_ctrls = (const char *const []){ "memory", NULL },
+ .needs_cgroup_ver = TST_CG_V2,
+ .needs_checkpoints = 1,
+ .min_kver = "5.7",
+ .bufs = (struct tst_buffers []) {
+ {&args, .size = sizeof(*args)},
+ {},
+ }
+};
--
2.35.3
More information about the ltp
mailing list