From: Marco Elver <elver@google.com>
To: elver@google.com
Cc: paulmck@kernel.org, andreyknvl@google.com, glider@google.com,
dvyukov@google.com, kasan-dev@googlegroups.com,
linux-kernel@vger.kernel.org
Subject: [PATCH] kcsan: Fix misreporting if concurrent races on same address
Date: Mon, 10 Feb 2020 15:56:39 +0100 [thread overview]
Message-ID: <20200210145639.169712-1-elver@google.com> (raw)
If there are more than 3 threads racing on the same address, it can
happen that 'other_info' is populated not by the thread that consumed
the calling thread's watchpoint but by one of the others.
To avoid deadlock, we have to consume 'other_info' regardless. In case
we observe that we only have information about readers, we discard the
'other_info' and skip the report.
Signed-off-by: Marco Elver <elver@google.com>
---
kernel/kcsan/report.c | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/kernel/kcsan/report.c b/kernel/kcsan/report.c
index 3bc590e6be7e3..e046dd26a2459 100644
--- a/kernel/kcsan/report.c
+++ b/kernel/kcsan/report.c
@@ -422,6 +422,26 @@ static bool prepare_report(unsigned long *flags, const volatile void *ptr,
return false;
}
+ access_type |= other_info.access_type;
+ if ((access_type & KCSAN_ACCESS_WRITE) == 0) {
+ /*
+ * This is not the other_info from the thread that
+ * consumed our watchpoint.
+ *
+ * There are concurrent races between more than 3
+ * threads on the same address. The thread that set up
+ * the watchpoint here was a read, as well as the one
+ * that is currently in other_info.
+ *
+ * It's fine if we simply omit this report, since the
+ * chances of one of the other reports including the
+ * same info is high, as well as the chances that we
+ * simply re-report the race again.
+ */
+ release_report(flags, KCSAN_REPORT_RACE_SIGNAL);
+ return false;
+ }
+
/*
* Matching & usable access in other_info: keep other_info_lock
* locked, as this thread consumes it to print the full report;
--
2.25.0.341.g760bfbb309-goog
next reply other threads:[~2020-02-10 14:56 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-10 14:56 Marco Elver [this message]
2020-02-10 15:21 ` [PATCH] kcsan: Fix misreporting if concurrent races on same address Paul E. McKenney
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=20200210145639.169712-1-elver@google.com \
--to=elver@google.com \
--cc=andreyknvl@google.com \
--cc=dvyukov@google.com \
--cc=glider@google.com \
--cc=kasan-dev@googlegroups.com \
--cc=linux-kernel@vger.kernel.org \
--cc=paulmck@kernel.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).