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 09CBCC54ED1 for ; Tue, 27 May 2025 16:13:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 39B3F6B00C4; Tue, 27 May 2025 12:13:29 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 34D986B00C6; Tue, 27 May 2025 12:13:29 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 216E86B00C7; Tue, 27 May 2025 12:13:29 -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 EA4DC6B00C4 for ; Tue, 27 May 2025 12:13:28 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id A56F1BEA50 for ; Tue, 27 May 2025 16:13:28 +0000 (UTC) X-FDA: 83489182896.27.943EF39 Received: from sea.source.kernel.org (sea.source.kernel.org [172.234.252.31]) by imf25.hostedemail.com (Postfix) with ESMTP id BFCC8A0005 for ; Tue, 27 May 2025 16:13:26 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=pjEoc81M; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf25.hostedemail.com: domain of broonie@kernel.org designates 172.234.252.31 as permitted sender) smtp.mailfrom=broonie@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1748362406; 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:dkim-signature; bh=99bJ7ncy3+BEpfODaLkzzMOkHF8vBf6y7HXnEqQjvn0=; b=p/1J1igXlJwzz7i2PylYPle7PiVMEQYYpwEKhtzGRn+XmqZdIYZL54k7O3h/O1CAdz2QA0 MXKwFVcTM13A3TVDRh4SoEIK/xN5mnE+1MUM8ZlMPy9hEdA7S4MD7kJV+nhmDnQM1KmH29 OKawZcxQ8d20LXhfhQWTetiHZ++iMHo= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=pjEoc81M; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf25.hostedemail.com: domain of broonie@kernel.org designates 172.234.252.31 as permitted sender) smtp.mailfrom=broonie@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1748362406; a=rsa-sha256; cv=none; b=hOvk4N5z/JTxVGMWSC+G/FYGgbh02c8HJg9WOLGBUICTgCFclIMOPpPu4A9+n3skQZwcNq 3wraQFIwO+oKRBOLZG7iuyD4cDZvWsnlNmkwOyJhkWoSjkaPXCDEk0rBsmLwCTXRcAEgUT Lr3R9bb0mtg7BlXEvIw3Fdug/sKoJyQ= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id B262F4369E; Tue, 27 May 2025 16:13:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DCF35C4CEED; Tue, 27 May 2025 16:13:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1748362405; bh=cHjqIjTqNNckbvYuzAVxs6zjA2YNzuxtFHwb8hivo1k=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=pjEoc81Mcd7bDU2MwEemHLEqhphq8QqYdsSHsvtGb9wC07nGF2gFqWd855oHHQnfy gF200HnsoXJ5p/iik7lnD6zmszNr9MFahbWoUrL142DpYwtuHuxvFLN2/uZPr83GgP Oa0/wrQHWXA4oo2H+tc8ylPIRpqSFqKFwKxWqxavQbZpF6NYba/fWd5sWbQaOdXEc2 u8TFQc56jDKiaiuLbm3Ht2j5y2uB+ky9hCTkb0uES2JSA8da4pNv98ABy8ntCuJRAo PLYx2kdzNxd57XmXb9sSm+d9XjAOxMygCEuSIkv/akw1iIsxZG4i0n10U4472jh49H yrjnkKbAib3Qw== From: Mark Brown Date: Tue, 27 May 2025 17:04:48 +0100 Subject: [PATCH v2 4/4] selftests/mm: Fix test result reporting in gup_longterm MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250527-selftests-mm-cow-dedupe-v2-4-ff198df8e38e@kernel.org> References: <20250527-selftests-mm-cow-dedupe-v2-0-ff198df8e38e@kernel.org> In-Reply-To: <20250527-selftests-mm-cow-dedupe-v2-0-ff198df8e38e@kernel.org> To: Andrew Morton , Shuah Khan , David Hildenbrand Cc: Lorenzo Stoakes , linux-mm@kvack.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Mark Brown X-Mailer: b4 0.15-dev-c25d1 X-Developer-Signature: v=1; a=openpgp-sha256; l=9917; i=broonie@kernel.org; h=from:subject:message-id; bh=cHjqIjTqNNckbvYuzAVxs6zjA2YNzuxtFHwb8hivo1k=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBoNeSbCL89IMT+omQKibdX1Q4UHkOcQk4OIx0wQ3Ja jZqH9cWJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCaDXkmwAKCRAk1otyXVSH0G/tB/ 43xwRr+1xlMMIzqRNi1BCKP8Hf9Lt9c3I3OoHqrsaJLZA1b+l66aDCWMlC1bc1M0Tl754qL4fd+dG2 9+vJedlFUoFIxQ0fHVUeoYLkR//BMiGWQflDWGJdjMLbVH5PQZk2QE4M6mUm42Tsi/nqyezAn7OwS8 bBzjeKrRI10NJpPEgDlBzDc2lO8KckqepVouAsUp5j3wtsiwO1enyux3TeOIBFcr3dlSxBJlC2nSut kZtvze5WT5vUX9jPRoRX941Z8KCr1hLQ0dK9x1m+D5WxrA8OIZMpe0RiIbPXGmHtgxWRrXd/f4kmaC HlsMhyXpsm7pBaOROIShQHXuP6Sg4t X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: BFCC8A0005 X-Stat-Signature: xyw6mps1d87qooejehb7z558ocy1o5z5 X-Rspam-User: X-HE-Tag: 1748362406-290084 X-HE-Meta: U2FsdGVkX19elOSJWfAFJG+MF53+6WVwLhvtRoTeuCWMrnx0EuY0m1hOhb0s0wI7q5+bokfrIVQmwJDjr/mkVZQmud15UoPlTQVbudHdtWuIWU9qZr+HqFBq11H0L15+UioV6xY6sJn4wED5Zlw/04DFtrXu7nrkMFL6ShpjQC44Mjn6en4LMmmpGO767CRqZcfKShKNfk/lVK9Lsk3ReIe7Z6Z7LrATMauNUox/oEGlD1f35x97hbBq3FG8eFTD4f660q6dGvpvcenWGKA4tH4pRqeAc/rwOtT3XFXhx2DI4D2H5kAoRytmFnvK+mZH+cTOx8HqQDW7VIOZujZon/nkioj4r+NyyA2VRUJ2U54QTbtacatcZqNjWKq6PnhfkO2r8Yr8z3VS5dKJLoPnRTkpFJ+jffj/SxJ97RneiSD/ODfvEDDILQw/JNU6sEyPNC/JPBVFEqKTb6di0X6kdxrf60i3r6RURCXU2NzmC5VM4ORnToWWf8GK9v+sE+ZMI4J/w9v8xvuRZB7A9QChwSub2mU38AT7DpL0DUFj8v9iCvWFayEdw3ew2lBEqFdyinvG80rKJHTBLYQpbwm3gpyOZ+TScByrIMl+c5zVwRhvfTJR+wnlRjeV6C16y7yPUqpw6CuP32BucG9EkwpeFdtMZe4BFX9NRTBd+SMrxrqztj4k0g00Egxc+5bLO88vajL5jkOaewhw1LXHJk6q4wCBW8XFiDhZo3YREBrEwSw6S199PTjmiVcAfkhKiS9VU0yWa4a3Xk9MouXbGehVVfddfqo24e0zej7UWSxH5Q5WhKjMrNguSlmJp6ZdVRoX2t0DCyBvjvBORbX10mGpZtnWJUWz/ZlAyEiZ2YsfIE+QNBR1PIeA6tY2Rrs17dDjbzcZW/Bv/tBIWADhK81LWN5lJAP/heCOeLx0ffg6TMs4TtE/BXNrwl2vsqdAhFtqHD4v8aIAbqldP6RPngF ofozHVck LC6HfBBvfbaeyu1fQ/9AHtIonn3HguKS47Xfog4MgJaT5sp6KP/7/pF0IkIXeYd2eHY3gUvUe82ASjbBymCEc0ZxhkNwaKq9kmLYqLE0Dw6GtW75WwJo1yRN7yowl3v3uCA/tnBDtV2J8XkBAB+VQrkpAMfzqr1Fp7MdwJjtpHpg1isS5VqvnJybqTDfsnoNZfPgy68Y8TyhMDzhmJHyAKQgu6EEQdp51zv8d/2dL89OmDXn+fC56ugvhsbvY72+nGytYAJDHilDcv8QQwvv9Mz9B+E4MqaogWAHc X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: The kselftest framework uses the string logged when a test result is reported as the unique identifier for a test, using it to track test results between runs. The gup_longterm test fails to follow this pattern, it runs a single test function repeatedly with various parameters but each result report is a string logging an error message which is fixed between runs. Since the code already logs each test uniquely before it starts refactor to also print this to a buffer, then use that name as the test result. This isn't especially pretty but is relatively straightforward and is a great help to tooling. Signed-off-by: Mark Brown --- tools/testing/selftests/mm/gup_longterm.c | 150 +++++++++++++++++++----------- 1 file changed, 94 insertions(+), 56 deletions(-) diff --git a/tools/testing/selftests/mm/gup_longterm.c b/tools/testing/selftests/mm/gup_longterm.c index e60e62809186..f84ea97c2543 100644 --- a/tools/testing/selftests/mm/gup_longterm.c +++ b/tools/testing/selftests/mm/gup_longterm.c @@ -93,33 +93,48 @@ static void do_test(int fd, size_t size, enum test_type type, bool shared) __fsword_t fs_type = get_fs_type(fd); bool should_work; char *mem; + int result = KSFT_PASS; int ret; + if (fd < 0) { + result = KSFT_FAIL; + goto report; + } + if (ftruncate(fd, size)) { if (errno == ENOENT) { skip_test_dodgy_fs("ftruncate()"); } else { - ksft_test_result_fail("ftruncate() failed (%s)\n", strerror(errno)); + ksft_print_msg("ftruncate() failed (%s)\n", + strerror(errno)); + result = KSFT_FAIL; + goto report; } return; } if (fallocate(fd, 0, 0, size)) { - if (size == pagesize) - ksft_test_result_fail("fallocate() failed (%s)\n", strerror(errno)); - else - ksft_test_result_skip("need more free huge pages\n"); - return; + if (size == pagesize) { + ksft_print_msg("fallocate() failed (%s)\n", strerror(errno)); + result = KSFT_FAIL; + } else { + ksft_print_msg("need more free huge pages\n"); + result = KSFT_SKIP; + } + goto report; } mem = mmap(NULL, size, PROT_READ | PROT_WRITE, shared ? MAP_SHARED : MAP_PRIVATE, fd, 0); if (mem == MAP_FAILED) { - if (size == pagesize || shared) - ksft_test_result_fail("mmap() failed (%s)\n", strerror(errno)); - else - ksft_test_result_skip("need more free huge pages\n"); - return; + if (size == pagesize || shared) { + ksft_print_msg("mmap() failed (%s)\n", strerror(errno)); + result = KSFT_FAIL; + } else { + ksft_print_msg("need more free huge pages\n"); + result = KSFT_SKIP; + } + goto report; } /* Fault in the page such that GUP-fast can pin it directly. */ @@ -134,7 +149,8 @@ static void do_test(int fd, size_t size, enum test_type type, bool shared) */ ret = mprotect(mem, size, PROT_READ); if (ret) { - ksft_test_result_fail("mprotect() failed (%s)\n", strerror(errno)); + ksft_print_msg("mprotect() failed (%s)\n", strerror(errno)); + result = KSFT_FAIL; goto munmap; } /* FALLTHROUGH */ @@ -147,12 +163,14 @@ static void do_test(int fd, size_t size, enum test_type type, bool shared) type == TEST_TYPE_RW_FAST; if (gup_fd < 0) { - ksft_test_result_skip("gup_test not available\n"); + ksft_print_msg("gup_test not available\n"); + result = KSFT_SKIP; break; } if (rw && shared && fs_is_unknown(fs_type)) { - ksft_test_result_skip("Unknown filesystem\n"); + ksft_print_msg("Unknown filesystem\n"); + result = KSFT_SKIP; return; } /* @@ -169,14 +187,19 @@ static void do_test(int fd, size_t size, enum test_type type, bool shared) args.flags |= rw ? PIN_LONGTERM_TEST_FLAG_USE_WRITE : 0; ret = ioctl(gup_fd, PIN_LONGTERM_TEST_START, &args); if (ret && errno == EINVAL) { - ksft_test_result_skip("PIN_LONGTERM_TEST_START failed (EINVAL)n"); + ksft_print_msg("PIN_LONGTERM_TEST_START failed (EINVAL)n"); + result = KSFT_SKIP; break; } else if (ret && errno == EFAULT) { - ksft_test_result(!should_work, "Should have failed\n"); + if (should_work) + result = KSFT_FAIL; + else + result = KSFT_PASS; break; } else if (ret) { - ksft_test_result_fail("PIN_LONGTERM_TEST_START failed (%s)\n", - strerror(errno)); + ksft_print_msg("PIN_LONGTERM_TEST_START failed (%s)\n", + strerror(errno)); + result = KSFT_FAIL; break; } @@ -189,7 +212,10 @@ static void do_test(int fd, size_t size, enum test_type type, bool shared) * some previously unsupported filesystems, we might want to * perform some additional tests for possible data corruptions. */ - ksft_test_result(should_work, "Should have worked\n"); + if (should_work) + result = KSFT_PASS; + else + result = KSFT_FAIL; break; } #ifdef LOCAL_CONFIG_HAVE_LIBURING @@ -199,8 +225,9 @@ static void do_test(int fd, size_t size, enum test_type type, bool shared) /* io_uring always pins pages writable. */ if (shared && fs_is_unknown(fs_type)) { - ksft_test_result_skip("Unknown filesystem\n"); - return; + ksft_print_msg("Unknown filesystem\n"); + result = KSFT_SKIP; + goto report; } should_work = !shared || fs_supports_writable_longterm_pinning(fs_type); @@ -208,8 +235,9 @@ static void do_test(int fd, size_t size, enum test_type type, bool shared) /* Skip on errors, as we might just lack kernel support. */ ret = io_uring_queue_init(1, &ring, 0); if (ret < 0) { - ksft_test_result_skip("io_uring_queue_init() failed (%s)\n", - strerror(-ret)); + ksft_print_msg("io_uring_queue_init() failed (%s)\n", + strerror(-ret)); + result = KSFT_SKIP; break; } /* @@ -222,17 +250,28 @@ static void do_test(int fd, size_t size, enum test_type type, bool shared) /* Only new kernels return EFAULT. */ if (ret && (errno == ENOSPC || errno == EOPNOTSUPP || errno == EFAULT)) { - ksft_test_result(!should_work, "Should have failed (%s)\n", - strerror(errno)); + if (should_work) { + ksft_print_msg("Should have failed (%s)\n", + strerror(errno)); + result = KSFT_FAIL; + } else { + result = KSFT_PASS; + } } else if (ret) { /* * We might just lack support or have insufficient * MEMLOCK limits. */ - ksft_test_result_skip("io_uring_register_buffers() failed (%s)\n", - strerror(-ret)); + ksft_print_msg("io_uring_register_buffers() failed (%s)\n", + strerror(-ret)); + result = KSFT_SKIP; } else { - ksft_test_result(should_work, "Should have worked\n"); + if (should_work) { + result = KSFT_PASS; + } else { + ksft_print_msg("Should have worked\n"); + result = KSFT_FAIL; + } io_uring_unregister_buffers(&ring); } @@ -246,6 +285,8 @@ static void do_test(int fd, size_t size, enum test_type type, bool shared) munmap: munmap(mem, size); +report: + log_test_result(result); } typedef void (*test_fn)(int fd, size_t size); @@ -254,13 +295,11 @@ static void run_with_memfd(test_fn fn, const char *desc) { int fd; - ksft_print_msg("[RUN] %s ... with memfd\n", desc); + log_test_start("%s ... with memfd", desc); fd = memfd_create("test", 0); - if (fd < 0) { - ksft_test_result_fail("memfd_create() failed (%s)\n", strerror(errno)); - return; - } + if (fd < 0) + ksft_print_msg("memfd_create() failed (%s)\n", strerror(errno)); fn(fd, pagesize); close(fd); @@ -271,23 +310,23 @@ static void run_with_tmpfile(test_fn fn, const char *desc) FILE *file; int fd; - ksft_print_msg("[RUN] %s ... with tmpfile\n", desc); + log_test_start("%s ... with tmpfile", desc); file = tmpfile(); if (!file) { - ksft_test_result_fail("tmpfile() failed (%s)\n", strerror(errno)); - return; - } - - fd = fileno(file); - if (fd < 0) { - ksft_test_result_fail("fileno() failed (%s)\n", strerror(errno)); - goto close; + ksft_print_msg("tmpfile() failed (%s)\n", strerror(errno)); + fd = -1; + } else { + fd = fileno(file); + if (fd < 0) { + ksft_print_msg("fileno() failed (%s)\n", strerror(errno)); + } } fn(fd, pagesize); -close: - fclose(file); + + if (file) + fclose(file); } static void run_with_local_tmpfile(test_fn fn, const char *desc) @@ -295,22 +334,22 @@ static void run_with_local_tmpfile(test_fn fn, const char *desc) char filename[] = __FILE__"_tmpfile_XXXXXX"; int fd; - ksft_print_msg("[RUN] %s ... with local tmpfile\n", desc); + log_test_start("%s ... with local tmpfile", desc); fd = mkstemp(filename); - if (fd < 0) { - ksft_test_result_fail("mkstemp() failed (%s)\n", strerror(errno)); - return; - } + if (fd < 0) + ksft_print_msg("mkstemp() failed (%s)\n", strerror(errno)); if (unlink(filename)) { - ksft_test_result_fail("unlink() failed (%s)\n", strerror(errno)); - goto close; + ksft_print_msg("unlink() failed (%s)\n", strerror(errno)); + close(fd); + fd = -1; } fn(fd, pagesize); -close: - close(fd); + + if (fd >= 0) + close(fd); } static void run_with_memfd_hugetlb(test_fn fn, const char *desc, @@ -319,15 +358,14 @@ static void run_with_memfd_hugetlb(test_fn fn, const char *desc, int flags = MFD_HUGETLB; int fd; - ksft_print_msg("[RUN] %s ... with memfd hugetlb (%zu kB)\n", desc, + log_test_start("%s ... with memfd hugetlb (%zu kB)", desc, hugetlbsize / 1024); flags |= __builtin_ctzll(hugetlbsize) << MFD_HUGE_SHIFT; fd = memfd_create("test", flags); if (fd < 0) { - ksft_test_result_skip("memfd_create() failed (%s)\n", strerror(errno)); - return; + ksft_print_msg("memfd_create() failed (%s)\n", strerror(errno)); } fn(fd, hugetlbsize); -- 2.39.5