[LTP] [PATCH v2] syscalls/mq_open: fix limits for queues_max

Xiao Yang yangx.jy@cn.fujitsu.com
Thu Feb 16 03:38:50 CET 2017


1) This case fails on RHEL6.8GA and RHEL6.9Beta, because setting
   queues_max to 0 is invalid.  the minimum value of queues_max
   has been limitted to 1 and hasn't been removed on some distributions.

   these limits are added in kernel:
   '93e6f119c0ce8("ipc/mqueue: cleanup definition names and locations")'

   these limits are removed in kernel:
   'a5c5928b759d8("ipc: convert use of typedef ctl_table to struct ctl_table")'

2) This case fails recently because it has been changed in ltp:
   '8e49ed6b0fa28("syscalls/mq_open: fix old tests + convert to use new API")'

We set queues_max to 1 instead of 0, so this case can work on both
older kernels(eg. RHEL6) and newer kernels.

Signed-off-by: Xiao Yang <yangx.jy@cn.fujitsu.com>
---
 testcases/kernel/syscalls/mq_open/mq_open01.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/testcases/kernel/syscalls/mq_open/mq_open01.c b/testcases/kernel/syscalls/mq_open/mq_open01.c
index d6f7196..6324d92 100644
--- a/testcases/kernel/syscalls/mq_open/mq_open01.c
+++ b/testcases/kernel/syscalls/mq_open/mq_open01.c
@@ -28,6 +28,7 @@
 #include "tst_test.h"
 
 #define QUEUE_NAME	"/test_mqueue"
+#define QUEUE_INIT	"/init_mqueue"
 
 static uid_t euid;
 static struct passwd *pw;
@@ -35,6 +36,7 @@ static char *qname;
 static struct rlimit rlim;
 
 static mqd_t fd, fd2;
+static mqd_t fd3 = -1;
 static int max_queues;
 
 struct test_case {
@@ -174,7 +176,7 @@ static void unlink_queue(void)
 static void set_max_queues(void)
 {
 	SAFE_FILE_SCANF(PROC_MAX_QUEUES, "%d", &max_queues);
-	SAFE_FILE_PRINTF(PROC_MAX_QUEUES, "%d", 0);
+	SAFE_FILE_PRINTF(PROC_MAX_QUEUES, "%d", 1);
 
 	SAFE_SETEUID(pw->pw_uid);
 }
@@ -206,6 +208,10 @@ static void setup(void)
 	euid = geteuid();
 	pw = SAFE_GETPWNAM("nobody");
 	SAFE_GETRLIMIT(RLIMIT_NOFILE, &rlim);
+
+	fd3 = mq_open(QUEUE_INIT, O_CREAT | O_EXCL | O_RDWR, S_IRWXU, NULL);
+	if (fd3 == -1)
+		tst_brk(TBROK | TERRNO, "mq_open(%s) failed", QUEUE_INIT);
 }
 
 static void cleanup(void)
@@ -216,6 +222,12 @@ static void cleanup(void)
 	if (fd2 > 0)
 		mq_close(fd2);
 
+	if (fd3 > 0 && mq_close(fd3))
+		tst_res(TWARN | TERRNO, "mq_close(%s) failed", QUEUE_INIT);
+
+	if (mq_unlink(QUEUE_INIT))
+		tst_res(TWARN | TERRNO, "mq_unlink(%s) failed", QUEUE_INIT);
+
 	mq_unlink(qname);
 }
 
-- 
1.8.3.1





More information about the ltp mailing list