Skip to contentSkip to conversation

kcsan: Prefer '__no_kcsan inline' in test

PATCH In review Marco Elver 3 participants 4 messages Jun 2, 2020 – Jun 3, 2020 KCSAN

lore
Share & tools
lore

Marco Elver

author maintainer
#0 lore raw

PATCH 1/1 kcsan: Prefer '__no_kcsan inline' in test

Instead of __no_kcsan_or_inline, prefer '__no_kcsan inline' in test -- this is in case we decide to remove __no_kcsan_or_inline.

---

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/[email protected]

Thanks,
-- Marco

---
 kernel/kcsan/kcsan-test.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/kcsan/kcsan-test.c +2 -2
index a8c11506dd2a..3af420ad6ee7 100644
@@ -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)) {
Signature · 1 line
2.27.0.rc2.251.g90737beb825-goog
#1 lore raw
Quoted 16 lines · Marco Elver

Instead of __no_kcsan_or_inline, prefer '__no_kcsan inline' in test -- this is in case we decide to remove __no_kcsan_or_inline.

---

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.

Quoted 2 lines

This came up in
https://lkml.kernel.org/r/[email protected]

Thanks Marco!

I just sent the rest of that patch here:

https://lkml.kernel.org/r/[email protected]

#2 lore raw
In reply to Marco Elver
Quoted 16 lines · Marco Elver

Instead of __no_kcsan_or_inline, prefer '__no_kcsan inline' in test -- this is in case we decide to remove __no_kcsan_or_inline.

---

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.

Quoted 2 lines

This came up in
https://lkml.kernel.org/r/[email protected]

Applied and pushed, thank you!

Please note that unless you would like this pushed into the current merge window, it will not be visible in -next until v5.8-rc1 comes out. Which sounds like you are aware of already, just want to be sure. ;-)

Thanx, Paul

Quoted 32 lines

Thanks,
-- Marco

---
 kernel/kcsan/kcsan-test.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/kcsan/kcsan-test.c +2 -2
index a8c11506dd2a..3af420ad6ee7 100644
@@ -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)) {
Signature · 1 line
2.27.0.rc2.251.g90737beb825-goog
author maintainer
#3 lore raw
Quoted 18 lines · Paul E. McKenney
Quoted 16 lines · Marco Elver

Instead of __no_kcsan_or_inline, prefer '__no_kcsan inline' in test -- this is in case we decide to remove __no_kcsan_or_inline.

---

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.

Quoted 8 lines
Quoted 2 lines

This came up in
https://lkml.kernel.org/r/[email protected]

Applied and pushed, thank you!

Please note that unless you would like this pushed into the current merge window, it will not be visible in -next until v5.8-rc1 comes out. Which sounds like you are aware of already, just want to be sure. ;-)

Thank you! Yes, that's fine. The test and this patch I'd expect will go into 5.9 earliest.

Thanks,
-- Marco