percpu-use-typeof_unqual-in-variable-declarations.patch removed from -mm tree
The quilt patch titled
Subject: percpu: use TYPEOF_UNQUAL() in variable declarations
has been removed from the -mm tree. Its filename was
percpu-use-typeof_unqual-in-variable-declarations.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Uros Bizjak <[email protected]>
Subject: percpu: use TYPEOF_UNQUAL() in variable declarations
Date: Mon, 27 Jan 2025 17:05:07 +0100
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.
---
arch/x86/include/asm/percpu.h | 10 +++++----- fs/bcachefs/util.h | 2 +- include/asm-generic/percpu.h | 26 +++++++++++++------------- include/linux/part_stat.h | 2 +- include/linux/percpu-defs.h | 4 ++-- include/net/snmp.h | 5 ++--- kernel/locking/percpu-rwsem.c | 2 +- net/mpls/internal.h | 4 ++-- 8 files changed, 27 insertions(+), 28 deletions(-)
arch/x86/include/asm/percpu.h renamed from arch/x86/include/asm/percpu.h~percpu-use-typeof_unqual-in-variable-declarations +5 -5
@@ -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 renamed from fs/bcachefs/util.h~percpu-use-typeof_unqual-in-variable-declarations +1 -1
@@ -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 renamed from include/asm-generic/percpu.h~percpu-use-typeof_unqual-in-variable-declarations +13 -13
@@ -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 renamed from include/linux/part_stat.h~percpu-use-typeof_unqual-in-variable-declarations +1 -1
@@ -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 renamed from include/linux/percpu-defs.h~percpu-use-typeof_unqual-in-variable-declarations +2 -2
@@ -317,7 +317,7 @@ static __always_inline void __this_cpu_p#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_p#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; \
include/net/snmp.h renamed from include/net/snmp.h~percpu-use-typeof_unqual-in-variable-declarations +2 -3
@@ -159,7 +159,7 @@ struct linux_tls_mib {#define __SNMP_ADD_STATS64 (mib, field, addend) \ do { \ - __typeof__(*mib) *ptr = raw_cpu_ptr(mib); \ + TYPEOF_UNQUAL(*mib) *ptr = raw_cpu_ptr(mib); \ u64_stats_update_begin(&ptr->syncp); \ ptr->mibs[field] += addend; \ u64_stats_update_end(&ptr->syncp); \
@@ -176,8 +176,7 @@ struct linux_tls_mib {#define SNMP_INC_STATS64 (mib, field) SNMP_ADD_STATS64(mib, field, 1)#define __SNMP_UPD_PO_STATS64 (mib, basefield, addend) \ do { \ - __typeof__(*mib) *ptr; \ - ptr = raw_cpu_ptr((mib)); \ + TYPEOF_UNQUAL(*mib) *ptr = raw_cpu_ptr(mib); \ u64_stats_update_begin(&ptr->syncp); \ ptr->mibs[basefield##PKTS]++; \ ptr->mibs[basefield##OCTETS] += addend; \
kernel/locking/percpu-rwsem.c renamed from kernel/locking/percpu-rwsem.c~percpu-use-typeof_unqual-in-variable-declarations +1 -1
@@ -184,7 +184,7 @@ EXPORT_SYMBOL_GPL(__percpu_down_read);#define per_cpu_sum (var) \ ({ \ - typeof(var) __sum = 0; \ + TYPEOF_UNQUAL(var) __sum = 0; \ int cpu; \ compiletime_assert_atomic_type(__sum); \ for_each_possible_cpu(cpu) \
net/mpls/internal.h renamed from net/mpls/internal.h~percpu-use-typeof_unqual-in-variable-declarations +2 -2
@@ -33,7 +33,7 @@ struct mpls_dev {#define MPLS_INC_STATS_LEN (mdev, len, pkts_field, bytes_field) \ do { \ - __typeof__(*(mdev)->stats) *ptr = \ + TYPEOF_UNQUAL(*(mdev)->stats) *ptr = \ raw_cpu_ptr((mdev)->stats); \ local_bh_disable(); \ u64_stats_update_begin(&ptr->syncp); \
@@ -45,7 +45,7 @@ struct mpls_dev {#define MPLS_INC_STATS (mdev, field) \ do { \ - __typeof__(*(mdev)->stats) *ptr = \ + TYPEOF_UNQUAL(*(mdev)->stats) *ptr = \ raw_cpu_ptr((mdev)->stats); \ local_bh_disable(); \ u64_stats_update_begin(&ptr->syncp); \
_
Patches currently in -mm which might be from [email protected] are