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 CFDFAC54E65 for ; Thu, 22 May 2025 17:39:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7CA3A6B0092; Thu, 22 May 2025 13:39:25 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 704806B0093; Thu, 22 May 2025 13:39:25 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 580436B0095; Thu, 22 May 2025 13:39:25 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 34E976B0092 for ; Thu, 22 May 2025 13:39:25 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id D355FB6A9F for ; Thu, 22 May 2025 17:39:24 +0000 (UTC) X-FDA: 83471255448.09.937FC9B Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf09.hostedemail.com (Postfix) with ESMTP id 02FC6140011 for ; Thu, 22 May 2025 17:39:22 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=OPMm+v0C; spf=pass (imf09.hostedemail.com: domain of broonie@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=broonie@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1747935563; 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=HwCiM4YAODuirFs/o9cuLG6gyA0Dqf77RehLBvhwARuuzbrhzOS9lQJp3D+pzG4JbDdXsS bSd3TGsxKHVjrfMHaWSKF9hnoBpSaj8crXfIqxdjp8ghOCOLr/wmfzk8solDJEfe2wA01B Onx6OQolBhusOV1JfSzXEkhCvwcsIC0= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=OPMm+v0C; spf=pass (imf09.hostedemail.com: domain of broonie@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=broonie@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747935563; a=rsa-sha256; cv=none; b=0YZlwQec4bF1h8wZe7GyYOcIi5fb+mmAHzP78k8Cg2IK2mZWf21twx7kVIwhOdg+1iSyMb ddNrejin3Cr/mgBgeICUk4LnEsC5km31pyOd/z+uGutmRfbKATYUWdYKd7Rm4hRhm5HDmp f/ZveVZvRtMCkwb7M2zy1HNGcYgCUao= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 044545C647B; Thu, 22 May 2025 17:37:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 03F50C4CEF5; Thu, 22 May 2025 17:39:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1747935561; bh=cHjqIjTqNNckbvYuzAVxs6zjA2YNzuxtFHwb8hivo1k=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=OPMm+v0Cnq0C5+AAGfHtutPNGqMIJn+4/l/UdX/Q2R9bl1e45NmHuqeF6fHMXyzN8 4e7pZRBsHnxPafCEenbO6z2uwnDjOcJLAXUwo1vKCE1Am9O99ThZB+0mXsJn2UzQIR 03Ss1Ic7s+QV+lcBt6VWtat59crRNvNSqV5mSBOaa/pq3dS0Kd7OXe2b0FKOXp0kB6 AHnaAO34cV/PJ0d9peSoSZdqRINPP1gcrSTdvrE8kc2PL4MUz4x2bhTQJu9PfAPWL+ y6yXSQS+HsFo+0ZQkN9Yn/eGxE1hU/OeyKUFP+oPePWcGYMznHk7vcF3w3ioA44xKb zpNnubg0KoRAw== From: Mark Brown Date: Thu, 22 May 2025 18:38:53 +0100 Subject: [PATCH 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: <20250522-selftests-mm-cow-dedupe-v1-4-713cee2fdd6d@kernel.org> References: <20250522-selftests-mm-cow-dedupe-v1-0-713cee2fdd6d@kernel.org> In-Reply-To: <20250522-selftests-mm-cow-dedupe-v1-0-713cee2fdd6d@kernel.org> To: Andrew Morton , Shuah Khan , David Hildenbrand Cc: 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/pANAwAKASTWi3JdVIfQAcsmYgBoL2E9Z3GLvXX9j/Zj6pEPY2WH14S5p6WXILcc5xZG LZTnACWJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCaC9hPQAKCRAk1otyXVSH0E1wB/ 9H9L+ofO7mB7KQHgFVq4IYJkW1aqTTPwMDZjTc/HvZmislDF7jBRyHsv5YD0/HagCbRTp6Y8lIB0G/ lBY4iVg1uhtjIzdMepIYj6/PsyK193og0OAe7h60Au4Tznz5a/IUYLHShC4+HW4e6lXD9knCmVlGDP EQIGTj4fqVxKwqdU7cwGKnhjz1VGT8dbqxY3VzBLQnhwo3zP/VBtU5QQrxsxSs1t8sc7eYQDdhI8kY b97E0V/1Y+i9cHfkwFVBLer41yWIKysF2Ejgi+Ue45KPImIDAC1MB7LX3+a4b1WhjEbvwbXwTukvoU 6OxbzxrOfUDfMb9pAsLD0x7nc256x1 X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 02FC6140011 X-Stat-Signature: ak55g49ygkic7jikwjo8n1zigspbhh1m X-Rspam-User: X-HE-Tag: 1747935562-65798 X-HE-Meta: U2FsdGVkX19Zlh8hhIzBkjmVQFeJuYcLsOIXEmymvrnnDlI+jskwAPYBy+El8y2IFR/djroQB9aSOgyEj+HdwbvQ6D/B190dMWbmLd947A5ET++yKNIc87pxyg0L09kRXM6MJmw7O2Lq2WfjQHLMG8eFBnMCSd70wHhCQGhgOIX83jpgva4Sn8jRRpYSkx0LuhFLckMMYzZnDah6fak7Yny3LcezyLk8KJCnv5f4y6gdzUwHQIczM2pRdqPXij3/nZ6doyrBsLYlB0Qjtb+ih394dla27kXWXSdXZKuWZ7ZdfKq2XYTOWc/7oIVuarsiOsHg4pac0me0xksl+lk7dEy8JsLuy3ji4STQSo6spdm5aq9IndC2zyFFEmooMyaN7o5ae3r9XykH9nT+gO6bMQs4ojvLnscEf4b0z6LuhU0veX2+nnkVE9jV/4wC2P7tYAGxR7QtWLX4arvgl6qbJnM8Ep/PVy9o8wIyO6RNLaZBloobIzVjLOO87331laPN59kjalVQGjEIgOyjb1ymmojBUGc9ZE9IMcKz+LT1p5+28rZSNQciihEUeIzCCr2hem+yYCkCJ+L3SuMRrK4/qiF7F/cJN3KAFUu173W3X4tKjwhaEz0ad9Xja6b8zWkMl4Fdb50d3e1LwnQ4nGr+ml4jGpeh/bhesDzDYvfXsw8o2dQ/J8ipSSm+TtB17KFswtP9eEsV0GC8LXlqTivUL2sHBIg5ddsT72euGN2CMslg2g7N8EYY6MwDHJAP7VUosr/LRzVb3/s03ECEwy5boh2fCpKQd95AsfPXt+PBXwBfWja+l2DnZYLiZgmG52rFqJldNNc3s1pGVLFdTV+mv4zA9SQ3tjXCTZUKM+AgbWzv1kGhryZIvZjLXOtSF48Tjk3NFTj3puU4zENH/ER2ZIEKiV8DYLUsWbGZ8GQU1mtorO4Mwd7ou1bqB1vCAdEoix7si4EOq3/6Ofhy894 BUjlYC9G z3uxxK7D71IqLJn8itM0+2PMCsNdKFhimQgMImDDIIjTC/g51T4t1uJSyeVRXu60uXpnlE+sKwhyD2ij0AXJ4uD+egXZzhBTwvGQRi8synufvkUbW3YQrFpSBkZAdGbduQGeeNpw3Ue3zD1YiPb9yK4M4Yr3ojiZGltIeIS5kdnlmQ3DHiwhBRjrjz2DewHiRC+sjeCzCZXTK4OQlqHPYUsfdQZSPKXSNiFBN37r7UxuB/pDkh77dj8DpmEe3m77HQF9mSHJDSpMX5jSyRdeRVBgE0/vAptueCHFL 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