From: Jinjiang Tu <tujinjiang@huawei.com>
To: <akpm@linux-foundation.org>, <david@redhat.com>,
<shr@devkernel.io>, <hannes@cmpxchg.org>, <riel@surriel.com>,
<wangkefeng.wang@huawei.com>, <sunnanyong@huawei.com>,
<linux-mm@kvack.org>
Cc: <tujinjiang@huawei.com>
Subject: [PATCH v3 3/3] selftest/mm: ksm_functional_tests: extend test case for ksm fork/exec
Date: Wed, 27 Mar 2024 14:09:22 +0800 [thread overview]
Message-ID: <20240327060922.1484395-4-tujinjiang@huawei.com> (raw)
In-Reply-To: <20240327060922.1484395-1-tujinjiang@huawei.com>
This extends test_prctl_fork() and test_prctl_fork_exec() to make sure
that deduplication really happens, instead of only test the
MMF_VM_MERGE_ANY flag is set.
Suggested-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Jinjiang Tu <tujinjiang@huawei.com>
---
.../selftests/mm/ksm_functional_tests.c | 52 ++++++++++++++++---
1 file changed, 46 insertions(+), 6 deletions(-)
diff --git a/tools/testing/selftests/mm/ksm_functional_tests.c b/tools/testing/selftests/mm/ksm_functional_tests.c
index da58545e58e1..c56e34946096 100644
--- a/tools/testing/selftests/mm/ksm_functional_tests.c
+++ b/tools/testing/selftests/mm/ksm_functional_tests.c
@@ -491,7 +491,20 @@ static void test_prctl_fork(void)
child_pid = fork();
if (!child_pid) {
- exit(prctl(PR_GET_MEMORY_MERGE, 0, 0, 0, 0));
+ const unsigned int size = 2 * MiB;
+ char *map;
+
+ if (prctl(PR_GET_MEMORY_MERGE, 0, 0, 0, 0) != 1)
+ exit(-1);
+
+ map = mmap_and_merge_range(0xcf, size, PROT_READ | PROT_WRITE, KSM_MERGE_NONE);
+ if (map == MAP_MERGE_FAIL)
+ exit(-2);
+ else if (map == MAP_MERGE_SKIP)
+ exit(-3);
+
+ munmap(map, size);
+ exit(0);
} else if (child_pid < 0) {
ksft_test_result_fail("fork() failed\n");
return;
@@ -500,8 +513,16 @@ static void test_prctl_fork(void)
if (waitpid(child_pid, &status, 0) < 0) {
ksft_test_result_fail("waitpid() failed\n");
return;
- } else if (WEXITSTATUS(status) != 1) {
- ksft_test_result_fail("unexpected PR_GET_MEMORY_MERGE result in child\n");
+ }
+
+ status = WEXITSTATUS(status);
+ if (status != 0) {
+ if (status == -1)
+ ksft_test_result_fail("unexpected PR_GET_MEMORY_MERGE result in child\n");
+ else if (status == -2)
+ ksft_test_result_fail("Merge in child failed\n");
+ else if (status == -3)
+ ksft_test_result_skip("Merge in child skiped\n");
return;
}
@@ -515,8 +536,21 @@ static void test_prctl_fork(void)
static int ksm_fork_exec_child(void)
{
+ const unsigned int size = 2 * MiB;
+ char *map;
+
/* Test if KSM is enabled for the process. */
- return prctl(PR_GET_MEMORY_MERGE, 0, 0, 0, 0) == 1;
+ if (prctl(PR_GET_MEMORY_MERGE, 0, 0, 0, 0) != 1)
+ return -1;
+
+ map = mmap_and_merge_range(0xcf, size, PROT_READ | PROT_WRITE, KSM_MERGE_NONE);
+ if (map == MAP_MERGE_FAIL)
+ return -2;
+ else if (map == MAP_MERGE_SKIP)
+ return -3;
+
+ munmap(map, size);
+ return 0;
}
static void test_prctl_fork_exec(void)
@@ -550,9 +584,15 @@ static void test_prctl_fork_exec(void)
if (waitpid(child_pid, &status, 0) > 0) {
if (WIFEXITED(status)) {
status = WEXITSTATUS(status);
- if (status) {
+ if (status == -1) {
ksft_test_result_fail("KSM not enabled\n");
return;
+ } else if (status == -2) {
+ ksft_test_result_fail("Merge in child failed\n");
+ return;
+ } else if (status == -3) {
+ ksft_test_result_skip("Merge in child skiped\n");
+ return;
}
} else {
ksft_test_result_fail("program didn't terminate normally\n");
@@ -632,7 +672,7 @@ int main(int argc, char **argv)
int err;
if (argc > 1 && !strcmp(argv[1], FORK_EXEC_CHILD_PRG_NAME)) {
- exit(ksm_fork_exec_child() == 1 ? 0 : 1);
+ exit(ksm_fork_exec_child());
}
#ifdef __NR_userfaultfd
--
2.25.1
prev parent reply other threads:[~2024-03-27 6:10 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-27 6:09 [PATCH v3 0/3] mm/ksm: fix ksm exec support for prctl Jinjiang Tu
2024-03-27 6:09 ` [PATCH v3 1/3] " Jinjiang Tu
2024-03-27 9:15 ` David Hildenbrand
2024-03-27 6:09 ` [PATCH v3 2/3] selftest/mm: ksm_functional_tests: refactor mmap_and_merge_range() Jinjiang Tu
2024-03-27 11:31 ` David Hildenbrand
2024-03-27 6:09 ` Jinjiang Tu [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240327060922.1484395-4-tujinjiang@huawei.com \
--to=tujinjiang@huawei.com \
--cc=akpm@linux-foundation.org \
--cc=david@redhat.com \
--cc=hannes@cmpxchg.org \
--cc=linux-mm@kvack.org \
--cc=riel@surriel.com \
--cc=shr@devkernel.io \
--cc=sunnanyong@huawei.com \
--cc=wangkefeng.wang@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox