From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DB9022DC335; Mon, 15 Sep 2025 23:26:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757978776; cv=none; b=qvS3R0We4KVij0nw7kqsbcdy4wdPA2PPk2OwBGHkj8EJhhIRsmdA0YzTCTntFCjG++YNRAkWveGtotFAAF7ukRZsmUTBHIxWVJYs+W40Q8fAbo+RmNwcR1D13NPv+xxbIlfQGR++LI0t84bThfIK0RpEpoESbQ45vauKlvtcSaQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757978776; c=relaxed/simple; bh=tAuylQj+jXMT0ulfEEiUYEaHrJIDwHN10sPhMMvpM2c=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=UkyYi3PVOAf5q1UZ0Pturl1xrm791EDS/JxkijAENLA/TmXZBZvu70F/ivK5l7FcBjM3oyqnFLWgCHHpCIbEOYTtxdAMsejOSvF62hqWPxWLQiJqwxlOE1wiDDLnYrs335KwfG8gx2CsPTyekVYif0x0P0ig3g2wTj02pjH5Bgw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=mLOfsFFA; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="mLOfsFFA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 014F0C4CEF1; Mon, 15 Sep 2025 23:26:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1757978775; bh=tAuylQj+jXMT0ulfEEiUYEaHrJIDwHN10sPhMMvpM2c=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=mLOfsFFApFvIf6sQxWhfX9ghTUZg2OUze1cucqZdBwvy5U6wkYb00M2oOfuhERvL2 Yowz9ciNglMhen3qeHdyXHl48/oQTlEKPM548GRJnFXix/WW8chyjZbDr+1vVcehFt S3xaoxO6GQjV8s/VhVrJNbCmmzLGj7ARjrtTfDhd6mKWcS5FIiwu2t8+/RHQTFGmzm 5VGPXBJWdsCMYCJQOYLjGKPuY0ryes3TsO6QJNB/opi2sdObwt01Jz3UFWUmjnM8Oq 6jF2uZ/3lehppkwOS0IKBd+QAkfo2bF67MKBwb2DKHaXy5Tgf9O17aRXnoMDN8d2d5 FWC1GUe/Vg/sg== From: Mark Brown Date: Tue, 16 Sep 2025 00:12:11 +0100 Subject: [PATCH v21 6/8] selftests/clone3: Factor more of main loop into test_clone3() Precedence: bulk X-Mailing-List: linux-api@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250916-clone3-shadow-stack-v21-6-910493527013@kernel.org> References: <20250916-clone3-shadow-stack-v21-0-910493527013@kernel.org> In-Reply-To: <20250916-clone3-shadow-stack-v21-0-910493527013@kernel.org> To: "Rick P. Edgecombe" , Deepak Gupta , Szabolcs Nagy , "H.J. Lu" , Florian Weimer , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Peter Zijlstra , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Valentin Schneider , Christian Brauner , Shuah Khan Cc: linux-kernel@vger.kernel.org, Catalin Marinas , Will Deacon , jannh@google.com, bsegall@google.com, Andrew Morton , Yury Khrustalev , Wilco Dijkstra , linux-kselftest@vger.kernel.org, linux-api@vger.kernel.org, Mark Brown , Kees Cook , Kees Cook , Shuah Khan X-Mailer: b4 0.15-dev-56183 X-Developer-Signature: v=1; a=openpgp-sha256; l=3987; i=broonie@kernel.org; h=from:subject:message-id; bh=tAuylQj+jXMT0ulfEEiUYEaHrJIDwHN10sPhMMvpM2c=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBoyKBqkbvsPYuelwScWvcn7hXNIQbiqqSG0Rxli YL+H7jtaPWJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCaMigagAKCRAk1otyXVSH 0Go6B/91LmVANryIFxxjY/iRz/S0i9nyAV8s+Fl8CN/nMELUWFHtKelmEPWymXDz8B6axs1VO83 4SWrcCol0+P1AN/fDIBG0RpZAZTr7gcApdZGti0Dm+kqhyJBvpUtw+y+H7VK7aWxxX1fVnOfKt+ 27YZwqjOOqqSCQ3M/kCQ+GB8oWEcydJOBnt3xaMiTo87MQ0HFwyfS2fLnW9PW8AWvhuThanY09W 74Wpk286yup8QlHWRGN2uo+YzcyEGpx7U6udxPdBonMb27jEPOWeADQwEFjvRAR7pJWeHIutC9u 1JBQzCrvhY1uQ6wCnMCEdOIApSRutHGtyOaX5JPhA6+Vww7a X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB In order to make it easier to add more configuration for the tests and more support for runtime detection of when tests can be run pass the structure describing the tests into test_clone3() rather than picking the arguments out of it and have that function do all the per-test work. No functional change. Reviewed-by: Kees Cook Tested-by: Kees Cook Acked-by: Shuah Khan Reviewed-by: Catalin Marinas Tested-by: Rick Edgecombe Signed-off-by: Mark Brown --- tools/testing/selftests/clone3/clone3.c | 77 ++++++++++++++++----------------- 1 file changed, 37 insertions(+), 40 deletions(-) diff --git a/tools/testing/selftests/clone3/clone3.c b/tools/testing/selftests/clone3/clone3.c index e61f07973ce5..e066b201fa64 100644 --- a/tools/testing/selftests/clone3/clone3.c +++ b/tools/testing/selftests/clone3/clone3.c @@ -30,6 +30,19 @@ enum test_mode { CLONE3_ARGS_INVAL_EXIT_SIGNAL_NSIG, }; +typedef bool (*filter_function)(void); +typedef size_t (*size_function)(void); + +struct test { + const char *name; + uint64_t flags; + size_t size; + size_function size_function; + int expected; + enum test_mode test_mode; + filter_function filter; +}; + static int call_clone3(uint64_t flags, size_t size, enum test_mode test_mode) { struct __clone_args args = { @@ -109,30 +122,40 @@ static int call_clone3(uint64_t flags, size_t size, enum test_mode test_mode) return 0; } -static bool test_clone3(uint64_t flags, size_t size, int expected, - enum test_mode test_mode) +static void test_clone3(const struct test *test) { + size_t size; int ret; + if (test->filter && test->filter()) { + ksft_test_result_skip("%s\n", test->name); + return; + } + + if (test->size_function) + size = test->size_function(); + else + size = test->size; + + ksft_print_msg("Running test '%s'\n", test->name); + ksft_print_msg( "[%d] Trying clone3() with flags %#" PRIx64 " (size %zu)\n", - getpid(), flags, size); - ret = call_clone3(flags, size, test_mode); + getpid(), test->flags, size); + ret = call_clone3(test->flags, size, test->test_mode); ksft_print_msg("[%d] clone3() with flags says: %d expected %d\n", - getpid(), ret, expected); - if (ret != expected) { + getpid(), ret, test->expected); + if (ret != test->expected) { ksft_print_msg( "[%d] Result (%d) is different than expected (%d)\n", - getpid(), ret, expected); - return false; + getpid(), ret, test->expected); + ksft_test_result_fail("%s\n", test->name); + return; } - return true; + ksft_test_result_pass("%s\n", test->name); } -typedef bool (*filter_function)(void); -typedef size_t (*size_function)(void); - static bool not_root(void) { if (getuid() != 0) { @@ -160,16 +183,6 @@ static size_t page_size_plus_8(void) return getpagesize() + 8; } -struct test { - const char *name; - uint64_t flags; - size_t size; - size_function size_function; - int expected; - enum test_mode test_mode; - filter_function filter; -}; - static const struct test tests[] = { { .name = "simple clone3()", @@ -319,24 +332,8 @@ int main(int argc, char *argv[]) ksft_set_plan(ARRAY_SIZE(tests)); test_clone3_supported(); - for (i = 0; i < ARRAY_SIZE(tests); i++) { - if (tests[i].filter && tests[i].filter()) { - ksft_test_result_skip("%s\n", tests[i].name); - continue; - } - - if (tests[i].size_function) - size = tests[i].size_function(); - else - size = tests[i].size; - - ksft_print_msg("Running test '%s'\n", tests[i].name); - - ksft_test_result(test_clone3(tests[i].flags, size, - tests[i].expected, - tests[i].test_mode), - "%s\n", tests[i].name); - } + for (i = 0; i < ARRAY_SIZE(tests); i++) + test_clone3(&tests[i]); ksft_finished(); } -- 2.47.2