Skip to contentSkip to conversation

pipe07: close /proc/self/fd after counting fds

PATCH Superseded Edward Liaw via ltp 2 participants 3 messages Sep 30, 2023 – Oct 1, 2023

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 pipe07: close /proc/self/fd after counting fds

Leaving the directory fd open will count against the max number of fds opened, so the final expected count will be off.

Also, removed the halving / doubling of exp_num_pipes since it is redundant.

---
 testcases/kernel/syscalls/pipe/pipe07.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
testcases/kernel/syscalls/pipe/pipe07.c +5 -3
index 196485684..01f6b78f8 100644
@@ -45,6 +45,8 @@ static int record_open_fds(void)
 		opened_fds[num_opened_fds++] = fd;
 	}
 
+	SAFE_CLOSEDIR(dir);
+
 	return num_opened_fds;
 }
 
@@ -56,8 +58,8 @@ static void setup(void)
 	tst_res(TINFO, "getdtablesize() = %d", max_fds);
 	pipe_fds = SAFE_MALLOC(max_fds * sizeof(int));
 
-	exp_num_pipes = (max_fds - record_open_fds()) / 2;
-	tst_res(TINFO, "expected max fds to be opened by pipe(): %d", exp_num_pipes * 2);
+	exp_num_pipes = max_fds - record_open_fds();
+	tst_res(TINFO, "expected max fds to be opened by pipe(): %d", exp_num_pipes);
 }
 
 static void run(void)
@@ -73,7 +75,7 @@ static void run(void)
 	} while (!TST_RET);
 
 	TST_EXP_EQ_LI(errno, EMFILE);
-	TST_EXP_EQ_LI(exp_num_pipes * 2, num_pipe_fds);
+	TST_EXP_EQ_LI(exp_num_pipes, num_pipe_fds);
 
 	for (int i = 0; i < num_pipe_fds; i++)
 		SAFE_CLOSE(pipe_fds[i]);
Signature · 5 lines
2.42.0.582.g8ccd20d70d-goog


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

Hi Edward,

Quoted 16 lines

Leaving the directory fd open will count against the max number of fds opened, so the final expected count will be off.

Also, removed the halving / doubling of exp_num_pipes since it is redundant.

---
 testcases/kernel/syscalls/pipe/pipe07.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
testcases/kernel/syscalls/pipe/pipe07.c +0 -0
index 196485684..01f6b78f8 100644

testcases/kernel/syscalls/pipe/pipe07.c static int record_open_fds(void) · line 48

Quoted 4 lines
testcases/kernel/syscalls/pipe/pipe07.c +1 -0
@@ -45,6 +45,8 @@ static int record_open_fds(void)
 		opened_fds[num_opened_fds++] = fd;
 	}
 
+	SAFE_CLOSEDIR(dir);

IMHO this changes counting from 1020:

pipe07.c:56: TINFO: getdtablesize() = 1024
pipe07.c:60: TINFO: expected max fds to be opened by pipe(): 1020 pipe07.c:75: TPASS: errno == EMFILE (24)
pipe07.c:76: TPASS: exp_num_pipes * 2 == num_pipe_fds (1020)

to 1021, which leads to failure:

pipe07.c:58: TINFO: getdtablesize() = 1024
pipe07.c:62: TINFO: expected max fds to be opened by pipe(): 1021 pipe07.c:77: TPASS: errno == EMFILE (24)
pipe07.c:78: TFAIL: exp_num_pipes (1021) != num_pipe_fds (1020)

testcases/kernel/syscalls/pipe/pipe07.c static int record_open_fds(void) · line 50

Quoted 2 lines
testcases/kernel/syscalls/pipe/pipe07.c +1 -0
+
 	return num_opened_fds;

This is not elegant, but get's the correct count. Will it fail on AOSP?

return num_opened_fds + 1;

testcases/kernel/syscalls/pipe/pipe07.c static void setup(void) · line 62

Quoted 10 lines
testcases/kernel/syscalls/pipe/pipe07.c +2 -2
 }
 
@@ -56,8 +58,8 @@ static void setup(void)
 	tst_res(TINFO, "getdtablesize() = %d", max_fds);
 	pipe_fds = SAFE_MALLOC(max_fds * sizeof(int));
 
-	exp_num_pipes = (max_fds - record_open_fds()) / 2;
-	tst_res(TINFO, "expected max fds to be opened by pipe(): %d", exp_num_pipes * 2);
+	exp_num_pipes = max_fds - record_open_fds();
+	tst_res(TINFO, "expected max fds to be opened by pipe(): %d", exp_num_pipes);

It'd be slightly more readable if this was in separate patch (as it modifies the same variable), but it's up to you.

Kind regards,
Petr

Quoted 12 lines
testcases/kernel/syscalls/pipe/pipe07.c +1 -1
 }
 
 static void run(void)
@@ -73,7 +75,7 @@ static void run(void)
 	} while (!TST_RET);
 
 	TST_EXP_EQ_LI(errno, EMFILE);
-	TST_EXP_EQ_LI(exp_num_pipes * 2, num_pipe_fds);
+	TST_EXP_EQ_LI(exp_num_pipes, num_pipe_fds);
 
 	for (int i = 0; i < num_pipe_fds; i++)
 		SAFE_CLOSE(pipe_fds[i]);
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
#2 lore raw
Quoted 38 lines · Petr Vorel

Hi Edward,

Quoted 7 lines

Leaving the directory fd open will count against the max number of fds opened, so the final expected count will be off.

Also, removed the halving / doubling of exp_num_pipes since it is redundant.

Review

Quoted 6 lines
---
 testcases/kernel/syscalls/pipe/pipe07.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
(quoted diff) +0 -0

b/testcases/kernel/syscalls/pipe/pipe07.c

testcases/kernel/syscalls/pipe/pipe07.c static int record_open_fds(void) · line 48

Quoted 8 lines

index 196485684..01f6b78f8 100644

testcases/kernel/syscalls/pipe/pipe07.c +1 -0
@@ -45,6 +45,8 @@ static int record_open_fds(void)
              opened_fds[num_opened_fds++] = fd;
      }
 
+     SAFE_CLOSEDIR(dir);

IMHO this changes counting from 1020:

pipe07.c:56: TINFO: getdtablesize() = 1024
pipe07.c:60: TINFO: expected max fds to be opened by pipe(): 1020 pipe07.c:75: TPASS: errno == EMFILE (24)
pipe07.c:76: TPASS: exp_num_pipes * 2 == num_pipe_fds (1020)

to 1021, which leads to failure:

pipe07.c:58: TINFO: getdtablesize() = 1024
pipe07.c:62: TINFO: expected max fds to be opened by pipe(): 1021 pipe07.c:77: TPASS: errno == EMFILE (24)
pipe07.c:78: TFAIL: exp_num_pipes (1021) != num_pipe_fds (1020)

Quoted 6 lines

testcases/kernel/syscalls/pipe/pipe07.c static int record_open_fds(void) · line 50

Quoted 2 lines
testcases/kernel/syscalls/pipe/pipe07.c +1 -0
+
      return num_opened_fds;

This is not elegant, but get's the correct count. Will it fail on AOSP?

return num_opened_fds + 1;

I'll get back to you on Monday, but I think this is because each pipe creates two fds, the resulting exp number of pipes will have to be even, and I messed that up by removing the halving/doubling. When I tested it, the exp_num_pipes happened to be even, so I didn't run into the odd case.

Quoted 32 lines

}

testcases/kernel/syscalls/pipe/pipe07.c static void setup(void) · line 60

Quoted 6 lines
testcases/kernel/syscalls/pipe/pipe07.c +0 -2
@@ -56,8 +58,8 @@ static void setup(void)
      tst_res(TINFO, "getdtablesize() = %d", max_fds);
      pipe_fds = SAFE_MALLOC(max_fds * sizeof(int));
 
-     exp_num_pipes = (max_fds - record_open_fds()) / 2;
-     tst_res(TINFO, "expected max fds to be opened by pipe(): %d",

exp_num_pipes * 2);

testcases/kernel/syscalls/pipe/pipe07.c static void setup(void) · line 62

Quoted 2 lines
testcases/kernel/syscalls/pipe/pipe07.c +2 -0
+     exp_num_pipes = max_fds - record_open_fds();
+     tst_res(TINFO, "expected max fds to be opened by pipe(): %d",

exp_num_pipes);

It'd be slightly more readable if this was in separate patch (as it modifies the same variable), but it's up to you.

Kind regards,
Petr

Quoted 12 lines
testcases/kernel/syscalls/pipe/pipe07.c +1 -1
 }
 
 static void run(void)
@@ -73,7 +75,7 @@ static void run(void)
      } while (!TST_RET);
 
      TST_EXP_EQ_LI(errno, EMFILE);
-     TST_EXP_EQ_LI(exp_num_pipes * 2, num_pipe_fds);
+     TST_EXP_EQ_LI(exp_num_pipes, num_pipe_fds);
 
      for (int i = 0; i < num_pipe_fds; i++)
              SAFE_CLOSE(pipe_fds[i]);
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp