[LTP] [PATCH v4 04/10] Rewrite sem_nstest.c using new LTP API
Andrea Cervesato
andrea.cervesato@suse.de
Fri Mar 25 13:54:39 CET 2022
Updated containers runtest file to include new sem_nstest.c options.
Signed-off-by: Andrea Cervesato <andrea.cervesato@suse.de>
---
runtest/containers | 6 +-
.../kernel/containers/sysvipc/sem_nstest.c | 212 +++++++-----------
2 files changed, 78 insertions(+), 140 deletions(-)
diff --git a/runtest/containers b/runtest/containers
index d863c10a4..4f56b1b4d 100644
--- a/runtest/containers
+++ b/runtest/containers
@@ -54,9 +54,9 @@ 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
-sem_nstest_unshare sem_nstest unshare
+sem_nstest_none sem_nstest -m none
+sem_nstest_clone sem_nstest -m clone
+sem_nstest_unshare sem_nstest -m unshare
semtest_2ns_none semtest_2ns none
semtest_2ns_clone semtest_2ns clone
semtest_2ns_unshare semtest_2ns unshare
diff --git a/testcases/kernel/containers/sysvipc/sem_nstest.c b/testcases/kernel/containers/sysvipc/sem_nstest.c
index 72e04fe4f..af4e87e8f 100644
--- a/testcases/kernel/containers/sysvipc/sem_nstest.c
+++ b/testcases/kernel/containers/sysvipc/sem_nstest.c
@@ -1,158 +1,96 @@
-/* *************************************************************************
-* 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 semaphore with key 154326L
-* Now create container by passing 1 of the below flag values..
-* clone(NONE), clone(CLONE_NEWIPC), or unshare(CLONE_NEWIPC)
-* In cloned process, try to access the created semaphore
-* Test PASS: If the semaphore is readable when flag is None.
-* Test FAIL: If the semaphore 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 semaphore usage between namespaces.
+ *
+ * [Algorithm]
+ *
+ * In parent process create a new semaphore with a specific key.
+ * In cloned process, try to access the created semaphore
+ *
+ * Test PASS if the semaphore is readable when flag is None.
+ * Test FAIL if the semaphore is readable when flag is Unshare or Clone.
+ */
+
+#define _GNU_SOURCE
+
+#include <sys/wait.h>
+#include <sys/msg.h>
+#include <sys/types.h>
#include <sys/sem.h>
-#include <libclone.h>
-#include "test.h"
-#include "ipcns_helper.h"
+#include "tst_safe_sysv_ipc.h"
+#include "tst_test.h"
+#include "common.h"
-#define MY_KEY 154326L
-#define UNSHARESTR "unshare"
-#define CLONESTR "clone"
-#define NONESTR "none"
+#define MY_KEY 154326L
-char *TCID = "sem_nstest";
-int TST_TOTAL = 1;
-int p1[2];
-int p2[2];
+static char *str_op;
+static int use_clone;
+static int ipc_id = -1;
-int check_semaphore(void *vtest)
+static int check_semaphore(LTP_ATTRIBUTE_UNUSED void *vtest)
{
- char buf[3];
int id;
- (void) vtest;
+ id = semget(MY_KEY, 1, 0);
- close(p1[1]);
- close(p2[0]);
+ if (id < 0) {
+ if (use_clone == T_NONE)
+ tst_res(TFAIL, "Plain cloned process didn't find semaphore");
+ else
+ tst_res(TPASS, "%s: container didn't find semaphore", str_op);
- read(p1[0], buf, 3);
- id = semget(MY_KEY, 1, 0);
- if (id == -1)
- write(p2[1], "notfnd", 7);
- else {
- write(p2[1], "exists", 7);
- tst_resm(TINFO, "PID %d: Fetched existing semaphore..id = %d",
- getpid(), id);
+ return 0;
}
- tst_exit();
+
+ tst_res(TINFO, "PID %d: fetched existing semaphore..id = %d", getpid(), id);
+
+ if (use_clone == T_NONE)
+ tst_res(TPASS, "Plain cloned process found semaphore inside container");
+ else
+ tst_res(TFAIL, "%s: Container init process found semaphore", str_op);
+
+ return 0;
}
-static void setup(void)
+static void run(void)
{
- tst_require_root();
- check_newipc();
+ clone_unshare_test(use_clone, CLONE_NEWIPC, check_semaphore, NULL);
}
-int main(int argc, char *argv[])
+static void setup(void)
{
- int ret, use_clone = T_NONE, id;
- char *tsttype = NONESTR;
- char buf[7];
-
- setup();
-
- 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);
- }
+ use_clone = get_clone_unshare_enum(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;
- }
-
- /* 1. Create (or fetch if existing) the binary semaphore */
- id = semget(MY_KEY, 1, IPC_CREAT | IPC_EXCL | 0666);
- if (id == -1) {
- perror("Semaphore create");
- if (errno != EEXIST) {
- perror("semget failure");
- tst_brkm(TBROK, NULL, "Semaphore creation failed");
- }
- id = semget(MY_KEY, 1, 0);
- if (id == -1) {
- perror("Semaphore create");
- tst_brkm(TBROK, NULL, "Semaphore operation failed");
- }
- }
-
- tst_resm(TINFO, "Semaphore namespaces Isolation test : %s", tsttype);
- /* fire off the test */
- ret =
- do_clone_unshare_test(use_clone, CLONE_NEWIPC, check_semaphore,
- 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);
- read(p2[0], buf, 7);
+ ipc_id = SAFE_SEMGET(MY_KEY, 1, IPC_CREAT | IPC_EXCL | 0666);
+}
- if (strcmp(buf, "exists") == 0) {
- if (use_clone == T_NONE)
- tst_resm(TPASS, "Plain cloned process found semaphore "
- "inside container");
- else
- tst_resm(TFAIL,
- "%s: Container init process found semaphore",
- tsttype);
- } else {
- if (use_clone == T_NONE)
- tst_resm(TFAIL,
- "Plain cloned process didn't find semaphore");
- else
- tst_resm(TPASS, "%s: Container didn't find semaphore",
- tsttype);
+static void cleanup(void)
+{
+ if (ipc_id != -1) {
+ tst_res(TINFO, "Delete semaphore");
+ SAFE_SEMCTL(ipc_id, IPC_RMID, 0);
}
-
- /* Delete the semaphore */
- id = semget(MY_KEY, 1, 0);
- semctl(id, IPC_RMID, 0);
-
- 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