| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20240719024010.3296488-1-maobibo@loongson.cn>
Date: Fri, 19 Jul 2024 10:40:10 +0800
From: Bibo Mao <maobibo@...ngson.cn>
To: Will Deacon <will@...nel.org>,
Peter Zijlstra <peterz@...radead.org>
Cc: Boqun Feng <boqun.feng@...il.com>,
Ingo Molnar <mingo@...nel.org>,
"Paul E . McKenney" <paulmck@...nel.org>,
Carlos Llamas <cmllamas@...gle.com>,
Uros Bizjak <ubizjak@...il.com>,
linux-kernel@...r.kernel.org
Subject: [PATCH] locking/atomic: scripts: Fix type error in macro try_cmpxchg
When porting pv spinlock function on LoongArch system, there is
compiling error such as:
from linux/include/linux/smp.h:13,
from linux/kernel/locking/qspinlock.c:16:
linux/kernel/locking/qspinlock_paravirt.h: In function 'pv_kick_node':
linux/include/linux/atomic/atomic-arch-fallback.h:242:34: error: initialization of 'u8 *' {aka 'unsigned char *'} from incompatible pointer type 'enum vcpu_state *' [-Wincompatible-pointer-types]
242 | typeof(*(_ptr)) *___op = (_oldp), ___o = *___op, ___r; \
| ^
linux/atomic/atomic-instrumented.h:4908:9: note: in expansion of macro 'raw_try_cmpxchg_relaxed'
4908 | raw_try_cmpxchg_relaxed(__ai_ptr, __ai_oldp, __VA_ARGS__); \
| ^~~~~~~~~~~~~~~~~~~~~~~
linux/kernel/locking/qspinlock_paravirt.h:377:14: note: in expansion of macro 'try_cmpxchg_relaxed'
377 | if (!try_cmpxchg_relaxed(&pn->state, &old, vcpu_hashed))
| ^~~~~~~~~~~~~~~~~~~
In file included from linux/kernel/locking/qspinlock.c:583:
linux/kernel/locking/qspinlock_paravirt.h: At top level:
linux/kernel/locking/qspinlock_paravirt.h:499:1: warning: no previous prototype for '__pv_queued_spin_unlock_slowpath' [-Wmissing-prototypes]
499 | __pv_queued_spin_unlock_slowpath(struct qspinlock *lock, u8 locked)
Macro try_cmpxchg_relaxed() is used by paravirt qspinlock, on LoongArch
it is defined as raw_try_cmpxchg_relaxed(). And there is different type
conversion in marco raw_try_cmpxchg_relaxed(). Here type declaration is
added beore type conversion.
Signed-off-by: Bibo Mao <maobibo@...ngson.cn>
---
include/linux/atomic/atomic-arch-fallback.h | 50 ++++++++++++++-------
scripts/atomic/gen-atomic-fallback.sh | 3 +-
2 files changed, 35 insertions(+), 18 deletions(-)
diff --git a/include/linux/atomic/atomic-arch-fallback.h b/include/linux/atomic/atomic-arch-fallback.h
index 2f9d36b72bd8..8273c53321c3 100644
--- a/include/linux/atomic/atomic-arch-fallback.h
+++ b/include/linux/atomic/atomic-arch-fallback.h
@@ -188,7 +188,8 @@ extern void raw_cmpxchg128_relaxed_not_implemented(void);
#else
#define raw_try_cmpxchg(_ptr, _oldp, _new) \
({ \
- typeof(*(_ptr)) *___op = (_oldp), ___o = *___op, ___r; \
+ typeof((_ptr)) ___op = (typeof((_ptr)))(_oldp); \
+ typeof(*(_ptr)) ___o = *___op, ___r; \
___r = raw_cmpxchg((_ptr), ___o, (_new)); \
if (unlikely(___r != ___o)) \
*___op = ___r; \
@@ -206,7 +207,8 @@ extern void raw_cmpxchg128_relaxed_not_implemented(void);
#else
#define raw_try_cmpxchg_acquire(_ptr, _oldp, _new) \
({ \
- typeof(*(_ptr)) *___op = (_oldp), ___o = *___op, ___r; \
+ typeof((_ptr)) ___op = (typeof((_ptr)))(_oldp); \
+ typeof(*(_ptr)) ___o = *___op, ___r; \
___r = raw_cmpxchg_acquire((_ptr), ___o, (_new)); \
if (unlikely(___r != ___o)) \
*___op = ___r; \
@@ -224,7 +226,8 @@ extern void raw_cmpxchg128_relaxed_not_implemented(void);
#else
#define raw_try_cmpxchg_release(_ptr, _oldp, _new) \
({ \
- typeof(*(_ptr)) *___op = (_oldp), ___o = *___op, ___r; \
+ typeof((_ptr)) ___op = (typeof((_ptr)))(_oldp); \
+ typeof(*(_ptr)) ___o = *___op, ___r; \
___r = raw_cmpxchg_release((_ptr), ___o, (_new)); \
if (unlikely(___r != ___o)) \
*___op = ___r; \
@@ -239,7 +242,8 @@ extern void raw_cmpxchg128_relaxed_not_implemented(void);
#else
#define raw_try_cmpxchg_relaxed(_ptr, _oldp, _new) \
({ \
- typeof(*(_ptr)) *___op = (_oldp), ___o = *___op, ___r; \
+ typeof((_ptr)) ___op = (typeof((_ptr)))(_oldp); \
+ typeof(*(_ptr)) ___o = *___op, ___r; \
___r = raw_cmpxchg_relaxed((_ptr), ___o, (_new)); \
if (unlikely(___r != ___o)) \
*___op = ___r; \
@@ -255,7 +259,8 @@ extern void raw_cmpxchg128_relaxed_not_implemented(void);
#else
#define raw_try_cmpxchg64(_ptr, _oldp, _new) \
({ \
- typeof(*(_ptr)) *___op = (_oldp), ___o = *___op, ___r; \
+ typeof((_ptr)) ___op = (typeof((_ptr)))(_oldp); \
+ typeof(*(_ptr)) ___o = *___op, ___r; \
___r = raw_cmpxchg64((_ptr), ___o, (_new)); \
if (unlikely(___r != ___o)) \
*___op = ___r; \
@@ -273,7 +278,8 @@ extern void raw_cmpxchg128_relaxed_not_implemented(void);
#else
#define raw_try_cmpxchg64_acquire(_ptr, _oldp, _new) \
({ \
- typeof(*(_ptr)) *___op = (_oldp), ___o = *___op, ___r; \
+ typeof((_ptr)) ___op = (typeof((_ptr)))(_oldp); \
+ typeof(*(_ptr)) ___o = *___op, ___r; \
___r = raw_cmpxchg64_acquire((_ptr), ___o, (_new)); \
if (unlikely(___r != ___o)) \
*___op = ___r; \
@@ -291,7 +297,8 @@ extern void raw_cmpxchg128_relaxed_not_implemented(void);
#else
#define raw_try_cmpxchg64_release(_ptr, _oldp, _new) \
({ \
- typeof(*(_ptr)) *___op = (_oldp), ___o = *___op, ___r; \
+ typeof((_ptr)) ___op = (typeof((_ptr)))(_oldp); \
+ typeof(*(_ptr)) ___o = *___op, ___r; \
___r = raw_cmpxchg64_release((_ptr), ___o, (_new)); \
if (unlikely(___r != ___o)) \
*___op = ___r; \
@@ -306,7 +313,8 @@ extern void raw_cmpxchg128_relaxed_not_implemented(void);
#else
#define raw_try_cmpxchg64_relaxed(_ptr, _oldp, _new) \
({ \
- typeof(*(_ptr)) *___op = (_oldp), ___o = *___op, ___r; \
+ typeof((_ptr)) ___op = (typeof((_ptr)))(_oldp); \
+ typeof(*(_ptr)) ___o = *___op, ___r; \
___r = raw_cmpxchg64_relaxed((_ptr), ___o, (_new)); \
if (unlikely(___r != ___o)) \
*___op = ___r; \
@@ -322,7 +330,8 @@ extern void raw_cmpxchg128_relaxed_not_implemented(void);
#else
#define raw_try_cmpxchg128(_ptr, _oldp, _new) \
({ \
- typeof(*(_ptr)) *___op = (_oldp), ___o = *___op, ___r; \
+ typeof((_ptr)) ___op = (typeof((_ptr)))(_oldp); \
+ typeof(*(_ptr)) ___o = *___op, ___r; \
___r = raw_cmpxchg128((_ptr), ___o, (_new)); \
if (unlikely(___r != ___o)) \
*___op = ___r; \
@@ -340,7 +349,8 @@ extern void raw_cmpxchg128_relaxed_not_implemented(void);
#else
#define raw_try_cmpxchg128_acquire(_ptr, _oldp, _new) \
({ \
- typeof(*(_ptr)) *___op = (_oldp), ___o = *___op, ___r; \
+ typeof((_ptr)) ___op = (typeof((_ptr)))(_oldp); \
+ typeof(*(_ptr)) ___o = *___op, ___r; \
___r = raw_cmpxchg128_acquire((_ptr), ___o, (_new)); \
if (unlikely(___r != ___o)) \
*___op = ___r; \
@@ -358,7 +368,8 @@ extern void raw_cmpxchg128_relaxed_not_implemented(void);
#else
#define raw_try_cmpxchg128_release(_ptr, _oldp, _new) \
({ \
- typeof(*(_ptr)) *___op = (_oldp), ___o = *___op, ___r; \
+ typeof((_ptr)) ___op = (typeof((_ptr)))(_oldp); \
+ typeof(*(_ptr)) ___o = *___op, ___r; \
___r = raw_cmpxchg128_release((_ptr), ___o, (_new)); \
if (unlikely(___r != ___o)) \
*___op = ___r; \
@@ -373,7 +384,8 @@ extern void raw_cmpxchg128_relaxed_not_implemented(void);
#else
#define raw_try_cmpxchg128_relaxed(_ptr, _oldp, _new) \
({ \
- typeof(*(_ptr)) *___op = (_oldp), ___o = *___op, ___r; \
+ typeof((_ptr)) ___op = (typeof((_ptr)))(_oldp); \
+ typeof(*(_ptr)) ___o = *___op, ___r; \
___r = raw_cmpxchg128_relaxed((_ptr), ___o, (_new)); \
if (unlikely(___r != ___o)) \
*___op = ___r; \
@@ -388,7 +400,8 @@ extern void raw_cmpxchg128_relaxed_not_implemented(void);
#else
#define raw_try_cmpxchg_local(_ptr, _oldp, _new) \
({ \
- typeof(*(_ptr)) *___op = (_oldp), ___o = *___op, ___r; \
+ typeof((_ptr)) ___op = (typeof((_ptr)))(_oldp); \
+ typeof(*(_ptr)) ___o = *___op, ___r; \
___r = raw_cmpxchg_local((_ptr), ___o, (_new)); \
if (unlikely(___r != ___o)) \
*___op = ___r; \
@@ -403,7 +416,8 @@ extern void raw_cmpxchg128_relaxed_not_implemented(void);
#else
#define raw_try_cmpxchg64_local(_ptr, _oldp, _new) \
({ \
- typeof(*(_ptr)) *___op = (_oldp), ___o = *___op, ___r; \
+ typeof((_ptr)) ___op = (typeof((_ptr)))(_oldp); \
+ typeof(*(_ptr)) ___o = *___op, ___r; \
___r = raw_cmpxchg64_local((_ptr), ___o, (_new)); \
if (unlikely(___r != ___o)) \
*___op = ___r; \
@@ -418,7 +432,8 @@ extern void raw_cmpxchg128_relaxed_not_implemented(void);
#else
#define raw_try_cmpxchg128_local(_ptr, _oldp, _new) \
({ \
- typeof(*(_ptr)) *___op = (_oldp), ___o = *___op, ___r; \
+ typeof((_ptr)) ___op = (typeof((_ptr)))(_oldp); \
+ typeof(*(_ptr)) ___o = *___op, ___r; \
___r = raw_cmpxchg128_local((_ptr), ___o, (_new)); \
if (unlikely(___r != ___o)) \
*___op = ___r; \
@@ -433,7 +448,8 @@ extern void raw_cmpxchg128_relaxed_not_implemented(void);
#else
#define raw_sync_try_cmpxchg(_ptr, _oldp, _new) \
({ \
- typeof(*(_ptr)) *___op = (_oldp), ___o = *___op, ___r; \
+ typeof((_ptr)) ___op = (typeof((_ptr)))(_oldp); \
+ typeof(*(_ptr)) ___o = *___op, ___r; \
___r = raw_sync_cmpxchg((_ptr), ___o, (_new)); \
if (unlikely(___r != ___o)) \
*___op = ___r; \
@@ -4690,4 +4706,4 @@ raw_atomic64_dec_if_positive(atomic64_t *v)
}
#endif /* _LINUX_ATOMIC_FALLBACK_H */
-// b565db590afeeff0d7c9485ccbca5bb6e155749f
+// 7b23ddca3c50c5869e68ded50748ffe111123156
diff --git a/scripts/atomic/gen-atomic-fallback.sh b/scripts/atomic/gen-atomic-fallback.sh
index f80d69cfeb1f..f3a9b084a176 100755
--- a/scripts/atomic/gen-atomic-fallback.sh
+++ b/scripts/atomic/gen-atomic-fallback.sh
@@ -230,7 +230,8 @@ gen_try_cmpxchg_fallback()
cat <<EOF
#define raw_${prefix}try_${cmpxchg}${suffix}(_ptr, _oldp, _new) \\
({ \\
- typeof(*(_ptr)) *___op = (_oldp), ___o = *___op, ___r; \\
+ typeof((_ptr)) ___op = (typeof((_ptr)))(_oldp); \\
+ typeof(*(_ptr)) ___o = *___op, ___r; \\
___r = raw_${prefix}${cmpxchg}${suffix}((_ptr), ___o, (_new)); \\
if (unlikely(___r != ___o)) \\
*___op = ___r; \\
base-commit: 720261cfc7329406a50c2a8536e0039b9dd9a4e5
--
2.39.3
Powered by blists - more mailing lists