From patchwork Thu Feb 6 11:38:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 13962934 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 0A89622CBC6; Thu, 6 Feb 2025 11:40:47 +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=1738842048; cv=none; b=Pa8nztfQ5KOHSGdlmvnmLzGYQtmooVdwDeonr/dVfX9fhSzswEcrVZRpLGyMzEPPhoDSEzwa4RmWE3O1eoQBNiFqZgatTUxmDxJhktlUp0T+IWI87V/LwiwI2zLiAqr/mjPqlMUdvi9y4DMEfhH8987Ypd+yxb+3+H7xTyVh2KE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738842048; c=relaxed/simple; bh=wcvwqUbnOLAAxDrogxdDS6u/ZDM3Aldxt+7Gj0ApJNU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=VthO0xZCgg1iaKP0/F2rqYcknxNXrYUUti/a47iCTF37GQWzGklEZIKfOX4BVYfS9a5A/NzrjPzLXXNxeM9CoVXFE6hUvj4ImpLV8EUA50ORB63i+EdnYlhe2vfHHL5wfu/trQRhNLi+kbgsFbLwQpoWfB80tVVt4yS/1fcjQr0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=KsoRdlYC; 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="KsoRdlYC" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DC18FC4CEDD; Thu, 6 Feb 2025 11:40:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1738842047; bh=wcvwqUbnOLAAxDrogxdDS6u/ZDM3Aldxt+7Gj0ApJNU=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=KsoRdlYCZd/SAQcW1gvI799ibhtCmAhdHJkjVpyTimgGjJCwRHeGxm1fUPPV6wgfo ihQg/EOxc9SKXjpFGxwfLzhjypZp8ywoqzZjIFnPnv+9Y40sjiVrWznMzuiLTzD4DH yifN2r/l33LZWXeL8Svhyt3EEXZeVSdiUC1vWtN8ZxRdZnJTv+6Pca7KY1FzRjeBIg 5RkNrmsb+r8PJPZy9GRH4NcZeixCeYL6N/WIqo+TDeSnSmJSWGiTztwrqVeOVbIfu7 wOoTZOtAgr9OMZjR7aBMMVTgrvqB9fPffvq9qPWKBohsx8lFdsib0MBgPhhLdMux7T Gba9J2BjRgUFw== From: Mark Brown Date: Thu, 06 Feb 2025 11:38:08 +0000 Subject: [PATCH RFT v14 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: <20250206-clone3-shadow-stack-v14-6-805b53af73b9@kernel.org> References: <20250206-clone3-shadow-stack-v14-0-805b53af73b9@kernel.org> In-Reply-To: <20250206-clone3-shadow-stack-v14-0-805b53af73b9@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-1b0d6 X-Developer-Signature: v=1; a=openpgp-sha256; l=3987; i=broonie@kernel.org; h=from:subject:message-id; bh=wcvwqUbnOLAAxDrogxdDS6u/ZDM3Aldxt+7Gj0ApJNU=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBnpJ+SfujCcQK6Uonhg58EJTuMpcGZA5C2px7/fz2O Q0Ce28yJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCZ6SfkgAKCRAk1otyXVSH0BHgB/ 9/DZIUmBRhKAqRPmR8kmu7XGlL8FM3CL8oiaLajbDwHMQDAW+SMAX+2UV2zuQlDJnew7bz+7eyGcdW KCfdrcPgvu5X18U5t5dztpj3eZqch4y1Jk7v5aBsIc+VHLVZawSK1PP4ZQ+wHCqREBA1HvRBKYHvuV Le+oPjPA0oRfybVbSy8fWOBEiTXcB9fxomnbkSnDuZcw7iyds0BqXS9CB/ZIdD/hzdjkLUSbkDNZlW Gbbat+bN4kzTUBapEFBmgwRi4okmN5OEiCnrnqwYlzWzuJSavwYjWPxDzCtvRJSALYG+FBe4lGwJF+ IyoaM9x/9KYxr28+QiG7yBSWFnZDyK 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 e61f07973ce5e27aff30047b35e03b1b51875c15..e066b201fa64eb17c55939b7cec18ac5d109613b 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(); }