Skip to contentSkip to conversation

msgget03: Set custom queue limit

PATCH In review Martin Doucha 3 participants 4 messages Jul 4, 2022 – Oct 10, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 msgget03: Set custom queue limit

The runtime limit patchset has reduced default test timeout to 30 seconds which is not enough for msgget03 on some archs. Set custom queue count limit to make the test faster.

---
 testcases/kernel/syscalls/ipc/msgget/msgget03.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
testcases/kernel/syscalls/ipc/msgget/msgget03.c +7 -2
index 711886e17..2257ae0f9 100644
@@ -41,7 +41,8 @@ static void setup(void)
 	tst_res(TINFO, "Current environment %d message queues are already in use",
 		used_cnt);
 
-	SAFE_FILE_SCANF("/proc/sys/kernel/msgmni", "%i", &maxmsgs);
+	maxmsgs = used_cnt + 32;
+	SAFE_FILE_PRINTF("/proc/sys/kernel/msgmni", "%i", maxmsgs);
 
 	queues = SAFE_MALLOC((maxmsgs - used_cnt) * sizeof(int));
 
@@ -73,5 +74,9 @@ static struct tst_test test = {
 	.needs_tmpdir = 1,
 	.setup = setup,
 	.cleanup = cleanup,
-	.test_all = verify_msgget
+	.test_all = verify_msgget,
+	.save_restore = (const struct tst_path_val[]){
+		{"/proc/sys/kernel/msgmni", NULL},
+		{}
+	}
 };
Signature · 5 lines
2.36.1


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
#1 lore raw

Hi Martin

I don't have objection for this patch.

But I think using system custom max value is more meaningful. How about setting timeout to 5min, I think it is enough.

Also shmget03 uses same logic, so I guess we need to modify it too.

Best Regards
Yang Xu

Quoted 34 lines

The runtime limit patchset has reduced default test timeout to 30 seconds which is not enough for msgget03 on some archs. Set custom queue count limit to make the test faster.

---
  testcases/kernel/syscalls/ipc/msgget/msgget03.c | 9 +++++++--
  1 file changed, 7 insertions(+), 2 deletions(-)
testcases/kernel/syscalls/ipc/msgget/msgget03.c +7 -2
index 711886e17..2257ae0f9 100644
@@ -41,7 +41,8 @@ static void setup(void)
  	tst_res(TINFO, "Current environment %d message queues are already in use",
  		used_cnt);
 
-	SAFE_FILE_SCANF("/proc/sys/kernel/msgmni", "%i",&maxmsgs);
+	maxmsgs = used_cnt + 32;
+	SAFE_FILE_PRINTF("/proc/sys/kernel/msgmni", "%i", maxmsgs);
 
  	queues = SAFE_MALLOC((maxmsgs - used_cnt) * sizeof(int));
 
@@ -73,5 +74,9 @@ static struct tst_test test = {
  	.needs_tmpdir = 1,
  	.setup = setup,
  	.cleanup = cleanup,
-	.test_all = verify_msgget
+	.test_all = verify_msgget,
+	.save_restore = (const struct tst_path_val[]){
+		{"/proc/sys/kernel/msgmni", NULL},
+		{}
+	}
  };
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
#2 lore raw
Quoted 6 lines · On 06. 07. 22 11:14, [email protected] wrote:

Hi Martin

I don't have objection for this patch.

But I think using system custom max value is more meaningful. How about setting timeout to 5min, I think it is enough.

The system max value is an arbitrary number that can be increased up to complete memory exhaustion. There's not much difference between checking the ENOSPC error quickly with low custom limit and running the test for 2 minutes with the default limit.

Quoted 1 line

Also shmget03 uses same logic, so I guess we need to modify it too.

shmget03 is significantly faster on all archs, there's no risk of timeout at the moment.

Signature · 11 lines
Martin Doucha   [email protected]
QA Engineer for Software Maintenance
SUSE LINUX, s.r.o.
CORSO IIa
Krizikova 148/34
186 00 Prague 8
Czech Republic


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
#3 lore raw
In reply to Martin Doucha

Hello,

Merged!

Quoted 36 lines · Martin Doucha

The runtime limit patchset has reduced default test timeout to 30 seconds which is not enough for msgget03 on some archs. Set custom queue count limit to make the test faster.

---
 testcases/kernel/syscalls/ipc/msgget/msgget03.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
testcases/kernel/syscalls/ipc/msgget/msgget03.c +7 -2
index 711886e17..2257ae0f9 100644
@@ -41,7 +41,8 @@ static void setup(void)
 	tst_res(TINFO, "Current environment %d message queues are already in use",
 		used_cnt);
 
-	SAFE_FILE_SCANF("/proc/sys/kernel/msgmni", "%i", &maxmsgs);
+	maxmsgs = used_cnt + 32;
+	SAFE_FILE_PRINTF("/proc/sys/kernel/msgmni", "%i", maxmsgs);
 
 	queues = SAFE_MALLOC((maxmsgs - used_cnt) * sizeof(int));
 
@@ -73,5 +74,9 @@ static struct tst_test test = {
 	.needs_tmpdir = 1,
 	.setup = setup,
 	.cleanup = cleanup,
-	.test_all = verify_msgget
+	.test_all = verify_msgget,
+	.save_restore = (const struct tst_path_val[]){
+		{"/proc/sys/kernel/msgmni", NULL},
+		{}
+	}
 };
Signature · 1 line
2.36.1
Signature · 5 lines
Thank you,
Richard.

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp