Skip to contentSkip to conversation

lib: Add timeout to TST_PROCESS_STATE_WAIT

PATCH Superseded Jorik Cronenberg 4 participants 7 messages Jan 22, 2020 – Jan 23, 2020 Library code

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 lib: Add timeout to TST_PROCESS_STATE_WAIT

Add the possibility to add a timeout to TST_PROCESS_STATE_WAIT. Like checkpoints add TST_PROCESS_STATE_WAIT2()
for specifying a timeout. The original TST_PROCESS_STATE_WAIT() works the same as before. Timeout can be specified in milliseconds.

---
 include/tst_process_state.h | 12 ++++++++----
 lib/tst_process_state.c     | 19 ++++++++++++++-----
 2 files changed, 22 insertions(+), 9 deletions(-)
include/tst_process_state.h +8 -4
index fab0491d9..27a8ffc36 100644
@@ -47,9 +47,13 @@
  */
 #ifdef TST_TEST_H__
 
+#define TST_PROCESS_STATE_WAIT2(pid, state, msec_timeout) \
+	tst_process_state_wait(__FILE__, __LINE__, NULL, \
+	                       (pid), (state), msec_timeout)
+
 #define TST_PROCESS_STATE_WAIT(pid, state) \
 	tst_process_state_wait(__FILE__, __LINE__, NULL, \
-	                       (pid), (state))
+	                       (pid), (state), 0)
 #else
 /*
  * The same as above but does not use tst_brkm() interface.
@@ -65,8 +69,8 @@ int tst_process_state_wait2(pid_t pid, const char state);
 	                        (pid), (state))
 #endif
 
-void tst_process_state_wait(const char *file, const int lineno,
-                            void (*cleanup_fn)(void),
-                            pid_t pid, const char state);
+int tst_process_state_wait(const char *file, const int lineno,
+                            void (*cleanup_fn)(void), pid_t pid,
+			    const char state, unsigned int msec_timeout);
 
 #endif /* TST_PROCESS_STATE__ */
lib/tst_process_state.c +14 -5
index 7a7824959..32b44992c 100644
@@ -28,11 +28,12 @@
 #include "test.h"
 #include "tst_process_state.h"
 
-void tst_process_state_wait(const char *file, const int lineno,
-                            void (*cleanup_fn)(void),
-                            pid_t pid, const char state)
+int tst_process_state_wait(const char *file, const int lineno,
+                            void (*cleanup_fn)(void), pid_t pid,
+			    const char state, unsigned int msec_timeout)
 {
 	char proc_path[128], cur_state;
+	unsigned int msecs = 0;
 
 	snprintf(proc_path, sizeof(proc_path), "/proc/%i/stat", pid);
 
@@ -41,10 +42,18 @@ void tst_process_state_wait(const char *file, const int lineno,
 		                "%*i %*s %c", &cur_state);
 
 		if (state == cur_state)
-			return;
+			break;
 
-		usleep(10000);
+		usleep(1000);
+		msecs += 1;
+
+		if (msecs >= msec_timeout) {
+			errno = ETIMEDOUT;
+			return -1;
+		}
 	}
+
+	return 0;
 }
 
 int tst_process_state_wait2(pid_t pid, const char state)
Signature · 1 line
2.24.1
#1 lore raw

PATCH 2/2 syscalls/vmsplice: Add NONBLOCK testcase

Add a testcase for vmsplice() with the flag SPLICE_F_NONBLOCK. And also test that vmsplice() blocks when writing to a full pipe without the flag specified.

---
 testcases/kernel/syscalls/vmsplice/.gitignore |  1 +
 .../kernel/syscalls/vmsplice/vmsplice04.c     | 87 +++++++++++++++++++
 2 files changed, 88 insertions(+)
 create mode 100644 testcases/kernel/syscalls/vmsplice/vmsplice04.c
testcases/kernel/syscalls/vmsplice/.gitignore +1 -0
index 03922073c..042c32585 100644
@@ -1,3 +1,4 @@
 /vmsplice01
 /vmsplice02
 /vmsplice03
+/vmsplice04
testcases/kernel/syscalls/vmsplice/vmsplice04.c new file +87 -0

87 lines not on this page · raw message

Signature · 1 line
2.24.1
#2 lore raw

PATCH 2/2 syscalls/vmsplice: Add NONBLOCK testcase

Hi

Quoted 10 lines

Add a testcase for vmsplice() with the flag SPLICE_F_NONBLOCK. And also test that vmsplice() blocks when writing to a full pipe without the flag specified.

---
  testcases/kernel/syscalls/vmsplice/.gitignore |  1 +
  .../kernel/syscalls/vmsplice/vmsplice04.c     | 87 +++++++++++++++++++
  2 files changed, 88 insertions(+)

create mode 100644 testcases/kernel/syscalls/vmsplice/vmsplice04.c

add vmsplice04 into runtest/syscalls

Quoted 21 lines
testcases/kernel/syscalls/vmsplice/.gitignore +1 -0
index 03922073c..042c32585 100644
@@ -1,3 +1,4 @@
  /vmsplice01
  /vmsplice02
  /vmsplice03
+/vmsplice04
testcases/kernel/syscalls/vmsplice/vmsplice04.c new file +5 -0
new file mode 100644
index 000000000..c49657d84
@@ -0,0 +1,87 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) 2019 SUSE LLC
+ * Author: Jorik Cronenberg <[email protected]>
+ *

testcases/kernel/syscalls/vmsplice/vmsplice04.c line 15

Quoted 10 lines
testcases/kernel/syscalls/vmsplice/vmsplice04.c new file +10 -0
+ * Test vmsplice() to a full pipe with SPLICE_F_NONBLOCK and without
+ * With SPLICE_F_NONBLOCK vmsplice() should return with errno EAGAIN
+ * Without SPLICE_F_NONBLOCK it should block
+ */
+
+#define _GNU_SOURCE
+
+#include "tst_test.h"
+#include "lapi/vmsplice.h"
+#include <stdlib.h>

miss "lapi/fcntl.h". it will compile failed because of undefined F_GETPIPE_SZ error on centos6 like my pipe12.c(v1)

https://travis-ci.org/xuyang0410/ltp/jobs/629597516?utm_medium=notification&utm_source=github_status

Quoted 14 lines
testcases/kernel/syscalls/vmsplice/vmsplice04.c new file +14 -0
+
+
+static int pipes[2];
+static ssize_t pipe_max_size;
+static char *write_buffer;
+
+static void vmsplice_test(void)
+{
+	int status;
+	struct iovec iov;
+	int pid;
+
+	iov.iov_base = write_buffer;
+	iov.iov_len = pipe_max_size;

testcases/kernel/syscalls/vmsplice/vmsplice04.c line 39

Quoted 10 lines
testcases/kernel/syscalls/vmsplice/vmsplice04.c new file +10 -0
+
+
+	TEST(vmsplice(pipes[1], &iov, 1, 0));
+	if (TST_RET < 0)
+		tst_brk(TBROK | TTERRNO,
+		    "Initial vmsplice() to fill pipe failed");
+
+	TEST(vmsplice(pipes[1], &iov, 1, SPLICE_F_NONBLOCK));
+	if (TST_RET < 0 && TST_ERR == EAGAIN)
+		tst_res(TPASS | TTERRNO, "vmsplice failed as expected");

I think we should add more info. such as "vmsplice failed EAGAIN to full pipe with SPLICE_F_NONBLOCK mode"

testcases/kernel/syscalls/vmsplice/vmsplice04.c line 42

Quoted 3 lines
testcases/kernel/syscalls/vmsplice/vmsplice04.c new file +3 -0
+	else if (TST_RET < 0)
+		tst_res(TFAIL | TTERRNO,
+		    "vmsplice failed with unexpected errno");

here as well

testcases/kernel/syscalls/vmsplice/vmsplice04.c line 44

Quoted 2 lines
testcases/kernel/syscalls/vmsplice/vmsplice04.c new file +2 -0
+	else
+		tst_res(TFAIL, "vmsplice wrote to a full pipe");

here as well

Quoted 4 lines
testcases/kernel/syscalls/vmsplice/vmsplice04.c new file +4 -0
+
+	pid = SAFE_FORK();
+	if (!pid) {
+		TEST(vmsplice(pipes[1], &iov, 1, 0));

testcases/kernel/syscalls/vmsplice/vmsplice04.c line 58

Quoted 10 lines
testcases/kernel/syscalls/vmsplice/vmsplice04.c new file +10 -0
+		if (TST_RET < 0)
+			tst_res(TFAIL | TTERRNO, "vmsplice() failed");
+		else
+			tst_res(TFAIL, "vmsplice() wrote to a full pipe");
+		exit(0);
+	} else {
+		if (TST_PROCESS_STATE_WAIT2(pid, 'S', 1000) < 0)
+			return;
+		else
+			tst_res(TPASS, "vmsplice() blocked");

here as well (without SPLICE_F_NONBLOCK mode)

Quoted 10 lines
testcases/kernel/syscalls/vmsplice/vmsplice04.c new file +10 -0
+		SAFE_KILL(pid, SIGKILL);
+		SAFE_WAIT(&status);
+	}
+
+}
+static void cleanup(void)
+{
+	if (pipes[1] > 0)
+		SAFE_CLOSE(pipes[1]);
+	if (pipes[0] > 0)

testcases/kernel/syscalls/vmsplice/vmsplice04.c line 78

Quoted 10 lines
testcases/kernel/syscalls/vmsplice/vmsplice04.c new file +10 -0
+		SAFE_CLOSE(pipes[0]);
+	if (write_buffer)
+		free(write_buffer);
+}
+static void setup(void)
+{
+	SAFE_PIPE(pipes);
+
+	pipe_max_size = SAFE_FCNTL(pipes[1], F_GETPIPE_SZ);
+	write_buffer = SAFE_MALLOC(pipe_max_size);

Can we use guarded buffer for iov in setup?
https://github.com/linux-test-project/ltp/wiki/Test-Writing-Guidelines#2231-guarded-buffers

other than, this patch looks good to me.

Quoted 10 lines
testcases/kernel/syscalls/vmsplice/vmsplice04.c new file +9 -0
+}
+
+static struct tst_test test = {
+	.setup = setup,
+	.cleanup = cleanup,
+	.test_all = vmsplice_test,
+	.min_kver = "2.6.17",
+	.forks_child = 1,
+};
#3 lore raw

PATCH 1/2 lib: Add timeout to TST_PROCESS_STATE_WAIT

In reply to Jorik Cronenberg
Quoted 6 lines

Add the possibility to add a timeout to TST_PROCESS_STATE_WAIT. Like checkpoints add TST_PROCESS_STATE_WAIT2()
for specifying a timeout. The original TST_PROCESS_STATE_WAIT() works the same as before. Timeout can be specified in milliseconds.

Hi Jorik

We have tst_process_state_wait2 since commit dbf270c5 ("lib: Add tst_process_state_wait2()"), this api has same functions as tst_process_state_wait but only return error instead of TBROK.

I think using TST_PROCESS_STATE_WAIT2 is confused and we can only expand tst_process_state_wait make it support sleep specifying in milliseconds.

Best Regards
Yang Xu

Quoted 79 lines
---
  include/tst_process_state.h | 12 ++++++++----
  lib/tst_process_state.c     | 19 ++++++++++++++-----
  2 files changed, 22 insertions(+), 9 deletions(-)
include/tst_process_state.h +8 -4
index fab0491d9..27a8ffc36 100644
@@ -47,9 +47,13 @@
   */
  #ifdef TST_TEST_H__
 
+#define TST_PROCESS_STATE_WAIT2(pid, state, msec_timeout) \
+	tst_process_state_wait(__FILE__, __LINE__, NULL, \
+	                       (pid), (state), msec_timeout)
+
  #define TST_PROCESS_STATE_WAIT(pid, state) \
  	tst_process_state_wait(__FILE__, __LINE__, NULL, \
-	                       (pid), (state))
+	                       (pid), (state), 0)
  #else
  /*
   * The same as above but does not use tst_brkm() interface.
@@ -65,8 +69,8 @@ int tst_process_state_wait2(pid_t pid, const char state);
  	                        (pid), (state))
  #endif
 
-void tst_process_state_wait(const char *file, const int lineno,
-                            void (*cleanup_fn)(void),
-                            pid_t pid, const char state);
+int tst_process_state_wait(const char *file, const int lineno,
+                            void (*cleanup_fn)(void), pid_t pid,
+			    const char state, unsigned int msec_timeout);
 
  #endif /* TST_PROCESS_STATE__ */
lib/tst_process_state.c +14 -5
index 7a7824959..32b44992c 100644
@@ -28,11 +28,12 @@
  #include "test.h"
  #include "tst_process_state.h"
 
-void tst_process_state_wait(const char *file, const int lineno,
-                            void (*cleanup_fn)(void),
-                            pid_t pid, const char state)
+int tst_process_state_wait(const char *file, const int lineno,
+                            void (*cleanup_fn)(void), pid_t pid,
+			    const char state, unsigned int msec_timeout)
  {
  	char proc_path[128], cur_state;
+	unsigned int msecs = 0;
 
  	snprintf(proc_path, sizeof(proc_path), "/proc/%i/stat", pid);
 
@@ -41,10 +42,18 @@ void tst_process_state_wait(const char *file, const int lineno,
  		                "%*i %*s %c", &cur_state);
 
  		if (state == cur_state)
-			return;
+			break;
 
-		usleep(10000);
+		usleep(1000);
+		msecs += 1;
+
+		if (msecs >= msec_timeout) {
+			errno = ETIMEDOUT;
+			return -1;
+		}
  	}
+
+	return 0;
  }
 
  int tst_process_state_wait2(pid_t pid, const char state)
#4 lore raw

PATCH 1/2 lib: Add timeout to TST_PROCESS_STATE_WAIT

Hi Yang, thanks for the review!

Quoted 12 lines
Quoted 6 lines

Add the possibility to add a timeout to TST_PROCESS_STATE_WAIT. Like checkpoints add TST_PROCESS_STATE_WAIT2()
for specifying a timeout. The original TST_PROCESS_STATE_WAIT() works the same as before. Timeout can be specified in milliseconds.

Hi Jorik

We have tst_process_state_wait2 since commit dbf270c5 ("lib: Add tst_process_state_wait2()"), this api has same functions as tst_process_state_wait but only return error instead of TBROK.

Quoted 5 lines

I think using TST_PROCESS_STATE_WAIT2 is confused and we can only expand tst_process_state_wait make it support sleep specifying in milliseconds.

Best Regards
Yang Xu

I don't think I quite understand what you mean. I can see that using TST_PROCESS_STATE_WAIT2 is confusing. But I didn't want to touch the existing TST_PROCESS_STATE_WAIT to ensure all older tests still run the same. Are you saying i should go through all tests that use TST_PROCESS_STATE_WAIT and specify that they use a timeout of 0(which according to a git grep doesn't seem too many, so it wouldn't be too much effort) and then change TST_PROCESS_STATE_WAIT to include a timeout or should I just rename TST_PROCESS_STATE_WAIT2 to something that seperates it more from tst_process_state_wait2?

regards,
Jorik Cronenberg

Quoted 74 lines
Quoted 72 lines

---
? include/tst_process_state.h | 12 ++++++++---- ? lib/tst_process_state.c???? | 19 ++++++++++++++----- ? 2 files changed, 22 insertions(+), 9 deletions(-)

include/tst_process_state.h +0 -0
index fab0491d9..27a8ffc36 100644
@@ -47,9 +47,13 @@

?? */
? #ifdef TST_TEST_H__
? +#define TST_PROCESS_STATE_WAIT2(pid, state, msec_timeout) \
+??? tst_process_state_wait(__FILE__, __LINE__, NULL, \
+?????????????????????????? (pid), (state), msec_timeout) +
? #define TST_PROCESS_STATE_WAIT(pid, state) \
????? tst_process_state_wait(__FILE__, __LINE__, NULL, \
-?????????????????????????? (pid), (state)) +?????????????????????????? (pid), (state), 0)
? #else
? /*
?? * The same as above but does not use tst_brkm() interface.

include/tst_process_state.h +0 -0
@@ -65,8 +69,8 @@ int tst_process_state_wait2(pid_t pid, const char
 state);
 ????????????????????????????? (pid), (state))

? #endif
? -void tst_process_state_wait(const char *file, const int lineno, -??????????????????????????? void (*cleanup_fn)(void), -??????????????????????????? pid_t pid, const char state); +int tst_process_state_wait(const char *file, const int lineno, +??????????????????????????? void (*cleanup_fn)(void), pid_t pid, +??????????????? const char state, unsigned int msec_timeout); ? ? #endif /* TST_PROCESS_STATE__ */

lib/tst_process_state.c +0 -0
index 7a7824959..32b44992c 100644
@@ -28,11 +28,12 @@

? #include "test.h"
? #include "tst_process_state.h"
? -void tst_process_state_wait(const char *file, const int lineno, -??????????????????????????? void (*cleanup_fn)(void), -??????????????????????????? pid_t pid, const char state) +int tst_process_state_wait(const char *file, const int lineno, +??????????????????????????? void (*cleanup_fn)(void), pid_t pid, +??????????????? const char state, unsigned int msec_timeout) ? {
????? char proc_path[128], cur_state;
+??? unsigned int msecs = 0;
? ????? snprintf(proc_path, sizeof(proc_path), "/proc/%i/stat", pid); ? @@ -41,10 +42,18 @@ void tst_process_state_wait(const char *file, const int lineno,
????????????????????????? "%*i %*s %c", &cur_state);
? ????????? if (state == cur_state)
-??????????? return;
+??????????? break;
? -??????? usleep(10000);
+??????? usleep(1000);
+??????? msecs += 1;
+
+??????? if (msecs >= msec_timeout) {
+??????????? errno = ETIMEDOUT;
+??????????? return -1;
+??????? }
????? }
+
+??? return 0;
? }
? ? int tst_process_state_wait2(pid_t pid, const char state)

#5 lore raw

PATCH 1/2 lib: Add timeout to TST_PROCESS_STATE_WAIT

Hi Jorik

Quoted 20 lines

Hi Yang, thanks for the review!

Quoted 12 lines
Quoted 6 lines

Add the possibility to add a timeout to TST_PROCESS_STATE_WAIT. Like checkpoints add TST_PROCESS_STATE_WAIT2()
for specifying a timeout. The original TST_PROCESS_STATE_WAIT() works the same as before. Timeout can be specified in milliseconds.

Hi Jorik

We have tst_process_state_wait2 since commit dbf270c5 ("lib: Add tst_process_state_wait2()"), this api has same functions as tst_process_state_wait but only return error instead of TBROK.

Quoted 5 lines

I think using TST_PROCESS_STATE_WAIT2 is confused and we can only expand tst_process_state_wait make it support sleep specifying in milliseconds.

Best Regards
Yang Xu

Quoted 7 lines

I don't think I quite understand what you mean. I can see that using TST_PROCESS_STATE_WAIT2 is confusing. But I didn't want to touch the existing TST_PROCESS_STATE_WAIT to ensure all older tests still run the same. Are you saying i should go through all tests that use TST_PROCESS_STATE_WAIT and specify that they use a timeout of 0(which according to a git grep doesn't seem too many, so it wouldn't be too much effort) and then change TST_PROCESS_STATE_WAIT to include a timeout

Yes.

Quoted 2 lines

or should I just rename TST_PROCESS_STATE_WAIT2 to something that seperates it more from tst_process_state_wait2?

Also, I am fine with the second way. Let we listen cyril's advise. @Cyril What do you think about it?

Quoted 78 lines

regards,
Jorik Cronenberg

Quoted 74 lines
Quoted 72 lines
---
 ? include/tst_process_state.h | 12 ++++++++----
 ? lib/tst_process_state.c???? | 19 ++++++++++++++-----

? 2 files changed, 22 insertions(+), 9 deletions(-)

include/tst_process_state.h +7 -3
index fab0491d9..27a8ffc36 100644
@@ -47,9 +47,13 @@
 ?? */
 ? #ifdef TST_TEST_H__
 ? +#define TST_PROCESS_STATE_WAIT2(pid, state, msec_timeout) \
+??? tst_process_state_wait(__FILE__, __LINE__, NULL, \
+?????????????????????????? (pid), (state), msec_timeout)
+
 ? #define TST_PROCESS_STATE_WAIT(pid, state) \
 ????? tst_process_state_wait(__FILE__, __LINE__, NULL, \
-?????????????????????????? (pid), (state))
+?????????????????????????? (pid), (state), 0)
 ? #else
 ? /*
 ?? * The same as above but does not use tst_brkm() interface.
@@ -65,8 +69,8 @@ int tst_process_state_wait2(pid_t pid, const char
 state);
 ????????????????????????????? (pid), (state))
 ? #endif
 ? -void tst_process_state_wait(const char *file, const int lineno,
-??????????????????????????? void (*cleanup_fn)(void),
-??????????????????????????? pid_t pid, const char state);
+int tst_process_state_wait(const char *file, const int lineno,
+??????????????????????????? void (*cleanup_fn)(void), pid_t pid,
+??????????????? const char state, unsigned int msec_timeout);
 ? ? #endif /* TST_PROCESS_STATE__ */
lib/tst_process_state.c +14 -3
index 7a7824959..32b44992c 100644
@@ -28,11 +28,12 @@
 ? #include "test.h"
 ? #include "tst_process_state.h"
 ? -void tst_process_state_wait(const char *file, const int lineno,
-??????????????????????????? void (*cleanup_fn)(void),
-??????????????????????????? pid_t pid, const char state)
+int tst_process_state_wait(const char *file, const int lineno,
+??????????????????????????? void (*cleanup_fn)(void), pid_t pid,
+??????????????? const char state, unsigned int msec_timeout)
 ? {
 ????? char proc_path[128], cur_state;
+??? unsigned int msecs = 0;
 ? ????? snprintf(proc_path, sizeof(proc_path), "/proc/%i/stat", pid);
 ? @@ -41,10 +42,18 @@ void tst_process_state_wait(const char *file,
 const int lineno,
 ????????????????????????? "%*i %*s %c", &cur_state);
 ? ????????? if (state == cur_state)
-??????????? return;
+??????????? break;
 ? -??????? usleep(10000);
+??????? usleep(1000);
+??????? msecs += 1;
+
+??????? if (msecs >= msec_timeout) {
+??????????? errno = ETIMEDOUT;
+??????????? return -1;
+??????? }
 ????? }
+
+??? return 0;
 ? }
 ? ? int tst_process_state_wait2(pid_t pid, const char state)
#6 lore raw

PATCH 1/2 lib: Add timeout to TST_PROCESS_STATE_WAIT

Hi!

Quoted 17 lines
Quoted 10 lines
Quoted 9 lines

We have tst_process_state_wait2 since commit dbf270c5 ("lib: Add tst_process_state_wait2()"), this api has same functions as tst_process_state_wait but only return error instead of TBROK.

I think using TST_PROCESS_STATE_WAIT2 is confused and we can only expand tst_process_state_wait make it support sleep specifying in milliseconds.

Best Regards
Yang Xu

Quoted 7 lines

I don't think I quite understand what you mean. I can see that using TST_PROCESS_STATE_WAIT2 is confusing. But I didn't want to touch the existing TST_PROCESS_STATE_WAIT to ensure all older tests still run the same. Are you saying i should go through all tests that use TST_PROCESS_STATE_WAIT and specify that they use a timeout of 0(which according to a git grep doesn't seem too many, so it wouldn't be too much effort) and then change TST_PROCESS_STATE_WAIT to include a timeout

Quoted 5 lines

Yes.

Quoted 2 lines

or should I just rename TST_PROCESS_STATE_WAIT2 to something that seperates it more from tst_process_state_wait2?

Also, I am fine with the second way. Let we listen cyril's advise. @Cyril What do you think about it?

Well that function is only supposed to be used from the old API while the macro is defined for the new API so they are never exported at the same time.

On the other hand we can change these few testcases quite easily, so we may as well do that.

Signature · 2 lines
Cyril Hrubis
[email protected]