Make test_encode_decode() more readable and add missing __init.
Signed-off-by: Marco Elver <[email protected]>
---
kernel/kcsan/selftest.c | 72 +++++++++++++++++------------------------
1 file changed, 30 insertions(+), 42 deletions(-)
diff --git a/kernel/kcsan/selftest.c b/kernel/kcsan/selftest.c
index 7f29cb0f5e63..b4295a3892b7 100644
--- a/kernel/kcsan/selftest.c
+++ b/kernel/kcsan/selftest.c
@@ -18,7 +18,7 @@
#define ITERS_PER_TEST 2000
/* Test requirements. */
-static bool test_requires(void)
+static bool __init test_requires(void)
{
/* random should be initialized for the below tests */
return prandom_u32() + prandom_u32() != 0;
@@ -28,14 +28,18 @@ static bool test_requires(void)
* Test watchpoint encode and decode: check that encoding some access's info,
* and then subsequent decode preserves the access's info.
*/
-static bool test_encode_decode(void)
+static bool __init test_encode_decode(void)
{
int i;
for (i = 0; i < ITERS_PER_TEST; ++i) {
size_t size = prandom_u32_max(MAX_ENCODABLE_SIZE) + 1;
bool is_write = !!prandom_u32_max(2);
+ unsigned long verif_masked_addr;
+ long encoded_watchpoint;
+ bool verif_is_write;
unsigned long addr;
+ size_t verif_size;
prandom_bytes(&addr, sizeof(addr));
if (addr < PAGE_SIZE)
@@ -44,53 +48,37 @@ static bool test_encode_decode(void)
if (WARN_ON(!check_encodable(addr, size)))
return false;
- /* Encode and decode */
- {
- const long encoded_watchpoint =
- encode_watchpoint(addr, size, is_write);
- unsigned long verif_masked_addr;
- size_t verif_size;
- bool verif_is_write;
-
- /* Check special watchpoints */
- if (WARN_ON(decode_watchpoint(
- INVALID_WATCHPOINT, &verif_masked_addr,
- &verif_size, &verif_is_write)))
- return false;
- if (WARN_ON(decode_watchpoint(
- CONSUMED_WATCHPOINT, &verif_masked_addr,
- &verif_size, &verif_is_write)))
- return false;
-
- /* Check decoding watchpoint returns same data */
- if (WARN_ON(!decode_watchpoint(
- encoded_watchpoint, &verif_masked_addr,
- &verif_size, &verif_is_write)))
- return false;
- if (WARN_ON(verif_masked_addr !=
- (addr & WATCHPOINT_ADDR_MASK)))
- goto fail;
- if (WARN_ON(verif_size != size))
- goto fail;
- if (WARN_ON(is_write != verif_is_write))
- goto fail;
-
- continue;
-fail:
- pr_err("%s fail: %s %zu bytes @ %lx -> encoded: %lx -> %s %zu bytes @ %lx\n",
- __func__, is_write ? "write" : "read", size,
- addr, encoded_watchpoint,
- verif_is_write ? "write" : "read", verif_size,
- verif_masked_addr);
+ encoded_watchpoint = encode_watchpoint(addr, size, is_write);
+
+ /* Check special watchpoints */
+ if (WARN_ON(decode_watchpoint(INVALID_WATCHPOINT, &verif_masked_addr, &verif_size, &verif_is_write)))
return false;
- }
+ if (WARN_ON(decode_watchpoint(CONSUMED_WATCHPOINT, &verif_masked_addr, &verif_size, &verif_is_write)))
+ return false;
+
+ /* Check decoding watchpoint returns same data */
+ if (WARN_ON(!decode_watchpoint(encoded_watchpoint, &verif_masked_addr, &verif_size, &verif_is_write)))
+ return false;
+ if (WARN_ON(verif_masked_addr != (addr & WATCHPOINT_ADDR_MASK)))
+ goto fail;
+ if (WARN_ON(verif_size != size))
+ goto fail;
+ if (WARN_ON(is_write != verif_is_write))
+ goto fail;
+
+ continue;
+fail:
+ pr_err("%s fail: %s %zu bytes @ %lx -> encoded: %lx -> %s %zu bytes @ %lx\n",
+ __func__, is_write ? "write" : "read", size, addr, encoded_watchpoint,
+ verif_is_write ? "write" : "read", verif_size, verif_masked_addr);
+ return false;
}
return true;
}
/* Test access matching function. */
-static bool test_matching_access(void)
+static bool __init test_matching_access(void)
{
if (WARN_ON(!matching_access(10, 1, 10, 1)))
return false;
--
2.33.0.rc1.237.g0d66db33f3-goog
On Fri, Aug 13, 2021 at 10:10:55AM +0200, Marco Elver wrote:
> Make test_encode_decode() more readable and add missing __init.
>
> Signed-off-by: Marco Elver <[email protected]>
Thank you! I have queued and pushed this one as well as your previous
series:
https://lkml.kernel.org/r/[email protected]
Thanx, Paul
> ---
> kernel/kcsan/selftest.c | 72 +++++++++++++++++------------------------
> 1 file changed, 30 insertions(+), 42 deletions(-)
>
> diff --git a/kernel/kcsan/selftest.c b/kernel/kcsan/selftest.c
> index 7f29cb0f5e63..b4295a3892b7 100644
> --- a/kernel/kcsan/selftest.c
> +++ b/kernel/kcsan/selftest.c
> @@ -18,7 +18,7 @@
> #define ITERS_PER_TEST 2000
>
> /* Test requirements. */
> -static bool test_requires(void)
> +static bool __init test_requires(void)
> {
> /* random should be initialized for the below tests */
> return prandom_u32() + prandom_u32() != 0;
> @@ -28,14 +28,18 @@ static bool test_requires(void)
> * Test watchpoint encode and decode: check that encoding some access's info,
> * and then subsequent decode preserves the access's info.
> */
> -static bool test_encode_decode(void)
> +static bool __init test_encode_decode(void)
> {
> int i;
>
> for (i = 0; i < ITERS_PER_TEST; ++i) {
> size_t size = prandom_u32_max(MAX_ENCODABLE_SIZE) + 1;
> bool is_write = !!prandom_u32_max(2);
> + unsigned long verif_masked_addr;
> + long encoded_watchpoint;
> + bool verif_is_write;
> unsigned long addr;
> + size_t verif_size;
>
> prandom_bytes(&addr, sizeof(addr));
> if (addr < PAGE_SIZE)
> @@ -44,53 +48,37 @@ static bool test_encode_decode(void)
> if (WARN_ON(!check_encodable(addr, size)))
> return false;
>
> - /* Encode and decode */
> - {
> - const long encoded_watchpoint =
> - encode_watchpoint(addr, size, is_write);
> - unsigned long verif_masked_addr;
> - size_t verif_size;
> - bool verif_is_write;
> -
> - /* Check special watchpoints */
> - if (WARN_ON(decode_watchpoint(
> - INVALID_WATCHPOINT, &verif_masked_addr,
> - &verif_size, &verif_is_write)))
> - return false;
> - if (WARN_ON(decode_watchpoint(
> - CONSUMED_WATCHPOINT, &verif_masked_addr,
> - &verif_size, &verif_is_write)))
> - return false;
> -
> - /* Check decoding watchpoint returns same data */
> - if (WARN_ON(!decode_watchpoint(
> - encoded_watchpoint, &verif_masked_addr,
> - &verif_size, &verif_is_write)))
> - return false;
> - if (WARN_ON(verif_masked_addr !=
> - (addr & WATCHPOINT_ADDR_MASK)))
> - goto fail;
> - if (WARN_ON(verif_size != size))
> - goto fail;
> - if (WARN_ON(is_write != verif_is_write))
> - goto fail;
> -
> - continue;
> -fail:
> - pr_err("%s fail: %s %zu bytes @ %lx -> encoded: %lx -> %s %zu bytes @ %lx\n",
> - __func__, is_write ? "write" : "read", size,
> - addr, encoded_watchpoint,
> - verif_is_write ? "write" : "read", verif_size,
> - verif_masked_addr);
> + encoded_watchpoint = encode_watchpoint(addr, size, is_write);
> +
> + /* Check special watchpoints */
> + if (WARN_ON(decode_watchpoint(INVALID_WATCHPOINT, &verif_masked_addr, &verif_size, &verif_is_write)))
> return false;
> - }
> + if (WARN_ON(decode_watchpoint(CONSUMED_WATCHPOINT, &verif_masked_addr, &verif_size, &verif_is_write)))
> + return false;
> +
> + /* Check decoding watchpoint returns same data */
> + if (WARN_ON(!decode_watchpoint(encoded_watchpoint, &verif_masked_addr, &verif_size, &verif_is_write)))
> + return false;
> + if (WARN_ON(verif_masked_addr != (addr & WATCHPOINT_ADDR_MASK)))
> + goto fail;
> + if (WARN_ON(verif_size != size))
> + goto fail;
> + if (WARN_ON(is_write != verif_is_write))
> + goto fail;
> +
> + continue;
> +fail:
> + pr_err("%s fail: %s %zu bytes @ %lx -> encoded: %lx -> %s %zu bytes @ %lx\n",
> + __func__, is_write ? "write" : "read", size, addr, encoded_watchpoint,
> + verif_is_write ? "write" : "read", verif_size, verif_masked_addr);
> + return false;
> }
>
> return true;
> }
>
> /* Test access matching function. */
> -static bool test_matching_access(void)
> +static bool __init test_matching_access(void)
> {
> if (WARN_ON(!matching_access(10, 1, 10, 1)))
> return false;
> --
> 2.33.0.rc1.237.g0d66db33f3-goog
>