msgctl11: process message queues by portions
/proc/sys/kernel/msgmni value scales with the amount of the host memory.
On systems with several tens gigabytes of ram this value is rather big (and
even may reach its limit - IPCMI (32768), defined in include/linux/ipc.h) and
therefore the test case fails with "Not enough free pids" error.
Now we process all avaliable message queues by portions (with the size based
on the amount of free pids).
Signed-off-by: Stanislav Kholmanskikh <stanislav.kholmanskikh@oracle.com>
diff --git a/testcases/kernel/syscalls/ipc/msgctl/msgctl11.c b/testcases/kernel/syscalls/ipc/msgctl/msgctl11.c
index 63ff88f..2be34b8 100644
--- a/testcases/kernel/syscalls/ipc/msgctl/msgctl11.c
+++ b/testcases/kernel/syscalls/ipc/msgctl/msgctl11.c
@@ -52,6 +52,7 @@
#define MAXNPROCS 100000 /* Coldfire can't deal with 1000000 */
#endif
#define MAXNKIDS 10
+#define DEFNKIDS 2
static int maxnkids = MAXNKIDS; /* Used if pid_max is exceeded */
static key_t keyarray[MAXNPROCS];
@@ -60,6 +61,7 @@
static int wkidarray[MAXNKIDS];
static int tid;
static int nprocs, nreps, nkids, MSGMNI;
+static int maxnprocs;
static int procstat;
void setup(void);
@@ -67,6 +69,7 @@
static void term(int);
static int dotest(key_t, int);
+static void dotest_iteration(int off);
static void cleanup_msgqueue(int i, int tid);
#ifdef UCLINUX
@@ -84,8 +87,7 @@
int main(int argc, char **argv)
{
- int i, j, ok, pid;
- int count, status;
+ int i, j, ok;
#ifdef UCLINUX
char *msg;
@@ -109,27 +111,25 @@
if (argc == 1) {
/* Set default parameters */
nreps = MAXNREPS;
- nprocs = MSGMNI;
- nkids = maxnkids;
+ nkids = DEFNKIDS;
} else if (argc == 4) {
if (atoi(argv[1]) > MAXNREPS) {
- tst_resm(TCONF,
+ tst_resm(TINFO,
"Requested number of iterations too large, setting to Max. of %d",
MAXNREPS);
nreps = MAXNREPS;
} else {
nreps = atoi(argv[1]);
}
- if (atoi(argv[2]) > MSGMNI) {
- tst_resm(TCONF,
+ if (atoi(argv[2]) > maxnprocs) {
+ tst_resm(TINFO,
"Requested number of processes too large, setting to Max. of %d",
- MSGMNI);
- nprocs = MSGMNI;
+ maxnprocs);
} else {
- nprocs = atoi(argv[2]);
+ maxnprocs = atoi(argv[2]);
}
if (atoi(argv[3]) > maxnkids) {
- tst_resm(TCONF,
+ tst_resm(TINFO,
"Requested number of read/write pairs too large; setting to Max. of %d",
maxnkids);
nkids = maxnkids;
@@ -153,7 +153,7 @@
/* Set up array of unique keys for use in allocating message
* queues
*/
- for (i = 0; i < nprocs; i++) {
+ for (i = 0; i < MSGMNI; i++) {
ok = 1;
do {
/* Get random key */
@@ -172,13 +172,45 @@
}
} while (ok == 0);
}
- /* Fork a number of processes (nprocs), each of which will
+ /* Fork a number of processes, each of which will
* create a message queue with several (nkids) reader/writer
* pairs which will read and write a number (iterations)
* of random length messages with specific values (keys).
+ *
+ * We do not fork more than maxnprocs at a time and
+ * we fork until all the message queues get used.
*/
+ if (MSGMNI <= maxnprocs) {
+ nprocs = MSGMNI;
+ dotest_iteration(0);
+ } else {
+ for (i = 0; i < (MSGMNI / maxnprocs); i++) {
+ nprocs = maxnprocs;
+ dotest_iteration(i*(MSGMNI / maxnprocs));
+ }
+
+ nprocs = MSGMNI % maxnprocs;
+ dotest_iteration(i*(MSGMNI / maxnprocs));
+ }
+
+ tst_resm(TPASS, "msgctl11 ran successfully!");
+
+ cleanup();
+ tst_exit();
+}
+
+static void dotest_iteration(int off)
+{
+ key_t key;
+ int i, count, status;
+ pid_t pid;
+
+ memset(pidarray, 0, sizeof(pidarray));
+
for (i = 0; i < nprocs; i++) {
+ key = keyarray[off + i];
+
if ((pid = FORK_OR_VFORK()) < 0)
tst_brkm(TFAIL, cleanup,
"Fork failed (may be OK if under stress)");
@@ -186,13 +218,13 @@
/* Child does this */
if (pid == 0) {
#ifdef UCLINUX
- if (self_exec(argv[0], "ndd", 1, keyarray[i], i) < 0) {
+ if (self_exec(argv0, "ndd", 1, key, i) < 0) {
printf("\tself_exec failed\n");
exit(FAIL);
}
#else
procstat = 1;
- exit(dotest(keyarray[i], i));
+ exit(dotest(key, i));
#endif
}
pidarray[i] = pid;
@@ -219,11 +251,6 @@
tst_brkm(TFAIL, cleanup,
"Wrong number of children exited, Saw %d, Expected %d",
count, nprocs);
-
- tst_resm(TPASS, "msgctl11 ran successfully!");
-
- cleanup();
- tst_exit();
}
#ifdef UCLINUX
@@ -447,6 +474,8 @@
tst_brkm(TBROK, cleanup,
"Max number of message queues already used, cannot create more.");
+ tst_resm(TINFO, "Found %d available message queues", MSGMNI);
+
free_pids = get_free_pids();
if (free_pids < 0) {
tst_brkm(TBROK, cleanup, "Can't obtain free_pid count");
@@ -454,11 +483,12 @@
tst_brkm(TBROK, cleanup, "No free pids");
}
- if ((MSGMNI * MAXNKIDS * 2) > (free_pids / 2)) {
- maxnkids = ((free_pids / 4) / MSGMNI);
- if (!maxnkids)
- tst_brkm(TBROK, cleanup, "Not enough free pids");
- }
+ /* We don't use more than a half of available pids.
+ * For each child we fork up to 2*maxnkids grandchildren. */
+ maxnprocs = (free_pids / 2) / (1 + 2 * maxnkids);
+
+ if (!maxnprocs)
+ tst_brkm(TBROK, cleanup, "Not enough free pids");
tst_resm(TINFO, "Using upto %d pids", free_pids / 2);
}