* [PATCH 1/4] tracing: add error_report trace points
[not found] <20210113091017.1444780-1-glider@google.com>
@ 2021-01-13 9:10 ` Alexander Potapenko
2021-01-13 9:10 ` [PATCH 2/4] lib: add error_report_notify to collect debugging tools' reports Alexander Potapenko
` (2 subsequent siblings)
3 siblings, 0 replies; 12+ messages in thread
From: Alexander Potapenko @ 2021-01-13 9:10 UTC (permalink / raw)
To: akpm
Cc: Alexander Potapenko, Marco Elver, Andrey Konovalov, Dmitry Vyukov,
Ingo Molnar, Petr Mladek, Steven Rostedt, Sergey Senozhatsky,
linux-mm
Introduce error_report_start and error_report_end tracepoints.
Those can be used in debugging tools like KASAN, KFENCE, etc.
to provide extensions to the error reporting mechanisms (e.g. allow
tests hook into error reporting, ease error report collection from
production kernels).
Another benefit would be making use of ftrace for debugging or
benchmarking the tools themselves.
Suggested-by: Marco Elver <elver@google.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andrey Konovalov <andreyknvl@gmail.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Marco Elver <elver@google.com>
Cc: Petr Mladek <pmladek@suse.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Cc: linux-mm@kvack.org
Signed-off-by: Alexander Potapenko <glider@google.com>
---
include/trace/events/error_report.h | 51 +++++++++++++++++++++++++++++
kernel/trace/Makefile | 1 +
kernel/trace/error_report-traces.c | 11 +++++++
3 files changed, 63 insertions(+)
create mode 100644 include/trace/events/error_report.h
create mode 100644 kernel/trace/error_report-traces.c
diff --git a/include/trace/events/error_report.h b/include/trace/events/error_report.h
new file mode 100644
index 000000000000..bae0129031f0
--- /dev/null
+++ b/include/trace/events/error_report.h
@@ -0,0 +1,51 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM error_report
+
+#if !defined(_TRACE_ERROR_REPORT_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_ERROR_REPORT_H
+
+#include <linux/tracepoint.h>
+
+DECLARE_EVENT_CLASS(error_report_template,
+ TP_PROTO(const char *error_detector, unsigned long id),
+ TP_ARGS(error_detector, id),
+ TP_STRUCT__entry(__field(const char *, error_detector)
+ __field(unsigned long, id)),
+ TP_fast_assign(__entry->error_detector = error_detector;
+ __entry->id = id;),
+ TP_printk("[%s] %lx", __entry->error_detector,
+ __entry->id));
+
+/**
+ * error_report_start - called before printing the error report
+ * @error_detector: short string describing the error detection tool
+ * @id: pseudo-unique descriptor that can help distinguish reports
+ * from one another. Depending on the tool, good examples
+ * could be: memory access address, call site, allocation
+ * site, etc.
+ *
+ * This event occurs right before a debugging tool starts printing the error
+ * report.
+ */
+DEFINE_EVENT(error_report_template, error_report_start,
+ TP_PROTO(const char *error_detector, unsigned long id),
+ TP_ARGS(error_detector, id));
+
+/**
+ * error_report_end - called after printing the error report
+ * @error_detector: short string describing the error detection tool
+ * @id: pseudo-unique descriptor, matches that passed to
+ * error_report_start
+ *
+ * This event occurs right after a debugging tool finishes printing the error
+ * report.
+ */
+DEFINE_EVENT(error_report_template, error_report_end,
+ TP_PROTO(const char *error_detector, unsigned long id),
+ TP_ARGS(error_detector, id));
+
+#endif /* _TRACE_ERROR_REPORT_H */
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>
diff --git a/kernel/trace/Makefile b/kernel/trace/Makefile
index 7e44cea89fdc..b28d3e5013cd 100644
--- a/kernel/trace/Makefile
+++ b/kernel/trace/Makefile
@@ -81,6 +81,7 @@ obj-$(CONFIG_SYNTH_EVENTS) += trace_events_synth.o
obj-$(CONFIG_HIST_TRIGGERS) += trace_events_hist.o
obj-$(CONFIG_BPF_EVENTS) += bpf_trace.o
obj-$(CONFIG_KPROBE_EVENTS) += trace_kprobe.o
+obj-$(CONFIG_TRACEPOINTS) += error_report-traces.o
obj-$(CONFIG_TRACEPOINTS) += power-traces.o
ifeq ($(CONFIG_PM),y)
obj-$(CONFIG_TRACEPOINTS) += rpm-traces.o
diff --git a/kernel/trace/error_report-traces.c b/kernel/trace/error_report-traces.c
new file mode 100644
index 000000000000..80960c52c705
--- /dev/null
+++ b/kernel/trace/error_report-traces.c
@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Error reporting trace points
+ */
+
+#define CREATE_TRACE_POINTS
+#include <trace/events/error_report.h>
+
+EXPORT_TRACEPOINT_SYMBOL_GPL(error_report_start);
+EXPORT_TRACEPOINT_SYMBOL_GPL(error_report_end);
+
--
2.30.0.284.gd98b1dd5eaa7-goog
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 2/4] lib: add error_report_notify to collect debugging tools' reports
[not found] <20210113091017.1444780-1-glider@google.com>
2021-01-13 9:10 ` [PATCH 1/4] tracing: add error_report trace points Alexander Potapenko
@ 2021-01-13 9:10 ` Alexander Potapenko
2021-01-13 9:18 ` Alexander Potapenko
2021-01-13 9:10 ` [PATCH 3/4] kfence: use error_report_start and error_report_end tracepoints Alexander Potapenko
2021-01-13 9:10 ` [PATCH 4/4] kasan: " Alexander Potapenko
3 siblings, 1 reply; 12+ messages in thread
From: Alexander Potapenko @ 2021-01-13 9:10 UTC (permalink / raw)
To: akpm
Cc: Alexander Potapenko, Marco Elver, Andrey Konovalov, Dmitry Vyukov,
Ingo Molnar, Petr Mladek, Steven Rostedt, Sergey Senozhatsky,
linux-mm
With the introduction of various production error-detection tools, such as
MTE-based KASAN and KFENCE, the need arises to efficiently notify the
userspace OS components about kernel errors. Currently, no facility exists
to notify userspace about a kernel error from such bug-detection tools.
The problem is obviously not restricted to the above bug detection tools,
and applies to any error reporting mechanism that does not panic the
kernel; this series, however, will only add support for KASAN and KFENCE
reporting.
All such error reports appear in the kernel log. But, when such errors
occur, userspace would normally need to read the entire kernel log and
parse the relevant errors. This is error prone and inefficient, as
userspace needs to continuously monitor the kernel log for error messages.
On certain devices, this is unfortunately not acceptable. Therefore, we
need to revisit how reports are propagated to userspace.
The library added, error_report_notify (CONFIG_ERROR_REPORT_NOTIFY),
solves the above by using the error_report_start/error_report_end tracing
events and exposing the last report and the total report count to the
userspace via /sys/kernel/error_report/last_report and
/sys/kernel/error_report/report_count.
Userspace apps can call poll(POLLPRI) on those files to get notified about
the new reports without having to watch dmesg in a loop.
Suggested-by: Marco Elver <elver@google.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andrey Konovalov <andreyknvl@gmail.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Marco Elver <elver@google.com>
Cc: Petr Mladek <pmladek@suse.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Cc: linux-mm@kvack.org
Signed-off-by: Alexander Potapenko <glider@google.com>
---
lib/Kconfig.debug | 14 ++
lib/Makefile | 2 +
lib/error_report_notify.c | 278 ++++++++++++++++++++++++++++++++++++++
3 files changed, 294 insertions(+)
create mode 100644 lib/error_report_notify.c
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 4b8f9e018f0f..c3f4aae9f19e 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -209,6 +209,20 @@ config DEBUG_BUGVERBOSE
of the BUG call as well as the EIP and oops trace. This aids
debugging but costs about 70-100K of memory.
+config ERROR_REPORT_NOTIFY
+ bool "Expose memory error reports to the userspace"
+ depends on TRACING
+ help
+ When enabled, captures error reports from debugging tools (such as
+ KFENCE or KASAN) using console tracing, and exposes reports in
+ /sys/kernel/error_report/: the file last_report contains the last
+ report (with maximum report length of PAGE_SIZE), and report_count,
+ the total report count.
+
+ Userspace programs can call poll(POLLPRI) on those files to get
+ notified about the new reports without having to watch dmesg in a
+ loop.
+
endmenu # "printk and dmesg options"
menu "Compile-time checks and compiler options"
diff --git a/lib/Makefile b/lib/Makefile
index afeff05fa8c5..96ed8bc0cc5b 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -240,6 +240,8 @@ obj-$(CONFIG_CPU_RMAP) += cpu_rmap.o
obj-$(CONFIG_DQL) += dynamic_queue_limits.o
+obj-$(CONFIG_ERROR_REPORT_NOTIFY) += error_report_notify.o
+
obj-$(CONFIG_GLOB) += glob.o
obj-$(CONFIG_GLOB_SELFTEST) += globtest.o
diff --git a/lib/error_report_notify.c b/lib/error_report_notify.c
new file mode 100644
index 000000000000..b0633f36ce6d
--- /dev/null
+++ b/lib/error_report_notify.c
@@ -0,0 +1,278 @@
+// SPDX-License-Identifier: GPL-2.0
+
+/*
+ * Userspace notification interface for debugging tools.
+ *
+ * Provide two sysfs files:
+ * - /sys/kernel/error_report/last_report
+ * - /sys/kernel/error_report/report_count
+ * that contain the last debugging tool report (taken from dmesg, delimited by
+ * the error_report_start/error_report_end tracing events) and the total report
+ * count.
+ */
+
+#include <linux/atomic.h>
+#include <linux/fs.h>
+#include <linux/kobject.h>
+#include <linux/string.h>
+#include <linux/sysfs.h>
+#include <linux/tracepoint.h>
+#include <linux/workqueue.h>
+#include <trace/events/error_report.h>
+#include <trace/events/printk.h>
+
+static struct kobject *error_report_kobj;
+
+/* sysfs files are capped at PAGE_SIZE. */
+#define BUF_SIZE PAGE_SIZE
+/* Two buffers to store the finished report and the report being recorded. */
+static char report_buffer[2][BUF_SIZE];
+/*
+ * Total report count. Also serves as a latch for report_buffer:
+ * report_buffer[num_reports % 2] is the currently available report,
+ * report_buffer[(num_reports + 1) % 2] is the report being recorded.
+ */
+static atomic_t num_reports;
+
+/*
+ * PID of the task currently recording the report, as returned by
+ * get_encoded_pid(), or -1. Used as a writer lock for report_buffer.
+ * A regular spinlock couldn't be used here, as probe_console() can be called
+ * from any thread, and it needs to know whether that thread is holding the
+ * lock.
+ */
+static atomic_t current_pid = ATOMIC_INIT(-1);
+
+static size_t current_pos;
+static bool truncated;
+static const char TRUNC_MSG[] = "<truncated>\n";
+
+static struct delayed_work reporting_done;
+
+static void error_report_notify(struct work_struct *work)
+{
+ sysfs_notify(error_report_kobj, NULL, "last_report");
+ sysfs_notify(error_report_kobj, NULL, "report_count");
+}
+static DECLARE_DELAYED_WORK(reporting_done, error_report_notify);
+
+/*
+ * Return the current PID combined together with in_task(). This lets us
+ * distinguish between normal task context and IRQ context.
+ */
+static int get_encoded_pid(void)
+{
+ return (current->pid << 1) | (!!in_task());
+}
+
+/*
+ * Trace hook for the error_report_start event. In an unlikely case of another
+ * task already printing a report bail out, otherwise save the current pid
+ * together with in_task() return value.
+ *
+ * Because reporting code can be called from low-level routines (e.g. locking
+ * primitives or allocator guts), report recording is implemented using a
+ * seqlock lock-free algorithm.
+ */
+static void probe_report_start(void *ignore, const char *tool_name,
+ unsigned long id)
+{
+ /*
+ * Acquire the writer lock. Any racing probe_report_start will not
+ * record anything. Pairs with the release in probe_report_end().
+ */
+ if (atomic_cmpxchg_acquire(¤t_pid, -1, get_encoded_pid()) != -1)
+ return;
+ current_pos = 0;
+ truncated = false;
+}
+
+/*
+ * Trace hook for the error_report_end event. If an event from the mismatching
+ * error_report_start is received, it is ignored. Otherwise, null-terminate the
+ * buffer, increase the report count (effectively releasing the report to
+ * last_report_show() and schedule a notification about a new report.
+ */
+static void probe_report_end(void *ignore, const char *tool_name,
+ unsigned long id)
+{
+ pid_t pid = atomic_read(¤t_pid);
+ int idx;
+
+ if (pid != get_encoded_pid())
+ return;
+
+ idx = (atomic_read(&num_reports) + 1) % 2;
+ if (current_pos == BUF_SIZE)
+ report_buffer[idx][current_pos - 1] = 0;
+ else
+ report_buffer[idx][current_pos] = 0;
+
+ /* Pairs with acquire in last_report_show(). */
+ atomic_inc_return_release(&num_reports);
+ schedule_delayed_work(&reporting_done, 0);
+ /*
+ * Release the writer lock. Pairs with the acquire in
+ * probe_report_start().
+ */
+ atomic_set_release(¤t_pid, -1);
+}
+
+/*
+ * Skip one or two leading pair of brackets containing the log timestamp and
+ * the task/CPU ID, plus the leading space, from the report line, e.g.:
+ * [ 0.698431][ T7] BUG: KFENCE: use-after-free ...
+ * becomes:
+ * BUG: KFENCE: use-after-free ...
+ *
+ * Report size is only 4K, and this boilerplate can easily account for half of
+ * that amount.
+ */
+static void skip_extra_info(const char **buf, size_t *len)
+{
+ int num_brackets = IS_ENABLED(CONFIG_PRINTK_TIME) +
+ IS_ENABLED(CONFIG_PRINTK_CALLER);
+ const char *found;
+
+ if (!buf || !len)
+ return;
+
+ while (num_brackets--) {
+ if (!*len || *buf[0] != '[')
+ return;
+ found = strnchr(*buf, *len, ']');
+ if (!found)
+ return;
+ *len -= found - *buf + 1;
+ *buf = found + 1;
+ }
+ if (*len && *buf[0] == ' ') {
+ ++*buf;
+ --*len;
+ }
+}
+
+/*
+ * Trace hook for the console event. If a line comes from a task/CPU that did
+ * not send the error_report_start event, that line is ignored. Otherwise, it
+ * is stored in the report_buffer[(num_reports + 1) % 2].
+ *
+ * To save space, the leading timestamps and (when enabled) CPU/task info is
+ * stripped away. The buffer may contain newlines, so this procedure is
+ * repeated for every line.
+ */
+static void probe_console(void *ignore, const char *buf, size_t len)
+{
+ int pid = atomic_read(¤t_pid);
+ size_t to_copy, cur_len;
+ char *newline;
+ int idx;
+
+ if (pid != get_encoded_pid() || truncated)
+ return;
+
+ idx = (atomic_read(&num_reports) + 1) % 2;
+ while (len) {
+ newline = strnchr(buf, len, '\n');
+ if (newline)
+ cur_len = newline - buf + 1;
+ else
+ cur_len = len;
+ /* Adjust len now, because skip_extra_info() may change cur_len. */
+ len -= cur_len;
+ skip_extra_info(&buf, &cur_len);
+ to_copy = min(cur_len, BUF_SIZE - current_pos);
+ memcpy(report_buffer[idx] + current_pos, buf, to_copy);
+ current_pos += to_copy;
+ if (cur_len > to_copy) {
+ truncated = true;
+ memcpy(report_buffer[idx] + current_pos - sizeof(TRUNC_MSG),
+ TRUNC_MSG, sizeof(TRUNC_MSG));
+ break;
+ }
+ buf += cur_len;
+ }
+}
+
+static void register_tracepoints(void)
+{
+ register_trace_console(probe_console, NULL);
+ register_trace_error_report_start(probe_report_start, NULL);
+ register_trace_error_report_end(probe_report_end, NULL);
+}
+
+/*
+ * read() handler for /sys/kernel/error_report/last_report.
+ * Because the number of reports can change under our feet, check it again
+ * after copying the report, and retry if the numbers mismatch.
+ */
+static ssize_t last_report_show(struct kobject *kobj,
+ struct kobj_attribute *attr, char *buf)
+{
+ ssize_t ret;
+ int index;
+
+ do {
+ /* Pairs with release in probe_report_end(). */
+ index = atomic_read_acquire(&num_reports);
+ /*
+ * If index and old_index mismatch, we might be accessing
+ * report_buffer concurrently with a writer thread. In that
+ * case the read data will be discarded.
+ */
+ ret = data_race(strscpy(buf, report_buffer[index % 2], BUF_SIZE));
+ /*
+ * Prevent reordering between the memcpy above and the atomic
+ * read below.
+ * See the comments in include/linux/seqlock.h for more
+ * details.
+ */
+ smp_rmb();
+ } while (index != atomic_read(&num_reports));
+ return ret;
+}
+
+/*
+ * read() handler for /sys/kernel/error_report/report_count.
+ */
+static ssize_t report_count_show(struct kobject *kobj,
+ struct kobj_attribute *attr, char *buf)
+{
+ return scnprintf(buf, PAGE_SIZE, "%d\n", atomic_read(&num_reports));
+}
+
+static struct kobj_attribute last_report_attr = __ATTR_RO(last_report);
+static struct kobj_attribute report_count_attr = __ATTR_RO(report_count);
+static struct attribute *error_report_sysfs_attrs[] = {
+ &last_report_attr.attr,
+ &report_count_attr.attr,
+ NULL,
+};
+
+static const struct attribute_group error_report_sysfs_attr_group = {
+ .attrs = error_report_sysfs_attrs,
+};
+
+/*
+ * Set up report notification: register tracepoints and create
+ * /sys/kernel/error_report/.
+ */
+static void error_report_notify_setup(void)
+{
+ int err;
+
+ register_tracepoints();
+ error_report_kobj = kobject_create_and_add("error_report", kernel_kobj);
+ if (!error_report_kobj)
+ goto error;
+ err = sysfs_create_group(error_report_kobj,
+ &error_report_sysfs_attr_group);
+ if (err)
+ goto error;
+ return;
+
+error:
+ if (error_report_kobj)
+ kobject_del(error_report_kobj);
+}
+late_initcall(error_report_notify_setup);
--
2.30.0.284.gd98b1dd5eaa7-goog
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 3/4] kfence: use error_report_start and error_report_end tracepoints
[not found] <20210113091017.1444780-1-glider@google.com>
2021-01-13 9:10 ` [PATCH 1/4] tracing: add error_report trace points Alexander Potapenko
2021-01-13 9:10 ` [PATCH 2/4] lib: add error_report_notify to collect debugging tools' reports Alexander Potapenko
@ 2021-01-13 9:10 ` Alexander Potapenko
2021-01-13 9:10 ` [PATCH 4/4] kasan: " Alexander Potapenko
3 siblings, 0 replies; 12+ messages in thread
From: Alexander Potapenko @ 2021-01-13 9:10 UTC (permalink / raw)
To: akpm
Cc: Alexander Potapenko, Marco Elver, Andrey Konovalov, Dmitry Vyukov,
Ingo Molnar, Petr Mladek, Steven Rostedt, Sergey Senozhatsky,
linux-mm
Make it possible to trace KFENCE error reporting (in particular, for
compatibility with CONFIG_ERROR_REPORT_NOTIFY).
Suggested-by: Marco Elver <elver@google.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andrey Konovalov <andreyknvl@gmail.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Marco Elver <elver@google.com>
Cc: Petr Mladek <pmladek@suse.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Cc: linux-mm@kvack.org
Signed-off-by: Alexander Potapenko <glider@google.com>
---
mm/kfence/report.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/mm/kfence/report.c b/mm/kfence/report.c
index 4dedc2ff8f28..5c063b5b2227 100644
--- a/mm/kfence/report.c
+++ b/mm/kfence/report.c
@@ -9,6 +9,7 @@
#include <linux/seq_file.h>
#include <linux/stacktrace.h>
#include <linux/string.h>
+#include <trace/events/error_report.h>
#include <asm/kfence.h>
@@ -184,6 +185,7 @@ void kfence_report_error(unsigned long address, struct pt_regs *regs,
lockdep_off();
pr_err("==================================================================\n");
+ trace_error_report_start("kfence", address);
/* Print report header. */
switch (type) {
case KFENCE_ERROR_OOB: {
@@ -232,6 +234,7 @@ void kfence_report_error(unsigned long address, struct pt_regs *regs,
show_regs(regs);
else
dump_stack_print_info(KERN_ERR);
+ trace_error_report_end("kfence", address);
pr_err("==================================================================\n");
lockdep_on();
--
2.30.0.284.gd98b1dd5eaa7-goog
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 4/4] kasan: use error_report_start and error_report_end tracepoints
[not found] <20210113091017.1444780-1-glider@google.com>
` (2 preceding siblings ...)
2021-01-13 9:10 ` [PATCH 3/4] kfence: use error_report_start and error_report_end tracepoints Alexander Potapenko
@ 2021-01-13 9:10 ` Alexander Potapenko
3 siblings, 0 replies; 12+ messages in thread
From: Alexander Potapenko @ 2021-01-13 9:10 UTC (permalink / raw)
To: akpm
Cc: Alexander Potapenko, Marco Elver, Andrey Konovalov, Dmitry Vyukov,
Ingo Molnar, Petr Mladek, Steven Rostedt, Sergey Senozhatsky,
linux-mm
Make it possible to trace KASAN error reporting (in particular, for
compatibility with CONFIG_ERROR_REPORT_NOTIFY).
Suggested-by: Marco Elver <elver@google.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andrey Konovalov <andreyknvl@gmail.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Marco Elver <elver@google.com>
Cc: Petr Mladek <pmladek@suse.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Cc: linux-mm@kvack.org
Signed-off-by: Alexander Potapenko <glider@google.com>
---
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..fd015dd5dd39 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("kasan", addr);
}
-static void end_report(unsigned long *flags)
+static void end_report(unsigned long *flags, unsigned long addr)
{
+ trace_error_report_end("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
^ permalink raw reply related [flat|nested] 12+ messages in thread