From patchwork Thu Dec 7 16:12:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Roberts X-Patchwork-Id: 13483623 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 4F2FFC4167B for ; Thu, 7 Dec 2023 16:12:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E33CF6B00A4; Thu, 7 Dec 2023 11:12:55 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D95456B00A5; Thu, 7 Dec 2023 11:12:55 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BBFB76B00A6; Thu, 7 Dec 2023 11:12:55 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id A47906B00A4 for ; Thu, 7 Dec 2023 11:12:55 -0500 (EST) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 652BD80145 for ; Thu, 7 Dec 2023 16:12:55 +0000 (UTC) X-FDA: 81540515910.23.86A8265 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf13.hostedemail.com (Postfix) with ESMTP id 5A43B20031 for ; Thu, 7 Dec 2023 16:12:53 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf13.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1701965573; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nVtg4pDvcT+em2d+o9RtqQ+BQ6db+znOIp81txf8KZ0=; b=ArdNIf0lOX/XTz+8eONWhWS7mUjfFT+M4Sl6wwKqQgZaSW0xKgicHGUpCoEqW3KYrlWTWP AIihhgT5qWoKO6ARR1N4Ovb9g383U5oSI+/u2MgAFlAfRHl1UdFhsDAMrz8tpscipgQMxR ECwofDdL1QgfYk+b0NvlOfT5zxl6KVU= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf13.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1701965573; a=rsa-sha256; cv=none; b=s5jL6lWVjUtIVaGzMXhn29CCuFidi2L+JVI7ilYMagA/aDLG1L9hPJ0iGlc7UaeCSgoenN di/Pg45fJxLdbd1UtSpLsHmunjv4mrUkzI6IVh/74J/TmUNRF38WHepa6MyQUhmf6Qn83y tVOkaee+JKXKQYWeWNlrJoh8HwG/YD8= Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 7819A15A1; Thu, 7 Dec 2023 08:13:38 -0800 (PST) Received: from e125769.cambridge.arm.com (e125769.cambridge.arm.com [10.1.196.26]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id B0DD83F762; Thu, 7 Dec 2023 08:12:49 -0800 (PST) From: Ryan Roberts To: Andrew Morton , Matthew Wilcox , Yin Fengwei , David Hildenbrand , Yu Zhao , Catalin Marinas , Anshuman Khandual , Yang Shi , "Huang, Ying" , Zi Yan , Luis Chamberlain , Itaru Kitayama , "Kirill A. Shutemov" , John Hubbard , David Rientjes , Vlastimil Babka , Hugh Dickins , Kefeng Wang , Barry Song <21cnbao@gmail.com>, Alistair Popple Cc: Ryan Roberts , linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v9 08/10] selftests/mm/khugepaged: Enlighten for multi-size THP Date: Thu, 7 Dec 2023 16:12:09 +0000 Message-Id: <20231207161211.2374093-9-ryan.roberts@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231207161211.2374093-1-ryan.roberts@arm.com> References: <20231207161211.2374093-1-ryan.roberts@arm.com> MIME-Version: 1.0 X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 5A43B20031 X-Stat-Signature: iizuy7rgtcbper7jxxeuz86jd1qay511 X-Rspam-User: X-HE-Tag: 1701965573-944113 X-HE-Meta: U2FsdGVkX18zor/aik0zeN9lOkFk3R3lCXNBi52cIXiW1+0BP/UHn8Rd7Q54Mjf8kpC4bfKuBixNn6nAyU9X6/ta2oK0rOQUwbMER21nhRyh2R3hgC9mdV/DxDh1d5+AwmiVvelRHqQNY/xrSVkniCQ9FoarK6wX0fff4rt1PMAklF+XUWTXfZJFveUnBYkefX2INOMIU8om5kMieQz+ZzWKgf+sdnpRf1d7UI6MOFwmvBXSHH0tK2Kv1t428tiRJbKJXjcUs0jIJoWhTX/+NEl3MUqIDaEeOlht9FYWrSdL3bDxU3YrdFEq7mtOznYWLrxnSoBzQqrge4A667jOwHYD3kOCzXsCsgodW/Ckva47h8nOOIpyULnh05Eza8DoMwQXMJQLAEPx84VomFErN3WjinlB8Tr13dVZZN1XZmeHJytwiQ+7tkrWd/fgAVr+wHiwmfqTjU1mEv1gUVwwosoZzHz8A//vhlVinQz1FAY9oYANnOgnT+pSsjTwab7sONIK0Ky/r6uRt1rg3oga3zA0DGjC/qigLVfXmuxLH5eO7wsne68wSOA+l0ALXU1big6Cfw5Lpp9MfHRwBWFd7xt8E2iGPpbcej7SWV03txJU6U98r4S257Zw7mK0HQJwIGqhsxue/BscYyhghb3tdlm/zpzr3M1+/uyo5Y7yAKEGBGJas3fEpQHbstnBaSvdBzLQMnHiCuHvmSBsKjIt+UUfmW35CMPKc31cRuAlUqaucadLAf9zaBbBjQU4uLvNlPetnqBkZXQvdcRB0nr3R4R5UGASUppLEsOVY4e8YE1Uz7FMhwdF4J9ObeiB69i3G2sGkx/trVKoa5Aj7asI50ZB8Xs+vE2jg+8Io2+Uyo7MA92rRNFtoaVaYnAKTzM5mG606mwZ8ZEJwJ8D9OhtLlUi5FAWlCglnB7dkgK3dm60/oJOwT9a4s9nX89rXlZk2/F2QAI5HmfwmCKG73y DeUmo1Mh +IF+2a9xt1EaF9HlWfZ4HW+I4OIrobqrr1vHipoQyhMt0AZ1Zm8g2rFNW3Y/0iFCj9L4Y43+MtBs7ndGHYRPywZXM+tNwHovob8QF4L08GTVHoYAY4HQCPdCW10uSZ/K7aG37YpMfLe93nqNXAPQwkOedeTSmqNtGyggydCrY3iu7FhxETEhSna3ucNzLJShnTZGcI8qvZzOit2tV79yZ7qP7qwGPO0x6Oj3ksWUN09LsOaGs69ABqKUjzyEpRhsOHK4xl6ent18LdJ7+f1EaIDpyzg== 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: The `collapse_max_ptes_none` test was previously failing when a THP size less than PMD-size had enabled="always". The root cause is because the test faults in 1 page less than the threshold it set for collapsing. But when THP is enabled always, we "over allocate" and therefore the threshold is passed, and collapse unexpectedly succeeds. Solve this by enlightening khugepaged selftest. Add a command line option to pass in the desired THP size that should be used for all anonymous allocations. The harness will then explicitly configure a THP size as requested and modify the `collapse_max_ptes_none` test so that it faults in the threshold minus the number of pages in the configured THP size. If no command line option is provided, default to order 0, as per previous behaviour. I chose to use an order in the command line interface, since this makes the interface agnostic of base page size, making it easier to invoke from run_vmtests.sh. Tested-by: Kefeng Wang Tested-by: John Hubbard Signed-off-by: Ryan Roberts --- tools/testing/selftests/mm/khugepaged.c | 48 +++++++++++++++++------ tools/testing/selftests/mm/run_vmtests.sh | 2 + 2 files changed, 39 insertions(+), 11 deletions(-) diff --git a/tools/testing/selftests/mm/khugepaged.c b/tools/testing/selftests/mm/khugepaged.c index 7bd3baa9d34b..829320a519e7 100644 --- a/tools/testing/selftests/mm/khugepaged.c +++ b/tools/testing/selftests/mm/khugepaged.c @@ -28,6 +28,7 @@ static unsigned long hpage_pmd_size; static unsigned long page_size; static int hpage_pmd_nr; +static int anon_order; #define PID_SMAPS "/proc/self/smaps" #define TEST_FILE "collapse_test_file" @@ -607,6 +608,11 @@ static bool is_tmpfs(struct mem_ops *ops) return ops == &__file_ops && finfo.type == VMA_SHMEM; } +static bool is_anon(struct mem_ops *ops) +{ + return ops == &__anon_ops; +} + static void alloc_at_fault(void) { struct thp_settings settings = *thp_current_settings(); @@ -673,6 +679,7 @@ static void collapse_max_ptes_none(struct collapse_context *c, struct mem_ops *o int max_ptes_none = hpage_pmd_nr / 2; struct thp_settings settings = *thp_current_settings(); void *p; + int fault_nr_pages = is_anon(ops) ? 1 << anon_order : 1; settings.khugepaged.max_ptes_none = max_ptes_none; thp_push_settings(&settings); @@ -686,10 +693,10 @@ static void collapse_max_ptes_none(struct collapse_context *c, struct mem_ops *o goto skip; } - ops->fault(p, 0, (hpage_pmd_nr - max_ptes_none - 1) * page_size); + ops->fault(p, 0, (hpage_pmd_nr - max_ptes_none - fault_nr_pages) * page_size); c->collapse("Maybe collapse with max_ptes_none exceeded", p, 1, ops, !c->enforce_pte_scan_limits); - validate_memory(p, 0, (hpage_pmd_nr - max_ptes_none - 1) * page_size); + validate_memory(p, 0, (hpage_pmd_nr - max_ptes_none - fault_nr_pages) * page_size); if (c->enforce_pte_scan_limits) { ops->fault(p, 0, (hpage_pmd_nr - max_ptes_none) * page_size); @@ -1076,7 +1083,7 @@ static void madvise_retracted_page_tables(struct collapse_context *c, static void usage(void) { - fprintf(stderr, "\nUsage: ./khugepaged [dir]\n\n"); + fprintf(stderr, "\nUsage: ./khugepaged [OPTIONS] [dir]\n\n"); fprintf(stderr, "\t\t: :\n"); fprintf(stderr, "\t\t: [all|khugepaged|madvise]\n"); fprintf(stderr, "\t\t: [all|anon|file|shmem]\n"); @@ -1085,15 +1092,34 @@ static void usage(void) fprintf(stderr, "\tCONFIG_READ_ONLY_THP_FOR_FS=y\n"); fprintf(stderr, "\n\tif [dir] is a (sub)directory of a tmpfs mount, tmpfs must be\n"); fprintf(stderr, "\tmounted with huge=madvise option for khugepaged tests to work\n"); + fprintf(stderr, "\n\tSupported Options:\n"); + fprintf(stderr, "\t\t-h: This help message.\n"); + fprintf(stderr, "\t\t-s: mTHP size, expressed as page order.\n"); + fprintf(stderr, "\t\t Defaults to 0. Use this size for anon allocations.\n"); exit(1); } -static void parse_test_type(int argc, const char **argv) +static void parse_test_type(int argc, char **argv) { + int opt; char *buf; const char *token; - if (argc == 1) { + while ((opt = getopt(argc, argv, "s:h")) != -1) { + switch (opt) { + case 's': + anon_order = atoi(optarg); + break; + case 'h': + default: + usage(); + } + } + + argv += optind; + argc -= optind; + + if (argc == 0) { /* Backwards compatibility */ khugepaged_context = &__khugepaged_context; madvise_context = &__madvise_context; @@ -1101,7 +1127,7 @@ static void parse_test_type(int argc, const char **argv) return; } - buf = strdup(argv[1]); + buf = strdup(argv[0]); token = strsep(&buf, ":"); if (!strcmp(token, "all")) { @@ -1135,11 +1161,13 @@ static void parse_test_type(int argc, const char **argv) if (!file_ops) return; - if (argc != 3) + if (argc != 2) usage(); + + get_finfo(argv[1]); } -int main(int argc, const char **argv) +int main(int argc, char **argv) { int hpage_pmd_order; struct thp_settings default_settings = { @@ -1164,9 +1192,6 @@ int main(int argc, const char **argv) parse_test_type(argc, argv); - if (file_ops) - get_finfo(argv[2]); - setbuf(stdout, NULL); page_size = getpagesize(); @@ -1183,6 +1208,7 @@ int main(int argc, const char **argv) default_settings.khugepaged.max_ptes_shared = hpage_pmd_nr / 2; default_settings.khugepaged.pages_to_scan = hpage_pmd_nr * 8; default_settings.hugepages[hpage_pmd_order].enabled = THP_INHERIT; + default_settings.hugepages[anon_order].enabled = THP_ALWAYS; save_settings(); thp_push_settings(&default_settings); diff --git a/tools/testing/selftests/mm/run_vmtests.sh b/tools/testing/selftests/mm/run_vmtests.sh index c0212258b852..87f513f5cf91 100755 --- a/tools/testing/selftests/mm/run_vmtests.sh +++ b/tools/testing/selftests/mm/run_vmtests.sh @@ -357,6 +357,8 @@ CATEGORY="cow" run_test ./cow CATEGORY="thp" run_test ./khugepaged +CATEGORY="thp" run_test ./khugepaged -s 2 + CATEGORY="thp" run_test ./transhuge-stress -d 20 CATEGORY="thp" run_test ./split_huge_page_test