From patchwork Wed Aug 21 19:49:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 13772032 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 C1BDC170A00; Wed, 21 Aug 2024 19:51:04 +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=1724269864; cv=none; b=pP06gVSUqIoUQVqOtJRGvg4Y2Bls896fCAalohZssKHOLDYkffXXx78HAzKFUuh1HNaUvrOb4m7MTDaZKuzHH9Xc0ZR2x4gEvgLcWL/Y+4d/SmTxWXzOCsz/FJ+nwZcyaibDUW2UQoyg/WHy5vVHoXoWvDDpuBgNPsbGcdn7aNg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724269864; c=relaxed/simple; bh=XIYOtX/wTMGB1zAIVkW11px29AlArl5B/1MgdpVsr7Y=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=keD0GBpMWoUy5HhSX01s0nnmszW8qERLM/hpvfyoDWDCkFhRMCcdujFWYMzajTj0KnadNrQ06dQJ+dxCIVttA2DfcoU4wvG45bri+tORv1DlGai7MlJvCVjoUDFq9vwPVf6aUvW4nYuhCJfKMuO++Zl1vTDJFZ878yiGmcy9cyw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=MJkGCy8A; 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="MJkGCy8A" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 72FA6C32781; Wed, 21 Aug 2024 19:50:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1724269864; bh=XIYOtX/wTMGB1zAIVkW11px29AlArl5B/1MgdpVsr7Y=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=MJkGCy8ApV/ys0URSN6hH8Yy1KNhHmo2xsoT5kBmK0eIaRLb5WDVR4ky76ZvLNlr3 bNtFWkYzuonEX1vVgK3YE8B0JqZDY+JPU+RFOAaG0Wa4XwRja3eAl9TwlLESA1tXHT cYaTDaiWpJFlQ6SoFCX9fJ1qd54HPj5wFr0EyVPnaS0EM2DvZ600D3BGvV8qepzUIx K7SHkrjeb+jjsOsrCPqbdf9gI3EXXYuB6YjDtp5dgkbiiS9SfLM1oC7Ey6VIEaywjK KxkGE4yAdSgJHKd6jOtD2CPqDtctWOaotABJXZLxaAvZAuFYB+YJh9IDjuwGJfgKjJ 192ckqk/Yj0+g== From: Mark Brown Date: Wed, 21 Aug 2024 20:49:52 +0100 Subject: [PATCH RFT v10 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: <20240821-clone3-shadow-stack-v10-6-06e8797b9445@kernel.org> References: <20240821-clone3-shadow-stack-v10-0-06e8797b9445@kernel.org> In-Reply-To: <20240821-clone3-shadow-stack-v10-0-06e8797b9445@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-37811 X-Developer-Signature: v=1; a=openpgp-sha256; l=3875; i=broonie@kernel.org; h=from:subject:message-id; bh=XIYOtX/wTMGB1zAIVkW11px29AlArl5B/1MgdpVsr7Y=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBmxkT3/kh+bLhfd2RVxC+EsB9zKKBJ9YgaCLhhrY05 ciAPt/SJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCZsZE9wAKCRAk1otyXVSH0KNqB/ 4/jfxK9edVHH0AUcfbvG2WMLLLq7yIfLNAYFwkXWgV355hHCTfnUD0ARLCTExHd6L+NztqfvT+i3XZ 4rKTlQ7SiYf3Z+RrCWr3cQsPkLWeAkmcoaMDCPjp7LJw39UNmzHs/B0d4N5iAb0TVa9OwW0U3MAobX G7u+15MQm9mUTbdB8Eu4IEctRLLMbHGMt20exFFXo0KC9fZ00cPvZ31W6sQMMRRfaD+PBZjPjeSjdL uSAUkn33ehaiiQaPBACAtugprpVp/l1L4h/UwWqZHhgNs/HimTplzbO9c7ZkS/Ta5uSxy7UVEslNgN Gq7NbucGYIzEAYJseJ46u9YaABZAvb 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 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(); }