Migrating the libhugetlbfs/testcases/ptrace-write-hugepage.c
PATCH v2 1/1 Migrating the libhugetlbfs/testcases/ptrace-write-hugepage.c
Changed testcase to use new API
--- runtest/hugetlb | 1 + testcases/kernel/mem/.gitignore | 1 + .../kernel/mem/hugetlb/hugemmap/hugemmap41.c | 147 ++++++++++++++++++ 3 files changed, 149 insertions(+) create mode 100644 testcases/kernel/mem/hugetlb/hugemmap/hugemmap41.c
runtest/hugetlb +1 -0
@@ -36,6 +36,7 @@ hugemmap30 hugemmap30 hugemmap31 hugemmap31 hugemmap32 hugemmap32 hugemmap34 hugemmap34 +hugemmap41 hugemmap41 hugemmap05_1 hugemmap05 -m hugemmap05_2 hugemmap05 -s hugemmap05_3 hugemmap05 -s -m
testcases/kernel/mem/.gitignore +1 -0
@@ -36,6 +36,7 @@ /hugetlb/hugemmap/hugemmap31 /hugetlb/hugemmap/hugemmap32 /hugetlb/hugemmap/hugemmap34 +/hugetlb/hugemmap/hugemmap41 /hugetlb/hugeshmat/hugeshmat01 /hugetlb/hugeshmat/hugeshmat02 /hugetlb/hugeshmat/hugeshmat03
testcases/kernel/mem/hugetlb/hugemmap/hugemmap41.c new file +147 -0
147 lines not on this page · raw message
Signature · 5 lines
2.53.0 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Hi Pavithra,
Thanks for the migration. A few things to address below.
First, the commit subject should follow the LTP convention, e.g.:
hugemmap41: Migrate ptrace-write-hugepage from libhugetlbfs
The body "Changed testcase to use new API" is too brief. Please explain what the original test does and why it is being migrated (preserving regression coverage for the ptrace hugepage fix, etc.).
Quoted 3 lines
+/*\
+ * [Description]
+ *
The [Description] tag is deprecated and must not be used. Just remove the line and keep the description text directly after the /*\ opener.
Quoted 1 line
+static volatile int
ready_to_trace;
[...]
Quoted 1 line
testcases/kernel/mem/hugetlb/hugemmap/hugemmap41.c new file +1
-0+ ready_to_trace =1 ;
[...]
testcases/kernel/mem/hugetlb/hugemmap/hugemmap41.c line 116
Quoted 2 lines
testcases/kernel/mem/hugetlb/hugemmap/hugemmap41.c new file +2
-0+while (!ready_to_trace) + ;
This busy-wait spin loop combined with a SIGCHLD handler is fragile and wastes CPU. The whole signal handler + spin loop can be replaced with TST_PROCESS_STATE_WAIT() after PTRACE_ATTACH:
err = ptrace(PTRACE_ATTACH, cpid, NULL, NULL);
if (err)
tst_brk(TFAIL | TERRNO, "ptrace(ATTACH) failed");
TST_PROCESS_STATE_WAIT(cpid, 't');This waits for the child to enter tracing stop, which is exactly what the original code was trying to achieve. It also eliminates the need for sigchld_handler() and the ready_to_trace variable entirely.
Quoted 2 lines
(quoted diff) +2
-0+static void run_test(void) +{
[...]
testcases/kernel/mem/hugetlb/hugemmap/hugemmap41.c line 94
Quoted 2 lines
testcases/kernel/mem/hugetlb/hugemmap/hugemmap41.c new file +2
-0+ hpage_size =tst_get_hugepage_size (); + fd =tst_creat_unlinked (MNTPOINT ,0 ,0600 );
Both hpage_size and fd are static variables set inside run_test(). When run with -i N, fd is overwritten each iteration without closing the previous one, leaking file descriptors. Move these to a setup() callback so they are initialized once, or close fd at the end of each iteration.
Also, ready_to_trace is never reset to 0 at the top of run_test(), so on -i N runs the spin loop is skipped on iteration 2+, causing a race. (This goes away if you adopt TST_PROCESS_STATE_WAIT() as suggested above.)
Quoted 1 line
testcases/kernel/mem/hugetlb/hugemmap/hugemmap41.c new file +1
-0+SAFE_PIPE (pipefd);
[...]
testcases/kernel/mem/hugetlb/hugemmap/hugemmap41.c line 107
Quoted 1 line
testcases/kernel/mem/hugetlb/hugemmap/hugemmap41.c new file +1
-0+SAFE_READ (1 , pipefd[0 ], &p,sizeof (p));
The pipe file descriptors are never closed. Close pipefd[1] in the parent after fork, and close pipefd[0] after the read. In the child, close pipefd[0] before use and close pipefd[1] after the write.
Quoted 6 lines
testcases/kernel/mem/hugetlb/hugemmap/hugemmap41.c new file +6
-0+static void child (int hugefd,int pipefd) +{ +void *p; + + p =SAFE_MMAP (NULL , hpage_size,PROT_READ |PROT_WRITE ,MAP_SHARED , + hugefd,0 );
[...]
Review
Quoted 2 lines
(quoted diff) +2
-0+ pause(); +}
The child maps a hugepage but never calls SAFE_MUNMAP(). Add a munmap before pause(), or restructure so the mapping is cleaned up.
Quoted 1 line
testcases/kernel/mem/hugetlb/hugemmap/hugemmap41.c new file +1
-0+int signal;
[...]
testcases/kernel/mem/hugetlb/hugemmap/hugemmap41.c line 124
Quoted 1 line
testcases/kernel/mem/hugetlb/hugemmap/hugemmap41.c new file +1
-0+SAFE_WAITPID (cpid, &signal,0 );
Minor: the variable name "signal" shadows the signal() function. Rename it to "status" for clarity.
Regards,
--
Andrea Cervesato
SUSE QE Automation Engineer Linux
[email protected]
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp