| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <CAAXuY3o9Xe-atK0Mja6qXLncUhmmVf4pR7hsANsqaoUX71RXVg@mail.gmail.com>
Date: Tue, 27 Oct 2020 10:33:34 -0700
From: Iurii Zaikin <yzaikin@...gle.com>
To: Arpitha Raghunandan <98.arpi@...il.com>
Cc: Brendan Higgins <brendanhiggins@...gle.com>,
Shuah Khan <skhan@...uxfoundation.org>,
Marco Elver <elver@...gle.com>,
"Theodore Ts'o" <tytso@....edu>,
Andreas Dilger <adilger.kernel@...ger.ca>,
"open list:KERNEL SELFTEST FRAMEWORK"
<linux-kselftest@...r.kernel.org>,
KUnit Development <kunit-dev@...glegroups.com>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
linux-kernel-mentees@...ts.linuxfoundation.org,
Ext4 Developers List <linux-ext4@...r.kernel.org>
Subject: Re: [PATCH v3 2/2] fs: ext4: Modify inode-test.c to use KUnit
parameterized testing feature
>
> Modify fs/ext4/inode-test.c to use the parameterized testing
> feature of KUnit.
>
> Signed-off-by: Arpitha Raghunandan <98.arpi@...il.com>
> ---
> Changes v2->v3:
> - Marked hardcoded test data const
> - Modification based on latest implementation of KUnit parameterized testing
> Changes v1->v2:
> - Modification based on latest implementation of KUnit parameterized testing
>
> fs/ext4/inode-test.c | 314 ++++++++++++++++++++++---------------------
> 1 file changed, 158 insertions(+), 156 deletions(-)
>
> diff --git a/fs/ext4/inode-test.c b/fs/ext4/inode-test.c
> index d62d802c9c12..3a449623b775 100644
> --- a/fs/ext4/inode-test.c
> +++ b/fs/ext4/inode-test.c
> @@ -80,6 +80,139 @@ struct timestamp_expectation {
> bool lower_bound;
> };
>
> +static const struct timestamp_expectation test_data[] = {
> + {
> + .test_case_name = LOWER_BOUND_NEG_NO_EXTRA_BITS_CASE,
> + .msb_set = true,
> + .lower_bound = true,
> + .extra_bits = 0,
> + .expected = {.tv_sec = -0x80000000LL, .tv_nsec = 0L},
> + },
> +
> + {
> + .test_case_name = UPPER_BOUND_NEG_NO_EXTRA_BITS_CASE,
> + .msb_set = true,
> + .lower_bound = false,
> + .extra_bits = 0,
> + .expected = {.tv_sec = -1LL, .tv_nsec = 0L},
> + },
> +
> + {
> + .test_case_name = LOWER_BOUND_NONNEG_NO_EXTRA_BITS_CASE,
> + .msb_set = false,
> + .lower_bound = true,
> + .extra_bits = 0,
> + .expected = {0LL, 0L},
> + },
> +
> + {
> + .test_case_name = UPPER_BOUND_NONNEG_NO_EXTRA_BITS_CASE,
> + .msb_set = false,
> + .lower_bound = false,
> + .extra_bits = 0,
> + .expected = {.tv_sec = 0x7fffffffLL, .tv_nsec = 0L},
> + },
> +
> + {
> + .test_case_name = LOWER_BOUND_NEG_LO_1_CASE,
> + .msb_set = true,
> + .lower_bound = true,
> + .extra_bits = 1,
> + .expected = {.tv_sec = 0x80000000LL, .tv_nsec = 0L},
> + },
> +
> + {
> + .test_case_name = UPPER_BOUND_NEG_LO_1_CASE,
> + .msb_set = true,
> + .lower_bound = false,
> + .extra_bits = 1,
> + .expected = {.tv_sec = 0xffffffffLL, .tv_nsec = 0L},
> + },
> +
> + {
> + .test_case_name = LOWER_BOUND_NONNEG_LO_1_CASE,
> + .msb_set = false,
> + .lower_bound = true,
> + .extra_bits = 1,
> + .expected = {.tv_sec = 0x100000000LL, .tv_nsec = 0L},
> + },
> +
> + {
> + .test_case_name = UPPER_BOUND_NONNEG_LO_1_CASE,
> + .msb_set = false,
> + .lower_bound = false,
> + .extra_bits = 1,
> + .expected = {.tv_sec = 0x17fffffffLL, .tv_nsec = 0L},
> + },
> +
> + {
> + .test_case_name = LOWER_BOUND_NEG_HI_1_CASE,
> + .msb_set = true,
> + .lower_bound = true,
> + .extra_bits = 2,
> + .expected = {.tv_sec = 0x180000000LL, .tv_nsec = 0L},
> + },
> +
> + {
> + .test_case_name = UPPER_BOUND_NEG_HI_1_CASE,
> + .msb_set = true,
> + .lower_bound = false,
> + .extra_bits = 2,
> + .expected = {.tv_sec = 0x1ffffffffLL, .tv_nsec = 0L},
> + },
> +
> + {
> + .test_case_name = LOWER_BOUND_NONNEG_HI_1_CASE,
> + .msb_set = false,
> + .lower_bound = true,
> + .extra_bits = 2,
> + .expected = {.tv_sec = 0x200000000LL, .tv_nsec = 0L},
> + },
> +
> + {
> + .test_case_name = UPPER_BOUND_NONNEG_HI_1_CASE,
> + .msb_set = false,
> + .lower_bound = false,
> + .extra_bits = 2,
> + .expected = {.tv_sec = 0x27fffffffLL, .tv_nsec = 0L},
> + },
> +
> + {
> + .test_case_name = UPPER_BOUND_NONNEG_HI_1_NS_1_CASE,
> + .msb_set = false,
> + .lower_bound = false,
> + .extra_bits = 6,
> + .expected = {.tv_sec = 0x27fffffffLL, .tv_nsec = 1L},
> + },
> +
> + {
> + .test_case_name = LOWER_BOUND_NONNEG_HI_1_NS_MAX_CASE,
> + .msb_set = false,
> + .lower_bound = true,
> + .extra_bits = 0xFFFFFFFF,
> + .expected = {.tv_sec = 0x300000000LL,
> + .tv_nsec = MAX_NANOSECONDS},
> + },
> +
> + {
> + .test_case_name = LOWER_BOUND_NONNEG_EXTRA_BITS_1_CASE,
> + .msb_set = false,
> + .lower_bound = true,
> + .extra_bits = 3,
> + .expected = {.tv_sec = 0x300000000LL, .tv_nsec = 0L},
> + },
> +
> + {
> + .test_case_name = UPPER_BOUND_NONNEG_EXTRA_BITS_1_CASE,
> + .msb_set = false,
> + .lower_bound = false,
> + .extra_bits = 3,
> + .expected = {.tv_sec = 0x37fffffffLL, .tv_nsec = 0L},
> + }
> +};
> +
> +KUNIT_PARAM_GENERATOR(ext4_inode, test_data);
> +
> static time64_t get_32bit_time(const struct timestamp_expectation * const test)
> {
> if (test->msb_set) {
> @@ -101,166 +234,35 @@ static time64_t get_32bit_time(const struct timestamp_expectation * const test)
> */
> static void inode_test_xtimestamp_decoding(struct kunit *test)
> {
> - const struct timestamp_expectation test_data[] = {
> - {
> - .test_case_name = LOWER_BOUND_NEG_NO_EXTRA_BITS_CASE,
> - .msb_set = true,
> - .lower_bound = true,
> - .extra_bits = 0,
> - .expected = {.tv_sec = -0x80000000LL, .tv_nsec = 0L},
> - },
> -
> - {
> - .test_case_name = UPPER_BOUND_NEG_NO_EXTRA_BITS_CASE,
> - .msb_set = true,
> - .lower_bound = false,
> - .extra_bits = 0,
> - .expected = {.tv_sec = -1LL, .tv_nsec = 0L},
> - },
> -
> - {
> - .test_case_name = LOWER_BOUND_NONNEG_NO_EXTRA_BITS_CASE,
> - .msb_set = false,
> - .lower_bound = true,
> - .extra_bits = 0,
> - .expected = {0LL, 0L},
> - },
> -
> - {
> - .test_case_name = UPPER_BOUND_NONNEG_NO_EXTRA_BITS_CASE,
> - .msb_set = false,
> - .lower_bound = false,
> - .extra_bits = 0,
> - .expected = {.tv_sec = 0x7fffffffLL, .tv_nsec = 0L},
> - },
> -
> - {
> - .test_case_name = LOWER_BOUND_NEG_LO_1_CASE,
> - .msb_set = true,
> - .lower_bound = true,
> - .extra_bits = 1,
> - .expected = {.tv_sec = 0x80000000LL, .tv_nsec = 0L},
> - },
> -
> - {
> - .test_case_name = UPPER_BOUND_NEG_LO_1_CASE,
> - .msb_set = true,
> - .lower_bound = false,
> - .extra_bits = 1,
> - .expected = {.tv_sec = 0xffffffffLL, .tv_nsec = 0L},
> - },
> -
> - {
> - .test_case_name = LOWER_BOUND_NONNEG_LO_1_CASE,
> - .msb_set = false,
> - .lower_bound = true,
> - .extra_bits = 1,
> - .expected = {.tv_sec = 0x100000000LL, .tv_nsec = 0L},
> - },
> -
> - {
> - .test_case_name = UPPER_BOUND_NONNEG_LO_1_CASE,
> - .msb_set = false,
> - .lower_bound = false,
> - .extra_bits = 1,
> - .expected = {.tv_sec = 0x17fffffffLL, .tv_nsec = 0L},
> - },
> -
> - {
> - .test_case_name = LOWER_BOUND_NEG_HI_1_CASE,
> - .msb_set = true,
> - .lower_bound = true,
> - .extra_bits = 2,
> - .expected = {.tv_sec = 0x180000000LL, .tv_nsec = 0L},
> - },
> -
> - {
> - .test_case_name = UPPER_BOUND_NEG_HI_1_CASE,
> - .msb_set = true,
> - .lower_bound = false,
> - .extra_bits = 2,
> - .expected = {.tv_sec = 0x1ffffffffLL, .tv_nsec = 0L},
> - },
> -
> - {
> - .test_case_name = LOWER_BOUND_NONNEG_HI_1_CASE,
> - .msb_set = false,
> - .lower_bound = true,
> - .extra_bits = 2,
> - .expected = {.tv_sec = 0x200000000LL, .tv_nsec = 0L},
> - },
> -
> - {
> - .test_case_name = UPPER_BOUND_NONNEG_HI_1_CASE,
> - .msb_set = false,
> - .lower_bound = false,
> - .extra_bits = 2,
> - .expected = {.tv_sec = 0x27fffffffLL, .tv_nsec = 0L},
> - },
> -
> - {
> - .test_case_name = UPPER_BOUND_NONNEG_HI_1_NS_1_CASE,
> - .msb_set = false,
> - .lower_bound = false,
> - .extra_bits = 6,
> - .expected = {.tv_sec = 0x27fffffffLL, .tv_nsec = 1L},
> - },
> -
> - {
> - .test_case_name = LOWER_BOUND_NONNEG_HI_1_NS_MAX_CASE,
> - .msb_set = false,
> - .lower_bound = true,
> - .extra_bits = 0xFFFFFFFF,
> - .expected = {.tv_sec = 0x300000000LL,
> - .tv_nsec = MAX_NANOSECONDS},
> - },
> -
> - {
> - .test_case_name = LOWER_BOUND_NONNEG_EXTRA_BITS_1_CASE,
> - .msb_set = false,
> - .lower_bound = true,
> - .extra_bits = 3,
> - .expected = {.tv_sec = 0x300000000LL, .tv_nsec = 0L},
> - },
> -
> - {
> - .test_case_name = UPPER_BOUND_NONNEG_EXTRA_BITS_1_CASE,
> - .msb_set = false,
> - .lower_bound = false,
> - .extra_bits = 3,
> - .expected = {.tv_sec = 0x37fffffffLL, .tv_nsec = 0L},
> - }
> - };
> -
> struct timespec64 timestamp;
> - int i;
> -
> - for (i = 0; i < ARRAY_SIZE(test_data); ++i) {
> - timestamp.tv_sec = get_32bit_time(&test_data[i]);
> - ext4_decode_extra_time(×tamp,
> - cpu_to_le32(test_data[i].extra_bits));
> -
> - KUNIT_EXPECT_EQ_MSG(test,
> - test_data[i].expected.tv_sec,
> - timestamp.tv_sec,
> - CASE_NAME_FORMAT,
> - test_data[i].test_case_name,
> - test_data[i].msb_set,
> - test_data[i].lower_bound,
> - test_data[i].extra_bits);
> - KUNIT_EXPECT_EQ_MSG(test,
> - test_data[i].expected.tv_nsec,
> - timestamp.tv_nsec,
> - CASE_NAME_FORMAT,
> - test_data[i].test_case_name,
> - test_data[i].msb_set,
> - test_data[i].lower_bound,
> - test_data[i].extra_bits);
> - }
> +
> + struct timestamp_expectation *test_param =
> + (struct timestamp_expectation *)(test->param_values);
> +
> + timestamp.tv_sec = get_32bit_time(test_param);
> + ext4_decode_extra_time(×tamp,
> + cpu_to_le32(test_param->extra_bits));
> +
> + KUNIT_EXPECT_EQ_MSG(test,
> + test_param->expected.tv_sec,
> + timestamp.tv_sec,
> + CASE_NAME_FORMAT,
> + test_param->test_case_name,
> + test_param->msb_set,
> + test_param->lower_bound,
> + test_param->extra_bits);
> + KUNIT_EXPECT_EQ_MSG(test,
> + test_param->expected.tv_nsec,
> + timestamp.tv_nsec,
> + CASE_NAME_FORMAT,
> + test_param->test_case_name,
> + test_param->msb_set,
> + test_param->lower_bound,
> + test_param->extra_bits);
> }
>
> static struct kunit_case ext4_inode_test_cases[] = {
> - KUNIT_CASE(inode_test_xtimestamp_decoding),
> + KUNIT_CASE_PARAM(inode_test_xtimestamp_decoding, ext4_inode_gen_params),
> {}
> };
>
> --
> 2.25.1
>
Reviewed-by: Iurii Zaikin <yzaikin@...gle.com>
Powered by blists - more mailing lists