[LTP] [PATCH v2 3/6] Rewrite mountns03 test using new LTP API
Andrea Cervesato
andrea.cervesato@suse.de
Mon Feb 28 14:32:53 CET 2022
Signed-off-by: Andrea Cervesato <andrea.cervesato@suse.de>
---
.../kernel/containers/mountns/mountns03.c | 158 ++++++++----------
1 file changed, 67 insertions(+), 91 deletions(-)
diff --git a/testcases/kernel/containers/mountns/mountns03.c b/testcases/kernel/containers/mountns/mountns03.c
index 196a36149..ab6a62e05 100644
--- a/testcases/kernel/containers/mountns/mountns03.c
+++ b/testcases/kernel/containers/mountns/mountns03.c
@@ -1,23 +1,17 @@
-/* Copyright (c) 2014 Red Hat, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of version 2 the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- ***********************************************************************
- * File: mountns03.c
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) 2014 Red Hat, Inc.
+ * Copyright (C) 2021 SUSE LLC Andrea Cervesato <andrea.cervesato@suse.com>
+ */
+
+/*\
+ * [Description]
*
* Tests a slave mount: slave mount is like a shared mount except that
* mount and umount events only propagate towards it.
*
- * Description:
+ * [Algorithm]
+ *
* 1. Creates directories "A", "B" and files "A/A", "B/B"
* 2. Unshares mount namespace and makes it private (so mounts/umounts
* have no effect on a real system)
@@ -36,131 +30,113 @@
* X: must see only the "A/A" and must not see "A/B" (as slave
* mount does not forward propagation)
* Y: umounts "A"
- ***********************************************************************/
+ */
-#define _GNU_SOURCE
#include <sys/wait.h>
#include <sys/mount.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <errno.h>
-#include "mountns_helper.h"
-#include "test.h"
-#include "safe_macros.h"
+#include "mountns.h"
+#include "tst_test.h"
-char *TCID = "mountns03";
-int TST_TOTAL = 2;
-
-#if defined(MS_SHARED) && defined(MS_PRIVATE) \
- && defined(MS_REC) && defined(MS_SLAVE)
-
-int child_func(void *arg LTP_ATTRIBUTE_UNUSED)
+static int child_func(LTP_ATTRIBUTE_UNUSED void *arg)
{
int ret = 0;
- /* makes mount DIRA a slave of DIRA (all slave mounts have
- * a master mount which is a shared mount) */
- if (mount("none", DIRA, "none", MS_SLAVE, NULL) == -1) {
- perror("mount");
- return 1;
- }
+ /*
+ * makes mount DIRA a slave of DIRA (all slave mounts have
+ * a master mount which is a shared mount)
+ */
+ SAFE_MOUNT("none", DIRA, "none", MS_SLAVE, NULL);
- TST_SAFE_CHECKPOINT_WAKE_AND_WAIT(NULL, 0);
+ TST_CHECKPOINT_WAKE_AND_WAIT(0);
/* checks that shared mounts propagates to slave mount */
- if (access(DIRA"/B", F_OK) == -1)
+ if (access(DIRA "/B", F_OK) < 0)
ret = 2;
- TST_SAFE_CHECKPOINT_WAKE_AND_WAIT(NULL, 0);
+ TST_CHECKPOINT_WAKE_AND_WAIT(0);
- /* bind mounts DIRB to DIRA making contents of DIRB visible
- * in DIRA */
- if (mount(DIRB, DIRA, "none", MS_BIND, NULL) == -1) {
- perror("mount");
- return 1;
- }
+ /* bind mounts DIRB to DIRA making contents of DIRB visible in DIRA */
+ SAFE_MOUNT(DIRB, DIRA, "none", MS_BIND, NULL);
- TST_SAFE_CHECKPOINT_WAKE_AND_WAIT(NULL, 0);
+ TST_CHECKPOINT_WAKE_AND_WAIT(0);
+
+ SAFE_UMOUNT(DIRA);
- umount(DIRA);
return ret;
}
-static void test(void)
+static void run(void)
{
- int status;
+ int status, ret;
/* unshares the mount ns */
- if (unshare(CLONE_NEWNS) == -1)
- tst_brkm(TBROK | TERRNO, cleanup, "unshare failed");
+ SAFE_UNSHARE(CLONE_NEWNS);
+
/* makes sure parent mounts/umounts have no effect on a real system */
- SAFE_MOUNT(cleanup, "none", "/", "none", MS_REC|MS_PRIVATE, NULL);
+ SAFE_MOUNT("none", "/", "none", MS_REC | MS_PRIVATE, NULL);
/* bind mounts DIRA to itself */
- SAFE_MOUNT(cleanup, DIRA, DIRA, "none", MS_BIND, NULL);
+ SAFE_MOUNT(DIRA, DIRA, "none", MS_BIND, NULL);
/* makes mount DIRA shared */
- SAFE_MOUNT(cleanup, "none", DIRA, "none", MS_SHARED, NULL);
+ SAFE_MOUNT("none", DIRA, "none", MS_SHARED, NULL);
- if (do_clone_tests(CLONE_NEWNS, child_func, NULL, NULL, NULL) == -1)
- tst_brkm(TBROK | TERRNO, cleanup, "clone failed");
+ ret = ltp_clone_quick(CLONE_NEWNS | SIGCHLD, child_func, NULL);
+ if (ret < 0)
+ tst_brk(TBROK, "clone failed");
/* waits for child to make a slave mount */
- TST_SAFE_CHECKPOINT_WAIT(cleanup, 0);
+ TST_CHECKPOINT_WAIT(0);
- /* bind mounts DIRB to DIRA making contents of DIRB visible
- * in DIRA */
- SAFE_MOUNT(cleanup, DIRB, DIRA, "none", MS_BIND, NULL);
+ /* bind mounts DIRB to DIRA making contents of DIRB visible in DIRA */
+ SAFE_MOUNT(DIRB, DIRA, "none", MS_BIND, NULL);
- TST_SAFE_CHECKPOINT_WAKE_AND_WAIT(cleanup, 0);
+ TST_CHECKPOINT_WAKE_AND_WAIT(0);
- SAFE_UMOUNT(cleanup, DIRA);
+ SAFE_UMOUNT(DIRA);
- TST_SAFE_CHECKPOINT_WAKE_AND_WAIT(cleanup, 0);
+ TST_CHECKPOINT_WAKE_AND_WAIT(0);
/* checks that slave mount doesn't propagate to shared mount */
- if ((access(DIRA"/A", F_OK) == 0) && (access(DIRA"/B", F_OK) == -1))
- tst_resm(TPASS, "propagation from slave mount passed");
+ if ((access(DIRA "/A", F_OK) == 0) && (access(DIRA "/B", F_OK) == -1))
+ tst_res(TPASS, "propagation from slave mount passed");
else
- tst_resm(TFAIL, "propagation form slave mount failed");
+ tst_res(TFAIL, "propagation form slave mount failed");
- TST_SAFE_CHECKPOINT_WAKE(cleanup, 0);
+ TST_CHECKPOINT_WAKE(0);
+ SAFE_WAIT(&status);
- SAFE_WAIT(cleanup, &status);
if (WIFEXITED(status)) {
if (WEXITSTATUS(status) == 0)
- tst_resm(TPASS, "propagation to slave mount passed");
+ tst_res(TPASS, "propagation to slave mount passed");
else
- tst_resm(TFAIL, "propagation to slave mount failed");
+ tst_res(TFAIL, "propagation to slave mount failed");
}
+
if (WIFSIGNALED(status)) {
- tst_resm(TBROK, "child was killed with signal %s",
- tst_strsig(WTERMSIG(status)));
- return;
+ tst_brk(TBROK, "child was killed with signal %s",
+ tst_strsig(WTERMSIG(status)));
}
- SAFE_UMOUNT(cleanup, DIRA);
+ SAFE_UMOUNT(DIRA);
}
-int main(int argc, char *argv[])
+static void setup(void)
{
- int lc;
-
- tst_parse_opts(argc, argv, NULL, NULL);
-
- setup();
-
- for (lc = 0; TEST_LOOPING(lc); lc++)
- test();
-
- cleanup();
- tst_exit();
+ check_newns();
+ create_folders();
}
-#else
-int main(void)
+static void cleanup(void)
{
- tst_brkm(TCONF, NULL, "needed mountflags are not defined");
+ umount_folders();
}
-#endif
+
+static struct tst_test test = {
+ .setup = setup,
+ .cleanup = cleanup,
+ .test_all = run,
+ .needs_root = 1,
+ .needs_checkpoints = 1,
+};
--
2.35.1
More information about the ltp
mailing list