From patchwork Sat Mar 14 00:54:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 11438171 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5188014E5 for ; Sat, 14 Mar 2020 00:55:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 31D8020753 for ; Sat, 14 Mar 2020 00:55:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584147335; bh=2cnl7okg3AmxXu5dT6XkLmtDGqMJ8gn49k1Ichb3lvo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=dbXFcbul9NOioU7Axjxl+oQxBLScySij0vVvnmYMrFXpvO1mjRDFQDP4m/bi9yiMg 3YDIWIeAwJJ+aeT2Je6jGtPrRLhE2+ueNHHnBpHt403yCT4QqmkRv6S2ihyrN6LB6g OXWzhh8QWO4TM2YOLqwU8t8r0Dy5fHiW+Vm+12xk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727906AbgCNAze (ORCPT ); Fri, 13 Mar 2020 20:55:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:53520 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727788AbgCNAzH (ORCPT ); Fri, 13 Mar 2020 20:55:07 -0400 Received: from kicinski-fedora-PC1C0HJN.thefacebook.com (unknown [163.114.132.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 52A652074E; Sat, 14 Mar 2020 00:55:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584147306; bh=2cnl7okg3AmxXu5dT6XkLmtDGqMJ8gn49k1Ichb3lvo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hBSNMpKxSaf5YdTXgfO6tieQtSAiMMIOInTFSlcgHUTi4aziXCqjN8mwLKtHj3zdx U2+9LO+wQ8G6EWd2JNBn0LOZplJc1V0jxG4wVeEqSuL9mxREYU1bVsv4j5zsJTGa1b vFCHsNJNTAKfnuk5Q9awDM13lnqyABu5r5RyQPBI= From: Jakub Kicinski To: shuah@kernel.org, keescook@chromium.org Cc: luto@amacapital.net, wad@chromium.org, linux-kselftest@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-team@fb.com, Jakub Kicinski Subject: [PATCH v2 1/4] selftests/seccomp: use correct FIXTURE macro Date: Fri, 13 Mar 2020 17:54:58 -0700 Message-Id: <20200314005501.2446494-2-kuba@kernel.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200314005501.2446494-1-kuba@kernel.org> References: <20200314005501.2446494-1-kuba@kernel.org> MIME-Version: 1.0 Sender: linux-kselftest-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org Quoting kdoc: FIXTURE_DATA: * This call may be used when the type of the fixture data * is needed. In general, this should not be needed unless * the *self* is being passed to a helper directly. FIXTURE: * Defines the data provided to TEST_F()-defined tests as *self*. It should be * populated and cleaned up using FIXTURE_SETUP() and FIXTURE_TEARDOWN(). seccomp should use FIXTURE to declare types. Signed-off-by: Jakub Kicinski Acked-by: Kees Cook --- Kees noted that he posted an equivalent patch already, feel free to drop this one. --- tools/testing/selftests/seccomp/seccomp_bpf.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/seccomp/seccomp_bpf.c b/tools/testing/selftests/seccomp/seccomp_bpf.c index ee1b727ede04..7bf82fb07f67 100644 --- a/tools/testing/selftests/seccomp/seccomp_bpf.c +++ b/tools/testing/selftests/seccomp/seccomp_bpf.c @@ -909,7 +909,7 @@ TEST(ERRNO_order) EXPECT_EQ(12, errno); } -FIXTURE_DATA(TRAP) { +FIXTURE(TRAP) { struct sock_fprog prog; }; @@ -1020,7 +1020,7 @@ TEST_F(TRAP, handler) EXPECT_NE(0, (unsigned long)sigsys->_call_addr); } -FIXTURE_DATA(precedence) { +FIXTURE(precedence) { struct sock_fprog allow; struct sock_fprog log; struct sock_fprog trace; @@ -1509,7 +1509,7 @@ void tracer_poke(struct __test_metadata *_metadata, pid_t tracee, int status, EXPECT_EQ(0, ret); } -FIXTURE_DATA(TRACE_poke) { +FIXTURE(TRACE_poke) { struct sock_fprog prog; pid_t tracer; long poked; @@ -1817,7 +1817,7 @@ void tracer_ptrace(struct __test_metadata *_metadata, pid_t tracee, change_syscall(_metadata, tracee, -1, -ESRCH); } -FIXTURE_DATA(TRACE_syscall) { +FIXTURE(TRACE_syscall) { struct sock_fprog prog; pid_t tracer, mytid, mypid, parent; }; @@ -2321,7 +2321,7 @@ struct tsync_sibling { } \ } while (0) -FIXTURE_DATA(TSYNC) { +FIXTURE(TSYNC) { struct sock_fprog root_prog, apply_prog; struct tsync_sibling sibling[TSYNC_SIBLINGS]; sem_t started; From patchwork Sat Mar 14 00:54:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 11438167 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 392326CA for ; Sat, 14 Mar 2020 00:55:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1951A20767 for ; Sat, 14 Mar 2020 00:55:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584147325; bh=A9LxF9QepjNmz5aiELSRd7cWBXPKdmZaxZjEEzMbCvs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=x5i2YjSbu8D0WR9tGyy42AjZxbF20TtT7gXZ2yi7cD9dFI7/SPechY0z3jjW/UbGC xJNde3pR9Nxpb+4BmTuA01J/P0ghXZiGYSHGYhMDITNnIexUaTifTbtK5/65W/eY/w Bxtr3PFSK5KU2Cd2fAiGzUZMb9vLqvF/FFrCLWdI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727873AbgCNAzY (ORCPT ); Fri, 13 Mar 2020 20:55:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:53546 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727629AbgCNAzI (ORCPT ); Fri, 13 Mar 2020 20:55:08 -0400 Received: from kicinski-fedora-PC1C0HJN.thefacebook.com (unknown [163.114.132.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D381820769; Sat, 14 Mar 2020 00:55:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584147307; bh=A9LxF9QepjNmz5aiELSRd7cWBXPKdmZaxZjEEzMbCvs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XyRqrhsjjfjgCfcV9f18JmjI8C47v87Zkh4lw4IIj2J739ULLIPMXUqf8A/t26gD8 xzCy+UPZsFvTlPpoztaDBTj9GfJUOdGPYH3e2aezXeezmV/opiu0QmOzPuEZ5AZSdf +bbrBHQBGvXtaax2eYEfaQZkrlL9neDX2bvClWYQ= From: Jakub Kicinski To: shuah@kernel.org, keescook@chromium.org Cc: luto@amacapital.net, wad@chromium.org, linux-kselftest@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-team@fb.com, Jakub Kicinski Subject: [PATCH v2 2/4] kselftest: create fixture objects Date: Fri, 13 Mar 2020 17:54:59 -0700 Message-Id: <20200314005501.2446494-3-kuba@kernel.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200314005501.2446494-1-kuba@kernel.org> References: <20200314005501.2446494-1-kuba@kernel.org> MIME-Version: 1.0 Sender: linux-kselftest-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org Grouping tests by fixture will allow us to parametrize test runs. Create full objects for fixtures. Add a "global" fixture for tests without a fixture. Signed-off-by: Jakub Kicinski Acked-by: Kees Cook --- v2: - remove the fixture list, we won't iterate over fixtures so it's not needed --- tools/testing/selftests/kselftest_harness.h | 31 ++++++++++++++++----- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/tools/testing/selftests/kselftest_harness.h b/tools/testing/selftests/kselftest_harness.h index 5336b26506ab..66c2397d8c51 100644 --- a/tools/testing/selftests/kselftest_harness.h +++ b/tools/testing/selftests/kselftest_harness.h @@ -169,8 +169,10 @@ #define __TEST_IMPL(test_name, _signal) \ static void test_name(struct __test_metadata *_metadata); \ static struct __test_metadata _##test_name##_object = \ - { .name = "global." #test_name, \ - .fn = &test_name, .termsig = _signal, \ + { .name = #test_name, \ + .fn = &test_name, \ + .fixture = &_fixture_global, \ + .termsig = _signal, \ .timeout = TEST_TIMEOUT_DEFAULT, }; \ static void __attribute__((constructor)) _register_##test_name(void) \ { \ @@ -212,6 +214,8 @@ * populated and cleaned up using FIXTURE_SETUP() and FIXTURE_TEARDOWN(). */ #define FIXTURE(fixture_name) \ + static struct __fixture_metadata _##fixture_name##_fixture_object = \ + { .name = #fixture_name, }; \ static void __attribute__((constructor)) \ _register_##fixture_name##_data(void) \ { \ @@ -309,8 +313,9 @@ } \ static struct __test_metadata \ _##fixture_name##_##test_name##_object = { \ - .name = #fixture_name "." #test_name, \ + .name = #test_name, \ .fn = &wrapper_##fixture_name##_##test_name, \ + .fixture = &_##fixture_name##_fixture_object, \ .termsig = signal, \ .timeout = tmout, \ }; \ @@ -632,9 +637,12 @@ } while (0); OPTIONAL_HANDLER(_assert) /* Contains all the information for test execution and status checking. */ +struct __fixture_metadata; + struct __test_metadata { const char *name; void (*fn)(struct __test_metadata *); + struct __fixture_metadata *fixture; int termsig; int passed; int trigger; /* extra handler after the evaluation */ @@ -685,6 +693,13 @@ static inline void __register_test(struct __test_metadata *t) } } +/* Contains all the information about a fixture */ +struct __fixture_metadata { + const char *name; +} _fixture_global __attribute__((unused)) = { + .name = "global", +}; + static inline int __bail(int for_realz, bool no_print, __u8 step) { if (for_realz) { @@ -695,14 +710,15 @@ static inline int __bail(int for_realz, bool no_print, __u8 step) return 0; } -void __run_test(struct __test_metadata *t) +void __run_test(struct __fixture_metadata *f, + struct __test_metadata *t) { pid_t child_pid; int status; t->passed = 1; t->trigger = 0; - printf("[ RUN ] %s\n", t->name); + printf("[ RUN ] %s.%s\n", f->name, t->name); alarm(t->timeout); child_pid = fork(); if (child_pid < 0) { @@ -751,7 +767,8 @@ void __run_test(struct __test_metadata *t) status); } } - printf("[ %4s ] %s\n", (t->passed ? "OK" : "FAIL"), t->name); + printf("[ %4s ] %s.%s\n", (t->passed ? "OK" : "FAIL"), + f->name, t->name); alarm(0); } @@ -768,7 +785,7 @@ static int test_harness_run(int __attribute__((unused)) argc, __test_count, __fixture_count + 1); for (t = __test_list; t; t = t->next) { count++; - __run_test(t); + __run_test(t->fixture, t); if (t->passed) pass_count++; else From patchwork Sat Mar 14 00:55:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 11438165 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4C6F06CA for ; Sat, 14 Mar 2020 00:55:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2B8FF2074D for ; Sat, 14 Mar 2020 00:55:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584147324; bh=1PE5F9GBO7z+taYxIwLOk+XjIk+3OynVr7wbWiBe/IY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=2dD6oteSUHwyEhruOQrq7kmi2MyRiozKLd1BqgfZJZy8mngJiNYXGQDCour3PbTIm EoWqiWEdZiBD5W3p4ekAco6eGVnILO19JqvP8NwC/Kr3MCQXAy2xIKS6XfmsAja3L5 10g5p+IJuOt1vVerKR5heTuu7G1VYJl+PVSGLw9c= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727769AbgCNAzJ (ORCPT ); Fri, 13 Mar 2020 20:55:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:53564 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727804AbgCNAzI (ORCPT ); Fri, 13 Mar 2020 20:55:08 -0400 Received: from kicinski-fedora-PC1C0HJN.thefacebook.com (unknown [163.114.132.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5ED6C2076B; Sat, 14 Mar 2020 00:55:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584147307; bh=1PE5F9GBO7z+taYxIwLOk+XjIk+3OynVr7wbWiBe/IY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MR3t5A8Sqqzn8lj28eViideZffAcUJuBxfFfM7fHLl5VmWcV62r0tvWxdgWEYrvVa PU8RUp/I38HPR5vHrLBWqnq9QJVFeQbgRwc7VUZoLN2u+eCbqW1gdLbmfVs5URc+j6 35LLjh02QHlX2J6chXoMG093FfalrgBeDAf++hUg= From: Jakub Kicinski To: shuah@kernel.org, keescook@chromium.org Cc: luto@amacapital.net, wad@chromium.org, linux-kselftest@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-team@fb.com, Jakub Kicinski Subject: [PATCH v2 3/4] kselftest: add fixture parameters Date: Fri, 13 Mar 2020 17:55:00 -0700 Message-Id: <20200314005501.2446494-4-kuba@kernel.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200314005501.2446494-1-kuba@kernel.org> References: <20200314005501.2446494-1-kuba@kernel.org> MIME-Version: 1.0 Sender: linux-kselftest-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org Allow users to pass parameters to fixtures. Each test will be run once for each set of its fixture parameter sets (or once if none). Signed-off-by: Jakub Kicinski --- v2: - don't pass params to functions, use a member of _metadata instead --- Documentation/dev-tools/kselftest.rst | 3 +- tools/testing/selftests/kselftest_harness.h | 133 ++++++++++++++++++-- 2 files changed, 126 insertions(+), 10 deletions(-) diff --git a/Documentation/dev-tools/kselftest.rst b/Documentation/dev-tools/kselftest.rst index 61ae13c44f91..8aff58d11937 100644 --- a/Documentation/dev-tools/kselftest.rst +++ b/Documentation/dev-tools/kselftest.rst @@ -301,7 +301,8 @@ Helpers .. kernel-doc:: tools/testing/selftests/kselftest_harness.h :functions: TH_LOG TEST TEST_SIGNAL FIXTURE FIXTURE_DATA FIXTURE_SETUP - FIXTURE_TEARDOWN TEST_F TEST_HARNESS_MAIN + FIXTURE_TEARDOWN TEST_F TEST_HARNESS_MAIN FIXTURE_PARAMS + FIXTURE_PARAMS_ADD CURRENT_PARAMS Operators --------- diff --git a/tools/testing/selftests/kselftest_harness.h b/tools/testing/selftests/kselftest_harness.h index 66c2397d8c51..b7e1ecda441c 100644 --- a/tools/testing/selftests/kselftest_harness.h +++ b/tools/testing/selftests/kselftest_harness.h @@ -214,6 +214,7 @@ * populated and cleaned up using FIXTURE_SETUP() and FIXTURE_TEARDOWN(). */ #define FIXTURE(fixture_name) \ + FIXTURE_PARAMS(fixture_name); \ static struct __fixture_metadata _##fixture_name##_fixture_object = \ { .name = #fixture_name, }; \ static void __attribute__((constructor)) \ @@ -246,6 +247,7 @@ void fixture_name##_setup( \ struct __test_metadata __attribute__((unused)) *_metadata, \ FIXTURE_DATA(fixture_name) __attribute__((unused)) *self) + /** * FIXTURE_TEARDOWN(fixture_name) * *_metadata* is included so that EXPECT_* and ASSERT_* work correctly. @@ -267,6 +269,72 @@ struct __test_metadata __attribute__((unused)) *_metadata, \ FIXTURE_DATA(fixture_name) __attribute__((unused)) *self) +/** + * FIXTURE_PARAMS(fixture_name) - Optionally called once per fixture + * to declare fixture parameters + * + * @fixture_name: fixture name + * + * .. code-block:: c + * + * FIXTURE_PARAMS(datatype name) { + * type property1; + * ... + * }; + * + * Defines type of constant parameters provided to FIXTURE_SETUP() and TEST_F() + * as *params*. + */ +#define FIXTURE_PARAMS(fixture_name) struct _fixture_params_##fixture_name + +/** + * FIXTURE_PARAMS_ADD(fixture_name, params_name) - Called once per fixture + * params to setup the data and register + * + * @fixture_name: fixture name + * @params_name: name of the parameter set + * + * .. code-block:: c + * + * FIXTURE_ADD(datatype name) { + * .property1 = val1; + * ... + * }; + * + * Defines an instance of parameters accessible in FIXTURE_SETUP(), + * FIXTURE_TEARDOWN() and TEST_F(). Tests will be run once for each + * parameter set. + */ +#define FIXTURE_PARAMS_ADD(fixture_name, params_name) \ + extern FIXTURE_PARAMS(fixture_name) \ + _##fixture_name##_##params_name##_params; \ + static struct __fixture_params_metadata \ + _##fixture_name##_##params_name##_object = \ + { .name = #params_name, \ + .data = &_##fixture_name##_##params_name##_params}; \ + static void __attribute__((constructor)) \ + _register_##fixture_name##_##params_name(void) \ + { \ + __register_fixture_params(&_##fixture_name##_fixture_object, \ + &_##fixture_name##_##params_name##_object); \ + } \ + FIXTURE_PARAMS(fixture_name) _##fixture_name##_##params_name##_params = + +/** + * CURRENT_PARAMS(fixture_name) - Access fixture parameters of the current test + * + * @fixture_name: fixture name + * + * .. code-block:: c + * + * CURRENT_PARAMS(fixture name)->property1 + * + * Helper macro for accessing parameters of current test. Can be used inside + * FIXTURE_SETUP(), FIXTURE_TEARDOWN() and TEST_F(). + */ +#define CURRENT_PARAMS(fixture_name) \ + ((const FIXTURE_PARAMS(fixture_name) *) _metadata->current_params->data) + /** * TEST_F(fixture_name, test_name) - Emits test registration and helpers for * fixture-based test cases @@ -638,11 +706,13 @@ /* Contains all the information for test execution and status checking. */ struct __fixture_metadata; +struct __fixture_params_metadata; struct __test_metadata { const char *name; void (*fn)(struct __test_metadata *); struct __fixture_metadata *fixture; + struct __fixture_params_metadata *current_params; int termsig; int passed; int trigger; /* extra handler after the evaluation */ @@ -696,10 +766,41 @@ static inline void __register_test(struct __test_metadata *t) /* Contains all the information about a fixture */ struct __fixture_metadata { const char *name; + struct __fixture_params_metadata *params; } _fixture_global __attribute__((unused)) = { .name = "global", }; +struct __fixture_params_metadata { + const char *name; + const void *data; + struct __fixture_params_metadata *prev, *next; +}; + +static inline void +__register_fixture_params(struct __fixture_metadata *f, + struct __fixture_params_metadata *p) +{ + /* Circular linked list where only prev is circular. */ + if (f->params == NULL) { + f->params = p; + p->next = NULL; + p->prev = p; + return; + } + if (__constructor_order == _CONSTRUCTOR_ORDER_FORWARD) { + p->next = NULL; + p->prev = f->params->prev; + p->prev->next = p; + f->params->prev = p; + } else { + p->next = f->params; + p->next->prev = p; + p->prev = p; + f->params = p; + } +} + static inline int __bail(int for_realz, bool no_print, __u8 step) { if (for_realz) { @@ -711,14 +812,21 @@ static inline int __bail(int for_realz, bool no_print, __u8 step) } void __run_test(struct __fixture_metadata *f, + struct __fixture_params_metadata *p, struct __test_metadata *t) { pid_t child_pid; int status; + /* reset test struct */ t->passed = 1; t->trigger = 0; - printf("[ RUN ] %s.%s\n", f->name, t->name); + t->step = 0; + t->no_print = 0; + + t->current_params = p; + + printf("[ RUN ] %s%s.%s\n", f->name, p->name, t->name); alarm(t->timeout); child_pid = fork(); if (child_pid < 0) { @@ -767,14 +875,17 @@ void __run_test(struct __fixture_metadata *f, status); } } - printf("[ %4s ] %s.%s\n", (t->passed ? "OK" : "FAIL"), - f->name, t->name); + printf("[ %4s ] %s%s.%s\n", (t->passed ? "OK" : "FAIL"), + f->name, p->name, t->name); alarm(0); } static int test_harness_run(int __attribute__((unused)) argc, char __attribute__((unused)) **argv) { + struct __fixture_params_metadata no_param = { .name = "", }; + struct __fixture_params_metadata *p; + struct __fixture_metadata *f; struct __test_metadata *t; int ret = 0; unsigned int count = 0; @@ -784,12 +895,16 @@ static int test_harness_run(int __attribute__((unused)) argc, printf("[==========] Running %u tests from %u test cases.\n", __test_count, __fixture_count + 1); for (t = __test_list; t; t = t->next) { - count++; - __run_test(t->fixture, t); - if (t->passed) - pass_count++; - else - ret = 1; + f = t->fixture; + + for (p = f->params ?: &no_param; p; p = p->next) { + count++; + __run_test(f, p, t); + if (t->passed) + pass_count++; + else + ret = 1; + } } printf("[==========] %u / %u tests passed.\n", pass_count, count); printf("[ %s ]\n", (ret ? "FAILED" : "PASSED")); From patchwork Sat Mar 14 00:55:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 11438169 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0BA8D14E5 for ; Sat, 14 Mar 2020 00:55:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DFCAC20753 for ; Sat, 14 Mar 2020 00:55:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584147333; bh=foM5P14pb5C9zO28lRafxju3k6trcDAwDnYDz9wY3ng=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=B0dE5X626oZ/7CfgSOU0eV/2meHg3k48pmkc2ymjAmBRSkOOxcVmDmIVss53Idc1l KhuRTiphYHRFwUrwMTbEl1LV+B9qvyh2XalKg7WVWR02NKchaI484aaeWClOPw/Hkg xJArM7TzbTr3dZV2MSH3Z4XG94tgmAWKKHrvBTlY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727868AbgCNAzY (ORCPT ); Fri, 13 Mar 2020 20:55:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:53590 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727811AbgCNAzJ (ORCPT ); Fri, 13 Mar 2020 20:55:09 -0400 Received: from kicinski-fedora-PC1C0HJN.thefacebook.com (unknown [163.114.132.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E6FBA20752; Sat, 14 Mar 2020 00:55:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584147308; bh=foM5P14pb5C9zO28lRafxju3k6trcDAwDnYDz9wY3ng=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vwXNdKTu9eEwIbdYjMhQcwMyCHftM+LN+NPamDzDiJ1RNVIcQf6CUhRHORwTeirM8 iH/m8g/7a20/sqB8LzztdeZvBscEAwT0l1gaRHH1aNXWPMr16XprQpipOXZH1FmKpX ypSwsYNLnSLP12rcO7TkjNxHNbYhdSqLi4TlxSWA= From: Jakub Kicinski To: shuah@kernel.org, keescook@chromium.org Cc: luto@amacapital.net, wad@chromium.org, linux-kselftest@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-team@fb.com, Jakub Kicinski Subject: [PATCH v2 4/4] selftests: tls: run all tests for TLS 1.2 and TLS 1.3 Date: Fri, 13 Mar 2020 17:55:01 -0700 Message-Id: <20200314005501.2446494-5-kuba@kernel.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200314005501.2446494-1-kuba@kernel.org> References: <20200314005501.2446494-1-kuba@kernel.org> MIME-Version: 1.0 Sender: linux-kselftest-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org TLS 1.2 and TLS 1.3 differ in the implementation. Use fixture parameters to run all tests for both versions, and remove the one-off TLS 1.2 test. Signed-off-by: Jakub Kicinski Reviewed-by: Kees Cook --- tools/testing/selftests/net/tls.c | 93 ++++++------------------------- 1 file changed, 17 insertions(+), 76 deletions(-) diff --git a/tools/testing/selftests/net/tls.c b/tools/testing/selftests/net/tls.c index 0ea44d975b6c..82d48ce0787e 100644 --- a/tools/testing/selftests/net/tls.c +++ b/tools/testing/selftests/net/tls.c @@ -101,6 +101,21 @@ FIXTURE(tls) bool notls; }; +FIXTURE_PARAMS(tls) +{ + unsigned int tls_version; +}; + +FIXTURE_PARAMS_ADD(tls, 12) +{ + .tls_version = TLS_1_2_VERSION, +}; + +FIXTURE_PARAMS_ADD(tls, 13) +{ + .tls_version = TLS_1_3_VERSION, +}; + FIXTURE_SETUP(tls) { struct tls12_crypto_info_aes_gcm_128 tls12; @@ -112,7 +127,7 @@ FIXTURE_SETUP(tls) len = sizeof(addr); memset(&tls12, 0, sizeof(tls12)); - tls12.info.version = TLS_1_3_VERSION; + tls12.info.version = CURRENT_PARAMS(tls)->tls_version; tls12.info.cipher_type = TLS_CIPHER_AES_GCM_128; addr.sin_family = AF_INET; @@ -733,7 +748,7 @@ TEST_F(tls, bidir) struct tls12_crypto_info_aes_gcm_128 tls12; memset(&tls12, 0, sizeof(tls12)); - tls12.info.version = TLS_1_3_VERSION; + tls12.info.version = CURRENT_PARAMS(tls)->tls_version; tls12.info.cipher_type = TLS_CIPHER_AES_GCM_128; ret = setsockopt(self->fd, SOL_TLS, TLS_RX, &tls12, @@ -1258,78 +1273,4 @@ TEST(keysizes) { close(cfd); } -TEST(tls12) { - int fd, cfd; - bool notls; - - struct tls12_crypto_info_aes_gcm_128 tls12; - struct sockaddr_in addr; - socklen_t len; - int sfd, ret; - - notls = false; - len = sizeof(addr); - - memset(&tls12, 0, sizeof(tls12)); - tls12.info.version = TLS_1_2_VERSION; - tls12.info.cipher_type = TLS_CIPHER_AES_GCM_128; - - addr.sin_family = AF_INET; - addr.sin_addr.s_addr = htonl(INADDR_ANY); - addr.sin_port = 0; - - fd = socket(AF_INET, SOCK_STREAM, 0); - sfd = socket(AF_INET, SOCK_STREAM, 0); - - ret = bind(sfd, &addr, sizeof(addr)); - ASSERT_EQ(ret, 0); - ret = listen(sfd, 10); - ASSERT_EQ(ret, 0); - - ret = getsockname(sfd, &addr, &len); - ASSERT_EQ(ret, 0); - - ret = connect(fd, &addr, sizeof(addr)); - ASSERT_EQ(ret, 0); - - ret = setsockopt(fd, IPPROTO_TCP, TCP_ULP, "tls", sizeof("tls")); - if (ret != 0) { - notls = true; - printf("Failure setting TCP_ULP, testing without tls\n"); - } - - if (!notls) { - ret = setsockopt(fd, SOL_TLS, TLS_TX, &tls12, - sizeof(tls12)); - ASSERT_EQ(ret, 0); - } - - cfd = accept(sfd, &addr, &len); - ASSERT_GE(cfd, 0); - - if (!notls) { - ret = setsockopt(cfd, IPPROTO_TCP, TCP_ULP, "tls", - sizeof("tls")); - ASSERT_EQ(ret, 0); - - ret = setsockopt(cfd, SOL_TLS, TLS_RX, &tls12, - sizeof(tls12)); - ASSERT_EQ(ret, 0); - } - - close(sfd); - - char const *test_str = "test_read"; - int send_len = 10; - char buf[10]; - - send_len = strlen(test_str) + 1; - EXPECT_EQ(send(fd, test_str, send_len, 0), send_len); - EXPECT_NE(recv(cfd, buf, send_len, 0), -1); - EXPECT_EQ(memcmp(buf, test_str, send_len), 0); - - close(fd); - close(cfd); -} - TEST_HARNESS_MAIN