Commit a4facc6b authored by Andrew Vagin's avatar Andrew Vagin Committed by Pavel Emelyanov

zdtm/mnt_tracefs: mount tracefs and don't affect an external mount namepace

====================== Run zdtm/static/mnt_tracefs in uns ======================
Start test
./mnt_tracefs --pidfile=mnt_tracefs.pid --outfile=mnt_tracefs.out --dirname=mnt_tracefs.test
Run criu dump
Wait for zdtm/static/mnt_tracefs to die for 0.100000
Run criu restore
Run criu dump
Run criu restore
Run criu dump
Run criu restore
1: Old mounts lost: set([])
1: New mounts appeared: set([('/', '/debugfs/tracing')])
Wait for zdtm/static/mnt_tracefs to die for 0.100000

Cc: Tycho Andersen <tycho.andersen@canonical.com>
Signed-off-by: 's avatarAndrew Vagin <avagin@virtuozzo.com>
Acked-by: 's avatarTycho Andersen <tycho.andersen@canonical.com>
Signed-off-by: 's avatarPavel Emelyanov <xemul@virtuozzo.com>
parent df8e3a8a
#define _GNU_SOURCE
#include <sched.h>
#include <sys/mount.h> #include <sys/mount.h>
#include <unistd.h> #include <unistd.h>
#include <sys/stat.h> #include <sys/stat.h>
...@@ -18,8 +20,6 @@ TEST_OPTION(dirname, string, "directory name", 1); ...@@ -18,8 +20,6 @@ TEST_OPTION(dirname, string, "directory name", 1);
int main(int argc, char ** argv) int main(int argc, char ** argv)
{ {
char dst[PATH_MAX], *root; char dst[PATH_MAX], *root;
int status;
pid_t pid;
root = getenv("ZDTM_ROOT"); root = getenv("ZDTM_ROOT");
if (root == NULL) { if (root == NULL) {
...@@ -32,23 +32,16 @@ int main(int argc, char ** argv) ...@@ -32,23 +32,16 @@ int main(int argc, char ** argv)
if (strcmp(getenv("ZDTM_NEWNS"), "1")) if (strcmp(getenv("ZDTM_NEWNS"), "1"))
goto test; goto test;
pid = fork(); if (unshare(CLONE_NEWNS)) {
if (pid < 0) pr_perror("unshare");
return 1; return 1;
if (pid == 0) {
test_ext_init(argc, argv);
mkdir(dst, 755);
if (mount("/sys/kernel/debug", dst, NULL, MS_BIND, NULL)) {
pr_perror("mount");
return 1;
}
return 0;
} }
wait(&status); mkdir(dst, 755);
if (status != 0) if (mount("/sys/kernel/debug", dst, NULL, MS_BIND | MS_REC, NULL)) {
pr_perror("mount");
return 1; return 1;
}
test: test:
test_init(argc, argv); test_init(argc, argv);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment