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 83794C3DA6E for ; Wed, 3 Jan 2024 06:22:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A6D296B00BC; Wed, 3 Jan 2024 01:22:16 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 9F4F86B00BD; Wed, 3 Jan 2024 01:22:16 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8977A6B00BE; Wed, 3 Jan 2024 01:22:16 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 76B5A6B00BC for ; Wed, 3 Jan 2024 01:22:16 -0500 (EST) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 3F11180123 for ; Wed, 3 Jan 2024 06:22:16 +0000 (UTC) X-FDA: 81637005072.08.9A4F27C Received: from out-186.mta0.migadu.com (out-186.mta0.migadu.com [91.218.175.186]) by imf14.hostedemail.com (Postfix) with ESMTP id 6046210000A for ; Wed, 3 Jan 2024 06:22:13 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b="VQeI/TvT"; spf=pass (imf14.hostedemail.com: domain of itaru.kitayama@linux.dev designates 91.218.175.186 as permitted sender) smtp.mailfrom=itaru.kitayama@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1704262933; a=rsa-sha256; cv=none; b=CO1vBs9Ajbzw72lk8Z61ielac4PbiT1JOfg5jtdqk+diMXa4fBPDHa1T3r7+0uq4R209r4 hl3TyfEMYhmbfxudA/2jwxsquCqrd4s+Z8+rWs5BIwfw0jTIQQTKVuwZNUM/TbUrWTCsEJ vKeR/kYf4o0ZUnRlrTrGNURu+RduXcU= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b="VQeI/TvT"; spf=pass (imf14.hostedemail.com: domain of itaru.kitayama@linux.dev designates 91.218.175.186 as permitted sender) smtp.mailfrom=itaru.kitayama@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1704262933; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=OkWOvh0R4AzZSrU0vzv3EnSquWMWG0rTt3bwonJYN+8=; b=nKiyDbPZQISyP96OJirmHFdGiTXD8PbdjunVIZfBo7IL7k/A9XbDNSGu3+BQz9/eb5qgvl V8W5U1Ty+hQ5IQEtS73GDVLjd9Bsv6+Q6q5SbzX3OuQK7q8nrpgaUiMvgsCiulwH61RNLz d6fNjRuNDzzeJpcL02QBxjg/JqMtR6I= Date: Wed, 3 Jan 2024 15:21:56 +0900 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1704262931; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=OkWOvh0R4AzZSrU0vzv3EnSquWMWG0rTt3bwonJYN+8=; b=VQeI/TvThTX0DYcsW5HWKSf0W7GVMNVuOD7PE52pb00ctxmftBccuI+ZxlD940CHPZrrTK 7i3VYRWCUlWJQHng6MYrlOnYKBApfRrZML5mppuijffoaanZooakRBxCnBCmuYAVEcQ3L9 AORoeoX8dr+FvT5SfJQwFMmRX7cI7fg= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Itaru Kitayama To: Ryan Roberts 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 Subject: Re: [PATCH v9 09/10] selftests/mm/cow: Generalize do_run_with_thp() helper Message-ID: References: <20231207161211.2374093-1-ryan.roberts@arm.com> <20231207161211.2374093-10-ryan.roberts@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20231207161211.2374093-10-ryan.roberts@arm.com> X-Migadu-Flow: FLOW_OUT X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 6046210000A X-Stat-Signature: uj7mzu8qwz4gt41a9an91m5kwfwhbdr4 X-Rspam-User: X-HE-Tag: 1704262933-119697 X-HE-Meta: U2FsdGVkX18CThg1lGKcVaYfS1ldIC7Wmkz4JSzxMCaFSK4jzwtsnq2IEp3izpGqzEXmLfj3WLm1VouwCc5/x4YCt0YpT/h3s5G5Q0CJBlZnDL+l8UR4eEjax2b1c3U7B0O6xzCeq+c3tH8SqvDhuxXxyjZ363smZTilTtZCU27JjL8rkB9OU6a6h0b93akvdS6X/RvZ281ixo6RPiests+OD30J5fZD6QQGgQnAiYCxBsQrxUYUXdqjEkAYe/bFUWelYx2in0SvcJwtLv1JJXzVysyU3OW8qPeEGblTs0ISI99CpUBL3IOeVMhqRlNHKaqv0f7w4y58UfH3iauLgzlvE9dtDyuQjjpjWDfFrb9vA/05mOtcfdntwfjzcZk5/tdqom8kdJnVxbeOEpprW8MUhtm1icRV3ppaT149+h6VTrwYX3CAQwjjN5d5EzUS556RQG3wUVHRfAJ0PBit6Rz16dKITvtzELzuGQ1G99HmQ5TsrteWBoPWjqW9UX4i8d2/25l3+sftL8SgdzaEXohc0V02IB3EubWxtnh9zHgj3DG/jx8N+qPW6whOEIDxEW2LgB+IfzjKh4gDyH/c65UAmBgLVR8YYjFcVWo9MyMTJvdz1QfhEwhddeY8J4MHjGC6cddfPAgyCyxwA//IZ/7z5hQXovPzdGmh+sxswNacON3GS0E9J8swJ9YJJdMViaE2MBVACWgKarJWoDPbR0KguC78BgYDDC4QEXJhMovjyVI1Vc1b/mM0lB2LTXVflRX3giZLBwe/0A9Glk1dVJBoDjjoQa/OL+VsnM450lZTr3RhQKZPp856c8HnlXEjnMTwqBKp5oru2+macUbj1E2Br4BDd2rQHNK0yWCoC2HU75l/UDme4SUAoQVtZ7frMQyzAaYyIT5s0jbkMr+hGFv1oYB/ylr9RlpO6uzmAfd3Ratc6PXT/Mx/Ulte+eTpeto8aaHvVq3YPABVGoL INOrW5VX rFrWuBCKU9RZsExkCTsf01Q0lfeDKtxFYHu+ViAq/S8WbpMVGkhZNaAD/SYaAwd26mo8BOhChTehSHL56B86j7El7ZXPVJBC1p33X6rXJfVh89tFXW3EPUKSnA4kvZSBXnyYYDzDkfpD8v6Kq0cq1hhG1awSbKLLRHyXalpIK9hCDK4ys6wpnn+5qXC5rZazUYQjAI+LlRyTEWdc6Sniww2zDbt8MfN4E1TQl29YPx+lGlR+dZnP4dBwRBouW9HuVOfACRHkxO4sjSQ8lMJgXJXv3yeRQp9Z9zrqBuGFeCdblcRD6k9rQD5EscoOp063GKtc8QmJnfcxXFUAjNd+aFFme0A== 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 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 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. > --- > 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 >