From: Marco Elver <elver@google.com>
To: elver@google.com
Cc: paulmck@kernel.org, kasan-dev@googlegroups.com,
linux-kernel@vger.kernel.org,
Peter Zijlstra <peterz@infradead.org>
Subject: [PATCH] kcsan: Prefer '__no_kcsan inline' in test
Date: Tue, 2 Jun 2020 16:36:33 +0200 [thread overview]
Message-ID: <20200602143633.104439-1-elver@google.com> (raw)
Instead of __no_kcsan_or_inline, prefer '__no_kcsan inline' in test --
this is in case we decide to remove __no_kcsan_or_inline.
Suggested-by: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Marco Elver <elver@google.com>
---
Hi Paul,
This is to prepare eventual removal of __no_kcsan_or_inline, and avoid a
series that doesn't apply to anything other than -next (because some
bits are in -tip and the test only in -rcu; although this problem might
be solved in 2 weeks). This patch is to make sure in case the
__kcsan_or_inline series is based on -tip, integration in -next doesn't
cause problems.
This came up in
https://lkml.kernel.org/r/20200529185923.GO706495@hirez.programming.kicks-ass.net
Thanks,
-- Marco
---
kernel/kcsan/kcsan-test.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/kernel/kcsan/kcsan-test.c b/kernel/kcsan/kcsan-test.c
index a8c11506dd2a..3af420ad6ee7 100644
--- a/kernel/kcsan/kcsan-test.c
+++ b/kernel/kcsan/kcsan-test.c
@@ -43,7 +43,7 @@ static struct {
};
/* Setup test checking loop. */
-static __no_kcsan_or_inline void
+static __no_kcsan inline void
begin_test_checks(void (*func1)(void), void (*func2)(void))
{
kcsan_disable_current();
@@ -60,7 +60,7 @@ begin_test_checks(void (*func1)(void), void (*func2)(void))
}
/* End test checking loop. */
-static __no_kcsan_or_inline bool
+static __no_kcsan inline bool
end_test_checks(bool stop)
{
if (!stop && time_before(jiffies, end_time)) {
--
2.27.0.rc2.251.g90737beb825-goog
next reply other threads:[~2020-06-02 14:36 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-02 14:36 Marco Elver [this message]
2020-06-02 17:36 ` [PATCH] kcsan: Prefer '__no_kcsan inline' in test Peter Zijlstra
2020-06-02 20:48 ` Paul E. McKenney
2020-06-03 7:53 ` Marco Elver
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=20200602143633.104439-1-elver@google.com \
--to=elver@google.com \
--cc=kasan-dev@googlegroups.com \
--cc=linux-kernel@vger.kernel.org \
--cc=paulmck@kernel.org \
--cc=peterz@infradead.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).