Revert "syscalls/msgstress*: cleanup and convert into new api"

This reverts commit e5c1aff.

Merged by accident, sorry.

Signed-off-by: Cyril Hrubis <chrubis@suse.cz>

Author: metan-ucw

testcases/kernel/syscalls/ipc/msgstress/Makefile

@@ -3,13 +3,10 @@
 
 top_srcdir              ?= ../../../../..
 
-LTPLIBS = ltpnewipc
+LTPLIBS = ltpipc
 
 include $(top_srcdir)/include/mk/testcases.mk
-
-LTPLDLIBS  = -lltpnewipc
 FILTER_OUT_MAKE_TARGETS         := msgstress_common
-MAKE_TARGETS            := $(patsubst $(abs_srcdir)/%.c,%,$(wildcard $(abs_srcdir)/*[1-4].c))
-$(MAKE_TARGETS): %: msgstress_common.o
+LTPLDLIBS  += -lltpipc
 
 include $(top_srcdir)/include/mk/generic_leaf_target.mk

testcases/kernel/syscalls/ipc/msgstress/msgstress01.c

@@ -1,12 +1,25 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (c) International Business Machines  Corp., 2002
- * Copyright (c) 2020 FUJITSU LIMITED. All rights reserved.
+ *
+ * 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
  *
  * 06/30/2001   Port to Linux   nsharoff@us.ibm.com
  * 11/06/2002   Port to LTP     dbarrera@us.ibm.com
- * 10/21/2020   Convert to new api xuyang2018.jy@cn.fujitsu.com
- *
+ */
+
+/*
  * Get and manipulate a message queue.
  */
 
@@ -18,61 +31,105 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
+#include <values.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
 #include <sys/ipc.h>
 #include <sys/msg.h>
-#include "tst_test.h"
-#include "libnewipc.h"
-#include "tst_safe_sysv_ipc.h"
-#include "msgstress_common.h"
+#include "test.h"
+#include "ipcmsg.h"
+#include "libmsgctl.h"
 
-#define MAXNPROCS       1000000
+char *TCID = "msgstress01";
+int TST_TOTAL = 1;
+
+#ifndef CONFIG_COLDFIRE
+#define MAXNPROCS	1000000	/* This value is set to an arbitrary high limit. */
+#else
+#define MAXNPROCS	 100000	/* Coldfire can't deal with 1000000 */
+#endif
 #define MAXNREPS	100000
 
 static key_t keyarray[MAXNPROCS];
+static int pidarray[MAXNPROCS];
 static int tid;
 static int MSGMNI, nprocs, nreps;
+static int procstat;
+static int mykid;
+
+void setup(void);
+void cleanup(void);
+
+static int dotest(key_t key, int child_process);
+static void sig_handler();
+
 static char *opt_nprocs;
 static char *opt_nreps;
-static void cleanup(void);
 
-static struct tst_option options[] = {
-	{"n:", &opt_nprocs, "-n N     Number of processes"},
-	{"l:", &opt_nreps, "-l N     Number of iterations"},
-	{NULL, NULL, NULL}
+static option_t options[] = {
+	{"n:", NULL, &opt_nprocs},
+	{"l:", NULL, &opt_nreps},
+	{NULL, NULL, NULL},
 };
 
-static void dotest(key_t key, int child_process)
+static void usage(void)
 {
-	int pid;
-
-	tid = SAFE_MSGGET(key, IPC_CREAT | S_IRUSR | S_IWUSR);
-
-	pid = SAFE_FORK();
-	if (pid == 0) {
-		do_reader(key, tid, 1, child_process, nreps);
-		exit(0);
-	}
-
-	do_writer(key, tid, 1, child_process, nreps);
-	SAFE_WAIT(NULL);
-	SAFE_MSGCTL(tid, IPC_RMID, NULL);
+	printf("  -n      Number of processes\n");
+	printf("  -l      Number of iterations\n");
 }
 
-static void verify_msgstress(void)
+int main(int argc, char **argv)
 {
 	int i, j, ok, pid;
-	int count;
+	int count, status;
+	struct sigaction act;
+
+	tst_parse_opts(argc, argv, options, usage);
+
+	setup();
+
+	nreps = MAXNREPS;
+	nprocs = MSGMNI;
+
+	if (opt_nreps) {
+		nreps = atoi(opt_nreps);
+		if (nreps > MAXNREPS) {
+			tst_resm(TINFO,
+				 "Requested number of iterations too large, "
+				 "setting to Max. of %d", MAXNREPS);
+			nreps = MAXNREPS;
+		}
+	}
+
+	if (opt_nprocs) {
+		nprocs = atoi(opt_nprocs);
+		if (nprocs > MSGMNI) {
+			tst_resm(TINFO,
+				 "Requested number of processes too large, "
+				 "setting to Max. of %d", MSGMNI);
+			nprocs = MSGMNI;
+		}
+	}
 
 	srand(getpid());
 	tid = -1;
 
-	/* Set up array of unique keys for use in allocating message queues */
+	/* Setup signal handling routine */
+	memset(&act, 0, sizeof(act));
+	act.sa_handler = sig_handler;
+	sigemptyset(&act.sa_mask);
+	sigaddset(&act.sa_mask, SIGTERM);
+	if (sigaction(SIGTERM, &act, NULL) < 0) {
+		tst_brkm(TFAIL, NULL, "Sigset SIGTERM failed");
+	}
+	/* Set up array of unique keys for use in allocating message
+	 * queues
+	 */
 	for (i = 0; i < nprocs; i++) {
 		ok = 1;
 		do {
+			/* Get random key */
 			keyarray[i] = (key_t) rand();
 			/* Make sure key is unique and not private */
 			if (keyarray[i] == IPC_PRIVATE) {
@@ -89,83 +146,156 @@ static void verify_msgstress(void)
 		} while (ok == 0);
 	}
 
-	/*
-	 * Fork a number of processes, each of which will
+	/* Fork a number of processes, each of which will
 	 * create a message queue with one reader/writer
 	 * pair which will read and write a number (iterations)
 	 * of random length messages with specific values.
 	 */
+
 	for (i = 0; i < nprocs; i++) {
-		pid = SAFE_FORK();
+		fflush(stdout);
+		if ((pid = FORK_OR_VFORK()) < 0) {
+			tst_brkm(TFAIL,
+				 NULL,
+				 "\tFork failed (may be OK if under stress)");
+		}
+		/* Child does this */
 		if (pid == 0) {
-			dotest(keyarray[i], i);
-			exit(0);
+			procstat = 1;
+			exit(dotest(keyarray[i], i));
 		}
+		pidarray[i] = pid;
 	}
 
 	count = 0;
-
 	while (1) {
-		if (wait(NULL) > 0) {
+		if ((wait(&status)) > 0) {
+			if (status >> 8 != 0) {
+				tst_brkm(TFAIL, NULL,
+					 "Child exit status = %d",
+					 status >> 8);
+			}
 			count++;
 		} else {
-			if (errno != EINTR)
+			if (errno != EINTR) {
 				break;
+			}
+#ifdef DEBUG
+			tst_resm(TINFO, "Signal detected during wait");
+#endif
 		}
 	}
+	/* Make sure proper number of children exited */
+	if (count != nprocs) {
+		tst_brkm(TFAIL,
+			 NULL,
+			 "Wrong number of children exited, Saw %d, Expected %d",
+			 count, nprocs);
+	}
 
-	if (count != nprocs)
-		tst_brk(TFAIL, "Wrong number of children exited, Saw %d, Expected %d",
-			count, nprocs);
+	tst_resm(TPASS, "Test ran successfully!");
 
-	tst_res(TPASS, "Test ran successfully!");
 	cleanup();
+	tst_exit();
 }
 
-static void setup(void)
+static int dotest(key_t key, int child_process)
 {
-	int nr_msgqs;
+	int id, pid;
+	int ret, status;
 
-	SAFE_FILE_SCANF("/proc/sys/kernel/msgmni", "%d", &nr_msgqs);
+	sighold(SIGTERM);
+	TEST(msgget(key, IPC_CREAT | S_IRUSR | S_IWUSR));
+	if (TEST_RETURN < 0) {
+		printf("msgget() error in child %d: %s\n",
+			child_process, strerror(TEST_ERRNO));
 
-	nr_msgqs -= GET_USED_QUEUES();
-	if (nr_msgqs <= 0)
-		tst_brk(TCONF, "Max number of message queues already used, "
-			"cannot create more.");
+		return FAIL;
+	}
+	tid = id = TEST_RETURN;
+	sigrelse(SIGTERM);
 
-	MSGMNI = min(nr_msgqs, NR_MSGQUEUES);
+	fflush(stdout);
+	if ((pid = FORK_OR_VFORK()) < 0) {
+		printf("\tFork failed (may be OK if under stress)\n");
+		TEST(msgctl(tid, IPC_RMID, 0));
+		if (TEST_RETURN < 0) {
+			printf("mscgtl() error in cleanup: %s\n",
+				strerror(TEST_ERRNO));
+		}
+		return FAIL;
+	}
+	/* Child does this */
+	if (pid == 0)
+		exit(doreader(key, id, 1, child_process, nreps));
+	/* Parent does this */
+	mykid = pid;
+	procstat = 2;
+	ret = dowriter(key, id, 1, child_process, nreps);
+	wait(&status);
 
-	if (opt_nreps) {
-		nreps = SAFE_STRTOL(opt_nreps, 1, INT_MAX);
-		nreps = min(nreps, MAXNREPS);
-	} else {
-		nreps = MAXNREPS;
+	if (ret != PASS)
+		exit(FAIL);
+
+	if ((!WIFEXITED(status) || (WEXITSTATUS(status) != PASS)))
+		exit(FAIL);
+
+	TEST(msgctl(id, IPC_RMID, 0));
+	if (TEST_RETURN < 0) {
+		printf("msgctl() errno %d: %s\n",
+			TEST_ERRNO, strerror(TEST_ERRNO));
+
+		return FAIL;
 	}
+	return PASS;
+}
 
-	if (opt_nprocs) {
-		nprocs = SAFE_STRTOL(opt_nprocs, 1, INT_MAX);
-		nprocs = min(nprocs, MAXNPROCS);
-		nprocs = min(nprocs, MSGMNI);
-	} else {
-		nprocs = MSGMNI;
+static void sig_handler(void)
+{
+}
+
+void setup(void)
+{
+	int nr_msgqs;
+
+	tst_tmpdir();
+
+	tst_sig(FORK, DEF_HANDLER, cleanup);
+
+	TEST_PAUSE;
+
+	nr_msgqs = get_max_msgqueues();
+	if (nr_msgqs < 0)
+		cleanup();
+
+	nr_msgqs -= get_used_msgqueues();
+	if (nr_msgqs <= 0) {
+		tst_resm(TBROK,
+			 "Max number of message queues already used, cannot create more.");
+		cleanup();
 	}
 
-	SAFE_SIGNAL(SIGTERM, SIG_IGN);
-	tst_res(TINFO, "Number of message queues is %d, process is %d, "
-		"iterations is %d", MSGMNI, nprocs, nreps);
+	/*
+	 * Since msgmni scales to the memory size, it may reach huge values
+	 * that are not necessary for this test.
+	 * That's why we define NR_MSGQUEUES as a high boundary for it.
+	 */
+	MSGMNI = min(nr_msgqs, NR_MSGQUEUES);
 }
 
 void cleanup(void)
 {
-	if (tid >= 0)
-		SAFE_MSGCTL(tid, IPC_RMID, NULL);
-}
+	int status;
 
-static struct tst_test test = {
-	.needs_tmpdir = 1,
-	.options = options,
-	.setup = setup,
-	.cleanup = cleanup,
-	.forks_child = 1,
-	.test_all = verify_msgstress,
-};
+#ifdef DEBUG
+	tst_resm(TINFO, "Removing the message queue");
+#endif
+	(void)msgctl(tid, IPC_RMID, NULL);
+	if ((status = msgctl(tid, IPC_STAT, NULL)) != -1) {
+		(void)msgctl(tid, IPC_RMID, NULL);
+		tst_resm(TFAIL, "msgctl(tid, IPC_RMID) failed");
+
+	}
+
+	tst_rmdir();
+}