Skip to contentSkip to conversation

syscalls/fanotify07: add stop_children() to cleanup()

PATCH zhaogongyi via ltp 1 participant 1 message Nov 22, 2021

lore
Share & tools
lore
#0 lore raw

Hi,

I have resubmit a new version patch as your review, please see https://patchwork.ozlabs.org/project/ltp/patch/[email protected]/

Thanks so much!

Gongyi

Quoted 72 lines

Hi all,

Quoted 7 lines

When we run the testcase simultaneously, and the ulimit of open files is small, the testcase will fail and remain many while(1) tasks in system, it makes the system very stuck.

---
v1->v2: add stop_children() to cleanup(),suggested by Amir and

Matthew.

Quoted 15 lines
 testcases/kernel/syscalls/fanotify/fanotify07.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
testcases/kernel/syscalls/fanotify/fanotify07.c +2 -1
index cc56d9019..40d1b96ce 100644
@@ -86,15 +86,21 @@ static int stop_children(void)
 	int child_ret;
 	int i, ret = 0;
 
-	for (i = 0; i < MAX_CHILDREN; i++)
+	for (i = 0; i < MAX_CHILDREN; i++) {
+		if (!child_pid[i])

testcases/kernel/syscalls/fanotify/fanotify07.c static int stop_children(void) · line 100

Quoted 10 lines
testcases/kernel/syscalls/fanotify/fanotify07.c +4 -0
+			continue;
 		SAFE_KILL(child_pid[i], SIGKILL);
+	}
 
 	for (i = 0; i < MAX_CHILDREN; i++) {
+		if (!child_pid[i])
+			continue;
 		SAFE_WAITPID(child_pid[i], &child_ret, 0);
 		if (!WIFSIGNALED(child_ret))
 			ret = 1;

I slightly prefer instead of using memset code which Amir suggested:

		child_pid[i] = 0;

testcases/kernel/syscalls/fanotify/fanotify07.c static int stop_children(void) · line 101

Quoted 1 line
testcases/kernel/syscalls/fanotify/fanotify07.c +0 -0
 	}

Otherwise LGTM.

NOTE: patch was corrupted, please take care next time (error: corrupt patch at line 131)
Also

Kind regards,
Petr

Quoted 20 lines
testcases/kernel/syscalls/fanotify/fanotify07.c +3 -0
+	memset(child_pid, 0, sizeof(pid_t) * MAX_CHILDREN);
 	return ret;
 }
 
@@ -190,6 +196,8 @@ static void setup(void)
 
 static void cleanup(void)
 {
+	stop_children();
+
 	if (fd_notify > 0)
 		SAFE_CLOSE(fd_notify);
 }
@@ -201,6 +209,7 @@ static struct tst_test test = {
 	.needs_tmpdir = 1,
 	.forks_child = 1,
 	.needs_root = 1,
 };
 
 #else
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp