* [LTP] [PATCH v8 1/4] Refactor mqns_03 using new LTP API
2023-07-05 14:12 [LTP] [PATCH v8 0/4] Refactor mqns testing suite Andrea Cervesato
@ 2023-07-05 14:12 ` Andrea Cervesato
2023-07-11 11:13 ` Petr Vorel
2023-09-13 12:17 ` Cyril Hrubis
2023-07-05 14:12 ` [LTP] [PATCH v8 2/4] Refactor mqns_04 " Andrea Cervesato
` (2 subsequent siblings)
3 siblings, 2 replies; 13+ messages in thread
From: Andrea Cervesato @ 2023-07-05 14:12 UTC (permalink / raw)
To: ltp
From: Andrea Cervesato <andrea.cervesato@suse.com>
Signed-off-by: Andrea Cervesato <andrea.cervesato@suse.com>
---
Use a single mq_freed volatile variable to know mqueues status
Better parameters handling
Check and umount mqueue(s)
testcases/kernel/containers/mqns/mqns_03.c | 317 +++++++++------------
1 file changed, 140 insertions(+), 177 deletions(-)
diff --git a/testcases/kernel/containers/mqns/mqns_03.c b/testcases/kernel/containers/mqns/mqns_03.c
index a7452b970..ff7571880 100644
--- a/testcases/kernel/containers/mqns/mqns_03.c
+++ b/testcases/kernel/containers/mqns/mqns_03.c
@@ -1,207 +1,170 @@
+// SPDX-License-Identifier: GPL-2.0
/*
-* Copyright (c) International Business Machines Corp., 2009
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* 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, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*
-* Author: Serge Hallyn <serue@us.ibm.com>
-*
-* Check ipcns+sb longevity
-*
-* Mount mqueue fs
-* unshare
-* In unshared process:
-* Create "/mq1" with mq_open()
-* Mount mqueuefs
-* Check that /mq1 exists
-* Create /dev/mqueue/mq2 through vfs (create(2))
-* Umount /dev/mqueue
-* Remount /dev/mqueue
-* Check that both /mq1 and /mq2 exist
-
-***************************************************************************/
-
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <errno.h>
-#include "mqns.h"
-#include "mqns_helper.h"
-
-char *TCID = "posixmq_namespace_03";
-int TST_TOTAL = 1;
-
-int p1[2];
-int p2[2];
-
-#define FNAM1 DEV_MQUEUE2 SLASH_MQ1
-#define FNAM2 DEV_MQUEUE2 SLASH_MQ2
-
-int check_mqueue(void *vtest)
+ * Copyright (c) International Business Machines Corp., 2009
+ * Copyright (c) Serge Hallyn <serue@us.ibm.com>
+ * Copyright (C) 2023 SUSE LLC Andrea Cervesato <andrea.cervesato@suse.com>
+ */
+
+/*\
+ * [Description]
+ *
+ * Test mqueuefs from an isolated/forked process namespace.
+ *
+ * [Algorithm]
+ *
+ * - create /MQ1
+ * - mount mqueue inside the temporary folder
+ * - check for /MQ1 existance
+ * - create /MQ2 inside the temporary folder
+ * - umount
+ * - mount mqueue inside the temporary folder
+ * - check /MQ1 existance
+ * - check /MQ2 existance
+ * - umount
+ */
+
+#include "tst_test.h"
+#include "lapi/sched.h"
+#include "tst_safe_posix_ipc.h"
+#include "tst_safe_stdio.h"
+#include "tst_safe_macros.h"
+
+#define CHECK_MQ_OPEN_RET(x) ((x) >= 0 || ((x) == -1 && errno != EMFILE))
+
+#define MQNAME1 "/MQ1"
+#define MQNAME2 "/MQ2"
+
+static char *str_op;
+static char *devdir;
+static char *mqueue1;
+static char *mqueue2;
+static volatile int *mq_freed;
+
+static void check_mqueue(void)
{
- char buf[30];
- mqd_t mqd;
int rc;
+ mqd_t mqd;
struct stat statbuf;
- (void) vtest;
+ tst_res(TINFO, "Creating %s mqueue from within child process", MQNAME1);
- close(p1[1]);
- close(p2[0]);
+ mqd = TST_RETRY_FUNC(
+ mq_open(MQNAME1, O_RDWR | O_CREAT | O_EXCL, 0777, NULL),
+ CHECK_MQ_OPEN_RET);
+ if (mqd == -1)
+ tst_brk(TBROK | TERRNO, "mq_open failed");
- if (read(p1[0], buf, 3) != 3) { /* go */
- perror("read failed");
- exit(1);
- }
+ SAFE_MQ_CLOSE(mqd);
+ mq_freed[0] = 1;
- mqd = tst_syscall(__NR_mq_open, NOSLASH_MQ1, O_RDWR | O_CREAT | O_EXCL,
- 0755, NULL);
- if (mqd == -1) {
- write(p2[1], "mqfail", 7);
- exit(1);
- }
+ tst_res(TINFO, "Mount %s from within child process", devdir);
- mq_close(mqd);
+ SAFE_MOUNT("mqueue", devdir, "mqueue", 0, NULL);
- rc = mount("mqueue", DEV_MQUEUE2, "mqueue", 0, NULL);
- if (rc == -1) {
- write(p2[1], "mount1", 7);
- exit(1);
- }
+ SAFE_STAT(mqueue1, &statbuf);
+ tst_res(TPASS, "%s exists at first mount", mqueue1);
- rc = stat(FNAM1, &statbuf);
- if (rc == -1) {
- write(p2[1], "stat1", 6);
- exit(1);
- }
+ tst_res(TINFO, "Creating %s from within child process", mqueue2);
- rc = creat(FNAM2, 0755);
- if (rc == -1) {
- write(p2[1], "creat", 6);
- exit(1);
- }
+ rc = SAFE_CREAT(mqueue2, 0755);
+ SAFE_CLOSE(rc);
+ mq_freed[1] = 1;
- close(rc);
+ tst_res(TINFO, "Mount %s from within child process a second time", devdir);
- rc = umount(DEV_MQUEUE2);
- if (rc == -1) {
- write(p2[1], "umount", 7);
- exit(1);
- }
+ SAFE_UMOUNT(devdir);
+ SAFE_MOUNT("mqueue", devdir, "mqueue", 0, NULL);
- rc = mount("mqueue", DEV_MQUEUE2, "mqueue", 0, NULL);
- if (rc == -1) {
- write(p2[1], "mount2", 7);
- exit(1);
- }
+ SAFE_STAT(mqueue1, &statbuf);
+ tst_res(TPASS, "%s exists at second mount", mqueue1);
- rc = stat(FNAM1, &statbuf);
- if (rc == -1) {
- write(p2[1], "stat2", 7);
- exit(1);
- }
+ SAFE_STAT(mqueue2, &statbuf);
+ tst_res(TPASS, "%s exists at second mount", mqueue2);
- rc = stat(FNAM2, &statbuf);
- if (rc == -1) {
- write(p2[1], "stat3", 7);
- exit(1);
- }
+ SAFE_UMOUNT(devdir);
+
+ SAFE_MQ_UNLINK(MQNAME1);
+ mq_freed[0] = 0;
- write(p2[1], "done", 5);
+ SAFE_MQ_UNLINK(MQNAME2);
+ mq_freed[1] = 0;
+}
- exit(0);
+static void run(void)
+{
+ const struct tst_clone_args clone_args = { CLONE_NEWIPC, SIGCHLD };
+
+ if (str_op && !strcmp(str_op, "clone")) {
+ tst_res(TINFO, "Spawning isolated process");
+
+ if (!SAFE_CLONE(&clone_args)) {
+ check_mqueue();
+ return;
+ }
+ } else if (str_op && !strcmp(str_op, "unshare")) {
+ tst_res(TINFO, "Spawning unshared process");
+
+ if (!SAFE_FORK()) {
+ SAFE_UNSHARE(CLONE_NEWIPC);
+ check_mqueue();
+ return;
+ }
+ }
}
static void setup(void)
{
- tst_require_root();
- check_mqns();
+ char *tmpdir;
+
+ if (!str_op || (strcmp(str_op, "clone") && strcmp(str_op, "unshare")))
+ tst_brk(TCONF, "Please specify clone|unshare child isolation");
+
+ tmpdir = tst_get_tmpdir();
+
+ SAFE_ASPRINTF(&devdir, "%s/mqueue", tmpdir);
+ SAFE_MKDIR(devdir, 0755);
+
+ SAFE_ASPRINTF(&mqueue1, "%s" MQNAME1, devdir);
+ SAFE_ASPRINTF(&mqueue2, "%s" MQNAME2, devdir);
+
+ mq_freed = SAFE_MMAP(NULL,
+ 2 * sizeof(int),
+ PROT_READ | PROT_WRITE,
+ MAP_SHARED | MAP_ANONYMOUS,
+ -1, 0);
}
-int main(int argc, char *argv[])
+static void cleanup(void)
{
- int r;
- char buf[30];
- int use_clone = T_UNSHARE;
-
- setup();
-
- if (argc == 2 && strcmp(argv[1], "-clone") == 0) {
- tst_resm(TINFO, "Testing posix mq namespaces through clone(2)");
- use_clone = T_CLONE;
- } else
- tst_resm(TINFO,
- "Testing posix mq namespaces through unshare(2)");
-
- if (pipe(p1) == -1 || pipe(p2) == -1)
- tst_brkm(TBROK | TERRNO, NULL, "pipe failed");
-
- /* fire off the test */
- r = do_clone_unshare_test(use_clone, CLONE_NEWIPC, check_mqueue, NULL);
- if (r < 0) {
- tst_brkm(TBROK | TERRNO, NULL, "failed clone/unshare");
- }
+ if (!devdir)
+ return;
- tst_resm(TINFO, "Checking correct umount+remount of mqueuefs");
-
- mkdir(DEV_MQUEUE2, 0755);
-
- close(p1[0]);
- close(p2[1]);
- write(p1[1], "go", 3);
-
- read(p2[0], buf, 7);
- r = TFAIL;
- if (!strcmp(buf, "mqfail")) {
- tst_resm(TFAIL, "child process could not create mqueue");
- goto fail;
- } else if (!strcmp(buf, "mount1")) {
- tst_resm(TFAIL, "child process could not mount mqueue");
- goto fail;
- } else if (!strcmp(buf, "stat1x")) {
- tst_resm(TFAIL, "mq created by child is not in mqueuefs");
- goto fail;
- } else if (!strcmp(buf, "creat")) {
- tst_resm(TFAIL, "child couldn't creat mq through mqueuefs");
- goto fail;
- } else if (!strcmp(buf, "umount")) {
- tst_resm(TFAIL, "child couldn't umount mqueuefs");
- goto fail;
- } else if (!strcmp(buf, "mount2")) {
- tst_resm(TFAIL, "child couldn't remount mqueuefs");
- goto fail;
- } else if (!strcmp(buf, "stat2")) {
- tst_resm(TFAIL,
- "mq_open()d file gone after remount of mqueuefs");
- goto fail;
- } else if (!strcmp(buf, "stat3")) {
- tst_resm(TFAIL,
- "creat(2)'d file gone after remount of mqueuefs");
- goto fail;
- }
+ if (!access(mqueue1, F_OK))
+ SAFE_MQ_UNLINK(MQNAME1);
+
+ if (!access(mqueue2, F_OK))
+ SAFE_MQ_UNLINK(MQNAME2);
- tst_resm(TPASS, "umount+remount of mqueuefs remounted the right fs");
+ if (tst_is_mounted(devdir))
+ SAFE_UMOUNT(devdir);
- r = 0;
-fail:
- umount(DEV_MQUEUE2);
- rmdir(DEV_MQUEUE2);
- tst_exit();
+ if (*mq_freed)
+ SAFE_MUNMAP((void *)mq_freed, 2 * sizeof(int));
}
+
+static struct tst_test test = {
+ .test_all = run,
+ .setup = setup,
+ .cleanup = cleanup,
+ .needs_root = 1,
+ .forks_child = 1,
+ .needs_tmpdir = 1,
+ .options = (struct tst_option[]) {
+ { "m:", &str_op, "Child process isolation <clone|unshare>" },
+ {},
+ },
+ .needs_kconfigs = (const char *[]) {
+ "CONFIG_USER_NS",
+ NULL
+ },
+};
--
2.35.3
--
Mailing list info: https://lists.linux.it/listinfo/ltp
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [LTP] [PATCH v8 1/4] Refactor mqns_03 using new LTP API
2023-07-05 14:12 ` [LTP] [PATCH v8 1/4] Refactor mqns_03 using new LTP API Andrea Cervesato
@ 2023-07-11 11:13 ` Petr Vorel
2023-09-13 12:17 ` Cyril Hrubis
1 sibling, 0 replies; 13+ messages in thread
From: Petr Vorel @ 2023-07-11 11:13 UTC (permalink / raw)
To: Andrea Cervesato; +Cc: ltp
Hi Andrea,
...
> +++ b/testcases/kernel/containers/mqns/mqns_03.c
> @@ -1,207 +1,170 @@
> +// SPDX-License-Identifier: GPL-2.0
> /*
> -* Copyright (c) International Business Machines Corp., 2009
> -* This program is free software; you can redistribute it and/or modify
> -* it under the terms of the GNU General Public License as published by
> -* the Free Software Foundation; either version 2 of the License, or
> -* (at your option) any later version.
or (at your option) any later version => SPDX-License-Identifier: GPL-2.0-or-later
The same applies to mqns_04. If it's the only change, it can be fixed by person
who merges the patchset.
Kind regards,
Petr
--
Mailing list info: https://lists.linux.it/listinfo/ltp
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [LTP] [PATCH v8 1/4] Refactor mqns_03 using new LTP API
2023-07-05 14:12 ` [LTP] [PATCH v8 1/4] Refactor mqns_03 using new LTP API Andrea Cervesato
2023-07-11 11:13 ` Petr Vorel
@ 2023-09-13 12:17 ` Cyril Hrubis
2023-09-13 12:57 ` Andrea Cervesato via ltp
1 sibling, 1 reply; 13+ messages in thread
From: Cyril Hrubis @ 2023-09-13 12:17 UTC (permalink / raw)
To: Andrea Cervesato; +Cc: ltp
Hi!
> static void setup(void)
> {
> - tst_require_root();
> - check_mqns();
> + char *tmpdir;
> +
> + if (!str_op || (strcmp(str_op, "clone") && strcmp(str_op, "unshare")))
> + tst_brk(TCONF, "Please specify clone|unshare child isolation");
> +
> + tmpdir = tst_get_tmpdir();
> +
> + SAFE_ASPRINTF(&devdir, "%s/mqueue", tmpdir);
> + SAFE_MKDIR(devdir, 0755);
> +
> + SAFE_ASPRINTF(&mqueue1, "%s" MQNAME1, devdir);
> + SAFE_ASPRINTF(&mqueue2, "%s" MQNAME2, devdir);
Do we really need the devdir and mqueue paths to be absolute?
--
Cyril Hrubis
chrubis@suse.cz
--
Mailing list info: https://lists.linux.it/listinfo/ltp
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [LTP] [PATCH v8 1/4] Refactor mqns_03 using new LTP API
2023-09-13 12:17 ` Cyril Hrubis
@ 2023-09-13 12:57 ` Andrea Cervesato via ltp
2023-09-13 14:44 ` Cyril Hrubis
0 siblings, 1 reply; 13+ messages in thread
From: Andrea Cervesato via ltp @ 2023-09-13 12:57 UTC (permalink / raw)
To: Cyril Hrubis, Andrea Cervesato; +Cc: ltp
Hi,
On 9/13/23 14:17, Cyril Hrubis wrote:
> Hi!
>> static void setup(void)
>> {
>> - tst_require_root();
>> - check_mqns();
>> + char *tmpdir;
>> +
>> + if (!str_op || (strcmp(str_op, "clone") && strcmp(str_op, "unshare")))
>> + tst_brk(TCONF, "Please specify clone|unshare child isolation");
>> +
>> + tmpdir = tst_get_tmpdir();
>> +
>> + SAFE_ASPRINTF(&devdir, "%s/mqueue", tmpdir);
>> + SAFE_MKDIR(devdir, 0755);
>> +
>> + SAFE_ASPRINTF(&mqueue1, "%s" MQNAME1, devdir);
>> + SAFE_ASPRINTF(&mqueue2, "%s" MQNAME2, devdir);
> Do we really need the devdir and mqueue paths to be absolute?
>
I tried absolute and relative path for devdir and they both work well
with SAFE_UMOUNT() function, but any other combination of SAFE_MOUNT()
parameters doesn't really work.
I think we can left it absolute, unless we really want to get rid of it.
Andrea
--
Mailing list info: https://lists.linux.it/listinfo/ltp
^ permalink raw reply [flat|nested] 13+ messages in thread
* [LTP] [PATCH v8 2/4] Refactor mqns_04 using new LTP API
2023-07-05 14:12 [LTP] [PATCH v8 0/4] Refactor mqns testing suite Andrea Cervesato
2023-07-05 14:12 ` [LTP] [PATCH v8 1/4] Refactor mqns_03 using new LTP API Andrea Cervesato
@ 2023-07-05 14:12 ` Andrea Cervesato
2023-07-11 11:14 ` Petr Vorel
2023-07-05 14:12 ` [LTP] [PATCH v8 3/4] Remove deprecated header files from mqns suite Andrea Cervesato
2023-07-05 14:12 ` [LTP] [PATCH v8 4/4] Remove libclone dependency " Andrea Cervesato
3 siblings, 1 reply; 13+ messages in thread
From: Andrea Cervesato @ 2023-07-05 14:12 UTC (permalink / raw)
To: ltp
From: Andrea Cervesato <andrea.cervesato@suse.com>
Signed-off-by: Andrea Cervesato <andrea.cervesato@suse.com>
---
Use a single mq_freed volatile variable to know mqueues status
Better parameters handling
Check and umount mqueue(s)
testcases/kernel/containers/mqns/mqns_04.c | 288 ++++++++++-----------
1 file changed, 134 insertions(+), 154 deletions(-)
diff --git a/testcases/kernel/containers/mqns/mqns_04.c b/testcases/kernel/containers/mqns/mqns_04.c
index d07a85c04..27ac0a868 100644
--- a/testcases/kernel/containers/mqns/mqns_04.c
+++ b/testcases/kernel/containers/mqns/mqns_04.c
@@ -1,187 +1,167 @@
+// SPDX-License-Identifier: GPL-2.0
/*
-* Copyright (c) International Business Machines Corp., 2009
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* 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, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*
-* Author: Serge Hallyn <serue@us.ibm.com>
-*
-* Check mqueuefs lifetime
-* . parent creates /dev/mqueue2
-* . child mounts mqueue there
-* . child does mq_open("/ab")
-* . parent checks for /dev/mqueue2
-* . child exits
-* . parent checks for /dev/mqueue2
-* . parent tries 'touch /dev/mqueue2/dd' -> should fail
-* . parent umounts /dev/mqueue2
-
-***************************************************************************/
-
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
-#include <sys/types.h>
-#include <sys/stat.h>
+ * Copyright (c) International Business Machines Corp., 2009
+ * Copyright (c) Serge Hallyn <serue@us.ibm.com>
+ * Copyright (C) 2023 SUSE LLC Andrea Cervesato <andrea.cervesato@suse.com>
+ */
+
+/*\
+ * [Description]
+ *
+ * Test mqueuefs manipulation from child/parent namespaces.
+ *
+ * [Algorithm]
+ *
+ * - parent creates mqueue folder in <tmpdir>
+ * - child mounts mqueue there
+ * - child creates /MQ1 mqueue
+ * - parent checks for <tmpdir>/mqueue/MQ1 existence
+ * - child exits
+ * - parent checks for <tmpdir>/mqueue/MQ1 existence
+ * - parent tries 'touch <tmpdir>/mqueue/MQ2' -> should fail
+ * - parent umount mqueuefs
+ */
+
#include <sys/wait.h>
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <errno.h>
-#include "mqns.h"
-#include "mqns_helper.h"
+#include "tst_test.h"
+#include "lapi/sched.h"
+#include "tst_safe_posix_ipc.h"
+#include "tst_safe_stdio.h"
+#include "tst_safe_macros.h"
-char *TCID = "posixmq_namespace_04";
-int TST_TOTAL = 1;
+#define CHECK_MQ_OPEN_RET(x) ((x) >= 0 || ((x) == -1 && errno != EMFILE))
-int p1[2];
-int p2[2];
+#define MQNAME1 "/MQ1"
+#define MQNAME2 "/MQ2"
-#define FNAM1 DEV_MQUEUE2 SLASH_MQ1
-#define FNAM2 DEV_MQUEUE2 SLASH_MQ2
+static char *str_op;
+static char *devdir;
+static char *mqueue1;
+static char *mqueue2;
+static volatile int *mq_freed;
-int check_mqueue(void *vtest)
+static void check_mqueue(void)
{
- char buf[30];
mqd_t mqd;
- int rc;
- (void) vtest;
+ tst_res(TINFO, "Creating %s mqueue from within child process", MQNAME1);
- close(p1[1]);
- close(p2[0]);
+ mqd = TST_RETRY_FUNC(
+ mq_open(MQNAME1, O_RDWR | O_CREAT | O_EXCL, 0755, NULL),
+ CHECK_MQ_OPEN_RET);
+ if (mqd == -1)
+ tst_brk(TBROK | TERRNO, "mq_open failed");
- read(p1[0], buf, 3); /* go */
+ SAFE_MQ_CLOSE(mqd);
+ mq_freed[0] = 1;
- mqd = tst_syscall(__NR_mq_open, NOSLASH_MQ1, O_RDWR | O_CREAT | O_EXCL,
- 0755, NULL);
- if (mqd == -1) {
- write(p2[1], "mqfail", 7);
- tst_exit();
- }
+ tst_res(TINFO, "Mount %s from within child process", devdir);
+
+ SAFE_MOUNT("mqueue", devdir, "mqueue", 0, NULL);
+
+ TST_CHECKPOINT_WAKE_AND_WAIT(0);
+}
- mq_close(mqd);
+static void run(void)
+{
+ const struct tst_clone_args clone_args = { CLONE_NEWIPC, SIGCHLD };
+ struct stat statbuf;
- rc = mount("mqueue", DEV_MQUEUE2, "mqueue", 0, NULL);
- if (rc == -1) {
- perror("mount");
- write(p2[1], "mount", 6);
- tst_exit();
+ if (str_op && !strcmp(str_op, "clone")) {
+ tst_res(TINFO, "Spawning isolated process");
+
+ if (!SAFE_CLONE(&clone_args)) {
+ check_mqueue();
+ return;
+ }
+ } else if (str_op && !strcmp(str_op, "unshare")) {
+ tst_res(TINFO, "Spawning unshared process");
+
+ if (!SAFE_FORK()) {
+ SAFE_UNSHARE(CLONE_NEWIPC);
+ check_mqueue();
+ return;
+ }
}
- write(p2[1], "go", 3);
- read(p1[0], buf, 3);
+ TST_CHECKPOINT_WAIT(0);
- tst_exit();
-}
+ SAFE_STAT(mqueue1, &statbuf);
+ tst_res(TPASS, "%s child's mqueue can be accessed from parent", mqueue1);
-static void setup(void)
-{
- tst_require_root();
- check_mqns();
-}
+ TST_CHECKPOINT_WAKE(0);
-int main(int argc, char *argv[])
-{
- int rc;
- int status;
- char buf[30];
- struct stat statbuf;
- int use_clone = T_UNSHARE;
+ tst_res(TINFO, "Waiting child to exit");
- setup();
+ tst_reap_children();
+ mq_freed[0] = 0;
- if (argc == 2 && strcmp(argv[1], "-clone") == 0) {
- tst_resm(TINFO,
- "Testing posix mq namespaces through clone(2).");
- use_clone = T_CLONE;
- } else
- tst_resm(TINFO,
- "Testing posix mq namespaces through unshare(2).");
+ SAFE_STAT(mqueue1, &statbuf);
+ tst_res(TPASS, "%s child's mqueue can be accessed from parent after child's dead", mqueue1);
- if (pipe(p1) == -1) {
- perror("pipe");
- exit(EXIT_FAILURE);
- }
- if (pipe(p2) == -1) {
- perror("pipe");
- exit(EXIT_FAILURE);
- }
+ tst_res(TINFO, "Try to create %s from parent", mqueue2);
- mkdir(DEV_MQUEUE2, 0755);
+ TST_EXP_FAIL(creat(mqueue2, 0755), EACCES);
+ if (!TST_PASS)
+ mq_freed[1] = 1;
- tst_resm(TINFO, "Checking mqueue filesystem lifetime");
+ SAFE_UMOUNT(devdir);
+}
- /* fire off the test */
- rc = do_clone_unshare_test(use_clone, CLONE_NEWIPC, check_mqueue, NULL);
- if (rc < 0) {
- tst_resm(TFAIL, "failed clone/unshare");
- goto fail;
- }
+static void setup(void)
+{
+ char *tmpdir;
- close(p1[0]);
- close(p2[1]);
- write(p1[1], "go", 3);
-
- read(p2[0], buf, 7);
- if (!strcmp(buf, "mqfail")) {
- tst_resm(TFAIL, "child process could not create mqueue");
- goto fail;
- } else if (!strcmp(buf, "mount")) {
- tst_resm(TFAIL, "child process could not mount mqueue");
- goto fail;
- }
+ if (!str_op || (strcmp(str_op, "clone") && strcmp(str_op, "unshare")))
+ tst_brk(TCONF, "Please specify clone|unshare child isolation");
- rc = stat(FNAM1, &statbuf);
- if (rc == -1) {
- perror("stat");
- write(p1[1], "go", 3);
- tst_resm(TFAIL, "parent could not see child's created mq");
- goto fail;
- }
- write(p1[1], "go", 3);
+ tmpdir = tst_get_tmpdir();
- rc = wait(&status);
- if (rc == -1) {
- perror("wait");
- tst_resm(TFAIL, "error while parent waited on child to exit");
- goto fail;
- }
- if (!WIFEXITED(status)) {
- tst_resm(TFAIL, "Child did not exit normally (status %d)",
- status);
- goto fail;
- }
- rc = stat(FNAM1, &statbuf);
- if (rc == -1) {
- tst_resm(TFAIL,
- "parent's view of child's mq died with child");
- goto fail;
- }
+ SAFE_ASPRINTF(&devdir, "%s/mqueue", tmpdir);
+ SAFE_MKDIR(devdir, 0755);
- rc = creat(FNAM2, 0755);
- if (rc != -1) {
- tst_resm(TFAIL,
- "parent was able to create a file in dead child's mqfs");
- goto fail;
- }
+ SAFE_ASPRINTF(&mqueue1, "%s" MQNAME1, devdir);
+ SAFE_ASPRINTF(&mqueue2, "%s" MQNAME2, devdir);
+
+ mq_freed = SAFE_MMAP(NULL,
+ 2 * sizeof(int),
+ PROT_READ | PROT_WRITE,
+ MAP_SHARED | MAP_ANONYMOUS,
+ -1, 0);
+}
- tst_resm(TPASS, "Child mqueue fs still visible for parent");
+static void cleanup(void)
+{
+ if (!devdir)
+ return;
-fail:
- umount(DEV_MQUEUE2);
- rmdir(DEV_MQUEUE2);
+ if (!access(mqueue1, F_OK))
+ SAFE_MQ_UNLINK(MQNAME1);
- tst_exit();
+ if (!access(mqueue2, F_OK))
+ SAFE_MQ_UNLINK(MQNAME2);
+
+ if (tst_is_mounted(devdir))
+ SAFE_UMOUNT(devdir);
+
+ if (*mq_freed)
+ SAFE_MUNMAP((void *)mq_freed, 2 * sizeof(int));
}
+
+static struct tst_test test = {
+ .test_all = run,
+ .setup = setup,
+ .cleanup = cleanup,
+ .needs_root = 1,
+ .forks_child = 1,
+ .needs_tmpdir = 1,
+ .needs_checkpoints = 1,
+ .options = (struct tst_option[]) {
+ { "m:", &str_op, "Child process isolation <clone|unshare>" },
+ {},
+ },
+ .needs_kconfigs = (const char *[]) {
+ "CONFIG_USER_NS",
+ NULL
+ },
+};
--
2.35.3
--
Mailing list info: https://lists.linux.it/listinfo/ltp
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [LTP] [PATCH v8 2/4] Refactor mqns_04 using new LTP API
2023-07-05 14:12 ` [LTP] [PATCH v8 2/4] Refactor mqns_04 " Andrea Cervesato
@ 2023-07-11 11:14 ` Petr Vorel
2023-07-11 11:17 ` Andrea Cervesato via ltp
0 siblings, 1 reply; 13+ messages in thread
From: Petr Vorel @ 2023-07-11 11:14 UTC (permalink / raw)
To: Andrea Cervesato; +Cc: ltp
Hi Andrea,
> +++ b/testcases/kernel/containers/mqns/mqns_04.c
> @@ -1,187 +1,167 @@
> +// SPDX-License-Identifier: GPL-2.0
> /*
> -* Copyright (c) International Business Machines Corp., 2009
> -* This program is free software; you can redistribute it and/or modify
> -* it under the terms of the GNU General Public License as published by
> -* the Free Software Foundation; either version 2 of the License, or
> -* (at your option) any later version.
or (at your option) any later version => SPDX-License-Identifier: GPL-2.0-or-later
This can be fixed by person who merges the patchset.
Kind regards,
Petr
--
Mailing list info: https://lists.linux.it/listinfo/ltp
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [LTP] [PATCH v8 2/4] Refactor mqns_04 using new LTP API
2023-07-11 11:14 ` Petr Vorel
@ 2023-07-11 11:17 ` Andrea Cervesato via ltp
2023-07-11 12:17 ` Andrea Cervesato via ltp
0 siblings, 1 reply; 13+ messages in thread
From: Andrea Cervesato via ltp @ 2023-07-11 11:17 UTC (permalink / raw)
To: Petr Vorel, Andrea Cervesato; +Cc: ltp
Hi Petr,
yes, I forgot it for all the other patches. I kindly ask you if you can
do it in the merge window.
Thanks
Andrea
On 7/11/23 13:14, Petr Vorel wrote:
> Hi Andrea,
>
>> +++ b/testcases/kernel/containers/mqns/mqns_04.c
>> @@ -1,187 +1,167 @@
>> +// SPDX-License-Identifier: GPL-2.0
>> /*
>> -* Copyright (c) International Business Machines Corp., 2009
>> -* This program is free software; you can redistribute it and/or modify
>> -* it under the terms of the GNU General Public License as published by
>> -* the Free Software Foundation; either version 2 of the License, or
>> -* (at your option) any later version.
> or (at your option) any later version => SPDX-License-Identifier: GPL-2.0-or-later
>
> This can be fixed by person who merges the patchset.
>
> Kind regards,
> Petr
--
Mailing list info: https://lists.linux.it/listinfo/ltp
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [LTP] [PATCH v8 2/4] Refactor mqns_04 using new LTP API
2023-07-11 11:17 ` Andrea Cervesato via ltp
@ 2023-07-11 12:17 ` Andrea Cervesato via ltp
2023-07-11 22:16 ` Petr Vorel
0 siblings, 1 reply; 13+ messages in thread
From: Andrea Cervesato via ltp @ 2023-07-11 12:17 UTC (permalink / raw)
To: Petr Vorel, Andrea Cervesato; +Cc: ltp
Hi,
there's an another problem with patches: controllers runtest file is not
updated according with the latest version, so it will need to be updated.
Thanks,
Andrea
On 7/11/23 13:17, Andrea Cervesato wrote:
> Hi Petr,
>
> yes, I forgot it for all the other patches. I kindly ask you if you
> can do it in the merge window.
> Thanks
> Andrea
>
>
> On 7/11/23 13:14, Petr Vorel wrote:
>> Hi Andrea,
>>
>>> +++ b/testcases/kernel/containers/mqns/mqns_04.c
>>> @@ -1,187 +1,167 @@
>>> +// SPDX-License-Identifier: GPL-2.0
>>> /*
>>> -* Copyright (c) International Business Machines Corp., 2009
>>> -* This program is free software; you can redistribute it and/or modify
>>> -* it under the terms of the GNU General Public License as published by
>>> -* the Free Software Foundation; either version 2 of the License, or
>>> -* (at your option) any later version.
>> or (at your option) any later version => SPDX-License-Identifier:
>> GPL-2.0-or-later
>>
>> This can be fixed by person who merges the patchset.
>>
>> Kind regards,
>> Petr
>
>
--
Mailing list info: https://lists.linux.it/listinfo/ltp
^ permalink raw reply [flat|nested] 13+ messages in thread
* [LTP] [PATCH v8 3/4] Remove deprecated header files from mqns suite
2023-07-05 14:12 [LTP] [PATCH v8 0/4] Refactor mqns testing suite Andrea Cervesato
2023-07-05 14:12 ` [LTP] [PATCH v8 1/4] Refactor mqns_03 using new LTP API Andrea Cervesato
2023-07-05 14:12 ` [LTP] [PATCH v8 2/4] Refactor mqns_04 " Andrea Cervesato
@ 2023-07-05 14:12 ` Andrea Cervesato
2023-07-05 14:12 ` [LTP] [PATCH v8 4/4] Remove libclone dependency " Andrea Cervesato
3 siblings, 0 replies; 13+ messages in thread
From: Andrea Cervesato @ 2023-07-05 14:12 UTC (permalink / raw)
To: ltp
From: Andrea Cervesato <andrea.cervesato@suse.com>
Signed-off-by: Andrea Cervesato <andrea.cervesato@suse.com>
---
testcases/kernel/containers/mqns/mqns.h | 11 ----
.../kernel/containers/mqns/mqns_helper.h | 53 -------------------
2 files changed, 64 deletions(-)
delete mode 100644 testcases/kernel/containers/mqns/mqns.h
delete mode 100644 testcases/kernel/containers/mqns/mqns_helper.h
diff --git a/testcases/kernel/containers/mqns/mqns.h b/testcases/kernel/containers/mqns/mqns.h
deleted file mode 100644
index 5a9056838..000000000
--- a/testcases/kernel/containers/mqns/mqns.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef __MQNS_H
-#define __MQNS_H
-
-#define DEV_MQUEUE "/dev/mqueue"
-#define DEV_MQUEUE2 "/dev/mqueue2"
-#define SLASH_MQ1 "/MQ1"
-#define NOSLASH_MQ1 "MQ1"
-#define SLASH_MQ2 "/MQ2"
-#define NOSLASH_MQ2 "MQ2"
-
-#endif /* __MQNS_H */
diff --git a/testcases/kernel/containers/mqns/mqns_helper.h b/testcases/kernel/containers/mqns/mqns_helper.h
deleted file mode 100644
index 03f50aa36..000000000
--- a/testcases/kernel/containers/mqns/mqns_helper.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) International Business Machines Corp., 2009
- * Copyright (c) Nadia Derbey, 2009
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Author: Serge Hallyn <serue@us.ibm.com>
- ***************************************************************************/
-#include <sys/mount.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <mqueue.h>
-#include "../libclone/libclone.h"
-#include "lapi/syscalls.h"
-#include "safe_macros.h"
-#include "test.h"
-
-static int dummy_child(void *v)
-{
- (void) v;
- return 0;
-}
-
-static void check_mqns(void)
-{
- int pid, status;
- mqd_t mqd;
-
- mq_unlink("/checkmqnsenabled");
- mqd =
- mq_open("/checkmqnsenabled", O_RDWR | O_CREAT | O_EXCL, 0777, NULL);
- if (mqd == -1)
- tst_brkm(TCONF, NULL, "mq_open check failed");
-
- mq_close(mqd);
- mq_unlink("/checkmqnsenabled");
-
- pid = do_clone_unshare_test(T_CLONE, CLONE_NEWIPC, dummy_child, NULL);
- if (pid == -1)
- tst_brkm(TCONF | TERRNO, NULL, "CLONE_NEWIPC not supported");
-
- SAFE_WAIT(NULL, &status);
-}
--
2.35.3
--
Mailing list info: https://lists.linux.it/listinfo/ltp
^ permalink raw reply related [flat|nested] 13+ messages in thread* [LTP] [PATCH v8 4/4] Remove libclone dependency from mqns suite
2023-07-05 14:12 [LTP] [PATCH v8 0/4] Refactor mqns testing suite Andrea Cervesato
` (2 preceding siblings ...)
2023-07-05 14:12 ` [LTP] [PATCH v8 3/4] Remove deprecated header files from mqns suite Andrea Cervesato
@ 2023-07-05 14:12 ` Andrea Cervesato
3 siblings, 0 replies; 13+ messages in thread
From: Andrea Cervesato @ 2023-07-05 14:12 UTC (permalink / raw)
To: ltp
From: Andrea Cervesato <andrea.cervesato@suse.com>
Signed-off-by: Andrea Cervesato <andrea.cervesato@suse.com>
---
testcases/kernel/containers/mqns/Makefile | 27 +++++------------------
1 file changed, 5 insertions(+), 22 deletions(-)
diff --git a/testcases/kernel/containers/mqns/Makefile b/testcases/kernel/containers/mqns/Makefile
index 64c3763ee..eb0f97c2b 100644
--- a/testcases/kernel/containers/mqns/Makefile
+++ b/testcases/kernel/containers/mqns/Makefile
@@ -1,29 +1,12 @@
-################################################################################
-## ##
-## Copyright (c) International Business Machines Corp., 2009 ##
-## Copyright (c) Nadia Derbey, 2009 ##
-## ##
-## This program is free software; you can redistribute it and#or modify ##
-## it under the terms of the GNU General Public License as published by ##
-## the Free Software Foundation; either version 2 of the License, or ##
-## (at your option) any later version. ##
-## ##
-## 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, write to the Free Software ##
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ##
-## ##
-################################################################################
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (c) International Business Machines Corp., 2009
+# Copyright (c) Nadia Derbey, 2009
+# Copyright (C) 2021 SUSE LLC Andrea Cervesato <andrea.cervesato@suse.com>
top_srcdir ?= ../../../..
include $(top_srcdir)/include/mk/testcases.mk
-include $(abs_srcdir)/../Makefile.inc
-LDLIBS := -lpthread -lrt -lclone $(LDLIBS)
+LDLIBS := -lpthread -lrt $(LDLIBS)
include $(top_srcdir)/include/mk/generic_leaf_target.mk
--
2.35.3
--
Mailing list info: https://lists.linux.it/listinfo/ltp
^ permalink raw reply related [flat|nested] 13+ messages in thread