mirror of
https://github.com/checkpoint-restore/criu
synced 2025-08-22 09:58:09 +00:00
01b8d40ced
This test specifically wants to create external bind-mount of "/" from criu mntns to test mntns, and it wants "/" in criu mntns to be a shared mount so that "external" mount in the test mntns is it's slave. This is to triger specific dirname() resolution which happens only when sharing restore is involved for external mounts, and only if rootfs is involved. But initially I missed that when we create external mount in test's temporary mntns it creates a propagation in criu mntns on top of root mount. This mount may influence other tests restore as child mount in root mount converts to locked child mount in criu service mntns (for uns flavour) and when criu would restore root container mount it would fail with EINVAL on non recursive bind with locked children. To fix this mess we just need to prohibit propagating from tests temporary mntns to criu mntns by making mounts slave. Fixes: #1941 Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
88 lines
1.7 KiB
C
88 lines
1.7 KiB
C
#include <sched.h>
|
|
#include <sys/mount.h>
|
|
#include <sys/stat.h>
|
|
#include <linux/limits.h>
|
|
|
|
#include "zdtmtst.h"
|
|
|
|
const char *test_doc = "Check external mount from host's rootfs";
|
|
const char *test_author = "Pavel Tikhomirov <ptikhomirov@virtuozzo.com>";
|
|
|
|
char *dirname = "mnt_root_ext.test";
|
|
TEST_OPTION(dirname, string, "directory name", 1);
|
|
|
|
int main(int argc, char **argv)
|
|
{
|
|
char *root, testdir[PATH_MAX], nstestdir[PATH_MAX];
|
|
char *zdtm_newns = getenv("ZDTM_NEWNS");
|
|
char tmp[] = "/.zdtm_root_ext.tmp";
|
|
|
|
root = getenv("ZDTM_ROOT");
|
|
if (root == NULL) {
|
|
pr_perror("root");
|
|
return 1;
|
|
}
|
|
|
|
if (!zdtm_newns) {
|
|
pr_perror("ZDTM_NEWNS is not set");
|
|
return 1;
|
|
} else if (strcmp(zdtm_newns, "1")) {
|
|
goto test;
|
|
}
|
|
|
|
/* Prepare directories in test root */
|
|
sprintf(testdir, "%s/%s", root, dirname);
|
|
mkdir(testdir, 0755);
|
|
|
|
/* Prepare directories in criu root */
|
|
mkdir(tmp, 0755);
|
|
|
|
/* Make criu's mntns root mount shared */
|
|
if (mount(NULL, "/", NULL, MS_SHARED, NULL)) {
|
|
pr_perror("make shared");
|
|
return 1;
|
|
}
|
|
|
|
/*
|
|
* Create temporary mntns, next mounts will not show up in criu mntns
|
|
*/
|
|
if (unshare(CLONE_NEWNS)) {
|
|
pr_perror("unshare");
|
|
return 1;
|
|
}
|
|
|
|
/*
|
|
* Make mounts in temporary mntns slave, to prevent propagation to criu mntns
|
|
*/
|
|
if (mount(NULL, "/", NULL, MS_SLAVE | MS_REC, NULL)) {
|
|
pr_perror("make rslave");
|
|
return 1;
|
|
}
|
|
|
|
/*
|
|
* Populate to the tests root host's rootfs subdir
|
|
*/
|
|
if (mount(tmp, testdir, NULL, MS_BIND, NULL)) {
|
|
pr_perror("bind");
|
|
return 1;
|
|
}
|
|
test:
|
|
test_init(argc, argv);
|
|
|
|
/*
|
|
* Make "external" mount to be slave
|
|
*/
|
|
sprintf(nstestdir, "/%s", dirname);
|
|
if (mount(NULL, nstestdir, NULL, MS_SLAVE, NULL)) {
|
|
pr_perror("make slave");
|
|
return 1;
|
|
}
|
|
|
|
test_daemon();
|
|
test_waitsig();
|
|
|
|
pass();
|
|
|
|
return 0;
|
|
}
|