[10/11] zdtm: test for new init reparent handling with nested pidns

Submitted by Pavel Tikhomirov on May 26, 2017, 5:02 p.m.

Details

Message ID 20170526170254.17038-11-ptikhomirov@virtuozzo.com
State New
Series "rework init child-reaper reparent handling for pidnses"
Headers show

Commit Message

Pavel Tikhomirov May 26, 2017, 5:02 p.m.
Demand ns_pid, ns_get_userns and ns_get_parent features, else will
have "Can't do ns ioctl" error in criu:set_ns_opt().

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 test/zdtm/static/Makefile       |   1 +
 test/zdtm/static/session04.c    | 316 ++++++++++++++++++++++++++++++++++++++++
 test/zdtm/static/session04.desc |   1 +
 3 files changed, 318 insertions(+)
 create mode 100644 test/zdtm/static/session04.c
 create mode 100644 test/zdtm/static/session04.desc

Patch hide | download patch | download mbox

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index 1ea9393..61e270a 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -125,6 +125,7 @@  TST_NOFILE	:=				\
 		session01			\
 		session02			\
 		session03			\
+		session04			\
 		socket-ext			\
 		unhashed_proc			\
 		cow00				\
diff --git a/test/zdtm/static/session04.c b/test/zdtm/static/session04.c
new file mode 100644
index 0000000..859a18a
--- /dev/null
+++ b/test/zdtm/static/session04.c
@@ -0,0 +1,316 @@ 
+#include <sys/mman.h>
+#include <sched.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/wait.h>
+#include <sys/prctl.h>
+#include <sys/user.h>
+
+#include "zdtmtst.h"
+
+const char *test_doc	= "Pidns init reparent test";
+const char *test_author	= "Pavel Tikhomirov <ptikhomirov@virtuozzo.com>";
+
+struct process
+{
+	pid_t pid;
+	pid_t sid;
+	int sks[2];
+	int dead;
+};
+
+struct process *processes;
+int nr_processes = 20;
+int current = 0;
+
+static void cleanup()
+{
+	int i;
+
+	kill(processes[0].pid, SIGKILL);
+	/* It's enought to kill pidns init for others to die */
+	kill(processes[1].pid, SIGKILL);
+}
+
+enum commands
+{
+	TEST_FORK,
+	TEST_WAIT,
+	TEST_SUBREAPER,
+	TEST_SETSID,
+	TEST_DIE,
+	TEST_GETSID,
+};
+
+struct command
+{
+	enum commands	cmd;
+	int		arg1;
+	int		arg2;
+};
+
+static void handle_command();
+
+static void mainloop()
+{
+	while (1)
+		handle_command();
+}
+
+#define CLONE_STACK_SIZE	4096
+/* All arguments should be above stack, because it grows down */
+struct clone_args {
+	char stack[CLONE_STACK_SIZE] __stack_aligned__;
+	char stack_ptr[0];
+	int id;
+};
+
+static int clone_func(void *_arg)
+{
+	struct clone_args *args = (struct clone_args *) _arg;
+
+	current = args->id;
+
+	test_msg("%3d: Hello. My pid is %d\n", args->id, getpid());
+	mainloop();
+	exit(0);
+}
+
+static int make_child(int id, int flags)
+{
+	struct clone_args args;
+	pid_t cid;
+
+	args.id = id;
+
+	cid = clone(clone_func, args.stack_ptr,
+			flags | SIGCHLD, &args);
+
+	if (cid < 0)
+		pr_perror("clone(%d, %d)", id, flags);
+
+	processes[id].pid = cid;
+
+	return cid;
+}
+
+static void handle_command()
+{
+	int sk = processes[current].sks[0], ret, status = 0;
+	struct command cmd;
+
+	ret = read(sk, &cmd, sizeof(cmd));
+	if (ret != sizeof(cmd)) {
+		pr_perror("Unable to get command");
+		goto err;
+	}
+
+	switch (cmd.cmd) {
+	case TEST_FORK:
+		{
+			pid_t pid;
+
+			pid = make_child(cmd.arg1, cmd.arg2);
+			if (pid == -1) {
+				status = -1;
+				goto err;
+			}
+
+			test_msg("%3d: fork(%d, %x) = %d\n",
+					current, cmd.arg1, cmd.arg2, pid);
+			processes[cmd.arg1].pid = pid;
+		}
+		break;
+	case TEST_WAIT:
+		test_msg("%3d: wait(%d) = %d\n", current,
+				cmd.arg1, processes[cmd.arg1].pid);
+
+		if (waitpid(processes[cmd.arg1].pid, NULL, 0) == -1) {
+			pr_perror("waitpid(%d)", processes[cmd.arg1].pid);
+			status = -1;
+		}
+		break;
+	case TEST_SUBREAPER:
+		test_msg("%3d: subreaper(%d)\n", current, cmd.arg1);
+		if (prctl(PR_SET_CHILD_SUBREAPER, cmd.arg1, 0, 0, 0) == -1) {
+			pr_perror("PR_SET_CHILD_SUBREAPER");
+			status = -1;
+		}
+		break;
+	case TEST_SETSID:
+		test_msg("%3d: setsid()\n", current);
+		if(setsid() == -1) {
+			pr_perror("setsid");
+			status = -1;
+		}
+		break;
+	case TEST_GETSID:
+		test_msg("%3d: getsid()\n", current);
+		status = getsid(getpid());
+		if(status == -1)
+			pr_perror("getsid");
+		break;
+	case TEST_DIE:
+		test_msg("%3d: die()\n", current);
+		processes[current].dead = 1;
+		shutdown(sk, SHUT_RDWR);
+		exit(0);
+	}
+
+	ret = write(sk, &status, sizeof(status));
+	if (ret != sizeof(status)) {
+		pr_perror("Unable to answer");
+		goto err;
+	}
+
+	if (status < 0)
+		goto err;
+
+	return;
+err:
+	shutdown(sk, SHUT_RDWR);
+	exit(1);
+}
+
+static int send_command(int id, enum commands op, int arg1, int arg2)
+{
+	int sk = processes[id].sks[1], ret, status;
+	struct command cmd = {op, arg1, arg2};
+
+	if (op == TEST_FORK) {
+		if (processes[arg1].pid) {
+			pr_perror("%d is busy", arg1);
+			return -1;
+		}
+	}
+
+	ret = write(sk, &cmd, sizeof(cmd));
+	if (ret != sizeof(cmd)) {
+		pr_perror("Unable to send command");
+		goto err;
+	}
+
+	status = 0;
+	ret = read(sk, &status, sizeof(status));
+	if (ret != sizeof(status) && !(status == 0 && op == TEST_DIE)) {
+		pr_perror("Unable to get answer");
+		goto err;
+	}
+
+	if (status != -1 && op == TEST_GETSID)
+		return status;
+
+	if (status) {
+		pr_perror("The command(%d, %d, %d) failed", op, arg1, arg2);
+		goto err;
+	}
+
+	return 0;
+err:
+	cleanup();
+	exit(1);
+}
+
+int main(int argc, char ** argv)
+{
+	int pid, i;
+	int fail_cnt = 0;
+
+	test_init(argc, argv);
+
+	processes = mmap(NULL, PAGE_SIZE, PROT_WRITE | PROT_READ,
+				MAP_SHARED | MAP_ANONYMOUS, 0, 0);
+	if (processes == NULL) {
+		pr_perror("Unable to map share memory");
+		return 1;
+	}
+
+	for (i = 0; i < nr_processes; i++) {
+		if (socketpair(PF_UNIX, SOCK_STREAM, 0, processes[i].sks) == -1) {
+			pr_perror("socketpair");
+			return 1;
+		}
+	}
+
+	pid = make_child(0, 0);
+	if (pid < 0)
+		return -1;
+	send_command(0, TEST_FORK,	1, CLONE_NEWPID);
+	send_command(1, TEST_SETSID,	0, 0);
+
+	/*
+	 * Branch of (2,2) - [(3,3)->(4,2)] reparents to init (1,1),
+	 * have no session leader for process (4,2).
+	 */
+	send_command(1, TEST_FORK,	2, 0);
+	send_command(2, TEST_SETSID,	0, 0);
+	send_command(2, TEST_FORK,	3, 0);
+	send_command(3, TEST_FORK,	4, 0);
+	send_command(3, TEST_SETSID,	0, 0);
+	send_command(2, TEST_DIE,	0, 0);
+	send_command(1, TEST_WAIT,	2, 0);
+
+	/*
+	 * Branch of (7,6) - [(8,8)->(9,6)] reparents to init (1,1),
+	 * have session leader but it is not reachable.
+	 */
+	send_command(1, TEST_FORK,	5, 0);
+	send_command(5, TEST_FORK,	6, 0);
+	send_command(6, TEST_SETSID,	0, 0);
+	send_command(6, TEST_FORK,	7, 0);
+	send_command(7, TEST_FORK,	8, 0);
+	send_command(8, TEST_FORK,	9, 0);
+	send_command(8, TEST_SETSID,	0, 0);
+	send_command(7, TEST_DIE,	0, 0);
+	send_command(6, TEST_WAIT,	7, 0);
+
+	for (i = 0; i < nr_processes; i++) {
+		if (processes[i].dead)
+			continue;
+		if (processes[i].pid == 0)
+			continue;
+
+		processes[i].sid = send_command(i, TEST_GETSID, 0, 0);
+		if (processes[i].sid == -1) {
+			pr_perror("getsid(%d)", i);
+			goto err;
+		}
+	}
+
+	test_daemon();
+
+	test_waitsig();
+
+	for (i = 0; i < nr_processes; i++) {
+		pid_t sid;
+
+		if (processes[i].dead)
+			continue;
+		if (processes[i].pid == 0)
+			continue;
+
+		sid = send_command(i, TEST_GETSID, 0, 0);
+		if (sid == -1) {
+			pr_perror("getsid(%d)", i);
+			goto err;
+		}
+
+		if (sid != processes[i].sid) {
+			fail("%d, %d: wrong sid %d (expected %d)",
+				i, processes[i].pid, sid, processes[i].sid);
+			fail_cnt++;
+		}
+	}
+
+	if (fail_cnt)
+		goto err;
+
+	pass();
+
+	return 0;
+err:
+	cleanup();
+	return 1;
+}
diff --git a/test/zdtm/static/session04.desc b/test/zdtm/static/session04.desc
new file mode 100644
index 0000000..1d1a440
--- /dev/null
+++ b/test/zdtm/static/session04.desc
@@ -0,0 +1 @@ 
+{'flavor': 'ns uns', 'flags': 'suid', 'feature': 'ns_pid ns_get_userns ns_get_parent'}