From: David Gow <davidgow@google.com>
To: trishalfonso@google.com, brendanhiggins@google.com,
aryabinin@virtuozzo.com, dvyukov@google.com, mingo@redhat.com,
peterz@infradead.org, juri.lelli@redhat.com,
vincent.guittot@linaro.org
Cc: David Gow <davidgow@google.com>,
linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com,
kunit-dev@googlegroups.com, linux-kselftest@vger.kernel.org,
Andrey Konovalov <andreyknvl@google.com>
Subject: [PATCH v7 5/5] mm: kasan: Do not panic if both panic_on_warn and kasan_multishot set
Date: Thu, 23 Apr 2020 23:13:42 -0700 [thread overview]
Message-ID: <20200424061342.212535-6-davidgow@google.com> (raw)
In-Reply-To: <20200424061342.212535-1-davidgow@google.com>
KASAN errors will currently trigger a panic when panic_on_warn is set.
This renders kasan_multishot useless, as further KASAN errors won't be
reported if the kernel has already paniced. By making kasan_multishot
disable this behaviour for KASAN errors, we can still have the benefits
of panic_on_warn for non-KASAN warnings, yet be able to use
kasan_multishot.
This is particularly important when running KASAN tests, which need to
trigger multiple KASAN errors: previously these would panic the system
if panic_on_warn was set, now they can run (and will panic the system
should non-KASAN warnings show up).
Signed-off-by: David Gow <davidgow@google.com>
Reviewed-by: Andrey Konovalov <andreyknvl@google.com>
---
mm/kasan/report.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mm/kasan/report.c b/mm/kasan/report.c
index 45f3c23f54cb..dc9fc5c09ea3 100644
--- a/mm/kasan/report.c
+++ b/mm/kasan/report.c
@@ -94,7 +94,7 @@ static void end_report(unsigned long *flags)
pr_err("==================================================================\n");
add_taint(TAINT_BAD_PAGE, LOCKDEP_NOW_UNRELIABLE);
spin_unlock_irqrestore(&report_lock, *flags);
- if (panic_on_warn) {
+ if (panic_on_warn && !test_bit(KASAN_BIT_MULTI_SHOT, &kasan_flags)) {
/*
* This thread may hit another WARN() in the panic path.
* Resetting this prevents additional WARN() from panicking the
--
2.26.2.303.gf8c07b1a785-goog
next prev parent reply other threads:[~2020-04-24 6:14 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-24 6:13 [PATCH v7 0/5] KUnit-KASAN Integration David Gow
2020-04-24 6:13 ` [PATCH v7 1/5] Add KUnit Struct to Current Task David Gow
2020-04-24 6:13 ` [PATCH v7 2/5] KUnit: KASAN Integration David Gow
2020-04-24 6:13 ` [PATCH v7 3/5] KASAN: Port KASAN Tests to KUnit David Gow
2020-04-24 6:13 ` [PATCH v7 4/5] KASAN: Testing Documentation David Gow
2020-04-24 13:23 ` Andrey Konovalov
2020-04-24 6:13 ` David Gow [this message]
2020-05-03 10:09 ` [PATCH v7 0/5] KUnit-KASAN Integration Alan Maguire
2020-05-22 22:30 ` shuah
2020-05-27 2:50 ` David Gow
2020-05-28 19:52 ` Brendan Higgins
2020-05-28 20:16 ` Shuah Khan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200424061342.212535-6-davidgow@google.com \
--to=davidgow@google.com \
--cc=andreyknvl@google.com \
--cc=aryabinin@virtuozzo.com \
--cc=brendanhiggins@google.com \
--cc=dvyukov@google.com \
--cc=juri.lelli@redhat.com \
--cc=kasan-dev@googlegroups.com \
--cc=kunit-dev@googlegroups.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=trishalfonso@google.com \
--cc=vincent.guittot@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).