From patchwork Mon Jul 17 10:31:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Roberts X-Patchwork-Id: 13315412 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 06A79C00528 for ; Mon, 17 Jul 2023 10:32:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 88FBC6B0074; Mon, 17 Jul 2023 06:32:11 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 83FC26B0075; Mon, 17 Jul 2023 06:32:11 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 72E778D0001; Mon, 17 Jul 2023 06:32:11 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 658756B0074 for ; Mon, 17 Jul 2023 06:32:11 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 341E240557 for ; Mon, 17 Jul 2023 10:32:11 +0000 (UTC) X-FDA: 81020738862.26.A4F710B Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf07.hostedemail.com (Postfix) with ESMTP id 5425940018 for ; Mon, 17 Jul 2023 10:32:09 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=none; spf=pass (imf07.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689589929; a=rsa-sha256; cv=none; b=4Dmnj1hP21pnypqYGvbNXj3jA5zizX/4kR5HS1PYwwgJnphr0aRUTMyL8ck0idQeegqK2q vOh4AvRbQMVTTkw912deRVBe3b6yKyfsbDgjffpTlJhHTn/v7LB6fEkcEz0ag+NwyMrN6O LiJ2rMNfULTfz6Bbw/sr5pjMGYKJQwc= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=none; spf=pass (imf07.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1689589929; 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=4IQ8IXDko9tfglX73dLBnmTqnSbgJyeqxWIDPYOqiN0=; b=noWAqozg0D10Gwm287Sz9l6AQDp2EJGiPk2xo04KFpeGxRLi4aocnk3OWoMo4xwAOVLOok lFoany0sMa/YbeFSPmIfLd770+ESvetvGaT33dUQNwITfseLrndjgw71RD4q3umshoD/Jn C/94tgVqJtJnUSu2ejOw7i7wa/VeVkk= 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 97EC2D75; Mon, 17 Jul 2023 03:32:51 -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 9E9463F67D; Mon, 17 Jul 2023 03:32:06 -0700 (PDT) From: Ryan Roberts To: "Andrew Morton" , "Shuah Khan" , =?utf-8?b?SsOpcsO0bWUgR2xpc3Nl?= , "David Hildenbrand" , "Mark Brown" , "John Hubbard" , "Florent Revest" , Peter Xu Cc: Ryan Roberts , linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-kselftest@vger.kernel.org Subject: [PATCH v2 1/8] selftests: Line buffer test program's stdout Date: Mon, 17 Jul 2023 11:31:45 +0100 Message-Id: <20230717103152.202078-2-ryan.roberts@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230717103152.202078-1-ryan.roberts@arm.com> References: <20230717103152.202078-1-ryan.roberts@arm.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 5425940018 X-Stat-Signature: tq1karrc4z6tc335fwzdgf5j3cdqdjzr X-HE-Tag: 1689589929-600528 X-HE-Meta: U2FsdGVkX1+dhGVGZT9p4eYUHeCS/6WfnXntMp6gk4ybYn9KqjNjuSkEQ9rSGrJNwBefHd5h/jsCp4OS264VEDXc1h07P8mevT5qXTZ4wIIMopnGyK25z9KaXGYMw9RVtRs71idBTXNVXGiQNTehsK+ZK+jEoxuf9TuIMvXkK8pFbOTYycetIvDAeUZwXjvw7G5Fztaj5KehisXC3ny7N4laOVy7tkTieoMVMNjKrTHo19FnxABOZchYSMvfgKIE7UGAzGznUho9f3ejRLW6jkcwWEWS6XmpfYdovs3teWGvZZwDpD4/x8rM7O2w+MEh50ZDgot5IrSITV87LhF5JeCkGUtN7M0BaP5WGYIBb9szc35IGZtWY+k6ZjvMSETSNchzJdcT++zANWdo9mg25Z0qDHz6aA0LlNrhgEfiGszvfuhZuwRPsgh06g5yNeAnSDvl7bD2HoTADijE5MV+2AxuRLz6TPVAUfMTEnVekjOcd+ds9inftcpVG9NGqEbT14/zbgNUJrITi/LFf2s/Cq7SjPSq+Xvh1evAZsryQSVKTghBFr1ZPaf95cP3e4ICAkDA9lFe1/R3qkyN0iZpIEBn0yclbF9tNeAkSw2Fz+3EyVxScOM8x0YRW9TCpU68OCzIkU4nSSaUomr+s9LT+2DQrVObKU8QPb2DwDXXHHiv37yWSO1Bj6q88qIJZ9l9DKQVI6TJImLZqrIzbWo59nZihOWSi8PuGE/U6ammwp+YT9st9sTMzI/yd4xyI2sohH6VfFDzF7QcXyOQk21mfon8PCm7AURfiV5BPErtu4UQxKsUOdoQy2hUXBp++XWxE3UWUVHCNU3+xB9FZeI9v9F/8+RBU/fYjQKX9abLtaPsf+lcoxOEcW4qnHlzQv22l+otZUCXEiVuTJQWmkII4aQtDGSWe8D5Bv2KENJi6qjmETG4rT+HqYlEL9zFeF8ZpmJHEyUWiEK7L/PvUIL PLlzD/dr pUQplLbUtXzK7w+VepiN+msKO9dYgIYzy9oq6QjHJ6PofnlUWbKGXAhZWgQfJWRnVFLw2N8NJp5Uiq8vQCezQHWPbIsPhb4DyZaDnaaU6Dm8Yy1K5srvdb8DOq2Hh9/S75qsY0mW5N9JuWbXR3/qiZCX65Q99cOwVSmAe 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: The selftests runner pipes the test program's stdout to tap_prefix. The presence of the pipe means that the test program sets its stdout to be fully buffered (as aposed to line buffered when directly connected to the terminal). The block buffering means that there is often content in the buffer at fork() time, which causes the output to end up duplicated. This was causing problems for mm:cow where test results were duplicated 20-30x. Solve this by using `stdbuf`, when available to force the test program to use line buffered mode. This means previously printf'ed results are flushed out of the program before any fork(). Additionally, explicitly set line buffer mode in ksft_print_header(), which means that all test programs that use the ksft framework will benefit even if stdbuf is not present on the system. Signed-off-by: Ryan Roberts Reviewed-by: Mark Brown --- tools/testing/selftests/kselftest.h | 9 +++++++++ tools/testing/selftests/kselftest/runner.sh | 7 +++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/kselftest.h b/tools/testing/selftests/kselftest.h index 829be379545a..529d29a35900 100644 --- a/tools/testing/selftests/kselftest.h +++ b/tools/testing/selftests/kselftest.h @@ -113,6 +113,15 @@ static inline int ksft_get_error_cnt(void) { return ksft_cnt.ksft_error; } static inline void ksft_print_header(void) { + /* + * Force line buffering; If stdout is not connected to a terminal, it + * will otherwise default to fully buffered, which can cause output + * duplication if there is content in the buffer when fork()ing. If + * there is a crash, line buffering also means the most recent output + * line will be visible. + */ + setvbuf(stdout, NULL, _IOLBF, 0); + if (!(getenv("KSFT_TAP_LEVEL"))) printf("TAP version 13\n"); } diff --git a/tools/testing/selftests/kselftest/runner.sh b/tools/testing/selftests/kselftest/runner.sh index 1c952d1401d4..261c73cab41b 100644 --- a/tools/testing/selftests/kselftest/runner.sh +++ b/tools/testing/selftests/kselftest/runner.sh @@ -105,15 +105,18 @@ run_one() echo "# Warning: file $TEST is missing!" echo "not ok $test_num $TEST_HDR_MSG" else + if [ -x /usr/bin/stdbuf ]; then + stdbuf="/usr/bin/stdbuf --output=L " + fi eval kselftest_cmd_args="\$${kselftest_cmd_args_ref:-}" - cmd="./$BASENAME_TEST $kselftest_cmd_args" + cmd="$stdbuf ./$BASENAME_TEST $kselftest_cmd_args" if [ ! -x "$TEST" ]; then echo "# Warning: file $TEST is not executable" if [ $(head -n 1 "$TEST" | cut -c -2) = "#!" ] then interpreter=$(head -n 1 "$TEST" | cut -c 3-) - cmd="$interpreter ./$BASENAME_TEST" + cmd="$stdbuf $interpreter ./$BASENAME_TEST" else echo "not ok $test_num $TEST_HDR_MSG" return From patchwork Mon Jul 17 10:31:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Roberts X-Patchwork-Id: 13315413 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 B3824C001DE for ; Mon, 17 Jul 2023 10:32:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4C3AC6B0075; Mon, 17 Jul 2023 06:32:13 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 470578D0001; Mon, 17 Jul 2023 06:32:13 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 29B5E6B007B; Mon, 17 Jul 2023 06:32:13 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 195EA6B0075 for ; Mon, 17 Jul 2023 06:32:13 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id E970AA04E0 for ; Mon, 17 Jul 2023 10:32:12 +0000 (UTC) X-FDA: 81020738904.11.A32147D Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf19.hostedemail.com (Postfix) with ESMTP id 2FC521A0006 for ; Mon, 17 Jul 2023 10:32:10 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf19.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=1689589931; 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=OhDfs2rBRxa6sjKAOBnl3G00rvbgCnvO7zVueRIMeN8=; b=EJR3azqyCXmk6xCUE07lHu2Ou0rDwBZ+k4W+OvAb+zNZyJqnjU5Z8QKROo2QWeXYU8FFtG nXG7wrsLf1eM/9LYNW1PYXpevHkBHwQLrZMprF3QGMYz4OIa/QUM8UKI9zbDB0bkKOI/az Q9t3RJ5Kk9qlJVTj2XEdkDgR/EO7BFg= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf19.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=1689589931; a=rsa-sha256; cv=none; b=EYV9KqAtXDmA1PP+Mni70mkXudJ0ZxJiUKVmpMnv95k6i5jmAmSKtwS9uTSgH++RbYI+ob SaQvN9arYJezzAUzuYAk9VQRtVQknfu+3kPPlMhtNFMWu8qePlg9sDhdtE15DHXjUehKRc rqJcGQCW0ZOH6NucYyf8xYb8c4FOa0s= 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 8D7CE2F4; Mon, 17 Jul 2023 03:32:53 -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 930F33F67D; Mon, 17 Jul 2023 03:32:08 -0700 (PDT) From: Ryan Roberts To: "Andrew Morton" , "Shuah Khan" , =?utf-8?b?SsOpcsO0bWUgR2xpc3Nl?= , "David Hildenbrand" , "Mark Brown" , "John Hubbard" , "Florent Revest" , Peter Xu Cc: Ryan Roberts , linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-kselftest@vger.kernel.org Subject: [PATCH v2 2/8] selftests/mm: Skip soft-dirty tests on arm64 Date: Mon, 17 Jul 2023 11:31:46 +0100 Message-Id: <20230717103152.202078-3-ryan.roberts@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230717103152.202078-1-ryan.roberts@arm.com> References: <20230717103152.202078-1-ryan.roberts@arm.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 2FC521A0006 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: mox8cser4sfahkmxw8i6ep8fx64ypyrj X-HE-Tag: 1689589930-450826 X-HE-Meta: U2FsdGVkX18M9K92mKt6CObmnRAAafkJ835bxlJviEV2Mrg4SApcVWd7Sg1JDVV5P7ha4EzbUZ+xGNLs3eov/7fJb0zQuesh+eqqmabYiy+lS3w4shb/kfKGp+Wm5hVgQm7HyGACdZkfhmpWAfRPiCJTHXO4An0HMz8UwIeloYS7dvhRB2yYpNo541rd8sZZxvRBVtaqhtej1TEsFywyaj0M5Z1HyJuxNfdHsE5Xtps7S9UUY1PsVQfnfY1WH39rnOaztppRIE2toLFBoON8be1zQs8wgpX8OX1H6oPI3OXHEkSuHdnCsrlXKkVNoZoaa+zOQf2q6pyhScrmFZHHUSaqCX2/yuGw6OWr6U5k48+EXdqY7ow1Ay4s3S1EJz7UR6VDsAxWcV1oC7r/bUPC4a0jP7DQM4a1OC4ymmmyjBg/Xs6n3eo2QI0LWAKIOn36/f99JKjgZYPIF3PxLfqxa+zVMn/QuBssnJuiIJMlmV6KwCFJLKLJdbmeF5Tzu2YQv3a5BeHEdQbHKTeGpvtn1ilt9/f3bpbtuu6peRy5zOAK4xiewOvdB8mk7upGKkT/HpXJnrKxDeL04wkA0QHFK/XgDOGCQRQmPhMUNRmvrHda3mhyEmPQQzGFuW0AEDRcDlG9Pb3Oek4eJ1XE0WxDDc9JZpP1BCfA2nNb7z3YslqinUzdAOHSWaX+ztO3XlrYmxppSF9K5Hrc0CYhysQvheAEL6pBqytlBdqOahQ/pg/ql9itI5bh9KbZZ0ECQOAzqpMBo/e9MFzLf2SxoEt5tuOaaE/2Z8RuOLlBOTZ7drbezu4nK3AwW+okHdrJnzy75CElRoIkC33UUkK+Ndu8Xl9xL2FXHvnSNzGlOxHEybKoR5LeTTVnbaXQl2Z99P/atH8lg7uVf4EmkHj5VMCiUcKJlcYztbMeFuxmK/4I6KvzOFwsnv2Zbnet+++PfvfiGd0YdMsFQmpKijTyjeZ cFdJtmcm bTgp+JcRPGaYo11jKc2x4BT+NdB368EZSq79wWFoV9igV0hrDqJyAlIQKSn3aCi2LbTUlDEJPD+pjCTSO9UK4b9fl9kBO8UaKggZ5PdYaovCxRIrBACTv71LeGhV9qbHMI3SJ4x+vl0ASO622u+K/I7lLSh97kHPIsUcN 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: arm64 does not support the soft-dirty PTE bit. However, the `soft-dirty` test suite is currently run unconditionally and therefore generates spurious test failures on arm64. There are also some tests in `madv_populate` which assume it is supported. For `soft-dirty` lets disable the whole suite for arm64; it is no longer built and run_vmtests.sh will skip it if its not present. For `madv_populate`, we need a runtime mechanism so that the remaining tests continue to be run. Unfortunately, the only way to determine if the soft-dirty dirty bit is supported is to write to a page, then see if the bit is set in /proc/self/pagemap. But the tests that we want to conditionally execute are testing precicesly this. So if we introduced this feature check, we could accedentally turn a real failure (on a system that claims to support soft-dirty) into a skip. So instead, do the check based on architecture; for arm64, we report that soft-dirty is not supported. Signed-off-by: Ryan Roberts Acked-by: David Hildenbrand --- tools/testing/selftests/mm/Makefile | 5 ++++- tools/testing/selftests/mm/madv_populate.c | 26 ++++++++++++++++++++-- tools/testing/selftests/mm/run_vmtests.sh | 5 ++++- 3 files changed, 32 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/mm/Makefile b/tools/testing/selftests/mm/Makefile index 66d7c07dc177..3514697fc2db 100644 --- a/tools/testing/selftests/mm/Makefile +++ b/tools/testing/selftests/mm/Makefile @@ -63,12 +63,15 @@ TEST_GEN_PROGS += thuge-gen TEST_GEN_PROGS += transhuge-stress TEST_GEN_PROGS += uffd-stress TEST_GEN_PROGS += uffd-unit-tests -TEST_GEN_PROGS += soft-dirty TEST_GEN_PROGS += split_huge_page_test TEST_GEN_PROGS += ksm_tests TEST_GEN_PROGS += ksm_functional_tests TEST_GEN_PROGS += mdwe_test +ifneq ($(ARCH),arm64) +TEST_GEN_PROGS += soft-dirty +endif + ifeq ($(ARCH),x86_64) CAN_BUILD_I386 := $(shell ./../x86/check_cc.sh "$(CC)" ../x86/trivial_32bit_program.c -m32) CAN_BUILD_X86_64 := $(shell ./../x86/check_cc.sh "$(CC)" ../x86/trivial_64bit_program.c) diff --git a/tools/testing/selftests/mm/madv_populate.c b/tools/testing/selftests/mm/madv_populate.c index 60547245e479..17bcb07f19f3 100644 --- a/tools/testing/selftests/mm/madv_populate.c +++ b/tools/testing/selftests/mm/madv_populate.c @@ -264,14 +264,35 @@ static void test_softdirty(void) munmap(addr, SIZE); } +static int system_has_softdirty(void) +{ + /* + * There is no way to check if the kernel supports soft-dirty, other + * than by writing to a page and seeing if the bit was set. But the + * tests are intended to check that the bit gets set when it should, so + * doing that check would turn a potentially legitimate fail into a + * skip. Fortunately, we know for sure that arm64 does not support + * soft-dirty. So for now, let's just use the arch as a corse guide. + */ +#if defined(__aarch64__) + return 0; +#else + return 1; +#endif +} + int main(int argc, char **argv) { + int nr_tests = 16; int err; pagesize = getpagesize(); + if (system_has_softdirty()) + nr_tests += 5; + ksft_print_header(); - ksft_set_plan(21); + ksft_set_plan(nr_tests); sense_support(); test_prot_read(); @@ -279,7 +300,8 @@ int main(int argc, char **argv) test_holes(); test_populate_read(); test_populate_write(); - test_softdirty(); + if (system_has_softdirty()) + test_softdirty(); err = ksft_get_fail_cnt(); if (err) diff --git a/tools/testing/selftests/mm/run_vmtests.sh b/tools/testing/selftests/mm/run_vmtests.sh index 3f26f6e15b2a..9e4338aa5e09 100755 --- a/tools/testing/selftests/mm/run_vmtests.sh +++ b/tools/testing/selftests/mm/run_vmtests.sh @@ -290,7 +290,10 @@ then CATEGORY="pkey" run_test ./protection_keys_64 fi -CATEGORY="soft_dirty" run_test ./soft-dirty +if [ -x ./soft-dirty ] +then + CATEGORY="soft_dirty" run_test ./soft-dirty +fi # COW tests CATEGORY="cow" run_test ./cow From patchwork Mon Jul 17 10:31:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Roberts X-Patchwork-Id: 13315414 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 C7871C0015E for ; Mon, 17 Jul 2023 10:32:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 646936B0078; Mon, 17 Jul 2023 06:32:15 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5CF886B007B; Mon, 17 Jul 2023 06:32:15 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 498766B007D; Mon, 17 Jul 2023 06:32:15 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 3B9626B0078 for ; Mon, 17 Jul 2023 06:32:15 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 0AC93C04E0 for ; Mon, 17 Jul 2023 10:32:15 +0000 (UTC) X-FDA: 81020739030.27.AB7F83D Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf16.hostedemail.com (Postfix) with ESMTP id 4EB2E180008 for ; Mon, 17 Jul 2023 10:32:13 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=none; spf=pass (imf16.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689589933; a=rsa-sha256; cv=none; b=jgidmgP05vkTnbDGuLDN+pBY61E2+/cD0FsB2foU2YlU69RV0Y575I7gegL1YZPvcoS2eG 9SirwSMF/9o9w0/NmjWESMOOsg/sC9wvcwFT9hijAJs56AZximzNs44oyk6yCzDlrXDQWQ oj410jlZ4+mNMt9xPJPJyL40EJMzTYQ= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=none; spf=pass (imf16.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1689589933; 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=W95hEJNsKwhNPSMzODBmivBuPCYdlHmjU8Wbx+BJ5Yw=; b=hTOmYaa5x5hnRIbYndDSQx9B1tbSCSPilnEo+vgG4bxCBuHCIV8VZMVS2cqEi53loLqD42 0y8SMOH35g8N3o9MSssn4l4WtMZuXFPYiBWcaQMgLzNLOH8sb6+X+eXYUpBJ3GPSqoat9o pUK5ESrH2JpDleCbrri5hUagJ+8pBgs= 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 803E4D75; Mon, 17 Jul 2023 03:32:55 -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 872443F67D; Mon, 17 Jul 2023 03:32:10 -0700 (PDT) From: Ryan Roberts To: "Andrew Morton" , "Shuah Khan" , =?utf-8?b?SsOpcsO0bWUgR2xpc3Nl?= , "David Hildenbrand" , "Mark Brown" , "John Hubbard" , "Florent Revest" , Peter Xu Cc: Ryan Roberts , linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-kselftest@vger.kernel.org Subject: [PATCH v2 3/8] selftests/mm: Enable mrelease_test for arm64 Date: Mon, 17 Jul 2023 11:31:47 +0100 Message-Id: <20230717103152.202078-4-ryan.roberts@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230717103152.202078-1-ryan.roberts@arm.com> References: <20230717103152.202078-1-ryan.roberts@arm.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 4EB2E180008 X-Stat-Signature: mx1q56bmxtm7sero7skbbctthschz1k4 X-HE-Tag: 1689589933-142681 X-HE-Meta: U2FsdGVkX18n8KJxl82XFQlb57QHoN9pcM612OvpscbWaK4DUnZ++Np2yUmNvZD8QI/1zqcFtEflLk7a0YG76LDxn543fn6SrnqY1lHQohOzChpc8PGiTE5kDO01BbjV/hUqLN+eC/bzzFXv5VNTb7hyZGEEqkOnmKfk0KOKhpiAeo9IynORHORI7fMgRLVy79guNGpXvN7n4xyLIcqlEso2v4S+Knwug02O1vLr2exrhOYA6Ktmxt3MYJ6lng9LQ87HNAzWCB4ct0fquQ4hPtvHEmyO896cyceCxQp7FJatZxuiIPfIHWBhplG/PLxXsoDbwu8PvundfQXm2UacjsGbe3fQ8ZRcsAhbTispj5sPr09G3I6mufgZyLAkFQUWSf+U6VWHVVb6YeMWwwqtzROVLohi7UCBSBcsZzzirJpqsLHA+9Ty/nGCRQQN3hXUzcDfaZAk1iQEWV1UNA6OvQI5zEb72nuDSfJCtIQjYtX0fEJ9WO++yPbAsxLzo/amO2SkSXse9FGsPUPnW247hQnquAWyIFU2GDxDuiW6upTvCbOha+tPbgYSC5UgMnkhyiSUs516QVnxtEMnXvfVIV6IZOM8eElL2x7ANIruIRDp8Im2i9HyVbioEh6mqJfvEbQ1AIOvmFz6lwKzFroPihU19jaulRayntRY3iKyxqWgCcKqXp8ueB3l0BF4pONmI1ATVBKBwKyB0v8CobJsG63uEX0/D9MSHoJp7Pabd1CHbt9rmlE0iVpy5jJyIEf5xozJXwUXSS5j6c3HuNUq/i5obW/GQ4spQZoJkYx/rb73Q2pnzaUWYKBKMxDjLDMbBfdiB1hZfkjok4MBVTxFdUJRIvNWJ3c09d5tFoDrvB2yKqG9wrq9kdsscGEBnVwXbGtai6zzTaL7KaRoajiltUEXTY7pN3VytempXdAdF/ncewa9IPWKynlGSpReXuBmlEV6NHhw77WK+I/5QuG NLbI/brz dN/dyTwGRPpozfawaym1nXX5T5LMmrSGQidD2LkcTM5EsnHwJfVRCkvxj32v2Txt4qpMBpth4ilxc0aW3VzZgq3xivIc1gMCcWA39AgjQrLcyk+UyrmyrAqKdsWhRNPS/VXs/R5/oWef778SA6EwlufY5I4Q0PsT3QVokBMnTlRdX447EdRTM5UpX5fdS+e6L7SElJOVSen1kCHE9IZyiVMJFCICmOrQElxmT 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: mrelease_test defaults to defining __NR_pidfd_open and __NR_process_mrelease syscall numbers to -1, if they are not defined anywhere else, and the suite would then be marked as skipped as a result. arm64 (at least the stock debian toolchain that I'm using) requires including to pull in the defines for these syscalls. So let's add this header. With this in place, the test is passing on arm64. Signed-off-by: Ryan Roberts Reviewed-by: David Hildenbrand --- tools/testing/selftests/mm/mrelease_test.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/testing/selftests/mm/mrelease_test.c b/tools/testing/selftests/mm/mrelease_test.c index dca21042b679..d822004a374e 100644 --- a/tools/testing/selftests/mm/mrelease_test.c +++ b/tools/testing/selftests/mm/mrelease_test.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include From patchwork Mon Jul 17 10:31:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Roberts X-Patchwork-Id: 13315415 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 D2857C00528 for ; Mon, 17 Jul 2023 10:32:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A64EF6B007B; Mon, 17 Jul 2023 06:32:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A15BA6B007D; Mon, 17 Jul 2023 06:32:16 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8B58D8D0001; Mon, 17 Jul 2023 06:32:16 -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 7EC306B007B for ; Mon, 17 Jul 2023 06:32:16 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 42E3C160422 for ; Mon, 17 Jul 2023 10:32:16 +0000 (UTC) X-FDA: 81020739072.16.3EA0171 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf19.hostedemail.com (Postfix) with ESMTP id 7FC341A0003 for ; Mon, 17 Jul 2023 10:32:14 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf19.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=1689589934; 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=/uEzG53FLjd2glqlFJWx0HAfJNrq3vkp38/U3IednXU=; b=CEsGjUgrGS3HiMJ00MO0/OYo+UUE4SbT+NhVTZ51Oge5mBHf7lTpd8a7DK0KEh3hy4OEb6 ZiSTOxdRO7I07yVbcGrv5iXVQr/ydVziKtfj+kjAK5YvC6z2fQkRyytC7oD9onhV80iFHn j9ULBsdcZ6SnI37li1Jcd4eYHaoEOXQ= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf19.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=1689589934; a=rsa-sha256; cv=none; b=GqnPbOzVgF3lfpo/syEAsNq+0XOAqAADLne5rPnPHjqVPI68tq94ZPVw6sAok6sQs5oTx/ fbZVIN3X2GpEyrqzwr/TLOVoV1mHwWwvBeDUsmaCQGiwLGGEttvRq+/Kbno3vduXJ7fy47 phzRfFVOVwFF7UIUb5zMuo52DBh57Xc= 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 7416A2F4; Mon, 17 Jul 2023 03:32:57 -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 7B42D3F67D; Mon, 17 Jul 2023 03:32:12 -0700 (PDT) From: Ryan Roberts To: "Andrew Morton" , "Shuah Khan" , =?utf-8?b?SsOpcsO0bWUgR2xpc3Nl?= , "David Hildenbrand" , "Mark Brown" , "John Hubbard" , "Florent Revest" , Peter Xu Cc: Ryan Roberts , linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-kselftest@vger.kernel.org Subject: [PATCH v2 4/8] selftests/mm: Fix thuge-gen test bugs Date: Mon, 17 Jul 2023 11:31:48 +0100 Message-Id: <20230717103152.202078-5-ryan.roberts@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230717103152.202078-1-ryan.roberts@arm.com> References: <20230717103152.202078-1-ryan.roberts@arm.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 7FC341A0003 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: acwr99w4hbo944w4z5dy5r6tzx5yahgi X-HE-Tag: 1689589934-464039 X-HE-Meta: U2FsdGVkX1/bdBzp95DR+zkA2l167MwdN/bcBobmyYRqT3pzpb/nUkdXCJJML5/CGt+CrmHKHGyr0lCKtDbH1VZrrqjAneRjxqXOE4l/WGYNqel0aSVHjNB6H4KSYIYkuBR6p4bQA+Bc/jFEdcg5RWRDOVvLl38TJyfgxgNG9hM+Ka3aMxRLJPdAdWuRDtnzlDLrm+dbwFUqPdKv7H4a0o6RdeAWmfisbil8Vd1vp6PFExKEmqZwgyV2XFKhVj5C0pk/32N0l4tKlKlRwb9e7RmeX/bGNvgvWi+liAhccdb+SkEVMD7haLYeQ+GYCbzY6dJO8EnZNxqzDONbJwBcaRIW6sC1c0KiKdSxKFYC0fJfNRAV9cJhk9GbYs0HGNYjnFf3RZHBg3CGriZ0HtSPQo38HkW+56afrOFFyyEATWInx9S6oE52pUxWWuLrydi9uuio+yRF2hkCGxYxPnHJVj7rHnujoD0Y63pC3hH0qYUvRK7e7Fjs8UZFT77R4HEJ7friYQgOtHpQngQXUB4JijU5Owe8Pd+hSrBxC1yySsPNuYOycuUHXB8QjN0MtqIGV/E/xFqkx2I3KAtcKgrpHimEI4A9X0CQKiNmgOEriQT/2//+Lj5HeWzuvRLcwFOrxczMJDxqyXU3ie8oJKfSFvfXPQmWw5iLXVWiZF72f8xG8U21LLd2dAUbalo5bXYepWqbKImCUDhRqurMxjn/cz2DokRuhSvzAE8VrJSudr4QFRA07PT926Fn+H5dkt4d2E1HwkwyW+4j6DrhNxCWukMt3wkZFuJiRhATLxL3GI9FpmHSCjWsa/Q16sn4H9ugu2U/glgFGLxOd2PaS2aiXcmc8agFJvyzzOphBH9akdxqFl1ttzEJ9/2XwLQjtzY88jVf5Oe2XqgkhKLzDem4npG8eP+mdEUd+Am+JKQdjPA9k808fGRSh5o7Kij/E6LBqbAfFX3rXnVq1IS/55s sTJtWMPw aeNV/Ve+Cu4HnEDaJ801Z9lc/QXbN64fw+pITuLTHU/tyRKulgpYlHoPh4rvHCQpr6VT2v4/xifkjY0Bhhmwpb/PmBgWBk8Fm9IWRSpzEwZXkxAkcGF+o7wTKZZDFr5Piyoq3G7mpB3snCvvM7k/FbV8SsghMqzsrqoUE 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: thuge-gen was previously only munmapping part of the mmapped buffer, which caused us to run out of 1G huge pages for a later part of the test. Fix this by munmapping the whole buffer. Based on the code, it looks like a typo rather than an intention to keep some of the buffer mapped. thuge-gen was also calling mmap with SHM_HUGETLB flag (bit 11 set), which is actually MAP_DENYWRITE in mmap context. The man page says this flag is ignored in modern kernels. I'm pretty sure from the context that the author intended to pass the MAP_HUGETLB flag so I've fixed that up too. Signed-off-by: Ryan Roberts Reviewed-by: David Hildenbrand --- tools/testing/selftests/mm/thuge-gen.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/mm/thuge-gen.c b/tools/testing/selftests/mm/thuge-gen.c index 380ab5f0a534..16ed4dfa7359 100644 --- a/tools/testing/selftests/mm/thuge-gen.c +++ b/tools/testing/selftests/mm/thuge-gen.c @@ -139,7 +139,7 @@ void test_mmap(unsigned long size, unsigned flags) before, after, before - after, size); assert(size == getpagesize() || (before - after) == NUM_PAGES); show(size); - err = munmap(map, size); + err = munmap(map, size * NUM_PAGES); assert(!err); } @@ -222,7 +222,7 @@ int main(void) test_mmap(ps, MAP_HUGETLB | arg); } printf("Testing default huge mmap\n"); - test_mmap(default_hps, SHM_HUGETLB); + test_mmap(default_hps, MAP_HUGETLB); puts("Testing non-huge shmget"); test_shmget(getpagesize(), 0); From patchwork Mon Jul 17 10:31:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Roberts X-Patchwork-Id: 13315416 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 2FB0BC0015E for ; Mon, 17 Jul 2023 10:32:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 360036B007D; Mon, 17 Jul 2023 06:32:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3107E6B007E; Mon, 17 Jul 2023 06:32:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 13BAF8D0001; Mon, 17 Jul 2023 06:32:19 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 06B2D6B007D for ; Mon, 17 Jul 2023 06:32:19 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id C8F184052B for ; Mon, 17 Jul 2023 10:32:18 +0000 (UTC) X-FDA: 81020739156.20.6758125 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf13.hostedemail.com (Postfix) with ESMTP id 24FA520028 for ; Mon, 17 Jul 2023 10:32:16 +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=1689589937; 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=dNlBjDfq+AmKtLS3RpRye5O1GUWvdXIGLiTgWzCy/u4=; b=PWbzkINTa+8VNez/Jc85SQ9Py9DTc52REUGd9L6WiWLaqAtGZok6cN5IKPP3wDsG3vgZiy Su4HQdhKcgAzNivcF+WHa9pbI+N4fCyJr2g1f9sKM/oIli/WX/dG56qNYEWHgp01NrWlUA mfZSZYvCq3863Ik14eYruTqnL1ZjB2M= 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=1689589937; a=rsa-sha256; cv=none; b=nVOogcZErdIa8KFmU0qQx8zzrgxTjaAP/d/+4DsTnSWAas8MXAFRIghQdvyOHstih+ZRGh ahPZZ4P9RdoNB2+sqBk/E/CKs5DcgQ91VY0Kack7cb26+Sxx9beGlez1EonwB/9zntoHOO WyOsYl6LglU6qP7ImIbA2zio/E2mSbc= 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 685612F4; Mon, 17 Jul 2023 03:32:59 -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 6F4F93F67D; Mon, 17 Jul 2023 03:32:14 -0700 (PDT) From: Ryan Roberts To: "Andrew Morton" , "Shuah Khan" , =?utf-8?b?SsOpcsO0bWUgR2xpc3Nl?= , "David Hildenbrand" , "Mark Brown" , "John Hubbard" , "Florent Revest" , Peter Xu Cc: Ryan Roberts , linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-kselftest@vger.kernel.org Subject: [PATCH v2 5/8] selftests/mm: va_high_addr_switch should skip unsupported arm64 configs Date: Mon, 17 Jul 2023 11:31:49 +0100 Message-Id: <20230717103152.202078-6-ryan.roberts@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230717103152.202078-1-ryan.roberts@arm.com> References: <20230717103152.202078-1-ryan.roberts@arm.com> MIME-Version: 1.0 X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 24FA520028 X-Stat-Signature: 5cxduear56eace5igc1wnkugdhciaoh8 X-Rspam-User: X-HE-Tag: 1689589936-511611 X-HE-Meta: U2FsdGVkX1+u5ixp5feUHQzzm8Brte9VnrVQhqbFdgHRgOwTK6oaHnndKeCLWWwmcNLKmkT9nqCxyMbLsQiPhxML6fN9R68bs2QSm/t/CsOg/TVIiB+LVIGU6z+xhqM67wdB7JLRDgMhgHShPhrln4iM0WXmAC8wDg1F35LmK1qRqWtiHMiRy2ImhRn+eij1dVo69DOVBAZ4AGHMR7mfk6M2DyHHUtxSz+BTO2AtPyHlfnQD9o1PJoifXW6Dmm/oOhoo8gP2vbJynBR8sZIKZwXiqRJXuIKx/s68xu0K/QU9B68CCBvZ7tGl2Lr7jGZD9u/9jbP4YHWmE5LqNXZJ6EdWLBGAH5UdieadsSDx+KXneB8eHqt+HqHzxHOExtBplr12/RMUKE3369RmchQoCqponjZLdlpDw2g6ACrmzpNjcj7E/J3KfHS/5YkbEyL2itSPyX6/SrqJ5q4kEaX1fwkRGr7ee6NwkCGZ6M+OnhzMuH1M1uUdwqgry15Ebn08XszaatDOgMohmbm5eyhdEF2CtBioU7DQaTNiYM1S3Oo6lopPYLMNZI6syShf73sdXWZFhzWiaD0pdgM5ZLyl3mQPAjVL47GSNnVgUyXbmnG03LA9oLeJkpbxaDBLlvRK84ziI+ly3emd2MgP8urZaIE/qW/og0ELrHVVfqR+D4RDzWEMwa3tQL9vXaEkmfUD/Eod9uX0rKA/KHv2o0y3N1zfr1aasac2bcq7a/ytMFClKU6pWeMih5U2SlaXbnO/4vscxtPX/LNcWvRgk41VSkNTgNZ+MKmkuNuZsz7XMX6++R2/UTfUXPkCUodx19IlQNgKp3k8roJ1ue3rughKuELUSJezygiPzwM2sg2s0jXkwoXdLcKRopCQepiU8/Q1bfxgSyhnt7LbvOnxy1FPdq+5rZlx1mAkolhRwPXn67w5WicezDkj0X461dmp2CCObVKBcqIcOfH+3kPUb/9 23/tz52s SX70qm76+pxDSdZFulhv4kNnaNsFuYbCyRCReEYJBwZxlbhJ4mX+hLjmELMVPCGdBHFF7JrKTY73f2S7Zds68rK6masYCQhG6UA9t+Yq9n107RiSudfDm4+39t9TAWRs34e2Fq40rcd5HBHKRgo1KEHapn5ycYJcip+Og2DuZengYVw8fwZtBAu0HJOnSY79fnKMgiytDEAIzxWo9k/KLQUaliAqEdBNZITH+ 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: va_high_addr_switch has a mechanism to determine if the tests should be run or skipped (supported_arch()). This currently returns unconditionally true for arm64. However, va_high_addr_switch also requires a large virtual address space for the tests to run, otherwise they spuriously fail. Since arm64 can only support VA > 48 bits when the page size is 64K, let's decide whether we should skip the test suite based on the page size. This reduces noise when running on 4K and 16K kernels. Signed-off-by: Ryan Roberts Reviewed-by: David Hildenbrand --- tools/testing/selftests/mm/va_high_addr_switch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/mm/va_high_addr_switch.c b/tools/testing/selftests/mm/va_high_addr_switch.c index 7cfaf4a74c57..cfbc501290d3 100644 --- a/tools/testing/selftests/mm/va_high_addr_switch.c +++ b/tools/testing/selftests/mm/va_high_addr_switch.c @@ -292,7 +292,7 @@ static int supported_arch(void) #elif defined(__x86_64__) return 1; #elif defined(__aarch64__) - return 1; + return getpagesize() == PAGE_SIZE; #else return 0; #endif From patchwork Mon Jul 17 10:31:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Roberts X-Patchwork-Id: 13315417 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 4865EEB64DC for ; Mon, 17 Jul 2023 10:32:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0EF026B007E; Mon, 17 Jul 2023 06:32:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 079F76B0080; Mon, 17 Jul 2023 06:32:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E5B5C6B0081; Mon, 17 Jul 2023 06:32:20 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id D92AB6B007E for ; Mon, 17 Jul 2023 06:32:20 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id BADF61604D6 for ; Mon, 17 Jul 2023 10:32:20 +0000 (UTC) X-FDA: 81020739240.04.5814E73 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf16.hostedemail.com (Postfix) with ESMTP id E8EB9180017 for ; Mon, 17 Jul 2023 10:32:18 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf16.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=1689589939; 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=rHtD/pnAHEzhlHxmKN5MIBCps4aYfm1NZFwHzfIO8rs=; b=6rx0x73IN0Xp0mQtP+dJ5d8nsI3FbsIxr71VSnSB4F2fJXqjLjnijMg1XfDwRliHV95GYk PEVeVamapEqKcVHvXq7eLgfMEJGGUxDCS8SHXlpdvrrr1SmpM0aeMwzpv6qUU3o20tTRsD 82ypkl6pCkOtEZgIP6HvH33W1vUfwfw= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf16.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=1689589939; a=rsa-sha256; cv=none; b=hiphogUacsEIJR5ggwk2ZcS5z+lfs4gyhJAl30s/10s5kFF5LxuoPpIOL1r0ukgneWbi32 fLPdj1ZQRLHxVrjgJ2HblzOrskZSBNnKtbman2kNwr+5xEat+7Sn3n1Mrw4sIHnfMb9rT4 6Qr4CPNu/gKIo2NUzDq2cnAChYZrDFw= 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 5DE7F11FB; Mon, 17 Jul 2023 03:33:01 -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 639333F67D; Mon, 17 Jul 2023 03:32:16 -0700 (PDT) From: Ryan Roberts To: "Andrew Morton" , "Shuah Khan" , =?utf-8?b?SsOpcsO0bWUgR2xpc3Nl?= , "David Hildenbrand" , "Mark Brown" , "John Hubbard" , "Florent Revest" , Peter Xu Cc: Ryan Roberts , linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-kselftest@vger.kernel.org Subject: [PATCH v2 6/8] selftests/mm: Make migration test robust to failure Date: Mon, 17 Jul 2023 11:31:50 +0100 Message-Id: <20230717103152.202078-7-ryan.roberts@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230717103152.202078-1-ryan.roberts@arm.com> References: <20230717103152.202078-1-ryan.roberts@arm.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: E8EB9180017 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: omt4scc9o71esrhe3e5m6spn8dyjm8e5 X-HE-Tag: 1689589938-320969 X-HE-Meta: U2FsdGVkX1+vGFMf36HWHdLVVA2NtcuV6fbBFRerpYXzN1qxPwtQ+tiX1RoBuhCSAxfSXX2rXIDGcr6YBE3O+e7pc3sOtFXXlHsxLWSBY8I3EghymfIRu6UAz9jSKQ67csgw8jAaELriMdRAEBga2tHPK9QVOmSerKp/8IStG61jhAvSf+ahy5jFhIy90btv2BUe8aNZP7/zLnjygBQbP4dw4TnjM0OsbB7S+z11Sd2gGGz9i8+gODbl7rS01TWFAIRtet1UF6o6WD5KDIDO7ouQwMWCW1kdWbNN7PdFetdQxpzr16laoM8rqtjQQMp4e0usqubTNoP98fpJ2lCe2HXw21KfVpVLVfZAQsW+oITNzAUuHKI3cqgkLAT13yqkF3Xe5eK2EcUZ2vb/ixr5zaEAbDL+p7HaXWwP+A/Z+Wj5d3LME8EtW7ltoUAAGutO4NlwLDOKKgWdJ+pRUOgA1nLpYb3EItFe3DrEhTOu09Gp7ecaoxbRnrVvRW/WgEiwTqcLvRZPQK+95rYx5xkolyOjrCBMCWEQUKycYY+CkmpBa8qLCNTwFkJx8KesC/Xzrd7Wr3yt225kbTjnQARlXdMZjSLmdDmd7C0VBJeMDebXVbu2T1svjfPGynWCDnvoeGIT1i/6T0sxoZVvrmy8GSbHHmt8XBCfqiUi+Bl3m56GXprjn3e4fQXaSNUNIrVgeRG7WbYkRB5ER/62owmPnYq+m3BmMeRm/6wHoITfkkeVYz5TpCOUknh3TGeU5dVcj43V+SZrxalbjvC5gU+mAkvOlYKwXZVUnTdH1/TDmTmFVSzaq6CaYj6G37CH69QJ076PmTlUri6xxj0YuWE7Od/d1MHlIC7m8GzLCRpjPxt6swBUkMyJf9/uhHhRKDLG8nocrBTfP/ZRDq54WWzd6EXOKJX46ccM571eL0UmHY3XeDSDom10FBbIom+6X6GSqEcwA6VM7SRr5YVLs6b FS3h7g+Q GzgKFxdi5foOGMaKtuJnQPsmxz5G4dIkBnMtfQDFcjiMZM0CAeM8fed2cI2hHUZ7cMNSm8IW+OSUEUMh6hZ+ZuvgAg30+Z8/haXtfGtnklnKZsKmlGLM/lBnDPM/KDWIhL0+mjy5eu8vClhJVHQ4mTYbkG0G8CpPDmvgO 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: The `migration` test currently has a number of robustness problems that cause it to hang and leak resources. Timeout: There are 3 tests, which each previously ran for 60 seconds. However, the timeout in mm/settings for a single test binary was set to 45 seconds. So when run using run_kselftest.sh, the top level timeout would trigger before the test binary was finished. Solve this by meeting in the middle; each of the 3 tests now runs for 20 seconds (for a total of 60), and the top level timeout is set to 90 seconds. Leaking child processes: the `shared_anon` test fork()s some children but then an ASSERT() fires before the test kills those children. The assert causes immediate exit of the parent and leaking of the children. Furthermore, if run using the run_kselftest.sh wrapper, the wrapper would get stuck waiting for those children to exit, which never happens. Solve this by deferring any asserts until after the children are killed. The same pattern is used for the threaded tests for uniformity. With these changes, the test binary now runs to completion on arm64, with 2 tests passing and the `shared_anon` test failing. Signed-off-by: Ryan Roberts --- tools/testing/selftests/mm/migration.c | 14 ++++++++++---- tools/testing/selftests/mm/settings | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/mm/migration.c b/tools/testing/selftests/mm/migration.c index 379581567f27..189d7d9070e8 100644 --- a/tools/testing/selftests/mm/migration.c +++ b/tools/testing/selftests/mm/migration.c @@ -15,7 +15,7 @@ #include #define TWOMEG (2<<20) -#define RUNTIME (60) +#define RUNTIME (20) #define ALIGN(x, a) (((x) + (a - 1)) & (~((a) - 1))) @@ -118,6 +118,7 @@ TEST_F_TIMEOUT(migration, private_anon, 2*RUNTIME) { uint64_t *ptr; int i; + int ret; if (self->nthreads < 2 || self->n1 < 0 || self->n2 < 0) SKIP(return, "Not enough threads or NUMA nodes available"); @@ -131,9 +132,10 @@ TEST_F_TIMEOUT(migration, private_anon, 2*RUNTIME) if (pthread_create(&self->threads[i], NULL, access_mem, ptr)) perror("Couldn't create thread"); - ASSERT_EQ(migrate(ptr, self->n1, self->n2), 0); + ret = migrate(ptr, self->n1, self->n2); for (i = 0; i < self->nthreads - 1; i++) ASSERT_EQ(pthread_cancel(self->threads[i]), 0); + ASSERT_EQ(ret, 0); } /* @@ -144,6 +146,7 @@ TEST_F_TIMEOUT(migration, shared_anon, 2*RUNTIME) pid_t pid; uint64_t *ptr; int i; + int ret; if (self->nthreads < 2 || self->n1 < 0 || self->n2 < 0) SKIP(return, "Not enough threads or NUMA nodes available"); @@ -161,9 +164,10 @@ TEST_F_TIMEOUT(migration, shared_anon, 2*RUNTIME) self->pids[i] = pid; } - ASSERT_EQ(migrate(ptr, self->n1, self->n2), 0); + ret = migrate(ptr, self->n1, self->n2); for (i = 0; i < self->nthreads - 1; i++) ASSERT_EQ(kill(self->pids[i], SIGTERM), 0); + ASSERT_EQ(ret, 0); } /* @@ -173,6 +177,7 @@ TEST_F_TIMEOUT(migration, private_anon_thp, 2*RUNTIME) { uint64_t *ptr; int i; + int ret; if (self->nthreads < 2 || self->n1 < 0 || self->n2 < 0) SKIP(return, "Not enough threads or NUMA nodes available"); @@ -188,9 +193,10 @@ TEST_F_TIMEOUT(migration, private_anon_thp, 2*RUNTIME) if (pthread_create(&self->threads[i], NULL, access_mem, ptr)) perror("Couldn't create thread"); - ASSERT_EQ(migrate(ptr, self->n1, self->n2), 0); + ret = migrate(ptr, self->n1, self->n2); for (i = 0; i < self->nthreads - 1; i++) ASSERT_EQ(pthread_cancel(self->threads[i]), 0); + ASSERT_EQ(ret, 0); } TEST_HARNESS_MAIN diff --git a/tools/testing/selftests/mm/settings b/tools/testing/selftests/mm/settings index 9abfc60e9e6f..ba4d85f74cd6 100644 --- a/tools/testing/selftests/mm/settings +++ b/tools/testing/selftests/mm/settings @@ -1 +1 @@ -timeout=45 +timeout=90 From patchwork Mon Jul 17 10:31:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Roberts X-Patchwork-Id: 13315418 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 8203BC001DE for ; Mon, 17 Jul 2023 10:32:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0A4566B0080; Mon, 17 Jul 2023 06:32:23 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 052266B0081; Mon, 17 Jul 2023 06:32:23 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E34358D0001; Mon, 17 Jul 2023 06:32:22 -0400 (EDT) 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 D52A66B0080 for ; Mon, 17 Jul 2023 06:32:22 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id A660E1A04DC for ; Mon, 17 Jul 2023 10:32:22 +0000 (UTC) X-FDA: 81020739324.18.131EBAD Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf14.hostedemail.com (Postfix) with ESMTP id E6C7310001B for ; Mon, 17 Jul 2023 10:32:20 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf14.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=1689589941; 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=HXaz2BG8nd6sNHnpf1UWxQkbMfGOr+JlGHxrRhsm3QQ=; b=eceFzSI3F7M6LPlf/fv9kfxUjFdJ3O/TALq3HqDuKBK/j/UCQtuhtUUB0jIq+ekTwHS6Yw Ui4SWjvS3tSCsjfaE1CEvhTfAKGb+cM+mOxhf4oXPfIiygd738NHdzyXpX/9CIclkBxa4Y X3r8LUiQMLTssXNHV6BRLCnWM4LQrGY= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf14.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=1689589941; a=rsa-sha256; cv=none; b=6SCUzi9793oz3omG+S7bKFmuQBwiJ4F1gOkSaAw3zGqSRaBh9+yldLlqxnDnszhruAdl4u KzzCh+ZecoKghUJKd+0G+DQ6eGawPfs84LYNdse5Xj9FnOw0xUIECbSiKk6b9Z52FjTknE nhwuK5kgeKUinJHQ+mb81lFD9J5u5TA= 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 50AD12F4; Mon, 17 Jul 2023 03:33:03 -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 578983F67D; Mon, 17 Jul 2023 03:32:18 -0700 (PDT) From: Ryan Roberts To: "Andrew Morton" , "Shuah Khan" , =?utf-8?b?SsOpcsO0bWUgR2xpc3Nl?= , "David Hildenbrand" , "Mark Brown" , "John Hubbard" , "Florent Revest" , Peter Xu Cc: Ryan Roberts , linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-kselftest@vger.kernel.org Subject: [PATCH v2 7/8] selftests/mm: Optionally pass duration to transhuge-stress Date: Mon, 17 Jul 2023 11:31:51 +0100 Message-Id: <20230717103152.202078-8-ryan.roberts@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230717103152.202078-1-ryan.roberts@arm.com> References: <20230717103152.202078-1-ryan.roberts@arm.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: E6C7310001B X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: i3febqbwdnch9q43jk318g4uwacys3h4 X-HE-Tag: 1689589940-333753 X-HE-Meta: U2FsdGVkX1/PBniZbrYa/9aBtMAdvRGtCTDc0PGZIchHTjA8ejXLfc9niuqo8SKxjxSotDDJY52LKfNX/ZknZIKveZkH5FIHs3hTYKInKrf08UHzSVeAR+goFh6rmTEukb58b1WyTpvTstvevbtliJC6p11dKa1xsQY7DPphm88QJ8bOXD6Ymtgh37rztv9MMWQs8Wa0SRZgEoabniI2dJwI5TNykKwHQ54T0imebBAts+ZoSq+ojsB3Vc4H3Gft7TOuYnFCsw9nzxsA7kU5rNQ8lh0KSXPdQ8roTusO2fu0z6a59nwtpAlhx72x0jeUPfWMCe5N1IEw4myBY2lM93RyLpsdM373Z8vpyLohyA/rSmxci+uaqsOocNZnI6WZNJxNeTyZV+rwGl5bLgd8WHWcAtLCFp5pXMaN02qNr1qAf/mv4dsSIavcyvt9rfxfJQXWVLg70xhFhvjiNZwwzcF7bG+ypxrzrMHrBWnTYlabFYfJ1ZIBgPXyF17qMqR41j3203zzGN70yojfBqqXBoaUzYTcSCs3HPGpIUyxY6Wzyxfl4GrgEXZLVXeQz/FAJ7NYhZsChiVTSf/998bVbliX9wC7TsVeNghr41t1MpwRBGeukN5ZCaHochUn32YbD+aeZH4RPIuLDkI/ouEM37S6WR2rv4VyPuvq2Al+wNTEaverk75DRp5qqiALaju4cL1Uoqm9UB5l9D8lMfRtmPhgrS9YyeYSZwefR6PmX5w+Mogx1yQg9i6D7Hqk7p/TmzBcpMu/whrL7R7UXvBxiHetDzByUHKIXq3YJDJoLr3MHkSdEVSu9jeh6BVPOGT+ouheZK9mDHNATZ0VtjEQzYKl3Uf1ZUx/iMeM0wkKKCojZS/tqTxfLhy1HUx4XNiANKyY0dTIMiS0gLMSRrqsR/5dIZjBi+wjcrJPo6CFHZVpU8PUq72GTbZS/RzSywoyhbEB0zHi5RyEw4Dpgca NZza3zHz l1gBU6u85qYdnntVbA2HvK8D2vcCjGUzjpTHV9c5E4ws2lkhfteiBlQdS9aQEjzkUr1lycQVbxCwIEp8UPDmajTcM0SHb76ucv8RVVsP3Q9K8h7FKxXqrsrNOIkP422GXwJ/mnqyxIXjy0zPxrc3hGluQOq3AazjtC0+8 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: Until now, transhuge-stress runs until its explicitly killed, so when invoked by run_kselftest.sh, it would run until the test timeout, then it would be killed and the test would be marked as failed. Add a new, optional command line parameter that allows the user to specify the duration in seconds that the program should run. The program exits after this duration with a success (0) exit code. If the argument is omitted the old behacvior remains. On it's own, this doesn't quite solve our problem because run_kselftest.sh does not allow passing parameters to the program under test. But we will shortly move this to run_vmtests.sh, which does allow parameter passing. Signed-off-by: Ryan Roberts Acked-by: David Hildenbrand --- tools/testing/selftests/mm/transhuge-stress.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/mm/transhuge-stress.c b/tools/testing/selftests/mm/transhuge-stress.c index ba9d37ad3a89..c61fb9350b8c 100644 --- a/tools/testing/selftests/mm/transhuge-stress.c +++ b/tools/testing/selftests/mm/transhuge-stress.c @@ -25,13 +25,14 @@ int main(int argc, char **argv) { size_t ram, len; void *ptr, *p; - struct timespec a, b; + struct timespec start, a, b; int i = 0; char *name = NULL; double s; uint8_t *map; size_t map_len; int pagemap_fd; + int duration = 0; ram = sysconf(_SC_PHYS_PAGES); if (ram > SIZE_MAX / psize() / 4) @@ -42,9 +43,11 @@ int main(int argc, char **argv) while (++i < argc) { if (!strcmp(argv[i], "-h")) - errx(1, "usage: %s [size in MiB]", argv[0]); + errx(1, "usage: %s [-f ] [-d ] [size in MiB]", argv[0]); else if (!strcmp(argv[i], "-f")) name = argv[++i]; + else if (!strcmp(argv[i], "-d")) + duration = atoi(argv[++i]); else len = atoll(argv[i]) << 20; } @@ -78,6 +81,8 @@ int main(int argc, char **argv) if (!map) errx(2, "map malloc"); + clock_gettime(CLOCK_MONOTONIC, &start); + while (1) { int nr_succeed = 0, nr_failed = 0, nr_pages = 0; @@ -118,5 +123,8 @@ int main(int argc, char **argv) "%4d succeed, %4d failed, %4d different pages", s, s * 1000 / (len >> HPAGE_SHIFT), len / s / (1 << 20), nr_succeed, nr_failed, nr_pages); + + if (duration > 0 && b.tv_sec - start.tv_sec >= duration) + return 0; } } From patchwork Mon Jul 17 10:31:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Roberts X-Patchwork-Id: 13315419 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 827AFC0015E for ; Mon, 17 Jul 2023 10:32:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EF8B86B0081; Mon, 17 Jul 2023 06:32:24 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E84EF6B0082; Mon, 17 Jul 2023 06:32:24 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D49B58D0001; Mon, 17 Jul 2023 06:32:24 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id C76B96B0081 for ; Mon, 17 Jul 2023 06:32:24 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 978C6C0492 for ; Mon, 17 Jul 2023 10:32:24 +0000 (UTC) X-FDA: 81020739408.05.1F9A545 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf03.hostedemail.com (Postfix) with ESMTP id D31AE20023 for ; Mon, 17 Jul 2023 10:32:22 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf03.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=1689589942; 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=rQ/yQh59/qrckarEtbcXWsGAbVL9grbrJM92PTJUxc4=; b=OA/KPkyHcxmKM4QrqZeiPpcw7AzDhzJ+sf8i2VNAyk9YZmL8AjVjyMYDOrEN7d06IJh0U5 UP7uPWbgM2pOkQnW/OY/ZfsZyumd0Hc0GaE5f2ojUPf9hOkyOSWf5ftlAbgrq7URc8ULRW R4eP0joouvLXfSsTysm/bJrFNGSwqdI= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf03.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=1689589943; a=rsa-sha256; cv=none; b=QhWcTnW5i3HmcVxMi7/q2GDNPgYg1XqfP6M6vjZZ5CweRf4t0tpF1beTYka9Wi12+USM74 f+0BxrCDq4jf5AThk4c9rX9dB+t/k9wQxiB4sKAmwH64dJKL721zDpR49x6tP4JE3ZyGnl VGYTDd9GzPzTsMF/rC44piDF9DVqJR4= 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 62C32D75; Mon, 17 Jul 2023 03:33:05 -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 4BFF43F67D; Mon, 17 Jul 2023 03:32:20 -0700 (PDT) From: Ryan Roberts To: "Andrew Morton" , "Shuah Khan" , =?utf-8?b?SsOpcsO0bWUgR2xpc3Nl?= , "David Hildenbrand" , "Mark Brown" , "John Hubbard" , "Florent Revest" , Peter Xu Cc: Ryan Roberts , linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-kselftest@vger.kernel.org Subject: [PATCH v2 8/8] selftests/mm: Run all tests from run_vmtests.sh Date: Mon, 17 Jul 2023 11:31:52 +0100 Message-Id: <20230717103152.202078-9-ryan.roberts@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230717103152.202078-1-ryan.roberts@arm.com> References: <20230717103152.202078-1-ryan.roberts@arm.com> MIME-Version: 1.0 X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: D31AE20023 X-Stat-Signature: apmnijbxuzps8u4mna9rgfgznmbjeg4t X-Rspam-User: X-HE-Tag: 1689589942-3921 X-HE-Meta: U2FsdGVkX1/BdiL6Nz1X1aAU9Bg4M7t6kQU251HkRszYWWuZYYqfYHCV2FTi4H5seZp3gmGU3wyOCtMMXxM57/drbQiczV01xMV28lQlq7mpkYmzUIpbQgHn9nL2lHfbYiMavDUMQw9untIuULXuouHCeNREnYPj12ZJ+fDBZJ8lOz7MHZDLaFHGP+hICI2Efy+H+8dCSOS92b8LYaB+ePNl6Wa5XOhT39JzqXKOS00rmdDHWsQVyf6/zDLQ24sApdoWW3izMbTMftv8tZI9RTKL4emlqZIfRQaBuCNrR19GBJRF+wmfIHTsSaKS09bvY1RzO/gnJcfUdfoAaeu8+1qaHeLHrJ7uGF9hquWFDk0dHNDmzEZ1wfl02vFmwibsLTbarMC2NGkti6ur8OsNNpWx5en7fnlNOuDkF5qdQnvTSI30OjSwM7YL4g6zpjxGA6L1VTd1XwWJDQj8gPLsAppgaZE33xib4NcArcuvLI9T9+RNxdgicOSEmT+MQmwHN9RjgPlqB7R3C/yZUV8RoyjAWM7yeLFzfAaX+hPpfJomC5SQHsd0rVurKMVTUQqZOxPmj2bSmBcr/JK3I5Q5VvX+mOhw9MyqBaWinTDUxOYyL6Pm9w5AbsRjVsQ20ZHXis2c8w4P/avq0oAV48wmNqm/xAPjWBWXjcrCtgRrujusSvwQvnUR8ZRnJzKoHBrzTWWfKIarO22mZLaJcxFrO8JsER/dNtxpbJfK1ePwvGP0tv8wirqGDOmXc+mrFwYxO289Idt+RS1GRHZ014lN4pw3jbOX1RucvdZOtGtx2gZsYNQFgB3u6iRudASiwKWXTWBwkakEWvDSEePf/q/KhRO8WKirLo4H6q6ZOvEDHwafUcnPHIW+33wIWZZqyU6DmvUSPV5wKxIFaGg+5SCrQk+wN1KQoEQ3vgjPQP5a5qGaAUqts80Hp1kEYPK8/o4hf6Tgz5MBmLGI0nGmWUA HO3Y0fLc QZNIaD88S4C0Sw+oBvj86RsCuAF3BShvl4wXyVm1eUJgSjKqG/DnZGFnlorfDHcTJZIFxoH6klHUdElwV0azGHPHyjm7QGJt0p2xQU0X6wQcgfJyjYtmAGU4Q6dq5i+xQVxgTwU4lmfU+KiuiaQxDYqMXMgH3w63wNRajzeN29vHhvsYTrTth8L58sdbXKKzlzGlqa+cf0jL9ZgSTnqpXzhk5Ow== 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: It is very unclear to me how one is supposed to run all the mm selftests consistently and get clear results. Most of the test programs are launched by both run_vmtests.sh and run_kselftest.sh: hugepage-mmap hugepage-shm map_hugetlb hugepage-mremap hugepage-vmemmap hugetlb-madvise map_fixed_noreplace gup_test gup_longterm uffd-unit-tests uffd-stress compaction_test on-fault-limit map_populate mlock-random-test mlock2-tests mrelease_test mremap_test thuge-gen virtual_address_range va_high_addr_switch mremap_dontunmap hmm-tests madv_populate memfd_secret ksm_tests ksm_functional_tests soft-dirty cow However, of this set, when launched by run_vmtests.sh, some of the programs are invoked multiple times with different arguments. When invoked by run_kselftest.sh, they are invoked without arguments (and as a consequence, some fail immediately). Some test programs are only launched by run_vmtests.sh: test_vmalloc.sh And some test programs and only launched by run_kselftest.sh: khugepaged migration mkdirty transhuge-stress split_huge_page_test mdwe_test write_to_hugetlbfs Furthermore, run_vmtests.sh is invoked by run_kselftest.sh, so in this case all the test programs invoked by both scripts are run twice! Needless to say, this is a bit of a mess. In the absence of fully understanding the history here, it looks to me like the best solution is to launch ALL test programs from run_vmtests.sh, and ONLY invoke run_vmtests.sh from run_kselftest.sh. This way, we get full control over the parameters, each program is only invoked the intended number of times, and regardless of which script is used, the same tests get run in the same way. The only drawback is that if using run_kselftest.sh, it's top-level tap result reporting reports only a single test and it fails if any of the contained tests fail. I don't see this as a big deal though since we still see all the nested reporting from multiple layers. The other issue with this is that all of run_vmtests.sh must execute within a single kselftest timeout period, so let's increase that to something more suitable. In the Makefile, TEST_GEN_PROGS will compile and install the tests and will add them to the list of tests that run_kselftest.sh will run. TEST_GEN_FILES will compile and install the tests but will not add them to the test list. So let's move all the programs from TEST_GEN_PROGS to TEST_GEN_FILES so that they are built but not executed by run_kselftest.sh. Note that run_vmtests.sh is added to TEST_PROGS, which means it ends up in the test list. (the lack of "_GEN" means it won't be compiled, but simply copied). Signed-off-by: Ryan Roberts Acked-by: David Hildenbrand Acked-by: Peter Xu --- tools/testing/selftests/mm/Makefile | 79 ++++++++++++----------- tools/testing/selftests/mm/run_vmtests.sh | 23 +++++++ tools/testing/selftests/mm/settings | 2 +- 3 files changed, 64 insertions(+), 40 deletions(-) diff --git a/tools/testing/selftests/mm/Makefile b/tools/testing/selftests/mm/Makefile index 3514697fc2db..f39ba27d15fa 100644 --- a/tools/testing/selftests/mm/Makefile +++ b/tools/testing/selftests/mm/Makefile @@ -35,41 +35,41 @@ MAKEFLAGS += --no-builtin-rules CFLAGS = -Wall -I $(top_srcdir) $(EXTRA_CFLAGS) $(KHDR_INCLUDES) LDLIBS = -lrt -lpthread -TEST_GEN_PROGS = cow -TEST_GEN_PROGS += compaction_test -TEST_GEN_PROGS += gup_longterm -TEST_GEN_PROGS += gup_test -TEST_GEN_PROGS += hmm-tests -TEST_GEN_PROGS += hugetlb-madvise -TEST_GEN_PROGS += hugepage-mmap -TEST_GEN_PROGS += hugepage-mremap -TEST_GEN_PROGS += hugepage-shm -TEST_GEN_PROGS += hugepage-vmemmap -TEST_GEN_PROGS += khugepaged -TEST_GEN_PROGS += madv_populate -TEST_GEN_PROGS += map_fixed_noreplace -TEST_GEN_PROGS += map_hugetlb -TEST_GEN_PROGS += map_populate -TEST_GEN_PROGS += memfd_secret -TEST_GEN_PROGS += migration -TEST_GEN_PROGS += mkdirty -TEST_GEN_PROGS += mlock-random-test -TEST_GEN_PROGS += mlock2-tests -TEST_GEN_PROGS += mrelease_test -TEST_GEN_PROGS += mremap_dontunmap -TEST_GEN_PROGS += mremap_test -TEST_GEN_PROGS += on-fault-limit -TEST_GEN_PROGS += thuge-gen -TEST_GEN_PROGS += transhuge-stress -TEST_GEN_PROGS += uffd-stress -TEST_GEN_PROGS += uffd-unit-tests -TEST_GEN_PROGS += split_huge_page_test -TEST_GEN_PROGS += ksm_tests -TEST_GEN_PROGS += ksm_functional_tests -TEST_GEN_PROGS += mdwe_test +TEST_GEN_FILES = cow +TEST_GEN_FILES += compaction_test +TEST_GEN_FILES += gup_longterm +TEST_GEN_FILES += gup_test +TEST_GEN_FILES += hmm-tests +TEST_GEN_FILES += hugetlb-madvise +TEST_GEN_FILES += hugepage-mmap +TEST_GEN_FILES += hugepage-mremap +TEST_GEN_FILES += hugepage-shm +TEST_GEN_FILES += hugepage-vmemmap +TEST_GEN_FILES += khugepaged +TEST_GEN_FILES += madv_populate +TEST_GEN_FILES += map_fixed_noreplace +TEST_GEN_FILES += map_hugetlb +TEST_GEN_FILES += map_populate +TEST_GEN_FILES += memfd_secret +TEST_GEN_FILES += migration +TEST_GEN_FILES += mkdirty +TEST_GEN_FILES += mlock-random-test +TEST_GEN_FILES += mlock2-tests +TEST_GEN_FILES += mrelease_test +TEST_GEN_FILES += mremap_dontunmap +TEST_GEN_FILES += mremap_test +TEST_GEN_FILES += on-fault-limit +TEST_GEN_FILES += thuge-gen +TEST_GEN_FILES += transhuge-stress +TEST_GEN_FILES += uffd-stress +TEST_GEN_FILES += uffd-unit-tests +TEST_GEN_FILES += split_huge_page_test +TEST_GEN_FILES += ksm_tests +TEST_GEN_FILES += ksm_functional_tests +TEST_GEN_FILES += mdwe_test ifneq ($(ARCH),arm64) -TEST_GEN_PROGS += soft-dirty +TEST_GEN_FILES += soft-dirty endif ifeq ($(ARCH),x86_64) @@ -86,24 +86,24 @@ CFLAGS += -no-pie endif ifeq ($(CAN_BUILD_I386),1) -TEST_GEN_PROGS += $(BINARIES_32) +TEST_GEN_FILES += $(BINARIES_32) endif ifeq ($(CAN_BUILD_X86_64),1) -TEST_GEN_PROGS += $(BINARIES_64) +TEST_GEN_FILES += $(BINARIES_64) endif else ifneq (,$(findstring $(ARCH),ppc64)) -TEST_GEN_PROGS += protection_keys +TEST_GEN_FILES += protection_keys endif endif ifneq (,$(filter $(ARCH),arm64 ia64 mips64 parisc64 ppc64 riscv64 s390x sparc64 x86_64)) -TEST_GEN_PROGS += va_high_addr_switch -TEST_GEN_PROGS += virtual_address_range -TEST_GEN_PROGS += write_to_hugetlbfs +TEST_GEN_FILES += va_high_addr_switch +TEST_GEN_FILES += virtual_address_range +TEST_GEN_FILES += write_to_hugetlbfs endif TEST_PROGS := run_vmtests.sh @@ -115,6 +115,7 @@ TEST_FILES += va_high_addr_switch.sh include ../lib.mk $(TEST_GEN_PROGS): vm_util.c +$(TEST_GEN_FILES): vm_util.c $(OUTPUT)/uffd-stress: uffd-common.c $(OUTPUT)/uffd-unit-tests: uffd-common.c diff --git a/tools/testing/selftests/mm/run_vmtests.sh b/tools/testing/selftests/mm/run_vmtests.sh index 9e4338aa5e09..cc2cbc4405ff 100755 --- a/tools/testing/selftests/mm/run_vmtests.sh +++ b/tools/testing/selftests/mm/run_vmtests.sh @@ -55,6 +55,17 @@ separated by spaces: test soft dirty page bit semantics - cow test copy-on-write semantics +- thp + test transparent huge pages +- migration + invoke move_pages(2) to exercise the migration entry code + paths in the kernel +- mkdirty + test handling of code that might set PTE/PMD dirty in + read-only VMAs +- mdwe + test prctl(PR_SET_MDWE, ...) + example: ./run_vmtests.sh -t "hmm mmap ksm" EOF exit 0 @@ -298,6 +309,18 @@ fi # COW tests CATEGORY="cow" run_test ./cow +CATEGORY="thp" run_test ./khugepaged + +CATEGORY="thp" run_test ./transhuge-stress -d 20 + +CATEGORY="thp" run_test ./split_huge_page_test + +CATEGORY="migration" run_test ./migration + +CATEGORY="mkdirty" run_test ./mkdirty + +CATEGORY="mdwe" run_test ./mdwe_test + echo "SUMMARY: PASS=${count_pass} SKIP=${count_skip} FAIL=${count_fail}" exit $exitcode diff --git a/tools/testing/selftests/mm/settings b/tools/testing/selftests/mm/settings index ba4d85f74cd6..a953c96aa16e 100644 --- a/tools/testing/selftests/mm/settings +++ b/tools/testing/selftests/mm/settings @@ -1 +1 @@ -timeout=90 +timeout=180