[PATCH v2 5/5] kasan: use error_report_start and error_report_end tracepoints

[Alexander Potapenko]

Make it possible to trace KASAN error reporting (in particular, for
compatibility with CONFIG_ERROR_REPORT_NOTIFY).

Suggested-by: Marco Elver <el...@google.com>
Cc: Andrew Morton <a...@linux-foundation.org>
Cc: Andrey Konovalov <andreyk...@google.com>
Cc: Dmitry Vyukov <dvyu...@google.com>
Cc: Ingo Molnar <mi...@redhat.com>
Cc: Marco Elver <el...@google.com>
Cc: Petr Mladek <pmla...@suse.com>
Cc: Steven Rostedt <rost...@goodmis.org>
Cc: Sergey Senozhatsky <sergey.senozhat...@gmail.com>
Cc: linux...@kvack.org
Signed-off-by: Alexander Potapenko <gli...@google.com>

---
v2:
 - change error_report_start and error_report_end prototypes
   to accept enum error_detector instead of char*
   (as suggested by Steven Rostedt)
---
 mm/kasan/report.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/mm/kasan/report.c b/mm/kasan/report.c
index c0fb21797550..78b8bbc84dc2 100644
--- a/mm/kasan/report.c
+++ b/mm/kasan/report.c
@@ -25,6 +25,7 @@
 #include <linux/module.h>
 #include <linux/sched/task_stack.h>
 #include <linux/uaccess.h>
+#include <trace/events/error_report.h>
 
 #include <asm/sections.h>
 
@@ -74,7 +75,7 @@ static void print_error_description(struct kasan_access_info 
*info)
 
 static DEFINE_SPINLOCK(report_lock);
 
-static void start_report(unsigned long *flags)
+static void start_report(unsigned long *flags, unsigned long addr)
 {
        /*
         * Make sure we don't end up in loop.
@@ -82,10 +83,12 @@ static void start_report(unsigned long *flags)
        kasan_disable_current();
        spin_lock_irqsave(&report_lock, *flags);
        
pr_err("==================================================================\n");
+       trace_error_report_start(ERROR_DETECTOR_KASAN, addr);
 }
 
-static void end_report(unsigned long *flags)
+static void end_report(unsigned long *flags, unsigned long addr)
 {
+       trace_error_report_end(ERROR_DETECTOR_KASAN, addr);
        
pr_err("==================================================================\n");
        add_taint(TAINT_BAD_PAGE, LOCKDEP_NOW_UNRELIABLE);
        spin_unlock_irqrestore(&report_lock, *flags);
@@ -348,14 +351,14 @@ void kasan_report_invalid_free(void *object, unsigned 
long ip)
                kasan_update_kunit_status(current->kunit_test);
 #endif /* IS_ENABLED(CONFIG_KUNIT) */
 
-       start_report(&flags);
+       start_report(&flags, (unsigned long)object);
        pr_err("BUG: KASAN: double-free or invalid-free in %pS\n", (void *)ip);
        print_tags(tag, object);
        pr_err("\n");
        print_address_description(object, tag);
        pr_err("\n");
        print_memory_metadata(object);
-       end_report(&flags);
+       end_report(&flags, (unsigned long)object);
 }
 
 static void __kasan_report(unsigned long addr, size_t size, bool is_write,
@@ -385,7 +388,7 @@ static void __kasan_report(unsigned long addr, size_t size, 
bool is_write,
        info.is_write = is_write;
        info.ip = ip;
 
-       start_report(&flags);
+       start_report(&flags, addr);
 
        print_error_description(&info);
        if (addr_has_metadata(untagged_addr))
@@ -400,7 +403,7 @@ static void __kasan_report(unsigned long addr, size_t size, 
bool is_write,
                dump_stack();
        }
 
-       end_report(&flags);
+       end_report(&flags, addr);
 }
 
 bool kasan_report(unsigned long addr, size_t size, bool is_write,
-- 
2.30.0.284.gd98b1dd5eaa7-goog