From patchwork Tue Apr 15 23:31:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 881496 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 1B50719C54E; Tue, 15 Apr 2025 23:32:20 +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=1744759941; cv=none; b=dEOF/X6GUv+T2o//yq7TF4HNbFAZe/trXfH9yKTgodwJ8o79zO0vDOawWY0SyDT8bxjJlV0RkMUL9yx2spKcblv8UWcDtQ9/jlCgXCjR4+KIenaxN7a/Wtvq+LjYvPk1WdHB4lTtCN1zNNDR7kbkQEGLSVdxWC2wU5Y95Ev4iig= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744759941; 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=lqIHoTFEMyje1RTtR58jJSctdKbxnRUASh9+YaTJWD2yEqnSoyI4ULtXAlv1ju+6GArmqmzDIBT5fwv2FZ3Kiv+buiwOr3yFtmcxiLnoWTtTcJ62gh3MEl8WDJqtcgnJBJVW0wT4ejQt7OeU1hfKK+UlfnZWRibJnb1MQULhbtI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=SE6iovMf; 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="SE6iovMf" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E7F01C4CEE7; Tue, 15 Apr 2025 23:32:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1744759940; bh=1QQTqlYHUjewASmFh86Dd+jl+m64vZGkDAeB+lVVa3I=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=SE6iovMftMuEL9lXVuQTnLTZmFNRzWc/QfKstO014/PgTrPmLEDG0qjHjSwKijqwV OsNu7UnGUo4+PG1tkIpcHLAkD80I0Uum6NeKfvWZZNIt0ymgG1uT2KLnEdzcIn5OZn xH3Y+YjFsNg15O/BkyliHkdQJDs/NzyKqo5eeNJuOoGe7VJ9nMMoFBG/flJkFQi/BN k2bR4SW1/B1xavq4IJXbvXTen/PaThTF5pSHRPiKQgbSopJqK6q0hL/URparIpNeDg SK+9y1CQJGv69x5kYQfajqDNtqUdxfzvfb1TxGbLov72OoQQLp9XDNTkyfwRdEa7I5 Rlu1lIvQwwYSA== From: Mark Brown Date: Wed, 16 Apr 2025 00:31:13 +0100 Subject: [PATCH RFT v16 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: <20250416-clone3-shadow-stack-v16-6-2ffc9ca3917b@kernel.org> References: <20250416-clone3-shadow-stack-v16-0-2ffc9ca3917b@kernel.org> In-Reply-To: <20250416-clone3-shadow-stack-v16-0-2ffc9ca3917b@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/pANAwAKASTWi3JdVIfQAcsmYgBn/uxYoIznsmrDeaKI7cAfJZ+UsQoZHFWKd9D4or/0 BURIRiWJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCZ/7sWAAKCRAk1otyXVSH0BPfB/ 9J6ojLziWb3d80AGaYNahTBf1hervoWnlbdyHe1nlajj8tfxRLBzfj9jmauqxt0hFCShGyDv5SkCR9 ZfIFBDf2yfG1QkIe80pOZyHA9TyyJDjEVoETG6mXWj1tmHENIleNjrd3q4dUpU2JK9Yhphw3of7VrP lhRM7HEVI52nfnTCzay4ETManqDPHrArKcCYLnLP3UgJwDkO3LKiE7C00kEXYJIOSz6idkpe5Q9toD TAt9zZEMAPuqW0BapqX/c9WF1KqxrDJdV7c+5x/sV4uCf2c83KtN6QvChQsWNv7vJr6huLjdEUs4Lg TXLOVIi30zs+CBxgO0kKLFh78vbvNO 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(); }