Skip to contentSkip to conversation

libs/libltpnewipc: Add libnewmsgctl.c

PATCH New Yang Xu 3 participants 26 messages Jun 18, 2020 – Jul 21, 2021

lore
Share & tools
lore

Yang Xu

author
#0 lore raw

PATCH v2 1/2 libs/libltpnewipc: Add libnewmsgctl.c

From: Yang Xu <[email protected]>

Add libnewmsgctl.c into ltp new ipc libs, so the upcoming msgstress cleanup cases can use doreader/dowirter functions such as old libmsgctl.c does.

---
 include/libnewmsgctl.h           |  22 +++++++
 libs/libltpnewipc/libnewmsgctl.c | 102 +++++++++++++++++++++++++++++++
 2 files changed, 124 insertions(+)
 create mode 100644 include/libnewmsgctl.h
 create mode 100644 libs/libltpnewipc/libnewmsgctl.c
include/libnewmsgctl.h new file +22 -0
new file mode 100644
index 000000000..e48a04277
@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) 2020 FUJITSU LIMITED. All rights reserved.
+ */
+
+#ifndef __LIBNEWMSGCTL_H__
+#define __LIBNEWMSGCTL_H__
+
+struct mbuffer {
+	long type;
+	struct {
+		char len;
+		char pbytes[99];
+	} data;
+};
+
+void doreader(long key, int tid, long type, int child, int nreps);
+void dowriter(long key, int tid, long type, int child, int nreps);
+void fill_buffer(char *buf, char val, int size);
+int verify(char *buf, char val, int size, int child);
+
+#endif /*__LIBNEWMSGCTL_H__ */
libs/libltpnewipc/libnewmsgctl.c new file +102 -0

102 lines not on this page · raw message

Signature · 1 line
2.23.0
author
#1 lore raw

PATCH v2 2/2 syscalls/msgstress: scale number of processes accodingly to available RAM

From: Yang Xu <[email protected]>

In these tests, fork may fail because of EAGAIN error in the following situations:
1)Reaching the RLIMIT_NPROC soft resource limit
2)Reaching /proc/sys/kernel/threads-max limit
3)Reaching /proc/sys/kernel/pid_max limit
4)the PID limit (pids.max) imposed by the cgroup "process number" (PIDs) controller was reached

According to kernel code kernel/fork.c, for thread_max it has the following calculation formula:

	THREAD_SIZE = PAGE_SIZE << THREAD_SIZE_ORDER
	max_threads = totalram_pages / (8 * THREAD_SIZE / PAGE_SIZE);

The default maximum number of threads is set to a safe value: the thread structures can take up at most one eighth of the memory. the pid limit is equal to max_threads/2.
For example(on x86_64), 4G memory, page_size is 4k,THREAD_SIZE_ORDER is 1 max_threads = 2^32/(8 * 8 * 1024) = 65536
RLIMIT_NPROC = 32768 // 0.5

Also, pids cgroup and systemd also has this limit. On old systemd version, ths limit is 0.8 *thread_num. On newer systemd version, the limit is 0.33 *thread_num. In here, we use 0.3.

Aparting from this changes, use new api for these cases and use some SAFE MACRO. Merge msgstress03.c into msgstress01.c and use -r option to read actual msgmni value on procfs instead.

Fixes #509

---
 runtest/syscalls                              |   4 +-
 runtest/syscalls-ipc                          |   4 +-
 .../kernel/syscalls/ipc/msgstress/.gitignore  |   1 -
 .../kernel/syscalls/ipc/msgstress/Makefile    |   4 +-
 .../syscalls/ipc/msgstress/msgstress01.c      | 317 +++++-------
 .../syscalls/ipc/msgstress/msgstress02.c      | 461 +++++++-----------
 .../syscalls/ipc/msgstress/msgstress03.c      | 290 -----------
 .../syscalls/ipc/msgstress/msgstress04.c      | 442 ++++++-----------
 8 files changed, 449 insertions(+), 1074 deletions(-)
 delete mode 100644 testcases/kernel/syscalls/ipc/msgstress/msgstress03.c
runtest/syscalls +2 -2
index ee7e2a0d2..f4640bf0b 100644
@@ -798,9 +798,9 @@ msgctl02 msgctl02
 msgctl03 msgctl03
 msgctl04 msgctl04
 msgctl05 msgctl05
-msgstress01 msgstress01
+msgstress01 msgstress01 -l 100000
 msgstress02 msgstress02
-msgstress03 msgstress03
+msgstress03 msgstress01 -r y
 msgstress04 msgstress04
 msgctl12 msgctl12
 
runtest/syscalls-ipc +2 -2
index c3a35896c..ab613fdfa 100644
@@ -3,9 +3,9 @@ msgctl02 msgctl02
 msgctl03 msgctl03
 msgctl04 msgctl04
 msgctl05 msgctl05
-msgstress01 msgstress01
+msgstress01 msgstress01  -l 100000
 msgstress02 msgstress02
-msgstress03 msgstress03
+msgstress03 msgstress01  -r y
 msgstress04 msgstress04
 msgctl12 msgctl12
 
testcases/kernel/syscalls/ipc/msgstress/.gitignore +0 -1
index a8f675399..e1df4cda8 100644
@@ -1,4 +1,3 @@
 /msgstress01
 /msgstress02
-/msgstress03
 /msgstress04
testcases/kernel/syscalls/ipc/msgstress/Makefile +2 -2
index f62cd1f48..a11cbcf2e 100644
@@ -3,10 +3,10 @@
 
 top_srcdir              ?= ../../../../..
 
-LTPLIBS = ltpipc
+LTPLIBS = ltpnewipc
 
 include $(top_srcdir)/include/mk/testcases.mk
 
-LDLIBS  += -lltpipc
+LDLIBS  += -lltpnewipc
 
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/kernel/syscalls/ipc/msgstress/msgstress01.c +111 -206

393 lines not on this page · raw message

testcases/kernel/syscalls/ipc/msgstress/msgstress02.c +174 -287

560 lines not on this page · raw message

testcases/kernel/syscalls/ipc/msgstress/msgstress03.c deleted +0 -290

290 lines not on this page · raw message

testcases/kernel/syscalls/ipc/msgstress/msgstress04.c +158 -284

580 lines not on this page · raw message

Signature · 1 line
2.23.0
#2 lore raw

PATCH v2 2/2 syscalls/msgstress: scale number of processes accodingly to available RAM

Hi!
The main problem with this patch is that it's doing too much.

The conversion to the new library should be ideally done in a separate patch, then we should start working on getting the limits right.

For the limits I would really like to introduce a library function that would return how many processes test can run before the system runs out of memory then we can build on the top of that and create a library function to return now many message queues we can run. As it is the code is still copy&pasted between the testcases.

So please can we do things in smaller, well defined, steps?

Signature · 2 lines
Cyril Hrubis
[email protected]
#3 lore raw

PATCH v2 2/2 syscalls/msgstress: scale number of processes accodingly to available RAM

HI Cyril

Quoted 2 lines

Hi!
The main problem with this patch is that it's doing too much.

Sorry for this. This patch is really unfriendly to the reviewer because it is too much.

Quoted 3 lines

The conversion to the new library should be ideally done in a separate patch, then we should start working on getting the limits right.

Yes, I will do this as your advise.

Quoted 6 lines

For the limits I would really like to introduce a library function that would return how many processes test can run before the system runs out of memory then we can build on the top of that and create a library function to return now many message queues we can run. As it is the code is still copy&pasted between the testcases.

Will do it.

Quoted 2 lines

So please can we do things in smaller, well defined, steps?

Of course.

Quoted 1 line
#4 lore raw

PATCH v3 1/4 syscalls/msgstress: Add common file for msgstress

In reply to Cyril Hrubis

Copy old libmsgctl.c three functions(doreader,dowriter, fill_buffer, verify) into this common file. The reason for not putting it into lib directory because only msgstress cases use these functions. So raising them into lib level makes no sense.

---
 .../kernel/syscalls/ipc/msgstress/Makefile    |  2 +-
 .../syscalls/ipc/msgstress/msgstress_common.c | 95 +++++++++++++++++++
 .../syscalls/ipc/msgstress/msgstress_common.h | 26 +++++
 3 files changed, 122 insertions(+), 1 deletion(-)
 create mode 100644 testcases/kernel/syscalls/ipc/msgstress/msgstress_common.c
 create mode 100644 testcases/kernel/syscalls/ipc/msgstress/msgstress_common.h
testcases/kernel/syscalls/ipc/msgstress/Makefile +1 -1
index b821bda01..2c8fa8e5b 100644
@@ -6,7 +6,7 @@ top_srcdir              ?= ../../../../..
 LTPLIBS = ltpipc
 
 include $(top_srcdir)/include/mk/testcases.mk
-
+FILTER_OUT_MAKE_TARGETS         := msgstress_common
 LTPLDLIBS  += -lltpipc
 
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/kernel/syscalls/ipc/msgstress/msgstress_common.c new file +95 -0

95 lines not on this page · raw message

testcases/kernel/syscalls/ipc/msgstress/msgstress_common.h new file +26 -0
new file mode 100644
index 000000000..81e2f288b
@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) 2020 FUJITSU LIMITED. All rights reserved.
+ * Author: Yang Xu <[email protected]>
+ */
+
+#ifndef MSGSTRESS_COMMON_H
+#define MSGSTRESS_COMMON_H
+
+#include <stdlib.h>
+#include "tst_safe_sysv_ipc.h"
+#include "tst_test.h"
+
+struct mbuffer {
+	long type;
+	struct {
+		char len;
+		char pbytes[99];
+	} data;
+};
+
+void do_reader(long key, int tid, long type, int child, int nreps);
+void do_writer(long key, int tid, long type, int child, int nreps);
+
+#endif
+
Signature · 1 line
2.23.0
#5 lore raw

PATCH v3 2/4 syscalls/msgstress*: cleanup and convert into new api

1)use some safe macros
2)remove SIGTERM signal handler and ignore it
3)remove CODEFIRE ifdef

---
 .../kernel/syscalls/ipc/msgstress/Makefile    |   7 +-
 .../syscalls/ipc/msgstress/msgstress01.c      | 282 ++++---------
 .../syscalls/ipc/msgstress/msgstress02.c      | 371 +++++------------
 .../syscalls/ipc/msgstress/msgstress03.c      | 277 ++++---------
 .../syscalls/ipc/msgstress/msgstress04.c      | 372 +++++-------------
 5 files changed, 366 insertions(+), 943 deletions(-)
testcases/kernel/syscalls/ipc/msgstress/Makefile +5 -2
index 2c8fa8e5b..aac90df51 100644
@@ -3,10 +3,13 @@
 
 top_srcdir              ?= ../../../../..
 
-LTPLIBS = ltpipc
+LTPLIBS = ltpnewipc
 
 include $(top_srcdir)/include/mk/testcases.mk
+
+LTPLDLIBS  = -lltpnewipc
 FILTER_OUT_MAKE_TARGETS         := msgstress_common
-LTPLDLIBS  += -lltpipc
+MAKE_TARGETS            := $(patsubst $(abs_srcdir)/%.c,%,$(wildcard $(abs_srcdir)/*[1-4].c))
+$(MAKE_TARGETS): %: msgstress_common.o
 
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/kernel/syscalls/ipc/msgstress/msgstress01.c +76 -206

362 lines not on this page · raw message

testcases/kernel/syscalls/ipc/msgstress/msgstress02.c +107 -264

479 lines not on this page · raw message

testcases/kernel/syscalls/ipc/msgstress/msgstress03.c +78 -199

354 lines not on this page · raw message

testcases/kernel/syscalls/ipc/msgstress/msgstress04.c +100 -272

504 lines not on this page · raw message

Signature · 1 line
2.23.0
#6 lore raw

PATCH v3 2/4 syscalls/msgstress*: cleanup and convert into new api

Hi!

Quoted 135 lines
testcases/kernel/syscalls/ipc/msgstress/msgstress01.c +27 -71
@@ -31,105 +18,61 @@
 #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 "test.h"
-#include "ipcmsg.h"
-#include "libmsgctl.h"
+#include "tst_test.h"
+#include "libnewipc.h"
+#include "tst_safe_sysv_ipc.h"
+#include "msgstress_common.h"
 
-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 MAXNPROCS       1000000
 #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 option_t options[] = {
-	{"n:", NULL, &opt_nprocs},
-	{"l:", NULL, &opt_nreps},
-	{NULL, NULL, NULL},
+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 void usage(void)
-{
-	printf("  -n      Number of processes\n");
-	printf("  -l      Number of iterations\n");
-}
-
-int main(int argc, char **argv)
+static void dotest(key_t key, int child_process)
 {
-	int i, j, ok, pid;
-	int count, status;
-	struct sigaction act;
-
-	tst_parse_opts(argc, argv, options, usage);
-
-	setup();
+	int pid;
 
-	nreps = MAXNREPS;
-	nprocs = MSGMNI;
+	tid = SAFE_MSGGET(key, IPC_CREAT | S_IRUSR | S_IWUSR);
 
-	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;
-		}
+	pid = SAFE_FORK();
+	if (pid == 0) {
+		do_reader(key, tid, 1, child_process, nreps);
+		exit(0);
 	}
 
-	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;
-		}
-	}
+	do_writer(key, tid, 1, child_process, nreps);
+	SAFE_WAIT(NULL);
+	SAFE_MSGCTL(tid, IPC_RMID, NULL);
+}
+
+static void verify_msgstress(void)
+{
+	int i, j, ok, pid;
+	int count;
 
 	srand(getpid());
 	tid = -1;
 
-	/* 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
-	 */
+	/* 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 */
(quoted diff) +0 -0
 			if (keyarray[i] == IPC_PRIVATE) {

Review int main(int argc, char **argv) · line 90

Quoted 2 lines
(quoted diff) +0 -0
@@ -146,156 +89,83 @@ int main(int argc, char **argv)
 		} while (ok == 0);
 	}

The functions that setups the keys should go to the library as well.

Quoted 52 lines
testcases/kernel/syscalls/ipc/msgstress/msgstress01.c +8 -28
-	/* 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++) {
-		fflush(stdout);
-		if ((pid = FORK_OR_VFORK()) < 0) {
-			tst_brkm(TFAIL,
-				 NULL,
-				 "\tFork failed (may be OK if under stress)");
-		}
-		/* Child does this */
+		pid = SAFE_FORK();
 		if (pid == 0) {
-			procstat = 1;
-			exit(dotest(keyarray[i], i));
+			dotest(keyarray[i], i);
+			exit(0);
 		}
-		pidarray[i] = pid;
 	}
 
 	count = 0;
+
 	while (1) {
-		if ((wait(&status)) > 0) {
-			if (status >> 8 != 0) {
-				tst_brkm(TFAIL, NULL,
-					 "Child exit status = %d",
-					 status >> 8);
-			}
+		if (wait(NULL) > 0) {
 			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",

testcases/kernel/syscalls/ipc/msgstress/msgstress01.c int main(int argc, char **argv) · line 122

Quoted 10 lines
testcases/kernel/syscalls/ipc/msgstress/msgstress01.c +4 -3
-			 count, nprocs);
-	}
 
-	tst_resm(TPASS, "Test ran successfully!");
+	if (count != nprocs)
+		tst_brk(TFAIL, "Wrong number of children exited, Saw %d, Expected %d",
+			count, nprocs);
 
+	tst_res(TPASS, "Test ran successfully!");
 	cleanup();

The cleanup will be called by the library, you must not call it here yourself.

Quoted 61 lines
testcases/kernel/syscalls/ipc/msgstress/msgstress01.c +1 -57
-	tst_exit();
-}
-
-static int dotest(key_t key, int child_process)
-{
-	int id, pid;
-	int ret, status;
-
-	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));
-
-		return FAIL;
-	}
-	tid = id = TEST_RETURN;
-	sigrelse(SIGTERM);
-
-	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 (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;
 }
 
-static void sig_handler(void)
-{
-}
-
-void setup(void)
+static void setup(void)
 {

testcases/kernel/syscalls/ipc/msgstress/msgstress01.c int main(int argc, char **argv) · line 134

Quoted 10 lines
testcases/kernel/syscalls/ipc/msgstress/msgstress01.c +5 -2
 	int nr_msgqs;
 
-	tst_tmpdir();
+	SAFE_FILE_SCANF("/proc/sys/kernel/msgmni", "%d", &nr_msgqs);
 
-	tst_sig(FORK, DEF_HANDLER, cleanup);
+	nr_msgqs -= GET_USED_QUEUES();
+	if (nr_msgqs <= 0)
+		tst_brk(TCONF, "Max number of message queues already used, "
+			"cannot create more.");

LKML coding style prefers not to break strings even if they are over 80 chars.

Quoted 14 lines
testcases/kernel/syscalls/ipc/msgstress/msgstress01.c +7 -6
-	TEST_PAUSE;
+	MSGMNI = min(nr_msgqs, NR_MSGQUEUES);
 
-	nr_msgqs = get_max_msgqueues();
-	if (nr_msgqs < 0)
-		cleanup();
+	if (opt_nreps) {
+		nreps = SAFE_STRTOL(opt_nreps, 1, INT_MAX);
+		nreps = min(nreps, MAXNREPS);
+	} else {
+		nreps = MAXNREPS;
+	}
-	nr_msgqs -= get_used_msgqueues();
-	if (nr_msgqs <= 0) {

testcases/kernel/syscalls/ipc/msgstress/msgstress01.c int main(int argc, char **argv) · line 151

Quoted 10 lines
testcases/kernel/syscalls/ipc/msgstress/msgstress01.c +6 -3
-		tst_resm(TBROK,
-			 "Max number of message queues already used, cannot create more.");
-		cleanup();
+	if (opt_nprocs) {
+		nprocs = SAFE_STRTOL(opt_nprocs, 1, INT_MAX);
+		nprocs = min(nprocs, MAXNPROCS);
+		nprocs = min(nprocs, MSGMNI);
+	} else {
+		nprocs = MSGMNI;
 	}

This looks completely wrong in this test we basically fork nproc processes and each of them runs one message queue. There is no point in setting anything else than nprocs and the nprocs is limited by the number of possible message queues.

So all this setup should be something as:

static int nprocs = MAXNPROCS;
static int nreps = MAXNREPS;

...

	unsigned int avail_msg_queues = get_avail_msgqueues();

	if (opt_nprocs)
		nprocs = SAFE_STRTOL(opt_nprocs, 1, MAXNPROCS);

	if (nprocs > avail_msg_queues) {
		tst_res(TINFO, "Setting max processes to %u", avail_msg_queues);
		nprocs = avail_msg_queues;
	}

	if (opt_nreps)
		nreps = SAFE_STRTOL(opt_nreps, 1, MAXNREPS);

Where the get_avail_msgqueues() is a library function that returns the max_queues - used_queues.

testcases/kernel/syscalls/ipc/msgstress/msgstress01.c int main(int argc, char **argv) · line 155

Quoted 9 lines
testcases/kernel/syscalls/ipc/msgstress/msgstress01.c +3 -6
-	/*
-	 * 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);
+	SAFE_SIGNAL(SIGTERM, SIG_IGN);
+	tst_res(TINFO, "Number of message queues is %d, process is %d, "
+		"iterations is %d", MSGMNI, nprocs, nreps);

The LKML coding style prefers not to break strings even if they are longer than 80 chars.

Quoted 19 lines
testcases/kernel/syscalls/ipc/msgstress/msgstress01.c +2 -13
 }
 
 void cleanup(void)
 {
-	int status;
-
-#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();
+	if (tid >= 0)
+		SAFE_MSGCTL(tid, IPC_RMID, NULL);

testcases/kernel/syscalls/ipc/msgstress/msgstress01.c int main(int argc, char **argv) · line 171

Quoted 10 lines
testcases/kernel/syscalls/ipc/msgstress/msgstress01.c +9 -0
 }
+
+static struct tst_test test = {
+	.needs_tmpdir = 1,
+	.options = options,
+	.setup = setup,
+	.cleanup = cleanup,
+	.forks_child = 1,
+	.test_all = verify_msgstress,
+};

And I've run out of time for today, but I think that similar comments would apply for the rest of the testcases as well.

It would also be easier if there was one patch per testcase, that would make it easier to review as well.

Signature · 2 lines
Cyril Hrubis
[email protected]
#7 lore raw

PATCH v4 1/5 libs/libltpnewipc/libnewipc.c: Add msg_do_reader/msg_do_writer function

Copy old libmsgctl.c three functions(doreader,dowriter,verify) into libnewipc.c. It is prepared for upcoming new api msgstress case. The reason for not using a new c lib file(ie libnewmsgctl.c) is that current libnewipc is small(only has getipckey, get_used_queues, probe_free_addr, get_ipc_timestamp function). So put them into libnewipc.c. Also use tst_brk for failure because we don't want to print many info in stress test when case fails.

---
 include/libnewipc.h           | 11 +++++
 libs/libltpnewipc/libnewipc.c | 75 +++++++++++++++++++++++++++++++++++
 2 files changed, 86 insertions(+)
include/libnewipc.h +11 -0
index 075364f85..0f099c939 100644
@@ -45,6 +45,14 @@
 #define INT_SIZE	4
 #define MODE_MASK	0x01FF
 
+struct mbuffer {
+	long type;
+	struct {
+		char len;
+		char pbytes[99];
+	} data;
+};
+
 key_t getipckey(const char *file, const int lineno);
 #define GETIPCKEY() \
 	getipckey(__FILE__, __LINE__)
@@ -59,4 +67,7 @@ void *probe_free_addr(const char *file, const int lineno);
 
 time_t get_ipc_timestamp(void);
 
+void msg_do_reader(long key, int tid, long type, int child, int nreps);
+
+void msg_do_writer(long key, int tid, long type, int child, int nreps);
 #endif /* newlibipc.h */
libs/libltpnewipc/libnewipc.c +75 -0

78 lines not on this page · raw message

Signature · 1 line
2.23.0
#8 lore raw

PATCH v4 2/5 syscalls/msgstress01: Convert into new api and merge msgstress03 into it

Since msgstress01 and msgstress03 has the small difference(whether use procfs value, msgstress01 uses 16 procs 100000 reps as default and msgstress03 uses 10000 procs 10000 reps as default).

We can merge the two cases directly by using proper process and rep value in runtest. In here, I use 1000/100000 value as default in msgstress01 tag instead of original 16/10000 value because 16 procs is so small and 1000 procs make more sense(It also
not exceed the maximum process limit). After this change, excuting msgstress01 doesn't
take a lot of time than before. msgstress03 tag uses "msgstress01 -n 10000 -l 10000" to replace.

We will use the bigger process num when we add process num check according into available memory in the future. Of course, we can add it into smoke-test at that time since it may take a lot of time.

Some changes since old api:
1) cleanup is useless since tid value is always -1 because we assign value in child but use it in parent. Use a tid array instead and put the position of getting msgget id into parent process.

2)Ignore SIGTERM instead of empty signhanlder and sighold/sigrelease

3)Add get_avail_queues and setup_msg_key_array in new ipc library

4)Add timeout=-1 since it maybe a smoke test when using bigger proc num or reps num

---
 include/libnewipc.h                           |  11 +
 libs/libltpnewipc/libnewipc.c                 |  39 +++
 runtest/syscalls                              |   2 +-
 runtest/syscalls-ipc                          |   2 +-
 .../kernel/syscalls/ipc/msgstress/.gitignore  |   1 -
 .../kernel/syscalls/ipc/msgstress/Makefile    |   5 +-
 .../syscalls/ipc/msgstress/msgstress01.c      | 314 +++++-------------
 .../syscalls/ipc/msgstress/msgstress03.c      | 290 ----------------
 8 files changed, 131 insertions(+), 533 deletions(-)
 delete mode 100644 testcases/kernel/syscalls/ipc/msgstress/msgstress03.c
include/libnewipc.h +11 -0
index 0f099c939..c1fa45ec3 100644
@@ -44,6 +44,11 @@
 #define SHM_SIZE	2048
 #define INT_SIZE	4
 #define MODE_MASK	0x01FF
+#define MAXNPROCS	1000000
+#define MAXNREPS	100000
+
+key_t keyarray[MAXNPROCS];
+int pidarray[MAXNPROCS];
 
 struct mbuffer {
 	long type;
@@ -65,9 +70,15 @@ void *probe_free_addr(const char *file, const int lineno);
 #define PROBE_FREE_ADDR() \
 	probe_free_addr(__FILE__, __LINE__)
 
+int get_avail_queues(const char *file, const int lineno);
+#define GET_AVAIL_QUEUES() \
+	get_avail_queues(__FILE__, __LINE__)
+
 time_t get_ipc_timestamp(void);
 
 void msg_do_reader(long key, int tid, long type, int child, int nreps);
 
 void msg_do_writer(long key, int tid, long type, int child, int nreps);
+
+void setup_msg_key_array(int nprocs);
 #endif /* newlibipc.h */
libs/libltpnewipc/libnewipc.c +39 -0
index 09871b421..cb885da13 100644
@@ -69,6 +69,19 @@ int get_used_queues(const char *file, const int lineno)
 	return used_queues;
 }
 
+int get_avail_queues(const char *file, const int lineno)
+{
+	int used_queues = -1;
+	int max_queues = -1;
+	int avail_queues = -1;
+
+	safe_file_scanf(file, lineno, NULL, "/proc/sys/kernel/msgmni", "%d", &max_queues);
+	used_queues = get_used_queues(file, lineno);
+	avail_queues = max_queues - used_queues;
+
+	return avail_queues;
+}
+
 void *probe_free_addr(const char *file, const int lineno)
 {
 	void *addr;
@@ -174,3 +187,29 @@ void msg_do_writer(long key, int tid, long type, int child, int nreps)
 		key++;
 	}
 }
+
+void setup_msg_key_array(int nprocs)
+{
+	int i, j, ok;
+
+	srand(getpid());
+	/* Set up array of unique keys for use in allocating message queues */
+	for (i = 0; i < nprocs; i++) {
+		ok = 1;
+		do {
+			keyarray[i] = (key_t) rand();
+			/* Make sure key is unique and not private */
+			if (keyarray[i] == IPC_PRIVATE) {
+				ok = 0;
+				continue;
+			}
+			for (j = 0; j < i; j++) {
+				if (keyarray[j] == keyarray[i]) {
+					ok = 0;
+					break;
+				}
+				ok = 1;
+			}
+		} while (ok == 0);
+	}
+}
runtest/syscalls +1 -1
index fe22ae5b6..68feb9390 100644
@@ -815,7 +815,7 @@ msgctl05 msgctl05
 msgctl06 msgctl06
 msgstress01 msgstress01
 msgstress02 msgstress02
-msgstress03 msgstress03
+msgstress03 msgstress01 -n 10000 -l 10000
 msgstress04 msgstress04
 msgctl12 msgctl12
 
runtest/syscalls-ipc +1 -1
index 68fff4038..8adb686c1 100644
@@ -6,7 +6,7 @@ msgctl05 msgctl05
 msgctl06 msgctl06
 msgstress01 msgstress01
 msgstress02 msgstress02
-msgstress03 msgstress03
+msgstress03 msgstress01 -n 10000 -l 10000
 msgstress04 msgstress04
 msgctl12 msgctl12
 
testcases/kernel/syscalls/ipc/msgstress/.gitignore +0 -1
index a8f675399..e1df4cda8 100644
@@ -1,4 +1,3 @@
 /msgstress01
 /msgstress02
-/msgstress03
 /msgstress04
testcases/kernel/syscalls/ipc/msgstress/Makefile +3 -2
index b821bda01..27caffb35 100644
@@ -3,10 +3,11 @@
 
 top_srcdir              ?= ../../../../..
 
-LTPLIBS = ltpipc
+LTPLIBS = ltpipc ltpnewipc
 
 include $(top_srcdir)/include/mk/testcases.mk
 
-LTPLDLIBS  += -lltpipc
+msgstress01: LTPLDLIBS = -lltpnewipc
+msgstress02 msgstress04: LTPLDLIBS = -lltpipc
 
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/kernel/syscalls/ipc/msgstress/msgstress01.c +76 -238

376 lines not on this page · raw message

testcases/kernel/syscalls/ipc/msgstress/msgstress03.c deleted +0 -290

290 lines not on this page · raw message

Signature · 1 line
2.23.0
#9 lore raw

PATCH v4 2/5 syscalls/msgstress01: Convert into new api and merge msgstress03 into it

Hi!
The code looks much better there are just two minor things.

Quoted 1 line

2)Ignore SIGTERM instead of empty signhanlder and sighold/sigrelease

I wonder why do we ingore SIGTERM in the first place?

Quoted 13 lines

msgctl06 msgctl06
msgstress01 msgstress01
msgstress02 msgstress02

runtest/syscalls +1 -1
-msgstress03 msgstress03
+msgstress03 msgstress01 -n 10000 -l 10000
 msgstress04 msgstress04
 msgctl12 msgctl12
runtest/syscalls-ipc +0 -0
index 68fff4038..8adb686c1 100644

runtest/syscalls-ipc msgctl05 msgctl05 · line 9

Quoted 5 lines
runtest/syscalls-ipc +1 -1
@@ -6,7 +6,7 @@ msgctl05 msgctl05
 msgctl06 msgctl06
 msgstress01 msgstress01
 msgstress02 msgstress02
-msgstress03 msgstress03
+msgstress03 msgstress01 -n 10000 -l 10000

I'm also not sure if we should call it msgstress03, maybe it would be cleaner if we named these two tests with msgstress01 with some suffix.

Signature · 2 lines
Cyril Hrubis
[email protected]
#10 lore raw

PATCH v4 3/5 syscalls/msgstress02: Convert into new api

In reply to Yang Xu

1)Remove SIGTERM signal handler and ignore it 2)use fork because SAFE_FORK not clean the another writer or reader proceess

It also missed process num limit check and we will add it in the future.

---
 .../kernel/syscalls/ipc/msgstress/Makefile    |   4 +-
 .../syscalls/ipc/msgstress/msgstress02.c      | 429 +++++-------------
 2 files changed, 116 insertions(+), 317 deletions(-)
testcases/kernel/syscalls/ipc/msgstress/Makefile +2 -2
index 27caffb35..d80d0bf98 100644
@@ -7,7 +7,7 @@ LTPLIBS = ltpipc ltpnewipc
 
 include $(top_srcdir)/include/mk/testcases.mk
 
-msgstress01: LTPLDLIBS = -lltpnewipc
-msgstress02 msgstress04: LTPLDLIBS = -lltpipc
+msgstress01 msgstress02: LTPLDLIBS = -lltpnewipc
+msgstress04: LTPLDLIBS = -lltpipc
 
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/kernel/syscalls/ipc/msgstress/msgstress02.c +114 -315

515 lines not on this page · raw message

Signature · 1 line
2.23.0
#11 lore raw

PATCH v4 3/5 syscalls/msgstress02: Convert into new api

Hi!
Generally looks much better, comments inline.

Quoted 13 lines
testcases/kernel/syscalls/ipc/msgstress/msgstress02.c +1 -11
-static int dotest(key_t key, int child_process)
+static void dotest(key_t key, int child_process, int id)
 {
-	int id, pid;
-	int i, count, status, exit_status;
-
-	sighold(SIGTERM);
-	if ((id = msgget(key, IPC_CREAT | S_IRUSR | S_IWUSR)) < 0) {
-		printf("msgget() error in child %d: %s\n",
-			child_process, strerror(errno));
-		return FAIL;
-	}
-	tid = id;

testcases/kernel/syscalls/ipc/msgstress/msgstress02.c line 75

Quoted 10 lines
testcases/kernel/syscalls/ipc/msgstress/msgstress02.c +2 -6
-	sigrelse(SIGTERM);
-
-	exit_status = PASS;
+	int pid, i, count;
 
 	for (i = 0; i < nkids; i++) {
-		fflush(stdout);
-		if ((pid = FORK_OR_VFORK()) < 0) {
-			printf("Fork failure in the first child of child group %d\n",
+		pid = fork();

Why don't we use SAFE_FORK() here as well?

I guess that the main point is to make sure that we cleanup the message queueus that would otherwise stayed on the system.

...

testcases/kernel/syscalls/ipc/msgstress/msgstress02.c static int dotest(key_t key, int child_process) · line 187

Quoted 1 line
testcases/kernel/syscalls/ipc/msgstress/msgstress02.c +1 -0
+	SAFE_SIGNAL(SIGTERM, SIG_IGN);

And here as well, I do not get why we ignore SIGTERM at all.

Signature · 2 lines
Cyril Hrubis
[email protected]
#12 lore raw

PATCH v4 4/5 sycalls/msgstress04: Convert into new api

In reply to Yang Xu

It also missed process num check according to available memory.

---
 .../kernel/syscalls/ipc/msgstress/Makefile    |   5 +-
 .../syscalls/ipc/msgstress/msgstress04.c      | 489 +++++-------------
 2 files changed, 142 insertions(+), 352 deletions(-)
testcases/kernel/syscalls/ipc/msgstress/Makefile +2 -3
index d80d0bf98..b1201281d 100644
@@ -3,11 +3,10 @@
 
 top_srcdir              ?= ../../../../..
 
-LTPLIBS = ltpipc ltpnewipc
+LTPLIBS = ltpnewipc
 
 include $(top_srcdir)/include/mk/testcases.mk
 
-msgstress01 msgstress02: LTPLDLIBS = -lltpnewipc
-msgstress04: LTPLDLIBS = -lltpipc
+LTPLDLIBS = -lltpnewipc
 
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/kernel/syscalls/ipc/msgstress/msgstress04.c +140 -349

585 lines not on this page · raw message

Signature · 1 line
2.23.0
#13 lore raw

PATCH v4 4/5 sycalls/msgstress04: Convert into new api

Hi!
Isn't this mostly the same as msgstress02.c? Can we merge these two as well?

Signature · 2 lines
Cyril Hrubis
[email protected]
#14 lore raw

PATCH v4 5/5 libs/libltpipc: Remove useless function and c file

In reply to Yang Xu

Only old msgstress* case use these apis, so we can remove them

---
 include/libmsgctl.h        |  39 ----------
 libs/libltpipc/libipc.c    |  46 ------------
 libs/libltpipc/libmsgctl.c | 147 -------------------------------------
 3 files changed, 232 deletions(-)
 delete mode 100644 include/libmsgctl.h
 delete mode 100644 libs/libltpipc/libmsgctl.c
include/libmsgctl.h deleted +0 -39
deleted file mode 100644
index e1afeab5f..000000000
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) International Business Machines  Corp., 2002
- * Copyright (c) 2013 Oracle and/or its affiliates. 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 would 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 the Free Software Foundation,
- * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#ifndef __LIBMSGCTL_H__
-#define __LIBMSGCTL_H__
-
-#define FAIL	1
-#define PASS	0
-
-struct mbuffer {
-	long type;
-	struct {
-		char len;
-		char pbytes[99];
-	} data;
-};
-
-int doreader(long key, int tid, long type, int child, int nreps);
-int dowriter(long key, int tid, long type, int child, int nreps);
-int fill_buffer(char *buf, char val, int size);
-int verify(char *buf, char val, int size, int child);
-
-#endif /*__LIBMSGCTL_H__ */
libs/libltpipc/libipc.c +0 -46

49 lines not on this page · raw message

libs/libltpipc/libmsgctl.c deleted +0 -147

147 lines not on this page · raw message

Signature · 1 line
2.23.0
#15 lore raw

PATCH v4 1/5 libs/libltpnewipc/libnewipc.c: Add msg_do_reader/msg_do_writer function

In reply to Yang Xu

Hi!
First of all sorry for the long delay.

Quoted 39 lines
---
 include/libnewipc.h           | 11 +++++
 libs/libltpnewipc/libnewipc.c | 75 +++++++++++++++++++++++++++++++++++
 2 files changed, 86 insertions(+)
include/libnewipc.h +11 -0
index 075364f85..0f099c939 100644
@@ -45,6 +45,14 @@
 #define INT_SIZE	4
 #define MODE_MASK	0x01FF
 
+struct mbuffer {
+	long type;
+	struct {
+		char len;
+		char pbytes[99];
+	} data;
+};
+
 key_t getipckey(const char *file, const int lineno);
 #define GETIPCKEY() \
 	getipckey(__FILE__, __LINE__)
@@ -59,4 +67,7 @@ void *probe_free_addr(const char *file, const int lineno);
 
 time_t get_ipc_timestamp(void);
 
+void msg_do_reader(long key, int tid, long type, int child, int nreps);
+
+void msg_do_writer(long key, int tid, long type, int child, int nreps);
 #endif /* newlibipc.h */
libs/libltpnewipc/libnewipc.c +0 -0
index d0974bbe0..09871b421 100644
@@ -99,3 +99,78 @@ time_t get_ipc_timestamp(void)
 

libs/libltpnewipc/libnewipc.c time_t get_ipc_timestamp(void) · line 109

Quoted 10 lines
libs/libltpnewipc/libnewipc.c +8 -0
 	return ts.tv_sec;
 }
+
+static int verify(char *buf, char val, int size, int child)
+{
+	while (size-- > 0) {
+		if (*buf++ != val) {
+			tst_res(TFAIL,
+				"Verify error in child %d, *buf = %x, val = %x, size = %d",
+				child, *buf, val, size);

Actually this piece of code had a bug in the original version as well, as we do *buf++ we end up one byte after the position we wanted to print if we ever got wrong byte, possibly out of the buffer as well.

So I guess that this will be much better and easier to read with usuall for loop and array subscript:

	for (i = 0; i < size; i++) {
		if (buf[i] != val)  {
		...

Also we report failure in the msg_do_reader() so I guess that it would be slightly better to report TINFO with the details here and let the msg_do_reader() report the failure.

Quoted 46 lines
libs/libltpnewipc/libnewipc.c +46 -0
+			return 1;
+		}
+	}
+	return 0;
+}
+
+void msg_do_reader(long key, int tid, long type, int child, int nreps)
+{
+	int i, size;
+	int id;
+	struct mbuffer buffer;
+
+	id = SAFE_MSGGET(key, 0);
+	if (id != tid) {
+		tst_brk(TFAIL,
+			"Message queue mismatch in the reader of child group %d for message queue id %d ",
+			child, id);
+	}
+	for (i = 0; i < nreps; i++) {
+		memset(&buffer, 0, sizeof(buffer));
+
+		size = SAFE_MSGRCV(id, &buffer, 100, type, 0);
+		if (buffer.type != type) {
+			tst_brk(TFAIL,
+				"Type mismatch in child %d, read #%d, for message got %ld, exected %ld",
+				child, (i + 1), buffer.type, type);
+		}
+		if (buffer.data.len + 1 != size) {
+			tst_brk(TFAIL,
+				"Size mismatch in child %d, read #%d, for message got %d, expected %d",
+				child, (i + 1), buffer.data.len + 1, size);
+		}
+		if (verify(buffer.data.pbytes, (key % 255), size - 1, child)) {
+			tst_brk(TFAIL,
+				"Verify failed in child %d read # = %d, key = %lx",
+				child, (i + 1), key);
+		}
+		key++;
+	}
+}
+
+void msg_do_writer(long key, int tid, long type, int child, int nreps)
+{
+	int i, size;
+	int id;
+	struct mbuffer buffer;

libs/libltpnewipc/libnewipc.c time_t get_ipc_timestamp(void) · line 165

Quoted 10 lines
libs/libltpnewipc/libnewipc.c +10 -0
+
+	id = SAFE_MSGGET(key, 0);
+	if (id != tid) {
+		tst_brk(TFAIL,
+			"Message queue mismatch in the writer of child group %d for message queue id %d",
+			child, id);
+	}
+
+	for (i = 0; i < nreps; i++) {
+		memset(&buffer, 0, sizeof(buffer));

We set the relevant part of the buffer with (key % 255), do we really have to clear it here?

Quoted 10 lines
libs/libltpnewipc/libnewipc.c +10 -0
+		do {
+			size = (lrand48() % 99);
+		} while (size == 0);
+		memset(buffer.data.pbytes, (key % 255), size);
+		buffer.data.len = size;
+		buffer.type = type;
+		SAFE_MSGSND(id, &buffer, size + 1, 0);
+		key++;
+	}
+}
Signature · 2 lines
Cyril Hrubis
[email protected]
#16 lore raw

PATCH v4 1/5 libs/libltpnewipc/libnewipc.c: Add msg_do_reader/msg_do_writer function

In reply to Yang Xu

Hi!

libs/libltpnewipc/libnewipc.c time_t get_ipc_timestamp(void) · line 127

Quoted 12 lines
libs/libltpnewipc/libnewipc.c +12 -0
+void msg_do_reader(long key, int tid, long type, int child, int nreps)
+{
+	int i, size;
+	int id;
+	struct mbuffer buffer;
+
+	id = SAFE_MSGGET(key, 0);
+	if (id != tid) {
+		tst_brk(TFAIL,
+			"Message queue mismatch in the reader of child group %d for message queue id %d ",
+			child, id);
+	}

Also looking at how these functions are used, we fork a child that calls this function then wait it and ignore the exit value it does not make sense to use tst_brk() here at all.

The tst_brk() is supposed to exit the whole test, including all suprocesses but that does not work if we throw away the child return value. This piece of code looks like we exit the whole test here, which isn't simply true.

So either we should do tst_res(TFAIL, ...) followed by an exit(0) here, or we should handle the return value in the parent. I.e. stop the test if one of the children reported a failure.

Quoted 11 lines
libs/libltpnewipc/libnewipc.c +11 -0
+	for (i = 0; i < nreps; i++) {
+		memset(&buffer, 0, sizeof(buffer));
+
+		size = SAFE_MSGRCV(id, &buffer, 100, type, 0);
+		if (buffer.type != type) {
+			tst_brk(TFAIL,
+				"Type mismatch in child %d, read #%d, for message got %ld, exected %ld",
+				child, (i + 1), buffer.type, type);
+		}
+		if (buffer.data.len + 1 != size) {
+			tst_brk(TFAIL,

libs/libltpnewipc/libnewipc.c time_t get_ipc_timestamp(void) · line 148

Quoted 10 lines
libs/libltpnewipc/libnewipc.c +10 -0
+				"Size mismatch in child %d, read #%d, for message got %d, expected %d",
+				child, (i + 1), buffer.data.len + 1, size);
+		}
+		if (verify(buffer.data.pbytes, (key % 255), size - 1, child)) {
+			tst_brk(TFAIL,
+				"Verify failed in child %d read # = %d, key = %lx",
+				child, (i + 1), key);
+		}
+		key++;
+	}

It would also make sense to do exit(0); here so that we do not have to repeat that in each test.

Quoted 18 lines
libs/libltpnewipc/libnewipc.c +18 -0
+}
+
+void msg_do_writer(long key, int tid, long type, int child, int nreps)
+{
+	int i, size;
+	int id;
+	struct mbuffer buffer;
+
+	id = SAFE_MSGGET(key, 0);
+	if (id != tid) {
+		tst_brk(TFAIL,
+			"Message queue mismatch in the writer of child group %d for message queue id %d",
+			child, id);
+	}
+
+	for (i = 0; i < nreps; i++) {
+		memset(&buffer, 0, sizeof(buffer));
+

libs/libltpnewipc/libnewipc.c time_t get_ipc_timestamp(void) · line 176

Quoted 10 lines
libs/libltpnewipc/libnewipc.c +10 -0
+		do {
+			size = (lrand48() % 99);
+		} while (size == 0);
+		memset(buffer.data.pbytes, (key % 255), size);
+		buffer.data.len = size;
+		buffer.type = type;
+		SAFE_MSGSND(id, &buffer, size + 1, 0);
+		key++;
+	}
+}

And same here.

Signature · 2 lines
Cyril Hrubis
[email protected]
#17 lore raw

PATCH v3 3/4 libmsgctl: Remove it

In reply to Yang Xu

This lib code was only used by msgstress case and we have created a msgstress_common.c code in msgstress directory, so it was useless and remove it.

---
 include/libmsgctl.h        |  39 ----------
 libs/libltpipc/libmsgctl.c | 147 -------------------------------------
 2 files changed, 186 deletions(-)
 delete mode 100644 include/libmsgctl.h
 delete mode 100644 libs/libltpipc/libmsgctl.c
include/libmsgctl.h deleted +0 -39
deleted file mode 100644
index e1afeab5f..000000000
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) International Business Machines  Corp., 2002
- * Copyright (c) 2013 Oracle and/or its affiliates. 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 would 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 the Free Software Foundation,
- * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#ifndef __LIBMSGCTL_H__
-#define __LIBMSGCTL_H__
-
-#define FAIL	1
-#define PASS	0
-
-struct mbuffer {
-	long type;
-	struct {
-		char len;
-		char pbytes[99];
-	} data;
-};
-
-int doreader(long key, int tid, long type, int child, int nreps);
-int dowriter(long key, int tid, long type, int child, int nreps);
-int fill_buffer(char *buf, char val, int size);
-int verify(char *buf, char val, int size, int child);
-
-#endif /*__LIBMSGCTL_H__ */
libs/libltpipc/libmsgctl.c deleted +0 -147

147 lines not on this page · raw message

Signature · 1 line
2.23.0
#18 lore raw

PATCH v3 4/4 lipipc: Remove useless get_max_msgqueues api

In reply to Yang Xu

Only old msgstress cases use this api and we have used SAFE_FILE_SCANF("/proc/sys/kernel/msgmni", "%d", &nr_msgqs) to get the max msgqueues. So remove this uesless api.

---
 include/ipcmsg.h        |  1 -
 libs/libltpipc/libipc.c | 23 -----------------------
 2 files changed, 24 deletions(-)
include/ipcmsg.h +0 -1
index d89894b72..21eb81b6b 100644
@@ -62,7 +62,6 @@ void rm_queue(int);
 key_t getipckey();
 int getuserid(char *);
 
-int get_max_msgqueues(void);
 int get_used_msgqueues(void);
 
 #endif /* ipcmsg.h */
libs/libltpipc/libipc.c +0 -23
index d94880f54..9c2da11b0 100644
@@ -195,26 +195,3 @@ int get_used_msgqueues(void)
 	}
 	return used_queues;
 }
-
-/*
- * Get the max number of message queues allowed on system
- */
-int get_max_msgqueues(void)
-{
-	FILE *f;
-	char buff[BUFSIZE];
-
-	/* Get the max number of message queues allowed on system */
-	f = fopen("/proc/sys/kernel/msgmni", "r");
-	if (!f) {
-		tst_resm(TBROK, "Could not open /proc/sys/kernel/msgmni");
-		return -1;
-	}
-	if (!fgets(buff, BUFSIZE, f)) {
-		fclose(f);
-		tst_resm(TBROK, "Could not read /proc/sys/kernel/msgmni");
-		return -1;
-	}
-	fclose(f);
-	return atoi(buff);
-}
Signature · 1 line
2.23.0
#19 lore raw

PATCH v3 1/4 syscalls/msgstress: Add common file for msgstress

In reply to Yang Xu

Hi!

Quoted 4 lines

Copy old libmsgctl.c three functions(doreader,dowriter, fill_buffer, verify) into this common file. The reason for not putting it into lib directory because only msgstress cases use these functions. So raising them into lib level makes no sense.

Well if we add msg to the function names there would be no harm in putting these functions into the ipc library, right? E.g. we would have msg_do_reader() etc.

I would actually prefer that, since we would have avoided complexity in the msgstress/Makefile that way.

Quoted 86 lines
---
 .../kernel/syscalls/ipc/msgstress/Makefile    |  2 +-
 .../syscalls/ipc/msgstress/msgstress_common.c | 95 +++++++++++++++++++
 .../syscalls/ipc/msgstress/msgstress_common.h | 26 +++++
 3 files changed, 122 insertions(+), 1 deletion(-)
 create mode 100644 testcases/kernel/syscalls/ipc/msgstress/msgstress_common.c
 create mode 100644 testcases/kernel/syscalls/ipc/msgstress/msgstress_common.h
testcases/kernel/syscalls/ipc/msgstress/Makefile +1 -1
index b821bda01..2c8fa8e5b 100644
@@ -6,7 +6,7 @@ top_srcdir              ?= ../../../../..
 LTPLIBS = ltpipc
 
 include $(top_srcdir)/include/mk/testcases.mk
-
+FILTER_OUT_MAKE_TARGETS         := msgstress_common
 LTPLDLIBS  += -lltpipc
 
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/kernel/syscalls/ipc/msgstress/msgstress_common.c new file +58 -0
new file mode 100644
index 000000000..3431355f6
@@ -0,0 +1,95 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) International Business Machines  Corp., 2002
+ * Copyright (c) 2013 Oracle and/or its affiliates. All Rights Reserved.
+ * Copyright (c) 2020 FUJITSU LIMITED. All rights reserved???
+ */
+
+#define TST_NO_DEFAULT_MAIN
+#include "msgstress_common.h"
+
+int verify(char *buf, char val, int size, int child)
+{
+	while (size-- > 0) {
+		if (*buf++ != val) {
+			tst_res(TFAIL, "Verify error in child %d, *buf = %x, "
+				"val = %x, size = %d\n", child, *buf, val,
+				size);
+			return 1;
+		}
+	}
+	return 0;
+}
+
+void do_reader(long key, int tid, long type, int child, int nreps)
+{
+	int i, size;
+	int id;
+	struct mbuffer buffer;
+
+	id = SAFE_MSGGET(key, 0);
+	if (id != tid) {
+		tst_res(TFAIL,
+			"Message queue mismatch in the reader of child group"
+			" %d for message queue id %d\n", child, id);
+		return;
+	}
+	for (i = 0; i < nreps; i++) {
+		memset(&buffer, 0, sizeof(buffer));
+
+		size = SAFE_MSGRCV(id, &buffer, 100, type, 0);
+		if (buffer.type != type) {
+			tst_res(TFAIL, "Type mismatch in child %d, read #%d, "
+				"for message got %ld, exected %ld",
+				child, (i + 1), buffer.type, type);
+			return;
+		}
+		if (buffer.data.len + 1 != size) {
+			tst_res(TFAIL, "Size mismatch in child %d, read #%d, "
+				"for message got %d, expected %d",
+				child, (i + 1), buffer.data.len + 1, size);
+			return;
+		}
+		if (verify(buffer.data.pbytes, (key % 255), size - 1, child)) {
+			tst_res(TFAIL, "Verify failed in child %d read # = %d, "
+				"key = %lx\n", child, (i + 1), key);
+			return;
+		}
+		key++;

testcases/kernel/syscalls/ipc/msgstress/msgstress_common.c line 68

Quoted 10 lines
testcases/kernel/syscalls/ipc/msgstress/msgstress_common.c new file +10 -0
+	}
+}
+
+void fill_buffer(char *buf, char val, int size)
+{
+	int i;
+
+	for (i = 0; i < size; i++)
+		buf[i] = val;
+}

This is open-coded memset() please use memset() instead.

Quoted 63 lines
testcases/kernel/syscalls/ipc/msgstress/msgstress_common.c new file +26 -0
+void do_writer(long key, int tid, long type, int child, int nreps)
+{
+	int i, size;
+	int id;
+	struct mbuffer buffer;
+
+	id = SAFE_MSGGET(key, 0);
+	if (id != tid) {
+		tst_res(TFAIL, "Message queue mismatch in the reader of child"
+			" group %d for message queue id %d\n", child, id);
+		return;
+	}
+
+	for (i = 0; i < nreps; i++) {
+		memset(&buffer, 0, sizeof(buffer));
+
+		do {
+			size = (lrand48() % 99);
+		} while (size == 0);
+		fill_buffer(buffer.data.pbytes, (key % 255), size);
+		buffer.data.len = size;
+		buffer.type = type;
+		SAFE_MSGSND(id, &buffer, size + 1, 0);
+		key++;
+	}
+}
testcases/kernel/syscalls/ipc/msgstress/msgstress_common.h new file +26 -0
new file mode 100644
index 000000000..81e2f288b
@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) 2020 FUJITSU LIMITED. All rights reserved.
+ * Author: Yang Xu <[email protected]>
+ */
+
+#ifndef MSGSTRESS_COMMON_H
+#define MSGSTRESS_COMMON_H
+
+#include <stdlib.h>
+#include "tst_safe_sysv_ipc.h"
+#include "tst_test.h"
+
+struct mbuffer {
+	long type;
+	struct {
+		char len;
+		char pbytes[99];
+	} data;
+};
+
+void do_reader(long key, int tid, long type, int child, int nreps);
+void do_writer(long key, int tid, long type, int child, int nreps);
+
+#endif
+
Signature · 1 line
2.23.0
Signature · 2 lines
Cyril Hrubis
[email protected]
#20 lore raw

PATCH v3 1/4 syscalls/msgstress: Add common file for msgstress

Hi Cyril

Quoted 9 lines

Hi!

Quoted 4 lines

Copy old libmsgctl.c three functions(doreader,dowriter, fill_buffer, verify) into this common file. The reason for not putting it into lib directory because only msgstress cases use these functions. So raising them into lib level makes no sense.

Well if we add msg to the function names there would be no harm in putting these functions into the ipc library, right? E.g. we would have msg_do_reader() etc.

Yes. it is no harm. But I don't see any other case using these api.

Also this patch looks has wrongly merged into ltp master.

Quoted 94 lines

I would actually prefer that, since we would have avoided complexity in the msgstress/Makefile that way.

Quoted 90 lines
---
  .../kernel/syscalls/ipc/msgstress/Makefile    |  2 +-
  .../syscalls/ipc/msgstress/msgstress_common.c | 95 +++++++++++++++++++
  .../syscalls/ipc/msgstress/msgstress_common.h | 26 +++++
  3 files changed, 122 insertions(+), 1 deletion(-)

create mode 100644 testcases/kernel/syscalls/ipc/msgstress/msgstress_common.c create mode 100644 testcases/kernel/syscalls/ipc/msgstress/msgstress_common.h

testcases/kernel/syscalls/ipc/msgstress/Makefile +1 -1
index b821bda01..2c8fa8e5b 100644
@@ -6,7 +6,7 @@ top_srcdir              ?= ../../../../..
  LTPLIBS = ltpipc
 
  include $(top_srcdir)/include/mk/testcases.mk
-
+FILTER_OUT_MAKE_TARGETS         := msgstress_common
  LTPLDLIBS  += -lltpipc
 
  include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/kernel/syscalls/ipc/msgstress/msgstress_common.c new file +62 -0
new file mode 100644
index 000000000..3431355f6
@@ -0,0 +1,95 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) International Business Machines  Corp., 2002
+ * Copyright (c) 2013 Oracle and/or its affiliates. All Rights Reserved.
+ * Copyright (c) 2020 FUJITSU LIMITED. All rights reserved???
+ */
+
+#define TST_NO_DEFAULT_MAIN
+#include "msgstress_common.h"
+
+int verify(char *buf, char val, int size, int child)
+{
+	while (size-->  0) {
+		if (*buf++ != val) {
+			tst_res(TFAIL, "Verify error in child %d, *buf = %x, "
+				"val = %x, size = %d\n", child, *buf, val,
+				size);
+			return 1;
+		}
+	}
+	return 0;
+}
+
+void do_reader(long key, int tid, long type, int child, int nreps)
+{
+	int i, size;
+	int id;
+	struct mbuffer buffer;
+
+	id = SAFE_MSGGET(key, 0);
+	if (id != tid) {
+		tst_res(TFAIL,
+			"Message queue mismatch in the reader of child group"
+			" %d for message queue id %d\n", child, id);
+		return;
+	}
+	for (i = 0; i<  nreps; i++) {
+		memset(&buffer, 0, sizeof(buffer));
+
+		size = SAFE_MSGRCV(id,&buffer, 100, type, 0);
+		if (buffer.type != type) {
+			tst_res(TFAIL, "Type mismatch in child %d, read #%d, "
+				"for message got %ld, exected %ld",
+				child, (i + 1), buffer.type, type);
+			return;
+		}
+		if (buffer.data.len + 1 != size) {
+			tst_res(TFAIL, "Size mismatch in child %d, read #%d, "
+				"for message got %d, expected %d",
+				child, (i + 1), buffer.data.len + 1, size);
+			return;
+		}
+		if (verify(buffer.data.pbytes, (key % 255), size - 1, child)) {
+			tst_res(TFAIL, "Verify failed in child %d read # = %d, "
+				"key = %lx\n", child, (i + 1), key);
+			return;
+		}
+		key++;
+	}
+}
+
+void fill_buffer(char *buf, char val, int size)
Quoted 8 lines

testcases/kernel/syscalls/ipc/msgstress/msgstress_common.c line 68

Quoted 6 lines
testcases/kernel/syscalls/ipc/msgstress/msgstress_common.c new file +6 -0
+{
+	int i;
+
+	for (i = 0; i<  size; i++)
+		buf[i] = val;
+}

This is open-coded memset() please use memset() instead.

OK

Quoted 65 lines
Quoted 64 lines
testcases/kernel/syscalls/ipc/msgstress/msgstress_common.c new file +26 -0
+void do_writer(long key, int tid, long type, int child, int nreps)
+{
+	int i, size;
+	int id;
+	struct mbuffer buffer;
+
+	id = SAFE_MSGGET(key, 0);
+	if (id != tid) {
+		tst_res(TFAIL, "Message queue mismatch in the reader of child"
+			" group %d for message queue id %d\n", child, id);
+		return;
+	}
+
+	for (i = 0; i<  nreps; i++) {
+		memset(&buffer, 0, sizeof(buffer));
+
+		do {
+			size = (lrand48() % 99);
+		} while (size == 0);
+		fill_buffer(buffer.data.pbytes, (key % 255), size);
+		buffer.data.len = size;
+		buffer.type = type;
+		SAFE_MSGSND(id,&buffer, size + 1, 0);
+		key++;
+	}
+}
testcases/kernel/syscalls/ipc/msgstress/msgstress_common.h new file +26 -1
new file mode 100644
index 000000000..81e2f288b
@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) 2020 FUJITSU LIMITED. All rights reserved.
+ * Author: Yang Xu<[email protected]>
+ */
+
+#ifndef MSGSTRESS_COMMON_H
+#define MSGSTRESS_COMMON_H
+
+#include<stdlib.h>
+#include "tst_safe_sysv_ipc.h"
+#include "tst_test.h"
+
+struct mbuffer {
+	long type;
+	struct {
+		char len;
+		char pbytes[99];
+	} data;
+};
+
+void do_reader(long key, int tid, long type, int child, int nreps);
+void do_writer(long key, int tid, long type, int child, int nreps);
+
+#endif
+
--

2.23.0

#21 lore raw

PATCH v3 1/4 syscalls/msgstress: Add common file for msgstress

Hi!

Quoted 5 lines
Quoted 3 lines

Well if we add msg to the function names there would be no harm in putting these functions into the ipc library, right? E.g. we would have msg_do_reader() etc.

Yes. it is no harm. But I don't see any other case using these api.

Well it makes it easier to maintain the build system since we do not end up with hacks in random Makefiles.

Quoted 1 line

Also this patch looks has wrongly merged into ltp master.

Sorry I must have pushed that by accident yesterday, I've reverted it now.

Signature · 2 lines
Cyril Hrubis
[email protected]
#22 lore raw

PATCH v2 1/2 libs/libltpnewipc: Add libnewmsgctl.c

In reply to Yang Xu

Hi
If we convert msgstress test cases into new api with using libnewmsgctl.c, the old libmsgctl.c is useless and we can remove them.

Best Regards
Yang Xu

Quoted 150 lines

From: Yang Xu <[email protected]>

Add libnewmsgctl.c into ltp new ipc libs, so the upcoming msgstress cleanup cases can use doreader/dowirter functions such as old libmsgctl.c does.

---
  include/libnewmsgctl.h           |  22 +++++++
  libs/libltpnewipc/libnewmsgctl.c | 102 +++++++++++++++++++++++++++++++
  2 files changed, 124 insertions(+)

create mode 100644 include/libnewmsgctl.h create mode 100644 libs/libltpnewipc/libnewmsgctl.c

include/libnewmsgctl.h new file +22 -0
new file mode 100644
index 000000000..e48a04277
@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) 2020 FUJITSU LIMITED. All rights reserved.
+ */
+
+#ifndef __LIBNEWMSGCTL_H__
+#define __LIBNEWMSGCTL_H__
+
+struct mbuffer {
+	long type;
+	struct {
+		char len;
+		char pbytes[99];
+	} data;
+};
+
+void doreader(long key, int tid, long type, int child, int nreps);
+void dowriter(long key, int tid, long type, int child, int nreps);
+void fill_buffer(char *buf, char val, int size);
+int verify(char *buf, char val, int size, int child);
+
+#endif /*__LIBNEWMSGCTL_H__ */
libs/libltpnewipc/libnewmsgctl.c new file +102 -0
new file mode 100644
index 000000000..1f6eed74a
@@ -0,0 +1,102 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) 2020 FUJITSU LIMITED. All rights reserved.
+ */
+
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/ipc.h>
+#include <sys/msg.h>
+
+#define TST_NO_DEFAULT_MAIN
+#include "tst_test.h"
+#include "tst_safe_sysv_ipc.h"
+#include "libnewmsgctl.h"
+
+void doreader(long key, int tid, long type, int child, int nreps)
+{
+	int i, size;
+	int id;
+	struct mbuffer buffer;
+
+	id = SAFE_MSGGET(key, 0);
+	if (id != tid) {
+		tst_res(TFAIL,
+			"Message queue mismatch in the reader of child group %d for message queue id %d\n",
+			child, id);
+		return;
+	}
+	for (i = 0; i < nreps; i++) {
+		memset(&buffer, 0, sizeof(buffer));
+
+		size = SAFE_MSGRCV(id, &buffer, 100, type, 0);
+		if (buffer.type != type) {
+			tst_res(TFAIL, "Type mismatch in child %d, read #%d, for message got %ld, exected %ld",
+				child, (i + 1), buffer.type, type);
+			return;
+		}
+		if (buffer.data.len + 1 != size) {
+			tst_res(TFAIL, "Size mismatch in child %d, read #%d, for message got %d, expected %d",
+				child, (i + 1), buffer.data.len + 1, size);
+			return;
+		}
+		if (verify(buffer.data.pbytes, (key % 255), size - 1, child)) {
+			tst_res(TFAIL, "Verify failed in child %d read # = %d, key = %lx\n",
+				child, (i + 1), key);
+			return;
+		}
+		key++;
+	}
+}
+
+void dowriter(long key, int tid, long type, int child, int nreps)
+{
+	int i, size;
+	int id;
+	struct mbuffer buffer;
+
+	id = SAFE_MSGGET(key, 0);
+	if (id != tid) {
+		tst_res(TFAIL, "Message queue mismatch in the reader of child group %d for message queue id %d\n",
+			child, id);
+		return;
+	}
+
+	for (i = 0; i < nreps; i++) {
+		memset(&buffer, 0, sizeof(buffer));
+
+		do {
+			size = (lrand48() % 99);
+		} while (size == 0);
+		fill_buffer(buffer.data.pbytes, (key % 255), size);
+		buffer.data.len = size;
+		buffer.type = type;
+		SAFE_MSGSND(id, &buffer, size + 1, 0);
+		key++;
+	}
+}
+
+void fill_buffer(char *buf, char val, int size)
+{
+	int i;
+
+	for (i = 0; i < size; i++)
+		buf[i] = val;
+}
+
+/* Check a buffer for correct values */
+int verify(char *buf, char val, int size, int child)
+{
+	while (size-- > 0) {
+		if (*buf++ != val) {
+			tst_res(TFAIL, "Verify error in child %d, *buf = %x, val = %x, size = %d\n",
+				child, *buf, val, size);
+			return 1;
+		}
+	}
+	return 0;
+}
#23 lore raw

PATCH v2 1/2 libs/libltpnewipc: Add libnewmsgctl.c

Hi!
Does anyone have some comment for this patch set?

Best Regards
Yang Xu

Quoted 164 lines

Hi
If we convert msgstress test cases into new api with using libnewmsgctl.c, the old libmsgctl.c is useless and we can remove them.

Best Regards
Yang Xu

Quoted 158 lines

From: Yang Xu <[email protected]>

Add libnewmsgctl.c into ltp new ipc libs, so the upcoming msgstress cleanup cases
can use doreader/dowirter functions such as old libmsgctl.c does.

---
? include/libnewmsgctl.h?????????? |? 22 +++++++
? libs/libltpnewipc/libnewmsgctl.c | 102 +++++++++++++++++++++++++++++++ ? 2 files changed, 124 insertions(+)
? create mode 100644 include/libnewmsgctl.h
? create mode 100644 libs/libltpnewipc/libnewmsgctl.c

include/libnewmsgctl.h new file +22 -0
new file mode 100644
index 000000000..e48a04277
@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) 2020 FUJITSU LIMITED. All rights reserved.
+ */
+
+#ifndef __LIBNEWMSGCTL_H__
+#define __LIBNEWMSGCTL_H__
+
+struct mbuffer {
+??? long type;
+??? struct {
+??????? char len;
+??????? char pbytes[99];
+??? } data;
+};
+
+void doreader(long key, int tid, long type, int child, int nreps);
+void dowriter(long key, int tid, long type, int child, int nreps);
+void fill_buffer(char *buf, char val, int size);
+int verify(char *buf, char val, int size, int child);
+
+#endif /*__LIBNEWMSGCTL_H__ */
libs/libltpnewipc/libnewmsgctl.c new file +29 -0
new file mode 100644
index 000000000..1f6eed74a
@@ -0,0 +1,102 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) 2020 FUJITSU LIMITED. All rights reserved.
+ */
+
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/ipc.h>
+#include <sys/msg.h>
+
+#define TST_NO_DEFAULT_MAIN
+#include "tst_test.h"
+#include "tst_safe_sysv_ipc.h"
+#include "libnewmsgctl.h"
+
+void doreader(long key, int tid, long type, int child, int nreps)
+{
+??? int i, size;
+??? int id;
+??? struct mbuffer buffer;
+
+??? id = SAFE_MSGGET(key, 0);
+??? if (id != tid) {
+??????? tst_res(TFAIL,
+??????????? "Message queue mismatch in the reader of child group %d 

for message queue id %d\n",
+??????????? child, id);
+??????? return;
+??? }
+??? for (i = 0; i < nreps; i++) {
+??????? memset(&buffer, 0, sizeof(buffer));
+
+??????? size = SAFE_MSGRCV(id, &buffer, 100, type, 0); +??????? if (buffer.type != type) {
+??????????? tst_res(TFAIL, "Type mismatch in child %d, read #%d, for message got %ld, exected %ld",
+??????????????? child, (i + 1), buffer.type, type); +??????????? return;
+??????? }
+??????? if (buffer.data.len + 1 != size) {
+??????????? tst_res(TFAIL, "Size mismatch in child %d, read #%d, for message got %d, expected %d",
+??????????????? child, (i + 1), buffer.data.len + 1, size); +??????????? return;
+??????? }
+??????? if (verify(buffer.data.pbytes, (key % 255), size - 1, child)) { +??????????? tst_res(TFAIL, "Verify failed in child %d read # = %d, key = %lx\n",
+??????????????? child, (i + 1), key);
+??????????? return;
+??????? }
+??????? key++;
+??? }

libs/libltpnewipc/libnewmsgctl.c new file +11 -0
+}
+
+void dowriter(long key, int tid, long type, int child, int nreps)
+{
+??? int i, size;
+??? int id;
+??? struct mbuffer buffer;
+
+??? id = SAFE_MSGGET(key, 0);
+??? if (id != tid) {
+??????? tst_res(TFAIL, "Message queue mismatch in the reader of child 

group %d for message queue id %d\n",
+??????????? child, id);
+??????? return;
+??? }

libs/libltpnewipc/libnewmsgctl.c new file +29 -0
+
+??? for (i = 0; i < nreps; i++) {
+??????? memset(&buffer, 0, sizeof(buffer));
+
+??????? do {
+??????????? size = (lrand48() % 99);
+??????? } while (size == 0);
+??????? fill_buffer(buffer.data.pbytes, (key % 255), size);
+??????? buffer.data.len = size;
+??????? buffer.type = type;
+??????? SAFE_MSGSND(id, &buffer, size + 1, 0);
+??????? key++;
+??? }
+}
+
+void fill_buffer(char *buf, char val, int size)
+{
+??? int i;
+
+??? for (i = 0; i < size; i++)
+??????? buf[i] = val;
+}
+
+/* Check a buffer for correct values */
+int verify(char *buf, char val, int size, int child)
+{
+??? while (size-- > 0) {
+??????? if (*buf++ != val) {
+??????????? tst_res(TFAIL, "Verify error in child %d, *buf = %x, val 

= %x, size = %d\n",
+??????????????? child, *buf, val, size);
+??????????? return 1;
+??????? }
+??? }
+??? return 0;
+}

#24 lore raw

PATCH v2 1/2 libs/libltpnewipc: Add libnewmsgctl.c

In reply to Yang Xu

Hi!

Quoted 10 lines

Add libnewmsgctl.c into ltp new ipc libs, so the upcoming msgstress cleanup cases can use doreader/dowirter functions such as old libmsgctl.c does.

---
 include/libnewmsgctl.h           |  22 +++++++
 libs/libltpnewipc/libnewmsgctl.c | 102 +++++++++++++++++++++++++++++++
 2 files changed, 124 insertions(+)
 create mode 100644 include/libnewmsgctl.h
 create mode 100644 libs/libltpnewipc/libnewmsgctl.c

As far as I can tell this is only used in msgstress testcases right?

So unless we plan to use it from different tests it does not make much sense to export it to the top level include and libs.

Or alternatively we do have libltpnewipc we can pust put the libnewmsgctl.c to that directory and with that we will have a single System V IPC helper library.

Signature · 2 lines
Cyril Hrubis
[email protected]
#25 lore raw

PATCH v2 1/2 libs/libltpnewipc: Add libnewmsgctl.c

Hi Cyril

Quoted 8 lines

As far as I can tell this is only used in msgstress testcases right?

So unless we plan to use it from different tests it does not make much sense to export it to the top level include and libs.

Or alternatively we do have libltpnewipc we can pust put the libnewmsgctl.c to that directory and with that we will have a single System V IPC helper library.

I think your word means merge libnewmsgctl.c and head file into libnewipc.c. So we only have a single system V ipc lib. I will do it.

Best Regards
Yang Xu