From patchwork Fri Sep 29 11:44:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Roberts X-Patchwork-Id: 13404143 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id AAA06E810D5 for ; Fri, 29 Sep 2023 11:46:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=A/HYklAq3LtZOmAWNLLtsxXA3KZWYZPRccWAzz/DCCA=; b=lMiZZLSzwwN9Fk d+GQNstsG0CkH4SzE4CFKz3GwU9o2qinKIKRfDHzmws0XlOM2lpOhTrmj4hrtULeOmeTvb6NCbW9d YIlgvqy3PwiTb4sEtH1RxsB/Eoej5jv5bNILqCDuZAG/uMhLXiHjXIRFf1AiMhr69atPgImVdMYV4 fmAr0TCrIbdPUqJXHZTORSAAkarqBu/RiK9FU+gwS5Y+TiVj6jpVPUIPkkF9fVuFvIo/v/WlsAF08 c3ols7NWdAcsHbjgUsXwIuMDshSTZ5Qy0NCXfDukQi7JX/CQBSzE8jPKkRp6xIgx/f0sKD01aHl06 vptI6oJ3SzQxx9Aiqkjg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qmBwG-007pfF-0M; Fri, 29 Sep 2023 11:45:44 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qmBvW-007pI7-2v for linux-arm-kernel@lists.infradead.org; Fri, 29 Sep 2023 11:45:02 +0000 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 7C4B61007; Fri, 29 Sep 2023 04:45:36 -0700 (PDT) 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 9A1783F59C; Fri, 29 Sep 2023 04:44:55 -0700 (PDT) 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 Cc: Ryan Roberts , linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v6 9/9] selftests/mm/cow: Add tests for small-order anon THP Date: Fri, 29 Sep 2023 12:44:20 +0100 Message-Id: <20230929114421.3761121-10-ryan.roberts@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230929114421.3761121-1-ryan.roberts@arm.com> References: <20230929114421.3761121-1-ryan.roberts@arm.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230929_044459_069264_D64333DF X-CRM114-Status: GOOD ( 17.71 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add tests similar to the existing THP tests, but which operate on memory backed by smaller-order, PTE-mapped THP. This reuses all the existing infrastructure. If the test suite detects that small-order THP is not supported by the kernel, the new tests are skipped. Signed-off-by: Ryan Roberts --- tools/testing/selftests/mm/cow.c | 93 ++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/tools/testing/selftests/mm/cow.c b/tools/testing/selftests/mm/cow.c index d887ce454e34..6c5e37d8bb69 100644 --- a/tools/testing/selftests/mm/cow.c +++ b/tools/testing/selftests/mm/cow.c @@ -33,10 +33,13 @@ static size_t pagesize; static int pagemap_fd; static size_t pmdsize; +static size_t ptesize; static int nr_hugetlbsizes; static size_t hugetlbsizes[10]; static int gup_fd; static bool has_huge_zeropage; +static unsigned int orig_anon_orders; +static bool orig_anon_orders_valid; static void detect_huge_zeropage(void) { @@ -1118,6 +1121,14 @@ static void run_anon_test_case(struct test_case const *test_case) run_with_partial_mremap_thp(test_case->fn, test_case->desc, pmdsize); run_with_partial_shared_thp(test_case->fn, test_case->desc, pmdsize); } + if (ptesize) { + run_with_pte_mapped_thp(test_case->fn, test_case->desc, ptesize); + run_with_pte_mapped_thp_swap(test_case->fn, test_case->desc, ptesize); + run_with_single_pte_of_thp(test_case->fn, test_case->desc, ptesize); + run_with_single_pte_of_thp_swap(test_case->fn, test_case->desc, ptesize); + run_with_partial_mremap_thp(test_case->fn, test_case->desc, ptesize); + run_with_partial_shared_thp(test_case->fn, test_case->desc, ptesize); + } for (i = 0; i < nr_hugetlbsizes; i++) run_with_hugetlb(test_case->fn, test_case->desc, hugetlbsizes[i]); @@ -1139,6 +1150,8 @@ static int tests_per_anon_test_case(void) if (pmdsize) tests += 8; + if (ptesize) + tests += 6; return tests; } @@ -1693,6 +1706,80 @@ static int tests_per_non_anon_test_case(void) return tests; } +#define ANON_ORDERS_FILE "/sys/kernel/mm/transparent_hugepage/anon_orders" + +static int read_anon_orders(unsigned int *orders) +{ + ssize_t buflen = 80; + char buf[buflen]; + int fd; + + fd = open(ANON_ORDERS_FILE, O_RDONLY); + if (fd == -1) + return -1; + + buflen = read(fd, buf, buflen); + close(fd); + + if (buflen < 1) + return -1; + + *orders = strtoul(buf, NULL, 16); + + return 0; +} + +static int write_anon_orders(unsigned int orders) +{ + ssize_t buflen = 80; + char buf[buflen]; + int fd; + + fd = open(ANON_ORDERS_FILE, O_WRONLY); + if (fd == -1) + return -1; + + buflen = snprintf(buf, buflen, "0x%08x\n", orders); + buflen = write(fd, buf, buflen); + close(fd); + + if (buflen < 1) + return -1; + + return 0; +} + +static size_t save_thp_anon_orders(void) +{ + /* + * If the kernel supports multiple orders for anon THP (indicated by the + * presence of anon_orders file), configure it for the PMD-order and the + * PMD-order - 1, which we will report back and use as the PTE-order THP + * size. Save the original value so that it can be restored on exit. If + * the kernel does not support multiple orders, report back 0 for the + * PTE-size so those tests are skipped. + */ + + int pteorder = sz2ord(pmdsize) - 1; + unsigned int orders = (1UL << sz2ord(pmdsize)) | (1UL << pteorder); + + if (read_anon_orders(&orig_anon_orders)) + return 0; + + orig_anon_orders_valid = true; + + if (write_anon_orders(orders)) + return 0; + + return pagesize << pteorder; +} + +static void restore_thp_anon_orders(void) +{ + if (orig_anon_orders_valid) + write_anon_orders(orig_anon_orders); +} + int main(int argc, char **argv) { int err; @@ -1702,6 +1789,10 @@ int main(int argc, char **argv) if (pmdsize) ksft_print_msg("[INFO] detected PMD-mapped THP size: %zu KiB\n", pmdsize / 1024); + ptesize = save_thp_anon_orders(); + if (ptesize) + ksft_print_msg("[INFO] configured PTE-mapped THP size: %zu KiB\n", + ptesize / 1024); nr_hugetlbsizes = detect_hugetlb_page_sizes(hugetlbsizes, ARRAY_SIZE(hugetlbsizes)); detect_huge_zeropage(); @@ -1720,6 +1811,8 @@ int main(int argc, char **argv) run_anon_thp_test_cases(); run_non_anon_test_cases(); + restore_thp_anon_orders(); + err = ksft_get_fail_cnt(); if (err) ksft_exit_fail_msg("%d out of %d tests failed\n",