[LTP] [PATCH v4 01/10] Rewrite mesgq_nstest.c using new LTP API
Andrea Cervesato
andrea.cervesato@suse.de
Fri Mar 25 13:54:36 CET 2022
Added common.h that is replacing ipcns_helper.h for refactored tests.
Updated containers runtime file to include the new mesgq_nstest.c
command line options.
Signed-off-by: Andrea Cervesato <andrea.cervesato@suse.de>
---
runtest/containers | 6 +-
testcases/kernel/containers/sysvipc/common.h | 110 ++++++++
.../kernel/containers/sysvipc/mesgq_nstest.c | 244 +++++++-----------
3 files changed, 206 insertions(+), 154 deletions(-)
create mode 100644 testcases/kernel/containers/sysvipc/common.h
diff --git a/runtest/containers b/runtest/containers
index eea7bfadb..d863c10a4 100644
--- a/runtest/containers
+++ b/runtest/containers
@@ -50,9 +50,9 @@ shmem_2nstest_none shmem_2nstest none
shmem_2nstest_clone shmem_2nstest clone
shmem_2nstest_unshare shmem_2nstest unshare
shm_comm shm_comm
-mesgq_nstest_none mesgq_nstest none
-mesgq_nstest_clone mesgq_nstest clone
-mesgq_nstest_unshare mesgq_nstest unshare
+mesgq_nstest_none mesgq_nstest -m none
+mesgq_nstest_clone mesgq_nstest -m clone
+mesgq_nstest_unshare mesgq_nstest -m unshare
msg_comm msg_comm
sem_nstest_none sem_nstest none
sem_nstest_clone sem_nstest clone
diff --git a/testcases/kernel/containers/sysvipc/common.h b/testcases/kernel/containers/sysvipc/common.h
new file mode 100644
index 000000000..d33185e1e
--- /dev/null
+++ b/testcases/kernel/containers/sysvipc/common.h
@@ -0,0 +1,110 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) International Business Machines Corp., 2007
+ * Rishikesh K Rajak <risrajak@in.ibm.com>
+ * Copyright (C) 2022 SUSE LLC Andrea Cervesato <andrea.cervesato@suse.com>
+ */
+
+#ifndef COMMON_H
+#define COMMON_H
+
+#include <stdlib.h>
+#include "tst_test.h"
+#include "lapi/syscalls.h"
+#include "lapi/namespaces_constants.h"
+
+enum {
+ T_CLONE,
+ T_UNSHARE,
+ T_NONE,
+};
+
+static int dummy_child(void *v)
+{
+ (void)v;
+ return 0;
+}
+
+static void check_newipc(void)
+{
+ int pid, status;
+
+ pid = ltp_clone_quick(CLONE_NEWIPC | SIGCHLD, dummy_child, NULL);
+ if (pid < 0)
+ tst_brk(TCONF | TERRNO, "CLONE_NEWIPC not supported");
+
+ SAFE_WAITPID(pid, &status, 0);
+}
+
+static inline int get_clone_unshare_enum(const char* str_op)
+{
+ int use_clone;
+
+ use_clone = T_NONE;
+
+ if (!str_op || !strcmp(str_op, "none"))
+ use_clone = T_NONE;
+ else if (!strcmp(str_op, "clone"))
+ use_clone = T_CLONE;
+ else if (!strcmp(str_op, "unshare"))
+ use_clone = T_UNSHARE;
+ else
+ tst_brk(TBROK, "Test execution mode <clone|unshare|none>");
+
+ return use_clone;
+}
+
+static void clone_test(unsigned long clone_flags, int (*fn1)(void *arg), void *arg1)
+{
+ int pid;
+
+ pid = ltp_clone_quick(clone_flags | SIGCHLD, fn1, arg1);
+ if (pid < 0)
+ tst_brk(TBROK | TERRNO, "ltp_clone_quick error");
+}
+
+static void unshare_test(unsigned long clone_flags, int (*fn1)(void *arg), void *arg1)
+{
+ int pid;
+
+ pid = SAFE_FORK();
+
+ if (!pid) {
+ int ret;
+
+ SAFE_UNSHARE(clone_flags);
+
+ ret = fn1(arg1);
+ exit(ret);
+ }
+}
+
+static void plain_test(int (*fn1)(void *arg), void *arg1)
+{
+ int pid;
+
+ pid = SAFE_FORK();
+ if (!pid)
+ exit(fn1(arg1));
+}
+
+static void clone_unshare_test(int use_clone, unsigned long clone_flags,
+ int (*fn1)(void *arg), void *arg1)
+{
+ switch (use_clone) {
+ case T_NONE:
+ plain_test(fn1, arg1);
+ break;
+ case T_CLONE:
+ clone_test(clone_flags, fn1, arg1);
+ break;
+ case T_UNSHARE:
+ unshare_test(clone_flags, fn1, arg1);
+ break;
+ default:
+ tst_brk(TBROK, "%s: bad use_clone option: %d", __FUNCTION__, use_clone);
+ break;
+ }
+}
+
+#endif
diff --git a/testcases/kernel/containers/sysvipc/mesgq_nstest.c b/testcases/kernel/containers/sysvipc/mesgq_nstest.c
index dbf311dc8..d8cc0616d 100644
--- a/testcases/kernel/containers/sysvipc/mesgq_nstest.c
+++ b/testcases/kernel/containers/sysvipc/mesgq_nstest.c
@@ -1,175 +1,117 @@
-/* *************************************************************************
-* 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: Veerendra C <vechandr@in.ibm.com>
-*
-* In Parent Process , create mesgq with key 154326L
-* Now create container by passing 1 of the flag values..
-* Flag = clone, clone(CLONE_NEWIPC), or unshare(CLONE_NEWIPC)
-* In cloned process, try to access the created mesgq
-* Test PASS: If the mesgq is readable when flag is None.
-* Test FAIL: If the mesgq is readable when flag is Unshare or Clone.
-***************************************************************************/
-
-#define _GNU_SOURCE 1
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <sys/ipc.h>
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) International Business Machines Corp., 2009
+ * Veerendra C <vechandr@in.ibm.com>
+ * Copyright (C) 2022 SUSE LLC Andrea Cervesato <andrea.cervesato@suse.com>
+ */
+
+/*\
+ * [Description]
+ *
+ * Test SysV IPC message passing through different namespaces.
+ *
+ * [Algorithm]
+ *
+ * In parent process create a new mesgq with a specific key.
+ * In cloned process try to access the created mesgq.
+ *
+ * Test will PASS if the mesgq is readable when flag is None.
+ * Test will FAIL if the mesgq is readable when flag is Unshare or Clone or
+ * the message received is wrong.
+ */
+
+#define _GNU_SOURCE
+
+#include <sys/wait.h>
#include <sys/msg.h>
-#include <libclone.h>
-#include "test.h"
-#include "ipcns_helper.h"
-
-#define KEY_VAL 154326L
-#define UNSHARESTR "unshare"
-#define CLONESTR "clone"
-#define NONESTR "none"
-
-char *TCID = "mesgq_nstest";
-int TST_TOTAL = 1;
-int p1[2];
-int p2[2];
-struct msg_buf {
- long int mtype; /* type of received/sent message */
- char mtext[80]; /* text of the message */
+#include <sys/types.h>
+#include "tst_safe_sysv_ipc.h"
+#include "tst_test.h"
+#include "common.h"
+
+#define KEY_VAL 154326L
+#define MSG_TYPE 5
+#define MSG_TEXT "My message!"
+
+static char *str_op;
+static int use_clone;
+static int ipc_id = -1;
+
+static struct msg_buf {
+ long mtype;
+ char mtext[80];
} msg;
-void mesgq_read(int id)
+static int check_mesgq(LTP_ATTRIBUTE_UNUSED void *vtest)
{
- int READMAX = 80;
- int n;
- /* read msg type 5 on the Q; msgtype, flags are last 2 params.. */
+ int id, n;
- n = msgrcv(id, &msg, READMAX, 5, 0);
- if (n == -1)
- perror("msgrcv"), tst_exit();
+ id = msgget(KEY_VAL, 0);
- tst_resm(TINFO, "Mesg read of %d bytes; Type %ld: Msg: %.*s",
- n, msg.mtype, n, msg.mtext);
-}
+ if (id < 0) {
+ if (use_clone == T_NONE)
+ tst_res(TFAIL, "Plain cloned process didn't find mesgq");
+ else
+ tst_res(TPASS, "%s: container didn't find mesgq", str_op);
-int check_mesgq(void *vtest)
-{
- char buf[3];
- int id;
+ return 0;
+ }
- (void) vtest;
+ if (use_clone == T_NONE) {
+ tst_res(TPASS, "Plain cloned process found mesgq inside container");
- close(p1[1]);
- close(p2[0]);
+ n = SAFE_MSGRCV(id, &msg, sizeof(msg.mtext), MSG_TYPE, 0);
- read(p1[0], buf, 3);
- id = msgget(KEY_VAL, 0);
- if (id == -1)
- write(p2[1], "notfnd", 7);
- else {
- write(p2[1], "exists", 7);
- mesgq_read(id);
+ tst_res(TINFO, "Mesg read of %d bytes, Type %ld, Msg: %s", n, msg.mtype, msg.mtext);
+
+ if (strcmp(msg.mtext, MSG_TEXT))
+ tst_res(TFAIL, "Received the wrong text message");
+ } else {
+ tst_res(TFAIL, "%s: container init process found mesgq", str_op);
}
- tst_exit();
-}
-static void setup(void)
-{
- tst_require_root();
- check_newipc();
+ return 0;
}
-int main(int argc, char *argv[])
+static void run(void)
{
- int ret, use_clone = T_NONE, id, n;
- char *tsttype = NONESTR;
- char buf[7];
-
- setup();
+ msg.mtype = MSG_TYPE;
+ strcpy(msg.mtext, "My message!");
- if (argc != 2) {
- tst_resm(TFAIL, "Usage: %s <clone|unshare|none>", argv[0]);
- tst_brkm(TFAIL, NULL, " where clone, unshare, or fork specifies"
- " unshare method.");
- }
-
- /* Using PIPE's to sync between container and Parent */
- if (pipe(p1) == -1) {
- perror("pipe");
- exit(EXIT_FAILURE);
- }
- if (pipe(p2) == -1) {
- perror("pipe");
- exit(EXIT_FAILURE);
- }
+ if (use_clone == T_NONE)
+ SAFE_MSGSND(ipc_id, &msg, strlen(msg.mtext), 0);
- tsttype = NONESTR;
+ tst_res(TINFO, "mesgq namespaces test: %s", str_op);
- if (strcmp(argv[1], "clone") == 0) {
- use_clone = T_CLONE;
- tsttype = CLONESTR;
- } else if (strcmp(argv[1], "unshare") == 0) {
- use_clone = T_UNSHARE;
- tsttype = UNSHARESTR;
- }
+ clone_unshare_test(use_clone, CLONE_NEWIPC, check_mesgq, NULL);
+}
- id = msgget(KEY_VAL, IPC_CREAT | IPC_EXCL | 0600);
- if (id == -1) {
- perror("msgget");
- /* Retry without attempting to create the MQ */
- id = msgget(KEY_VAL, 0);
- if (id == -1)
- perror("msgget failure"), exit(1);
- }
+static void setup(void)
+{
+ use_clone = get_clone_unshare_enum(str_op);
- msg.mtype = 5;
- strcpy(msg.mtext, "Message of type 5!");
- n = msgsnd(id, &msg, strlen(msg.mtext), 0);
- if (n == -1)
- perror("msgsnd"), tst_exit();
-
- tst_resm(TINFO, "mesgq namespaces test : %s", tsttype);
- /* fire off the test */
- ret = do_clone_unshare_test(use_clone, CLONE_NEWIPC, check_mesgq, NULL);
- if (ret < 0) {
- tst_brkm(TFAIL, NULL, "%s failed", tsttype);
- }
+ if (use_clone != T_NONE)
+ check_newipc();
- close(p1[0]);
- close(p2[1]);
- write(p1[1], "go", 3);
+ ipc_id = SAFE_MSGGET(KEY_VAL, IPC_CREAT | IPC_EXCL | 0600);
+}
- read(p2[0], buf, 7);
- if (strcmp(buf, "exists") == 0) {
- if (use_clone == T_NONE)
- tst_resm(TPASS, "Plain cloned process found mesgq "
- "inside container");
- else
- tst_resm(TFAIL,
- "%s: Container init process found mesgq",
- tsttype);
- } else {
- if (use_clone == T_NONE)
- tst_resm(TFAIL,
- "Plain cloned process didn't find mesgq");
- else
- tst_resm(TPASS, "%s: Container didn't find mesgq",
- tsttype);
+static void cleanup(void)
+{
+ if (ipc_id != -1) {
+ tst_res(TINFO, "Destroy message");
+ SAFE_MSGCTL(ipc_id, IPC_RMID, NULL);
}
-
- /* Delete the mesgQ */
- id = msgget(KEY_VAL, 0);
- msgctl(id, IPC_RMID, NULL);
-
- tst_exit();
}
+
+static struct tst_test test = {
+ .test_all = run,
+ .setup = setup,
+ .cleanup = cleanup,
+ .needs_root = 1,
+ .forks_child = 1,
+ .options = (struct tst_option[]) {
+ { "m:", &str_op, "Test execution mode <clone|unshare|none>" },
+ {},
+ },
+};
--
2.35.1
More information about the ltp
mailing list