From patchwork Wed Mar 27 06:09:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jinjiang Tu X-Patchwork-Id: 13605605 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id CCDD6C54E67 for ; Wed, 27 Mar 2024 06:09:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 87E3F6B008A; Wed, 27 Mar 2024 02:09:54 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 82BE36B0095; Wed, 27 Mar 2024 02:09:54 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 726376B0096; Wed, 27 Mar 2024 02:09:54 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 61EB26B008A for ; Wed, 27 Mar 2024 02:09:54 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 2F15E406D6 for ; Wed, 27 Mar 2024 06:09:54 +0000 (UTC) X-FDA: 81941793108.01.4DD1CD6 Received: from szxga04-in.huawei.com (szxga04-in.huawei.com [45.249.212.190]) by imf10.hostedemail.com (Postfix) with ESMTP id B8AD2C0004 for ; Wed, 27 Mar 2024 06:09:51 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf10.hostedemail.com: domain of tujinjiang@huawei.com designates 45.249.212.190 as permitted sender) smtp.mailfrom=tujinjiang@huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1711519792; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NhPLJM3Cd3azoJDiiiyuK4BfrsuZ+cy36ol4s5YcX0k=; b=ITH+B3UvJuhgCH8Sjw3pzWaPMjSH/qRc0YgnjWfqj1jKdgf0rwwHh5iGSGwlIodE8DzVgg g5myBclLqO+HB2SVcq5Jn2L/dN4M6iNSvLVZ70Nuz6npLj5gvFkN9fN/SLskhd6Pcr70BZ P1+JetoNbi7B7mPWZsmjfPgoYRXStik= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf10.hostedemail.com: domain of tujinjiang@huawei.com designates 45.249.212.190 as permitted sender) smtp.mailfrom=tujinjiang@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1711519792; a=rsa-sha256; cv=none; b=AWljXH3lSPT1oQuXk/fQ79V95+7rP95FdrEyTv5GTXuaBj2GU7PipiLxAi4O8jT42XdeWA h48QFDykbySDauFTaAWlWjNSeSLaNn/nXREqBvBTJJUiAwgvB3mHawW9tLnuIBGlHh++zF u1R+F9pTX7kOAEddoGn7OkqG8KJDpDM= Received: from mail.maildlp.com (unknown [172.19.162.112]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4V4GQv2PZtz2Bj1M; Wed, 27 Mar 2024 14:07:03 +0800 (CST) Received: from dggpeml500011.china.huawei.com (unknown [7.185.36.84]) by mail.maildlp.com (Postfix) with ESMTPS id B44921400DA; Wed, 27 Mar 2024 14:09:42 +0800 (CST) Received: from huawei.com (10.175.113.32) by dggpeml500011.china.huawei.com (7.185.36.84) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Wed, 27 Mar 2024 14:09:42 +0800 From: Jinjiang Tu To: , , , , , , , CC: Subject: [PATCH v3 2/3] selftest/mm: ksm_functional_tests: refactor mmap_and_merge_range() Date: Wed, 27 Mar 2024 14:09:21 +0800 Message-ID: <20240327060922.1484395-3-tujinjiang@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240327060922.1484395-1-tujinjiang@huawei.com> References: <20240327060922.1484395-1-tujinjiang@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.113.32] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To dggpeml500011.china.huawei.com (7.185.36.84) X-Rspam-User: X-Stat-Signature: 6kbmubeijby836s3kop6kufuqixy1odc X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: B8AD2C0004 X-HE-Tag: 1711519791-561478 X-HE-Meta: U2FsdGVkX1/czfJ/XzgXYHLu8yD8QqMi44Ydj/+HvVgSmssN7etHUgzzxVHqUblfXwsauQ7ILEaaURKCrIf5cKm49CFHk2e+XfIzR+ydPysyHg71q4bNGbHvohmQuo55oLOSAMtgN7Y0TVOqNqWmNrkX1kDZmBivrSgKOZ7u/rqQUmAR2VTG0Pd2Krp7zC2wNZYnAaV+RovovxecIbjTp9wTjfN9IqkT/P5ukmFxIKlh5sTMG2CV69VMA/BMQ8QGUEk6R29olykn4WT153Faj0olJAaukehlb+Q8lVJgktsKWhrT6AmZBNXZlXf3MCDxgs8XMpJV6pPJRxiOV1oBl3qStTcwO1WwjVaeU2iE8x/OyIVgYQMiXZ/gv9G4HR2uOm78XAZupzy09fYmBrOmJUqWzLWyzVpTxK80TWRuT47n961Pf9YjoMqpqXZ9MLiQ3ezzVyGzCmFYVaDm370E8NMIDQ1M+UBwYJtn1+fmCedM4SI3bEaJMFQJk7EnfpG6UQGIdDqFlAt5UTUbxGgq+ehB8WWhX9+6e5W75zLMnDZUDlZk6kJlzcDrbyprmd6398FbWIelD+iQ6QKo6FqKkVJwpbcxqhdLzX2HWIRSkTv2yCFjgbkG5cuwqdWOtwsr4s1ygLGeRHiu9Jdd6s4P3+PI5zXaBMBgG7+FUZw3F8gw+TDFgo4YOOJMsyN87Ud4GGu6uWn05xKlKPOsxatk0tUDih7Dg2eQT1BePkHbXv22Gs0xN/cw4o4n8U/KuOI7LJZ9T31oHm2iq9sDg9RKypoe68pgMDA22rPtjXVNIPc9wL5LvkSop2eCHAcBjjoSU0I0b2bQa0uPFSt7GVWucVmJ10Kn+Lmw/twB8Lty2MeyhFAKPmMFuT1+eHEEfbOMl+WZJSVROZcTUUHrx/CrwRMpYW+3kzzCuF3NrcxPVloN6Ootv+XPBz6kwHr/N+dPmcaPtZyjS8fjvcBxHEZ BxfP5cKJ UjxoRpkJaoQfNng+rXd9g6KBtqOsp24gPkPhY7FmmGB6HvLXM0FJcZSaOk0f6KCsLL2ZpYJHZOGX/8d8H8jEsF/767WQQ3yymiUWgeVe5ja8kg6Vc+SkI7R7OylaMyNLjlZchF6TViGAOE0TR76n5iH/4/4wFr6wfa5yt/r7kodV2xhbVa05yc+6jhsBUznFYDHKooz+hnxmNoZFpW6hwYNlS3Q== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: In order to extend test_prctl_fork() and test_prctl_fork_exec() to make sure that deduplication really happens, mmap_and_merge_range() needs to be refactored. Firstly, mmap_and_merge_range() will be called with no need to call enable KSM by madvise or prctl. So, switch the 'bool use_prctl' parameter to enum ksm_merge_mode. Secondly, mmap_and_merge_range() will be called in child process in the two testcases, it isn't appropriate to call ksft_test_result_{fail, skip}, because the global variables ksft_{fail, skip} aren't consistent with the parent process. Thus, convert calls of ksft_test_result_{fail, skip} to ksft_print_msg() and return differrent error according to the two cases. The callers of mmap_and_merge_range() then call ksft_test_result_{fail, skip} according to the return value. Introduce mmap_and_merge_err_print() helper to make it easier. Suggested-by: David Hildenbrand Signed-off-by: Jinjiang Tu --- .../selftests/mm/ksm_functional_tests.c | 93 +++++++++++++------ 1 file changed, 63 insertions(+), 30 deletions(-) diff --git a/tools/testing/selftests/mm/ksm_functional_tests.c b/tools/testing/selftests/mm/ksm_functional_tests.c index d615767e396b..da58545e58e1 100644 --- a/tools/testing/selftests/mm/ksm_functional_tests.c +++ b/tools/testing/selftests/mm/ksm_functional_tests.c @@ -28,6 +28,15 @@ #define MiB (1024 * KiB) #define FORK_EXEC_CHILD_PRG_NAME "ksm_fork_exec_child" +#define MAP_MERGE_FAIL ((void *)-1) +#define MAP_MERGE_SKIP ((void *)-2) + +enum ksm_merge_mode { + KSM_MERGE_PRCTL, + KSM_MERGE_MADVISE, + KSM_MERGE_NONE, /* PRCTL already set */ +}; + static int mem_fd; static int ksm_fd; static int ksm_full_scans_fd; @@ -147,32 +156,33 @@ static int ksm_unmerge(void) } static char *mmap_and_merge_range(char val, unsigned long size, int prot, - bool use_prctl) + enum ksm_merge_mode mode) { char *map; + char *err_map = MAP_MERGE_FAIL; int ret; /* Stabilize accounting by disabling KSM completely. */ if (ksm_unmerge()) { - ksft_test_result_fail("Disabling (unmerging) KSM failed\n"); - return MAP_FAILED; + ksft_print_msg("Disabling (unmerging) KSM failed\n"); + return err_map; } if (get_my_merging_pages() > 0) { - ksft_test_result_fail("Still pages merged\n"); - return MAP_FAILED; + ksft_print_msg("Still pages merged\n"); + return err_map; } map = mmap(NULL, size, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANON, -1, 0); if (map == MAP_FAILED) { - ksft_test_result_fail("mmap() failed\n"); - return MAP_FAILED; + ksft_print_msg("mmap() failed\n"); + return err_map; } /* Don't use THP. Ignore if THP are not around on a kernel. */ if (madvise(map, size, MADV_NOHUGEPAGE) && errno != EINVAL) { - ksft_test_result_fail("MADV_NOHUGEPAGE failed\n"); + ksft_print_msg("MADV_NOHUGEPAGE failed\n"); goto unmap; } @@ -180,27 +190,36 @@ static char *mmap_and_merge_range(char val, unsigned long size, int prot, memset(map, val, size); if (mprotect(map, size, prot)) { - ksft_test_result_skip("mprotect() failed\n"); + ksft_print_msg("mprotect() failed\n"); + err_map = MAP_MERGE_SKIP; goto unmap; } - if (use_prctl) { + switch (mode) { + case KSM_MERGE_PRCTL: ret = prctl(PR_SET_MEMORY_MERGE, 1, 0, 0, 0); if (ret < 0 && errno == EINVAL) { - ksft_test_result_skip("PR_SET_MEMORY_MERGE not supported\n"); + ksft_print_msg("PR_SET_MEMORY_MERGE not supported\n"); + err_map = MAP_MERGE_SKIP; goto unmap; } else if (ret) { - ksft_test_result_fail("PR_SET_MEMORY_MERGE=1 failed\n"); + ksft_print_msg("PR_SET_MEMORY_MERGE=1 failed\n"); goto unmap; } - } else if (madvise(map, size, MADV_MERGEABLE)) { - ksft_test_result_fail("MADV_MERGEABLE failed\n"); - goto unmap; + break; + case KSM_MERGE_MADVISE: + if (madvise(map, size, MADV_MERGEABLE)) { + ksft_print_msg("MADV_MERGEABLE failed\n"); + goto unmap; + } + break; + case KSM_MERGE_NONE: + break; } /* Run KSM to trigger merging and wait. */ if (ksm_merge()) { - ksft_test_result_fail("Running KSM failed\n"); + ksft_print_msg("Running KSM failed\n"); goto unmap; } @@ -209,14 +228,28 @@ static char *mmap_and_merge_range(char val, unsigned long size, int prot, * accounted differently (depending on kernel support). */ if (val && !get_my_merging_pages()) { - ksft_test_result_fail("No pages got merged\n"); + ksft_print_msg("No pages got merged\n"); goto unmap; } return map; unmap: munmap(map, size); - return MAP_FAILED; + return err_map; +} + +static inline int mmap_and_merge_err_print(char *map) +{ + int ret = -1; + + if (map == MAP_MERGE_FAIL) + ksft_test_result_fail("Merging memory failed"); + else if (map == MAP_MERGE_FAIL) + ksft_test_result_skip("Merging memory skiped"); + else + ret = 0; + + return ret; } static void test_unmerge(void) @@ -226,8 +259,8 @@ static void test_unmerge(void) ksft_print_msg("[RUN] %s\n", __func__); - map = mmap_and_merge_range(0xcf, size, PROT_READ | PROT_WRITE, false); - if (map == MAP_FAILED) + map = mmap_and_merge_range(0xcf, size, PROT_READ | PROT_WRITE, KSM_MERGE_MADVISE); + if (mmap_and_merge_err_print(map)) return; if (madvise(map, size, MADV_UNMERGEABLE)) { @@ -264,8 +297,8 @@ static void test_unmerge_zero_pages(void) } /* Let KSM deduplicate zero pages. */ - map = mmap_and_merge_range(0x00, size, PROT_READ | PROT_WRITE, false); - if (map == MAP_FAILED) + map = mmap_and_merge_range(0x00, size, PROT_READ | PROT_WRITE, KSM_MERGE_MADVISE); + if (mmap_and_merge_err_print(map)) return; /* Check if ksm_zero_pages is updated correctly after KSM merging */ @@ -312,8 +345,8 @@ static void test_unmerge_discarded(void) ksft_print_msg("[RUN] %s\n", __func__); - map = mmap_and_merge_range(0xcf, size, PROT_READ | PROT_WRITE, false); - if (map == MAP_FAILED) + map = mmap_and_merge_range(0xcf, size, PROT_READ | PROT_WRITE, KSM_MERGE_MADVISE); + if (mmap_and_merge_err_print(map)) return; /* Discard half of all mapped pages so we have pte_none() entries. */ @@ -344,8 +377,8 @@ static void test_unmerge_uffd_wp(void) ksft_print_msg("[RUN] %s\n", __func__); - map = mmap_and_merge_range(0xcf, size, PROT_READ | PROT_WRITE, false); - if (map == MAP_FAILED) + map = mmap_and_merge_range(0xcf, size, PROT_READ | PROT_WRITE, KSM_MERGE_MADVISE); + if (mmap_and_merge_err_print(map)) return; /* See if UFFD is around. */ @@ -545,8 +578,8 @@ static void test_prctl_unmerge(void) ksft_print_msg("[RUN] %s\n", __func__); - map = mmap_and_merge_range(0xcf, size, PROT_READ | PROT_WRITE, true); - if (map == MAP_FAILED) + map = mmap_and_merge_range(0xcf, size, PROT_READ | PROT_WRITE, KSM_MERGE_PRCTL); + if (mmap_and_merge_err_print(map)) return; if (prctl(PR_SET_MEMORY_MERGE, 0, 0, 0, 0)) { @@ -568,8 +601,8 @@ static void test_prot_none(void) ksft_print_msg("[RUN] %s\n", __func__); - map = mmap_and_merge_range(0x11, size, PROT_NONE, false); - if (map == MAP_FAILED) + map = mmap_and_merge_range(0x11, size, PROT_NONE, KSM_MERGE_MADVISE); + if (mmap_and_merge_err_print(map)) goto unmap; /* Store a unique value in each page on one half using ptrace */