From mboxrd@z Thu Jan 1 00:00:00 1970 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 5444EC3DA6E for ; Wed, 3 Jan 2024 08:34:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DDAA46B018A; Wed, 3 Jan 2024 03:34:06 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D8E486B0339; Wed, 3 Jan 2024 03:34:06 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C03D16B033A; Wed, 3 Jan 2024 03:34:06 -0500 (EST) 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 AAED06B018A for ; Wed, 3 Jan 2024 03:34:06 -0500 (EST) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 82640A1C1D for ; Wed, 3 Jan 2024 08:34:06 +0000 (UTC) X-FDA: 81637337292.03.A39E161 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf13.hostedemail.com (Postfix) with ESMTP id A4F8320018 for ; Wed, 3 Jan 2024 08:34:04 +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=1704270844; 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=HHm8QUt800shuehjhFMkYPmiOGyftiCKnKWWWImXWZA=; b=s1ByfT5GA3EzN3493UIFhEw0z2c+PaVZE/1x7V89ku74tZwILggpVWgDJTLTqzEm58B+pL +U52VTpLN5x1v7u2U37578EdqmNwXIJEoobYjv0l+udQlKb3f2mqYvXEFebPvCikJV7hEW E7Tp6bFo3r/qAwUhPlZV8v7/0bMXl7U= 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=1704270844; a=rsa-sha256; cv=none; b=3JIeYUSYr7+Khi+axi+tu8AFK6iJ9hr5kjLkwwWsP/S4oLxdCgv5+3kC0L6pAqv1yMMt1S pYCVKjYgmg8K/W++UXE6UDTCIv6f58SKVqOcA9HZwAE+Q15LgnzEAnKjYOCqgiSHKIfRUh L4GV4WJ+zMkbRKqDEi3OSEA+dZisJpk= 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 72AA7C15; Wed, 3 Jan 2024 00:34:49 -0800 (PST) Received: from [10.57.74.226] (unknown [10.57.74.226]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 356A43F5A1; Wed, 3 Jan 2024 00:33:33 -0800 (PST) Message-ID: <7d07caae-ae22-4cda-a3d0-4f542f52817a@arm.com> Date: Wed, 3 Jan 2024 08:33:24 +0000 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v9 09/10] selftests/mm/cow: Generalize do_run_with_thp() helper Content-Language: en-GB To: Itaru Kitayama Cc: 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 , linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org References: <20231207161211.2374093-1-ryan.roberts@arm.com> <20231207161211.2374093-10-ryan.roberts@arm.com> From: Ryan Roberts In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: A4F8320018 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: p4dbhxattyogxw6tbpscmzxsy5qjyjek X-HE-Tag: 1704270844-37863 X-HE-Meta: U2FsdGVkX1+pNoXzqIqEs0FaeR1iv8PfSU7ad5XehLcbL84Uw932NNdHLbSftkPDU+V9P8LzQOHYOzxW4D5nXdHREXSLYySWfLIh7XgVwfAZBOjVCwr1BDtI6h/mmKJLb9eeC/AYE8V3UA67zxeL7thdqn4Wd3UqVqQCVKdFisJD1TxUoFAf3WkY2EvvFBgdPJCaNpAwHdznsE0Qeqs3fdJ67hKcr6mVs3L4pkVgAGDgdcn51V7eipagKcp0hWe82Uyb1W3wYpM9EZA23qaAm4yj3t4KYFEKZqfNlL3JX5Y7OXM3WqmC8gwSpnjy9okvqpKzDSpmcuYNKuWkhZuaInioe6+Np2J0dFQfSdOYmOHH7H+0lh7eB09GDdybOZQG85cb0tagfn8AwJuo/GGQT5JQdSH2/sz+j5DctPdygn9Siea0Et4eQkoTAD5nAkZiW9SnenRpm+2K/96OxYr1U1TuFJM62sSVKUZtaOIn+mbB3Mc4iGi9i2QBHgFjt7Xva4kHpfu+TQi9m7O/T7InH8q0EknI1cq5IT1r6yRyXeQwCnHZTIeilRHtHjqTjGtQrLQ26epEC/OYaDJBpl8nEpOeERnTcOit7QogGy54ulKcVcyn44o1LszG/+WqrTq0SECVg5t370F+GodgWSsIN5e5PocMCiThv0rNEiALCV27aKTijKgpUaLFwR0wHDQOG2zDxxvSchf/3jaM1np/hmob64hPYMoi20koE7AwSfXiiZtDLZ+9/wtAiMFFdg/lXVjOIEZEkfNM6bA5aDoBM1ZuI0l1Ztuj4eLccoMOG3ZX2MIC/95OBj1a9Myb4a0AmoQoe9ZEkH7ADoX/4RwNQZi3C7+dOPvK31Btvz8ydbq0VG0sPab1KavDtpoOsO4tFnb3CecUqykAS1/smZW8bCZvZT07RPFJgJfreSbfGs/3HZFUNK3oh6+p4brbnOdM3eNPuhWo5swasBYv0Cw ydJ1AMC3 dkxnx/gvi/afYIx6bw2UE2DnlpgXkKMjLNc+TBEzKInLCofoMn5ZxMkQyMGtRZNPcQNbVNTHqjP+/b4Ydm+3+sUhAsh/1g/7gAnj1QVyaeoILNjh9HZ+ztSptrvruLfvsOH7LORJ4nQfkb9iHbEGzlQPlEIVG7VJn4wDPs2aZ9Li2AvRFjcNC1b7aDYeqGLciLJlXYN+PGvMtyupeIv7RDq3YvWa7y+fRVcJ4ms1OhcyCyAdDhZIABevl+3ADxND2sZQhA2+DAYfvj4U3sXkADt9JbPsyD1uKiZy6rnqaKNsVGTBW6dfX659n0hWG6OocibjLmnXh5TMWmFYUHkDhpOkmItjjbCTf09Qfhm6CWPpr/E4r7bHwIRoTbyLVi+N2Pfwv5MVdDCA0xo0= 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: On 03/01/2024 06:21, Itaru Kitayama wrote: > On Thu, Dec 07, 2023 at 04:12:10PM +0000, Ryan Roberts wrote: >> do_run_with_thp() prepares (PMD-sized) THP memory into different states >> before running tests. With the introduction of multi-size THP, we would >> like to reuse this logic to also test those smaller THP sizes. So let's >> add a thpsize parameter which tells the function what size THP it should >> operate on. >> >> A separate commit will utilize this change to add new tests for >> multi-size THP, where available. >> >> Reviewed-by: David Hildenbrand >> Tested-by: Kefeng Wang >> Tested-by: John Hubbard >> Signed-off-by: Ryan Roberts > > Tested-by: Itaru Kitayama Thanks for testing! > > I am replying to all this time; Ryan, do you think it's okay to run > 700 of selftests/mm/cow tests? Even on FVP, they did not take longer > though. What exactly is your concern, the amount of time it takes to run the tests? I've found (at least on real HW) that the time it takes to run a test is dominated by accessing the folio's memory. So adding all of the new tests that test sizes between order-2 and PMD_ORDER-1 is ~equivalent to running the existing PMD_ORDER tests twice. And the runtime of those is barely noticable compared to the PUD_ORDER HugeTLB tests. So I don't think we are impacting runtime by much. Sounds like your experience says that's also true for FVP? > >> --- >> tools/testing/selftests/mm/cow.c | 121 +++++++++++++++++-------------- >> 1 file changed, 67 insertions(+), 54 deletions(-) >> >> diff --git a/tools/testing/selftests/mm/cow.c b/tools/testing/selftests/mm/cow.c >> index 7324ce5363c0..4d0b5a125d3c 100644 >> --- a/tools/testing/selftests/mm/cow.c >> +++ b/tools/testing/selftests/mm/cow.c >> @@ -32,7 +32,7 @@ >> >> static size_t pagesize; >> static int pagemap_fd; >> -static size_t thpsize; >> +static size_t pmdsize; >> static int nr_hugetlbsizes; >> static size_t hugetlbsizes[10]; >> static int gup_fd; >> @@ -734,7 +734,7 @@ enum thp_run { >> THP_RUN_PARTIAL_SHARED, >> }; >> >> -static void do_run_with_thp(test_fn fn, enum thp_run thp_run) >> +static void do_run_with_thp(test_fn fn, enum thp_run thp_run, size_t thpsize) >> { >> char *mem, *mmap_mem, *tmp, *mremap_mem = MAP_FAILED; >> size_t size, mmap_size, mremap_size; >> @@ -759,11 +759,11 @@ static void do_run_with_thp(test_fn fn, enum thp_run thp_run) >> } >> >> /* >> - * Try to populate a THP. Touch the first sub-page and test if we get >> - * another sub-page populated automatically. >> + * Try to populate a THP. Touch the first sub-page and test if >> + * we get the last sub-page populated automatically. >> */ >> mem[0] = 0; >> - if (!pagemap_is_populated(pagemap_fd, mem + pagesize)) { >> + if (!pagemap_is_populated(pagemap_fd, mem + thpsize - pagesize)) { >> ksft_test_result_skip("Did not get a THP populated\n"); >> goto munmap; >> } >> @@ -773,12 +773,14 @@ static void do_run_with_thp(test_fn fn, enum thp_run thp_run) >> switch (thp_run) { >> case THP_RUN_PMD: >> case THP_RUN_PMD_SWAPOUT: >> + assert(thpsize == pmdsize); >> break; >> case THP_RUN_PTE: >> case THP_RUN_PTE_SWAPOUT: >> /* >> * Trigger PTE-mapping the THP by temporarily mapping a single >> - * subpage R/O. >> + * subpage R/O. This is a noop if the THP is not pmdsize (and >> + * therefore already PTE-mapped). >> */ >> ret = mprotect(mem + pagesize, pagesize, PROT_READ); >> if (ret) { >> @@ -875,52 +877,60 @@ static void do_run_with_thp(test_fn fn, enum thp_run thp_run) >> munmap(mremap_mem, mremap_size); >> } >> >> -static void run_with_thp(test_fn fn, const char *desc) >> +static void run_with_thp(test_fn fn, const char *desc, size_t size) >> { >> - ksft_print_msg("[RUN] %s ... with THP\n", desc); >> - do_run_with_thp(fn, THP_RUN_PMD); >> + ksft_print_msg("[RUN] %s ... with THP (%zu kB)\n", >> + desc, size / 1024); >> + do_run_with_thp(fn, THP_RUN_PMD, size); >> } >> >> -static void run_with_thp_swap(test_fn fn, const char *desc) >> +static void run_with_thp_swap(test_fn fn, const char *desc, size_t size) >> { >> - ksft_print_msg("[RUN] %s ... with swapped-out THP\n", desc); >> - do_run_with_thp(fn, THP_RUN_PMD_SWAPOUT); >> + ksft_print_msg("[RUN] %s ... with swapped-out THP (%zu kB)\n", >> + desc, size / 1024); >> + do_run_with_thp(fn, THP_RUN_PMD_SWAPOUT, size); >> } >> >> -static void run_with_pte_mapped_thp(test_fn fn, const char *desc) >> +static void run_with_pte_mapped_thp(test_fn fn, const char *desc, size_t size) >> { >> - ksft_print_msg("[RUN] %s ... with PTE-mapped THP\n", desc); >> - do_run_with_thp(fn, THP_RUN_PTE); >> + ksft_print_msg("[RUN] %s ... with PTE-mapped THP (%zu kB)\n", >> + desc, size / 1024); >> + do_run_with_thp(fn, THP_RUN_PTE, size); >> } >> >> -static void run_with_pte_mapped_thp_swap(test_fn fn, const char *desc) >> +static void run_with_pte_mapped_thp_swap(test_fn fn, const char *desc, size_t size) >> { >> - ksft_print_msg("[RUN] %s ... with swapped-out, PTE-mapped THP\n", desc); >> - do_run_with_thp(fn, THP_RUN_PTE_SWAPOUT); >> + ksft_print_msg("[RUN] %s ... with swapped-out, PTE-mapped THP (%zu kB)\n", >> + desc, size / 1024); >> + do_run_with_thp(fn, THP_RUN_PTE_SWAPOUT, size); >> } >> >> -static void run_with_single_pte_of_thp(test_fn fn, const char *desc) >> +static void run_with_single_pte_of_thp(test_fn fn, const char *desc, size_t size) >> { >> - ksft_print_msg("[RUN] %s ... with single PTE of THP\n", desc); >> - do_run_with_thp(fn, THP_RUN_SINGLE_PTE); >> + ksft_print_msg("[RUN] %s ... with single PTE of THP (%zu kB)\n", >> + desc, size / 1024); >> + do_run_with_thp(fn, THP_RUN_SINGLE_PTE, size); >> } >> >> -static void run_with_single_pte_of_thp_swap(test_fn fn, const char *desc) >> +static void run_with_single_pte_of_thp_swap(test_fn fn, const char *desc, size_t size) >> { >> - ksft_print_msg("[RUN] %s ... with single PTE of swapped-out THP\n", desc); >> - do_run_with_thp(fn, THP_RUN_SINGLE_PTE_SWAPOUT); >> + ksft_print_msg("[RUN] %s ... with single PTE of swapped-out THP (%zu kB)\n", >> + desc, size / 1024); >> + do_run_with_thp(fn, THP_RUN_SINGLE_PTE_SWAPOUT, size); >> } >> >> -static void run_with_partial_mremap_thp(test_fn fn, const char *desc) >> +static void run_with_partial_mremap_thp(test_fn fn, const char *desc, size_t size) >> { >> - ksft_print_msg("[RUN] %s ... with partially mremap()'ed THP\n", desc); >> - do_run_with_thp(fn, THP_RUN_PARTIAL_MREMAP); >> + ksft_print_msg("[RUN] %s ... with partially mremap()'ed THP (%zu kB)\n", >> + desc, size / 1024); >> + do_run_with_thp(fn, THP_RUN_PARTIAL_MREMAP, size); >> } >> >> -static void run_with_partial_shared_thp(test_fn fn, const char *desc) >> +static void run_with_partial_shared_thp(test_fn fn, const char *desc, size_t size) >> { >> - ksft_print_msg("[RUN] %s ... with partially shared THP\n", desc); >> - do_run_with_thp(fn, THP_RUN_PARTIAL_SHARED); >> + ksft_print_msg("[RUN] %s ... with partially shared THP (%zu kB)\n", >> + desc, size / 1024); >> + do_run_with_thp(fn, THP_RUN_PARTIAL_SHARED, size); >> } >> >> static void run_with_hugetlb(test_fn fn, const char *desc, size_t hugetlbsize) >> @@ -1091,15 +1101,15 @@ static void run_anon_test_case(struct test_case const *test_case) >> >> run_with_base_page(test_case->fn, test_case->desc); >> run_with_base_page_swap(test_case->fn, test_case->desc); >> - if (thpsize) { >> - run_with_thp(test_case->fn, test_case->desc); >> - run_with_thp_swap(test_case->fn, test_case->desc); >> - run_with_pte_mapped_thp(test_case->fn, test_case->desc); >> - run_with_pte_mapped_thp_swap(test_case->fn, test_case->desc); >> - run_with_single_pte_of_thp(test_case->fn, test_case->desc); >> - run_with_single_pte_of_thp_swap(test_case->fn, test_case->desc); >> - run_with_partial_mremap_thp(test_case->fn, test_case->desc); >> - run_with_partial_shared_thp(test_case->fn, test_case->desc); >> + if (pmdsize) { >> + run_with_thp(test_case->fn, test_case->desc, pmdsize); >> + run_with_thp_swap(test_case->fn, test_case->desc, pmdsize); >> + run_with_pte_mapped_thp(test_case->fn, test_case->desc, pmdsize); >> + run_with_pte_mapped_thp_swap(test_case->fn, test_case->desc, pmdsize); >> + run_with_single_pte_of_thp(test_case->fn, test_case->desc, pmdsize); >> + run_with_single_pte_of_thp_swap(test_case->fn, test_case->desc, pmdsize); >> + run_with_partial_mremap_thp(test_case->fn, test_case->desc, pmdsize); >> + run_with_partial_shared_thp(test_case->fn, test_case->desc, pmdsize); >> } >> for (i = 0; i < nr_hugetlbsizes; i++) >> run_with_hugetlb(test_case->fn, test_case->desc, >> @@ -1120,7 +1130,7 @@ static int tests_per_anon_test_case(void) >> { >> int tests = 2 + nr_hugetlbsizes; >> >> - if (thpsize) >> + if (pmdsize) >> tests += 8; >> return tests; >> } >> @@ -1329,7 +1339,7 @@ static void run_anon_thp_test_cases(void) >> { >> int i; >> >> - if (!thpsize) >> + if (!pmdsize) >> return; >> >> ksft_print_msg("[INFO] Anonymous THP tests\n"); >> @@ -1338,13 +1348,13 @@ static void run_anon_thp_test_cases(void) >> struct test_case const *test_case = &anon_thp_test_cases[i]; >> >> ksft_print_msg("[RUN] %s\n", test_case->desc); >> - do_run_with_thp(test_case->fn, THP_RUN_PMD); >> + do_run_with_thp(test_case->fn, THP_RUN_PMD, pmdsize); >> } >> } >> >> static int tests_per_anon_thp_test_case(void) >> { >> - return thpsize ? 1 : 0; >> + return pmdsize ? 1 : 0; >> } >> >> typedef void (*non_anon_test_fn)(char *mem, const char *smem, size_t size); >> @@ -1419,7 +1429,7 @@ static void run_with_huge_zeropage(non_anon_test_fn fn, const char *desc) >> } >> >> /* For alignment purposes, we need twice the thp size. */ >> - mmap_size = 2 * thpsize; >> + mmap_size = 2 * pmdsize; >> mmap_mem = mmap(NULL, mmap_size, PROT_READ | PROT_WRITE, >> MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); >> if (mmap_mem == MAP_FAILED) { >> @@ -1434,11 +1444,11 @@ static void run_with_huge_zeropage(non_anon_test_fn fn, const char *desc) >> } >> >> /* We need a THP-aligned memory area. */ >> - mem = (char *)(((uintptr_t)mmap_mem + thpsize) & ~(thpsize - 1)); >> - smem = (char *)(((uintptr_t)mmap_smem + thpsize) & ~(thpsize - 1)); >> + mem = (char *)(((uintptr_t)mmap_mem + pmdsize) & ~(pmdsize - 1)); >> + smem = (char *)(((uintptr_t)mmap_smem + pmdsize) & ~(pmdsize - 1)); >> >> - ret = madvise(mem, thpsize, MADV_HUGEPAGE); >> - ret |= madvise(smem, thpsize, MADV_HUGEPAGE); >> + ret = madvise(mem, pmdsize, MADV_HUGEPAGE); >> + ret |= madvise(smem, pmdsize, MADV_HUGEPAGE); >> if (ret) { >> ksft_test_result_fail("MADV_HUGEPAGE failed\n"); >> goto munmap; >> @@ -1457,7 +1467,7 @@ static void run_with_huge_zeropage(non_anon_test_fn fn, const char *desc) >> goto munmap; >> } >> >> - fn(mem, smem, thpsize); >> + fn(mem, smem, pmdsize); >> munmap: >> munmap(mmap_mem, mmap_size); >> if (mmap_smem != MAP_FAILED) >> @@ -1650,7 +1660,7 @@ static void run_non_anon_test_case(struct non_anon_test_case const *test_case) >> run_with_zeropage(test_case->fn, test_case->desc); >> run_with_memfd(test_case->fn, test_case->desc); >> run_with_tmpfile(test_case->fn, test_case->desc); >> - if (thpsize) >> + if (pmdsize) >> run_with_huge_zeropage(test_case->fn, test_case->desc); >> for (i = 0; i < nr_hugetlbsizes; i++) >> run_with_memfd_hugetlb(test_case->fn, test_case->desc, >> @@ -1671,7 +1681,7 @@ static int tests_per_non_anon_test_case(void) >> { >> int tests = 3 + nr_hugetlbsizes; >> >> - if (thpsize) >> + if (pmdsize) >> tests += 1; >> return tests; >> } >> @@ -1681,10 +1691,13 @@ int main(int argc, char **argv) >> int err; >> >> pagesize = getpagesize(); >> - thpsize = read_pmd_pagesize(); >> - if (thpsize) >> + pmdsize = read_pmd_pagesize(); >> + if (pmdsize) { >> + ksft_print_msg("[INFO] detected PMD size: %zu KiB\n", >> + pmdsize / 1024); >> ksft_print_msg("[INFO] detected THP size: %zu KiB\n", >> - thpsize / 1024); >> + pmdsize / 1024); >> + } >> nr_hugetlbsizes = detect_hugetlb_page_sizes(hugetlbsizes, >> ARRAY_SIZE(hugetlbsizes)); >> detect_huge_zeropage(); >> -- >> 2.25.1 >>