From patchwork Tue Apr 8 18:49:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 879206 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 933A2256D; Tue, 8 Apr 2025 18:51:03 +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=1744138263; cv=none; b=UQI1FY28HMTgPEtsG6jS/6doCi2MaxtEfes0nieO9/XdyGuT8fLmiswM7tYjXt1+lg0kchAtp3sdL1Q+qWANCz0ECq+NTY3qpCsorkC6zQpqGKHFxMeELJwhY9I/pVnJxUkKfA3BRFal4I7IAY1R1vMmZ5NVLhqC3vgWO6cwtGk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744138263; c=relaxed/simple; bh=1QQTqlYHUjewASmFh86Dd+jl+m64vZGkDAeB+lVVa3I=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=JtYoJ4kolZrabbrNAz2GSGkA4xOB42Zl8ztS2+34PMqeoC/1N2fEBF/A2Ed1xAKwS9v670BJ46pSg1dZd7doQE8RaRnHC/9PfBWlP6OAiwmncdUZy0UtxwXy4fJCDu6NRvgacudQejM3Yd1+Raik50wOBJHm+Fx1gaHUI4Draj4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=tVEz1zcD; 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="tVEz1zcD" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C6D46C4CEED; Tue, 8 Apr 2025 18:50:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1744138263; bh=1QQTqlYHUjewASmFh86Dd+jl+m64vZGkDAeB+lVVa3I=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=tVEz1zcDAjlOjs/RHoMZ0E+olCncmQ+1E8mXBntv6H4X0xRZmYt/F9clZr0wzwyU8 V6NKLHxy+aXVTE4qB7UQggTNpKn48LV9kL5caiVcDsysXkNhjjRZvexi3Ucb8z8Hrc nkSq7Z9X+2g4vxACSWtQjFLrU6CAjFRSBr+8yPFcrFKTs05Rz+F5Lty5n1hg+JykaS A0geMBmRWBTAdPOrzGihT4ooMdPm2QI3PfPFu1d4kPFYODAoDfU/rRCrgNHrwYG1D7 V5GYx9oXAlam47v/ELwPexLb+U8z/D5EfsC9oHNm97nz8JsrEy9wC+0kiq1TL4s527 5irvTNVINsCNQ== From: Mark Brown Date: Tue, 08 Apr 2025 19:49:46 +0100 Subject: [PATCH RFT v15 6/8] selftests/clone3: Factor more of main loop into test_clone3() Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250408-clone3-shadow-stack-v15-6-3fa245c6e3be@kernel.org> References: <20250408-clone3-shadow-stack-v15-0-3fa245c6e3be@kernel.org> In-Reply-To: <20250408-clone3-shadow-stack-v15-0-3fa245c6e3be@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, 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-c25d1 X-Developer-Signature: v=1; a=openpgp-sha256; l=3931; i=broonie@kernel.org; h=from:subject:message-id; bh=1QQTqlYHUjewASmFh86Dd+jl+m64vZGkDAeB+lVVa3I=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBn9W/r1Mr2S49RxTacwu4TSa0qgbUe8fMzqooomHJp /z5UPSGJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCZ/Vv6wAKCRAk1otyXVSH0NevB/ 91VS1MjIA+aUqIzW3eazJxkOw6xK8bNbjoc8cFPt/LrnEAIEnifcXmIKgVP9498Ztd8q1v09F+s984 qrELmfjMpIUSoGYam5pjzU/MCL0OCa39rRoU14MMTr3/REsubp16GrWJJcyxZBU9ZuDBNo166/2Sl+ NtelrcjqmqsLx2VcWZdGuG/yPHgtPlwesCYIcXfiac4R4VMUrEyMt8m4d1EsSg44YP4C0/skG4DR3o Dz9g5IcxMc1pno2Ok8Eqodx4b5gPGFRBie6j49BB160qwc8NrE2Z4JWVQT17lV/G9Zz8IAof23XcN1 bJ6KcGn9W0VXwZOj7S4oxXKGDoBwRe 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 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(); }