Commit 8a3c3923 authored by Uros Bizjak's avatar Uros Bizjak Committed by Andrew Morton
Browse files

percpu: use TYPEOF_UNQUAL() in variable declarations 

Use TYPEOF_UNQUAL() to declare variables as a corresponding type without
named address space qualifier to avoid "`__seg_gs' specified for auto
variable `var'" errors.

Link: https://lkml.kernel.org/r/20250127160709.80604-4-ubizjak@gmail.com


Signed-off-by: default avatarUros Bizjak <ubizjak@gmail.com>
Acked-by: default avatarNadav Amit <nadav.amit@gmail.com>
Acked-by: default avatarChristoph Lameter <cl@linux.com>
Cc: Dennis Zhou <dennis@kernel.org>
Cc: Tejun Heo <tj@kernel.org>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Kent Overstreet <kent.overstreet@linux.dev>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Eric Dumazet <edumazet@google.com>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Paolo Abeni <pabeni@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Will Deacon <will@kernel.org>
Cc: Waiman Long <longman@redhat.com>
Cc: Boqun Feng <boqun.feng@gmail.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent ac053946

arch/x86/include/asm/percpu.h

+5 −5
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ do { \ 
	__pcpu_type_##size pto_val__ = __pcpu_cast_##size(_val);	\

									\

	if (0) {		                                        \

		typeof(_var) pto_tmp__;					\

		TYPEOF_UNQUAL(_var) pto_tmp__;				\

		pto_tmp__ = (_val);					\

		(void)pto_tmp__;					\

	}								\
@@ -219,7 +219,7 @@ do { \ 
	__pcpu_type_##size pto_val__ = __pcpu_cast_##size(_val);	\

									\

	if (0) {		                                        \

		typeof(_var) pto_tmp__;					\

		TYPEOF_UNQUAL(_var) pto_tmp__;				\

		pto_tmp__ = (_val);					\

		(void)pto_tmp__;					\

	}								\
@@ -240,7 +240,7 @@ do { \ 
			 (val) == (typeof(val))-1)) ? (int)(val) : 0;	\

									\

	if (0) {							\

		typeof(var) pao_tmp__;					\

		TYPEOF_UNQUAL(var) pao_tmp__;				\

		pao_tmp__ = (val);					\

		(void)pao_tmp__;					\

	}								\
@@ -273,7 +273,7 @@ do { \ 
 */

#define raw_percpu_xchg_op(_var, _nval)					\

({									\

	typeof(_var) pxo_old__ = raw_cpu_read(_var);			\

	TYPEOF_UNQUAL(_var) pxo_old__ = raw_cpu_read(_var);		\

									\

	raw_cpu_write(_var, _nval);					\

									\
@@ -287,7 +287,7 @@ do { \ 
 */

#define this_percpu_xchg_op(_var, _nval)				\

({									\

	typeof(_var) pxo_old__ = this_cpu_read(_var);			\

	TYPEOF_UNQUAL(_var) pxo_old__ = this_cpu_read(_var);		\

									\

	do { } while (!this_cpu_try_cmpxchg(_var, &pxo_old__, _nval));	\

									\

fs/bcachefs/util.h

+1 −1
Original line number Diff line number Diff line
@@ -609,7 +609,7 @@ do { \ 


#define per_cpu_sum(_p)							\

({									\

	typeof(*_p) _ret = 0;						\

	TYPEOF_UNQUAL(*_p) _ret = 0;					\

									\

	int cpu;							\

	for_each_possible_cpu(cpu)					\

include/asm-generic/percpu.h

+13 −13
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ do { \ 


#define raw_cpu_generic_add_return(pcp, val)				\

({									\

	typeof(pcp) *__p = raw_cpu_ptr(&(pcp));				\

	TYPEOF_UNQUAL(pcp) *__p = raw_cpu_ptr(&(pcp));			\

									\

	*__p += val;							\

	*__p;								\
@@ -82,8 +82,8 @@ do { \ 


#define raw_cpu_generic_xchg(pcp, nval)					\

({									\

	typeof(pcp) *__p = raw_cpu_ptr(&(pcp));				\

	typeof(pcp) __ret;						\

	TYPEOF_UNQUAL(pcp) *__p = raw_cpu_ptr(&(pcp));			\

	TYPEOF_UNQUAL(pcp) __ret;					\

	__ret = *__p;							\

	*__p = nval;							\

	__ret;								\
@@ -91,7 +91,7 @@ do { \ 


#define __cpu_fallback_try_cmpxchg(pcp, ovalp, nval, _cmpxchg)		\

({									\

	typeof(pcp) __val, __old = *(ovalp);				\

	TYPEOF_UNQUAL(pcp) __val, __old = *(ovalp);			\

	__val = _cmpxchg(pcp, __old, nval);				\

	if (__val != __old)						\

		*(ovalp) = __val;					\
@@ -100,8 +100,8 @@ do { \ 


#define raw_cpu_generic_try_cmpxchg(pcp, ovalp, nval)			\

({									\

	typeof(pcp) *__p = raw_cpu_ptr(&(pcp));				\

	typeof(pcp) __val = *__p, ___old = *(ovalp);			\

	TYPEOF_UNQUAL(pcp) *__p = raw_cpu_ptr(&(pcp));			\

	TYPEOF_UNQUAL(pcp) __val = *__p, ___old = *(ovalp);		\

	bool __ret;							\

	if (__val == ___old) {						\

		*__p = nval;						\
@@ -115,14 +115,14 @@ do { \ 


#define raw_cpu_generic_cmpxchg(pcp, oval, nval)			\

({									\

	typeof(pcp) __old = (oval);					\

	TYPEOF_UNQUAL(pcp) __old = (oval);				\

	raw_cpu_generic_try_cmpxchg(pcp, &__old, nval);			\

	__old;								\

})



#define __this_cpu_generic_read_nopreempt(pcp)				\

({									\

	typeof(pcp) ___ret;						\

	TYPEOF_UNQUAL(pcp) ___ret;					\

	preempt_disable_notrace();					\

	___ret = READ_ONCE(*raw_cpu_ptr(&(pcp)));			\

	preempt_enable_notrace();					\
@@ -131,7 +131,7 @@ do { \ 


#define __this_cpu_generic_read_noirq(pcp)				\

({									\

	typeof(pcp) ___ret;						\

	TYPEOF_UNQUAL(pcp) ___ret;					\

	unsigned long ___flags;						\

	raw_local_irq_save(___flags);					\

	___ret = raw_cpu_generic_read(pcp);				\
@@ -141,7 +141,7 @@ do { \ 


#define this_cpu_generic_read(pcp)					\

({									\

	typeof(pcp) __ret;						\

	TYPEOF_UNQUAL(pcp) __ret;					\

	if (__native_word(pcp))						\

		__ret = __this_cpu_generic_read_nopreempt(pcp);		\

	else								\
@@ -160,7 +160,7 @@ do { \ 


#define this_cpu_generic_add_return(pcp, val)				\

({									\

	typeof(pcp) __ret;						\

	TYPEOF_UNQUAL(pcp) __ret;					\

	unsigned long __flags;						\

	raw_local_irq_save(__flags);					\

	__ret = raw_cpu_generic_add_return(pcp, val);			\
@@ -170,7 +170,7 @@ do { \ 


#define this_cpu_generic_xchg(pcp, nval)				\

({									\

	typeof(pcp) __ret;						\

	TYPEOF_UNQUAL(pcp) __ret;					\

	unsigned long __flags;						\

	raw_local_irq_save(__flags);					\

	__ret = raw_cpu_generic_xchg(pcp, nval);			\
@@ -190,7 +190,7 @@ do { \ 


#define this_cpu_generic_cmpxchg(pcp, oval, nval)			\

({									\

	typeof(pcp) __ret;						\

	TYPEOF_UNQUAL(pcp) __ret;					\

	unsigned long __flags;						\

	raw_local_irq_save(__flags);					\

	__ret = raw_cpu_generic_cmpxchg(pcp, oval, nval);		\

include/linux/part_stat.h

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ struct disk_stats { 


#define part_stat_read(part, field)					\

({									\

	typeof((part)->bd_stats->field) res = 0;			\

	TYPEOF_UNQUAL((part)->bd_stats->field) res = 0;			\

	unsigned int _cpu;						\

	for_each_possible_cpu(_cpu)					\

		res += per_cpu_ptr((part)->bd_stats, _cpu)->field; \

include/linux/percpu-defs.h

+2 −2
Original line number Diff line number Diff line
@@ -317,7 +317,7 @@ static __always_inline void __this_cpu_preempt_check(const char *op) { } 


#define __pcpu_size_call_return(stem, variable)				\

({									\

	typeof(variable) pscr_ret__;					\

	TYPEOF_UNQUAL(variable) pscr_ret__;				\

	__verify_pcpu_ptr(&(variable));					\

	switch(sizeof(variable)) {					\

	case 1: pscr_ret__ = stem##1(variable); break;			\
@@ -332,7 +332,7 @@ static __always_inline void __this_cpu_preempt_check(const char *op) { } 


#define __pcpu_size_call_return2(stem, variable, ...)			\

({									\

	typeof(variable) pscr2_ret__;					\

	TYPEOF_UNQUAL(variable) pscr2_ret__;				\

	__verify_pcpu_ptr(&(variable));					\

	switch(sizeof(variable)) {					\

	case 1: pscr2_ret__ = stem##1(variable, __VA_ARGS__); break;	\