From: Peter Zijlstra <peterz@infradead.org>
To: tglx@linutronix.de
Cc: x86@kernel.org, elver@google.com, paulmck@kernel.org,
kasan-dev@googlegroups.com, linux-kernel@vger.kernel.org,
peterz@infradead.org
Subject: [PATCH 1/3] x86, kcsan: Remove __no_kcsan_or_inline usage
Date: Tue, 02 Jun 2020 19:31:04 +0200 [thread overview]
Message-ID: <20200602173348.343967487@infradead.org> (raw)
In-Reply-To: 20200602173103.931412766@infradead.org
Now that KCSAN relies on -tsan-distinguish-volatile we no longer need
the annotation for constant_test_bit(). Remove it.
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
---
arch/x86/include/asm/bitops.h | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
--- a/arch/x86/include/asm/bitops.h
+++ b/arch/x86/include/asm/bitops.h
@@ -201,12 +201,8 @@ arch_test_and_change_bit(long nr, volati
return GEN_BINARY_RMWcc(LOCK_PREFIX __ASM_SIZE(btc), *addr, c, "Ir", nr);
}
-static __no_kcsan_or_inline bool constant_test_bit(long nr, const volatile unsigned long *addr)
+static __always_inline bool constant_test_bit(long nr, const volatile unsigned long *addr)
{
- /*
- * Because this is a plain access, we need to disable KCSAN here to
- * avoid double instrumentation via instrumented bitops.
- */
return ((1UL << (nr & (BITS_PER_LONG-1))) &
(addr[nr >> _BITOPS_LONG_SHIFT])) != 0;
}
next prev parent reply other threads:[~2020-06-02 17:34 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-02 17:31 [PATCH 0/3] KCSAN cleanups and noinstr Peter Zijlstra
2020-06-02 17:31 ` Peter Zijlstra [this message]
2020-06-02 17:31 ` [PATCH 2/3] kcsan: Remove __no_kcsan_or_inline Peter Zijlstra
2020-06-02 17:31 ` [PATCH 3/3] x86, kcsan: Add __no_kcsan to noinstr Peter Zijlstra
2020-06-02 18:46 ` [PATCH 0/3] KCSAN cleanups and noinstr 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=20200602173348.343967487@infradead.org \
--to=peterz@infradead.org \
--cc=elver@google.com \
--cc=kasan-dev@googlegroups.com \
--cc=linux-kernel@vger.kernel.org \
--cc=paulmck@kernel.org \
--cc=tglx@linutronix.de \
--cc=x86@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).