[CRIU] [PATCH 2/2] zdtm: add test for shared threads FS structure migration

Stanislav Kinsburskiy skinsbursky at virtuozzo.com
Fri Sep 23 07:41:50 PDT 2016


Signed-off-by: Stanislav Kinsburskiy <skinsbursky at virtuozzo.com>
---
 test/zdtm/static/Makefile   |    2 +
 test/zdtm/static/clone_fs.c |  105 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 107 insertions(+)
 create mode 100644 test/zdtm/static/clone_fs.c

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index c5a1584..af1254f 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -151,6 +151,7 @@ TST_NOFILE	:=				\
 		loginuid			\
 		cgroupns			\
 		helper_zombie_child		\
+		clone_fs			\
 #		jobctl00			\
 
 ifneq ($(SRCARCH),arm)
@@ -407,6 +408,7 @@ sk-freebind-false:	override CFLAGS += -DZDTM_FREEBIND_FALSE
 stopped01:	override CFLAGS += -DZDTM_STOPPED_KILL
 stopped02:	override CFLAGS += -DZDTM_STOPPED_TKILL
 stopped12:	override CFLAGS += -DZDTM_STOPPED_KILL -DZDTM_STOPPED_TKILL
+clone_fs:		override LDLIBS += -pthread
 
 $(LIB):	force
 	$(Q) $(MAKE) -C $(LIBDIR)
diff --git a/test/zdtm/static/clone_fs.c b/test/zdtm/static/clone_fs.c
new file mode 100644
index 0000000..1db7371
--- /dev/null
+++ b/test/zdtm/static/clone_fs.c
@@ -0,0 +1,105 @@
+#define _GNU_SOURCE
+#include <stdlib.h>
+#include <syscall.h>
+#include <pthread.h>
+
+#include "zdtmtst.h"
+
+const char *test_doc    = "Check that shared FS is migrated properly";
+const char *test_author = "Stanislav Kinsburskiy <skinsbursky at virtuozzo.com>";
+
+enum kcmp_type {
+	KCMP_FILE,
+	KCMP_VM,
+	KCMP_FILES,
+	KCMP_FS,
+	KCMP_SIGHAND,
+	KCMP_IO,
+	KCMP_SYSVSEM,
+
+	KCMP_TYPES,
+};
+
+static int kcmp(int type, pid_t pid1, pid_t pid2, unsigned long idx1, unsigned long idx2)
+{
+	int ret;
+
+	ret = syscall(SYS_kcmp, pid1, pid2, type, idx1, idx2);
+
+	switch (ret) {
+		case 0:
+			break;
+		case 1:
+		case 2:
+			test_msg("FS for pids %d and %d doesn't match: %d\n", pid1, pid2, ret);
+			break;
+		case -1:
+			pr_perror("kcmp (type: %d, pid1: %d, pid2: %d, "
+					"idx1: %ld, idx2: %ld) failed: %d\n",
+					type, pid1, pid2, idx1, idx2, errno);
+			break;
+		default:
+			pr_perror("kcmp (type: %d, pid1: %d, pid2: %d, "
+					"idx1: %ld, idx2: %ld) returned %d\n\n",
+					type, pid1, pid2, idx1, idx2, ret);
+			break;
+	}
+	return ret;
+}
+
+#define gettid(code)        \
+	        syscall(__NR_gettid)
+
+static pthread_mutex_t init_lock;
+static pthread_mutex_t exit_lock;
+
+static void *thread_func(void *tid2)
+{
+	*(int *)tid2 = gettid();
+
+	pthread_mutex_unlock(&init_lock);
+	pthread_mutex_lock(&exit_lock);
+
+	return NULL;
+}
+
+int main(int argc, char **argv)
+{
+	pid_t tid;
+	int ret;
+	pthread_t th;
+
+        test_init(argc, argv);
+
+	pthread_mutex_init(&init_lock, NULL);
+	pthread_mutex_lock(&init_lock);
+	pthread_mutex_init(&exit_lock, NULL);
+	pthread_mutex_lock(&exit_lock);
+
+	if (pthread_create(&th, NULL, thread_func, &tid)) {
+		fail("Can't pthread_create");
+		return 1;
+	}
+
+	pthread_mutex_lock(&init_lock);
+
+	ret = kcmp(KCMP_FS, gettid(), tid, 0, 0);
+	if (ret)
+		exit(1);
+
+	test_daemon();
+	test_waitsig();
+
+	ret = kcmp(KCMP_FS, gettid(), tid, 0, 0);
+	if (ret) {
+		fail();
+		exit(1);
+	}
+
+	pthread_mutex_unlock(&exit_lock);
+	pthread_join(th, NULL);
+
+	pass();
+
+	return 0;
+}



More information about the CRIU mailing list