On Sat, Sep 24, 2022 at 08:31PM +0200, andrey.konovalov@xxxxxxxxx wrote:
> From: Andrey Konovalov <andreyknvl@xxxxxxxxxx>
>
> Switch KUnit-compatible KASAN tests from using per-task KUnit resources
> to console tracepoints.
>
> This allows for two things:
>
> 1. Migrating tests that trigger a KASAN report in the context of a task
> other than current to KUnit framework.
> This is implemented in the patches that follow.
>
> 2. Parsing and matching the contents of KASAN reports.
> This is not yet implemented.
>
> Signed-off-by: Andrey Konovalov <andreyknvl@xxxxxxxxxx>
> ---
> lib/Kconfig.kasan | 2 +-
> mm/kasan/kasan_test.c | 85 +++++++++++++++++++++++++++++++------------
> mm/kasan/report.c | 31 ----------------
> 3 files changed, 63 insertions(+), 55 deletions(-)
>
> diff --git a/lib/Kconfig.kasan b/lib/Kconfig.kasan
> index ca09b1cf8ee9..ba5b27962c34 100644
> --- a/lib/Kconfig.kasan
> +++ b/lib/Kconfig.kasan
> @@ -181,7 +181,7 @@ config KASAN_VMALLOC
>
> config KASAN_KUNIT_TEST
> tristate "KUnit-compatible tests of KASAN bug detection capabilities" if !KUNIT_ALL_TESTS
> - depends on KASAN && KUNIT
> + depends on KASAN && KUNIT && TRACEPOINTS
> default KUNIT_ALL_TESTS
> help
> A KUnit-based KASAN test suite. Triggers different kinds of
> diff --git a/mm/kasan/kasan_test.c b/mm/kasan/kasan_test.c
> index f25692def781..3a2886f85e69 100644
> --- a/mm/kasan/kasan_test.c
> +++ b/mm/kasan/kasan_test.c
> @@ -5,8 +5,12 @@
> * Author: Andrey Ryabinin <a.ryabinin@xxxxxxxxxxx>
> */
>
> +#define pr_fmt(fmt) "kasan_test: " fmt
> +
> +#include <kunit/test.h>
> #include <linux/bitops.h>
> #include <linux/delay.h>
> +#include <linux/io.h>
> #include <linux/kasan.h>
> #include <linux/kernel.h>
> #include <linux/mm.h>
> @@ -14,21 +18,28 @@
> #include <linux/module.h>
> #include <linux/printk.h>
> #include <linux/random.h>
> +#include <linux/set_memory.h>
> #include <linux/slab.h>
> #include <linux/string.h>
> +#include <linux/tracepoint.h>
> #include <linux/uaccess.h>
> -#include <linux/io.h>
> #include <linux/vmalloc.h>
> -#include <linux/set_memory.h>
> +#include <trace/events/printk.h>
>
> #include <asm/page.h>
>
> -#include <kunit/test.h>
> -
> #include "kasan.h"
>
> #define OOB_TAG_OFF (IS_ENABLED(CONFIG_KASAN_GENERIC) ? 0 : KASAN_GRANULE_SIZE)
>
> +static bool multishot;
> +
> +/* Fields set based on lines observed in the console. */
> +static struct {
> + bool report_found;
> + bool async_fault;
> +} test_status;
> +
> /*
> * Some tests use these global variables to store return values from function
> * calls that could otherwise be eliminated by the compiler as dead code.
> @@ -36,35 +47,61 @@
> void *kasan_ptr_result;
> int kasan_int_result;
>
> -static struct kunit_resource resource;
> -static struct kunit_kasan_status test_status;
Also remove this struct from kasan.h?
