* [tip:master 19/19] include/linux/irq-entry-common.h:201:2: error: unexpected token
@ 2025-07-01 21:56 kernel test robot
2025-07-02 12:32 ` Borislav Petkov
0 siblings, 1 reply; 16+ messages in thread
From: kernel test robot @ 2025-07-01 21:56 UTC (permalink / raw)
To: Thomas Gleixner
Cc: llvm, oe-kbuild-all, linux-kernel, x86, Borislav Petkov (AMD)
tree: https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git master
head: 104f02a7798f7e8aba25545f9d485035532260b2
commit: 104f02a7798f7e8aba25545f9d485035532260b2 [19/19] Merge core/entry into tip/master
config: s390-allmodconfig (https://download.01.org/0day-ci/archive/20250702/202507020528.N0LtekXt-lkp@intel.com/config)
compiler: clang version 18.1.8 (https://github.com/llvm/llvm-project 3b5b5c1ec4a3095ab096dd780e84d7ab81f3d7ff)
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250702/202507020528.N0LtekXt-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202507020528.N0LtekXt-lkp@intel.com/
All errors (new ones prefixed by >>):
In file included from arch/s390/kernel/process.c:32:
include/linux/entry-common.h:161:7: error: unexpected token
161 | if (WARN(irqs_disabled(), "syscall %lu left IRQs disabled", nr))
| ^
include/asm-generic/bug.h:141:3: note: expanded from macro 'WARN'
141 | __WARN_printf(TAINT_WARN, format); \
| ^
include/asm-generic/bug.h:113:3: note: expanded from macro '__WARN_printf'
113 | __WARN_FLAGS("", BUGFLAG_NO_CUT_HERE | BUGFLAG_TAINT(taint));\
| ^
arch/s390/include/asm/bug.h:44:2: note: expanded from macro '__WARN_FLAGS'
44 | __BUG_FLAGS(cond_str, BUGFLAG_WARNING|(flags)); \
| ^
note: (skipping 1 expansions in backtrace; use -fmacro-backtrace-limit=0 to see all)
include/linux/stringify.h:10:27: note: expanded from macro '__stringify'
10 | #define __stringify(x...) __stringify_1(x)
| ^
include/linux/stringify.h:9:29: note: expanded from macro '__stringify_1'
9 | #define __stringify_1(x...) #x
| ^
<scratch space>:31:1: note: expanded from here
31 | ".pushsection __bug_table, \"aw\"; .align 4; 10000: .long 10001f - .; .pushsection .rodata.str, \"aMS\", @progbits, 1; 10002: .string \"\" \"include/linux/entry-common.h\"; .popsection; .long 10002b - .; .short 161; .short (1 << 0)|((1 << 3) | ((9) << 8)); .popsection; 10001: mc 0,0"
| ^
<inline asm>:1:134: note: instantiated into assembly here
1 | .pushsection __bug_table, "aw"; .align 4; 10000: .long 10001f - .; .pushsection .rodata.str, "aMS", @progbits, 1; 10002: .string "" "include/linux/entry-common.h"; .popsection; .long 10002b - .; .short 161; .short (1 << 0)|((1 << 3) | ((9) << 8)); .popsection; 10001: mc 0,0
| ^
In file included from arch/s390/kernel/process.c:32:
In file included from include/linux/entry-common.h:5:
>> include/linux/irq-entry-common.h:201:2: error: unexpected token
201 | lockdep_assert_irqs_disabled();
| ^
include/linux/lockdep.h:582:2: note: expanded from macro 'lockdep_assert_irqs_disabled'
582 | WARN_ON_ONCE(__lockdep_enabled && this_cpu_read(hardirqs_enabled)); \
| ^
include/asm-generic/bug.h:119:3: note: expanded from macro 'WARN_ON_ONCE'
119 | __WARN_FLAGS("["#condition"] ", \
| ^
arch/s390/include/asm/bug.h:44:2: note: expanded from macro '__WARN_FLAGS'
44 | __BUG_FLAGS(cond_str, BUGFLAG_WARNING|(flags)); \
| ^
note: (skipping 1 expansions in backtrace; use -fmacro-backtrace-limit=0 to see all)
include/linux/stringify.h:10:27: note: expanded from macro '__stringify'
10 | #define __stringify(x...) __stringify_1(x)
| ^
include/linux/stringify.h:9:29: note: expanded from macro '__stringify_1'
9 | #define __stringify_1(x...) #x
| ^
<scratch space>:153:1: note: expanded from here
153 | ".pushsection __bug_table, \"aw\"; .align 4; 10000: .long 10001f - .; .pushsection .rodata.str, \"aMS\", @progbits, 1; 10002: .string \"[\"\"__lockdep_enabled && this_cpu_read(hardirqs_enabled)\"\"] \" \"include/linux/irq-entry-common.h\"; .popsection; .long 10002b - .; .short 201; .short (1 << 0)|((1 << 1) | ((9) << 8)); .popsection; 10001: mc 0,0"
| ^
<inline asm>:1:134: note: instantiated into assembly here
1 | .pushsection __bug_table, "aw"; .align 4; 10000: .long 10001f - .; .pushsection .rodata.str, "aMS", @progbits, 1; 10002: .string "[""__lockdep_enabled && this_cpu_read(hardirqs_enabled)""] " "include/linux/irq-entry-common.h"; .popsection; .long 10002b - .; .short 201; .short (1 << 0)|((1 << 1) | ((9) << 8)); .popsection; 10001: mc 0,0
| ^
In file included from arch/s390/kernel/process.c:32:
In file included from include/linux/entry-common.h:5:
include/linux/irq-entry-common.h:214:2: error: unexpected token
214 | lockdep_assert_irqs_disabled();
| ^
include/linux/lockdep.h:582:2: note: expanded from macro 'lockdep_assert_irqs_disabled'
582 | WARN_ON_ONCE(__lockdep_enabled && this_cpu_read(hardirqs_enabled)); \
| ^
include/asm-generic/bug.h:119:3: note: expanded from macro 'WARN_ON_ONCE'
119 | __WARN_FLAGS("["#condition"] ", \
| ^
arch/s390/include/asm/bug.h:44:2: note: expanded from macro '__WARN_FLAGS'
44 | __BUG_FLAGS(cond_str, BUGFLAG_WARNING|(flags)); \
| ^
note: (skipping 1 expansions in backtrace; use -fmacro-backtrace-limit=0 to see all)
include/linux/stringify.h:10:27: note: expanded from macro '__stringify'
10 | #define __stringify(x...) __stringify_1(x)
| ^
include/linux/stringify.h:9:29: note: expanded from macro '__stringify_1'
9 | #define __stringify_1(x...) #x
| ^
<scratch space>:2:1: note: expanded from here
2 | ".pushsection __bug_table, \"aw\"; .align 4; 10000: .long 10001f - .; .pushsection .rodata.str, \"aMS\", @progbits, 1; 10002: .string \"[\"\"__lockdep_enabled && this_cpu_read(hardirqs_enabled)\"\"] \" \"include/linux/irq-entry-common.h\"; .popsection; .long 10002b - .; .short 214; .short (1 << 0)|((1 << 1) | ((9) << 8)); .popsection; 10001: mc 0,0"
| ^
<inline asm>:1:134: note: instantiated into assembly here
1 | .pushsection __bug_table, "aw"; .align 4; 10000: .long 10001f - .; .pushsection .rodata.str, "aMS", @progbits, 1; 10002: .string "[""__lockdep_enabled && this_cpu_read(hardirqs_enabled)""] " "include/linux/irq-entry-common.h"; .popsection; .long 10002b - .; .short 214; .short (1 << 0)|((1 << 1) | ((9) << 8)); .popsection; 10001: mc 0,0
| ^
3 errors generated.
--
In file included from arch/s390/kernel/syscall.c:35:
include/linux/entry-common.h:161:7: error: unexpected token
161 | if (WARN(irqs_disabled(), "syscall %lu left IRQs disabled", nr))
| ^
include/asm-generic/bug.h:141:3: note: expanded from macro 'WARN'
141 | __WARN_printf(TAINT_WARN, format); \
| ^
include/asm-generic/bug.h:113:3: note: expanded from macro '__WARN_printf'
113 | __WARN_FLAGS("", BUGFLAG_NO_CUT_HERE | BUGFLAG_TAINT(taint));\
| ^
arch/s390/include/asm/bug.h:44:2: note: expanded from macro '__WARN_FLAGS'
44 | __BUG_FLAGS(cond_str, BUGFLAG_WARNING|(flags)); \
| ^
note: (skipping 1 expansions in backtrace; use -fmacro-backtrace-limit=0 to see all)
include/linux/stringify.h:10:27: note: expanded from macro '__stringify'
10 | #define __stringify(x...) __stringify_1(x)
| ^
include/linux/stringify.h:9:29: note: expanded from macro '__stringify_1'
9 | #define __stringify_1(x...) #x
| ^
<scratch space>:137:1: note: expanded from here
137 | ".pushsection __bug_table, \"aw\"; .align 4; 10000: .long 10001f - .; .pushsection .rodata.str, \"aMS\", @progbits, 1; 10002: .string \"\" \"include/linux/entry-common.h\"; .popsection; .long 10002b - .; .short 161; .short (1 << 0)|((1 << 3) | ((9) << 8)); .popsection; 10001: mc 0,0"
| ^
<inline asm>:1:134: note: instantiated into assembly here
1 | .pushsection __bug_table, "aw"; .align 4; 10000: .long 10001f - .; .pushsection .rodata.str, "aMS", @progbits, 1; 10002: .string "" "include/linux/entry-common.h"; .popsection; .long 10002b - .; .short 161; .short (1 << 0)|((1 << 3) | ((9) << 8)); .popsection; 10001: mc 0,0
| ^
In file included from arch/s390/kernel/syscall.c:35:
In file included from include/linux/entry-common.h:5:
>> include/linux/irq-entry-common.h:201:2: error: unexpected token
201 | lockdep_assert_irqs_disabled();
| ^
include/linux/lockdep.h:582:2: note: expanded from macro 'lockdep_assert_irqs_disabled'
582 | WARN_ON_ONCE(__lockdep_enabled && this_cpu_read(hardirqs_enabled)); \
| ^
include/asm-generic/bug.h:119:3: note: expanded from macro 'WARN_ON_ONCE'
119 | __WARN_FLAGS("["#condition"] ", \
| ^
arch/s390/include/asm/bug.h:44:2: note: expanded from macro '__WARN_FLAGS'
44 | __BUG_FLAGS(cond_str, BUGFLAG_WARNING|(flags)); \
| ^
note: (skipping 1 expansions in backtrace; use -fmacro-backtrace-limit=0 to see all)
include/linux/stringify.h:10:27: note: expanded from macro '__stringify'
10 | #define __stringify(x...) __stringify_1(x)
| ^
include/linux/stringify.h:9:29: note: expanded from macro '__stringify_1'
9 | #define __stringify_1(x...) #x
| ^
<scratch space>:59:1: note: expanded from here
59 | ".pushsection __bug_table, \"aw\"; .align 4; 10000: .long 10001f - .; .pushsection .rodata.str, \"aMS\", @progbits, 1; 10002: .string \"[\"\"__lockdep_enabled && this_cpu_read(hardirqs_enabled)\"\"] \" \"include/linux/irq-entry-common.h\"; .popsection; .long 10002b - .; .short 201; .short (1 << 0)|((1 << 1) | ((9) << 8)); .popsection; 10001: mc 0,0"
| ^
<inline asm>:1:134: note: instantiated into assembly here
1 | .pushsection __bug_table, "aw"; .align 4; 10000: .long 10001f - .; .pushsection .rodata.str, "aMS", @progbits, 1; 10002: .string "[""__lockdep_enabled && this_cpu_read(hardirqs_enabled)""] " "include/linux/irq-entry-common.h"; .popsection; .long 10002b - .; .short 201; .short (1 << 0)|((1 << 1) | ((9) << 8)); .popsection; 10001: mc 0,0
| ^
In file included from arch/s390/kernel/syscall.c:35:
In file included from include/linux/entry-common.h:5:
include/linux/irq-entry-common.h:214:2: error: unexpected token
214 | lockdep_assert_irqs_disabled();
| ^
include/linux/lockdep.h:582:2: note: expanded from macro 'lockdep_assert_irqs_disabled'
582 | WARN_ON_ONCE(__lockdep_enabled && this_cpu_read(hardirqs_enabled)); \
| ^
include/asm-generic/bug.h:119:3: note: expanded from macro 'WARN_ON_ONCE'
119 | __WARN_FLAGS("["#condition"] ", \
| ^
arch/s390/include/asm/bug.h:44:2: note: expanded from macro '__WARN_FLAGS'
44 | __BUG_FLAGS(cond_str, BUGFLAG_WARNING|(flags)); \
| ^
note: (skipping 1 expansions in backtrace; use -fmacro-backtrace-limit=0 to see all)
include/linux/stringify.h:10:27: note: expanded from macro '__stringify'
10 | #define __stringify(x...) __stringify_1(x)
| ^
include/linux/stringify.h:9:29: note: expanded from macro '__stringify_1'
9 | #define __stringify_1(x...) #x
| ^
<scratch space>:104:1: note: expanded from here
104 | ".pushsection __bug_table, \"aw\"; .align 4; 10000: .long 10001f - .; .pushsection .rodata.str, \"aMS\", @progbits, 1; 10002: .string \"[\"\"__lockdep_enabled && this_cpu_read(hardirqs_enabled)\"\"] \" \"include/linux/irq-entry-common.h\"; .popsection; .long 10002b - .; .short 214; .short (1 << 0)|((1 << 1) | ((9) << 8)); .popsection; 10001: mc 0,0"
| ^
<inline asm>:1:134: note: instantiated into assembly here
1 | .pushsection __bug_table, "aw"; .align 4; 10000: .long 10001f - .; .pushsection .rodata.str, "aMS", @progbits, 1; 10002: .string "[""__lockdep_enabled && this_cpu_read(hardirqs_enabled)""] " "include/linux/irq-entry-common.h"; .popsection; .long 10002b - .; .short 214; .short (1 << 0)|((1 << 1) | ((9) << 8)); .popsection; 10001: mc 0,0
| ^
3 errors generated.
vim +201 include/linux/irq-entry-common.h
a70e9f647f501e3 Jinjie Ruan 2025-06-24 180
a70e9f647f501e3 Jinjie Ruan 2025-06-24 181 /**
a70e9f647f501e3 Jinjie Ruan 2025-06-24 182 * exit_to_user_mode_loop - do any pending work before leaving to user space
a70e9f647f501e3 Jinjie Ruan 2025-06-24 183 */
a70e9f647f501e3 Jinjie Ruan 2025-06-24 184 unsigned long exit_to_user_mode_loop(struct pt_regs *regs,
a70e9f647f501e3 Jinjie Ruan 2025-06-24 185 unsigned long ti_work);
a70e9f647f501e3 Jinjie Ruan 2025-06-24 186
a70e9f647f501e3 Jinjie Ruan 2025-06-24 187 /**
a70e9f647f501e3 Jinjie Ruan 2025-06-24 188 * exit_to_user_mode_prepare - call exit_to_user_mode_loop() if required
a70e9f647f501e3 Jinjie Ruan 2025-06-24 189 * @regs: Pointer to pt_regs on entry stack
a70e9f647f501e3 Jinjie Ruan 2025-06-24 190 *
a70e9f647f501e3 Jinjie Ruan 2025-06-24 191 * 1) check that interrupts are disabled
a70e9f647f501e3 Jinjie Ruan 2025-06-24 192 * 2) call tick_nohz_user_enter_prepare()
a70e9f647f501e3 Jinjie Ruan 2025-06-24 193 * 3) call exit_to_user_mode_loop() if any flags from
a70e9f647f501e3 Jinjie Ruan 2025-06-24 194 * EXIT_TO_USER_MODE_WORK are set
a70e9f647f501e3 Jinjie Ruan 2025-06-24 195 * 4) check that interrupts are still disabled
a70e9f647f501e3 Jinjie Ruan 2025-06-24 196 */
a70e9f647f501e3 Jinjie Ruan 2025-06-24 197 static __always_inline void exit_to_user_mode_prepare(struct pt_regs *regs)
a70e9f647f501e3 Jinjie Ruan 2025-06-24 198 {
a70e9f647f501e3 Jinjie Ruan 2025-06-24 199 unsigned long ti_work;
a70e9f647f501e3 Jinjie Ruan 2025-06-24 200
a70e9f647f501e3 Jinjie Ruan 2025-06-24 @201 lockdep_assert_irqs_disabled();
a70e9f647f501e3 Jinjie Ruan 2025-06-24 202
a70e9f647f501e3 Jinjie Ruan 2025-06-24 203 /* Flush pending rcuog wakeup before the last need_resched() check */
a70e9f647f501e3 Jinjie Ruan 2025-06-24 204 tick_nohz_user_enter_prepare();
a70e9f647f501e3 Jinjie Ruan 2025-06-24 205
a70e9f647f501e3 Jinjie Ruan 2025-06-24 206 ti_work = read_thread_flags();
a70e9f647f501e3 Jinjie Ruan 2025-06-24 207 if (unlikely(ti_work & EXIT_TO_USER_MODE_WORK))
a70e9f647f501e3 Jinjie Ruan 2025-06-24 208 ti_work = exit_to_user_mode_loop(regs, ti_work);
a70e9f647f501e3 Jinjie Ruan 2025-06-24 209
a70e9f647f501e3 Jinjie Ruan 2025-06-24 210 arch_exit_to_user_mode_prepare(regs, ti_work);
a70e9f647f501e3 Jinjie Ruan 2025-06-24 211
a70e9f647f501e3 Jinjie Ruan 2025-06-24 212 /* Ensure that kernel state is sane for a return to userspace */
a70e9f647f501e3 Jinjie Ruan 2025-06-24 213 kmap_assert_nomap();
a70e9f647f501e3 Jinjie Ruan 2025-06-24 214 lockdep_assert_irqs_disabled();
a70e9f647f501e3 Jinjie Ruan 2025-06-24 215 lockdep_sys_exit();
a70e9f647f501e3 Jinjie Ruan 2025-06-24 216 }
a70e9f647f501e3 Jinjie Ruan 2025-06-24 217
:::::: The code at line 201 was first introduced by commit
:::::: a70e9f647f501e36a6a092888b1ea7386b7c5664 entry: Split generic entry into generic exception and syscall entry
:::::: TO: Jinjie Ruan <ruanjinjie@huawei.com>
:::::: CC: Thomas Gleixner <tglx@linutronix.de>
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [tip:master 19/19] include/linux/irq-entry-common.h:201:2: error: unexpected token
2025-07-01 21:56 [tip:master 19/19] include/linux/irq-entry-common.h:201:2: error: unexpected token kernel test robot
@ 2025-07-02 12:32 ` Borislav Petkov
2025-07-02 12:58 ` Mark Rutland
0 siblings, 1 reply; 16+ messages in thread
From: Borislav Petkov @ 2025-07-02 12:32 UTC (permalink / raw)
To: kernel test robot; +Cc: Thomas Gleixner, llvm, oe-kbuild-all, linux-kernel, x86
On Wed, Jul 02, 2025 at 05:56:06AM +0800, kernel test robot wrote:
> tree: https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git master
> head: 104f02a7798f7e8aba25545f9d485035532260b2
> commit: 104f02a7798f7e8aba25545f9d485035532260b2 [19/19] Merge core/entry into tip/master
> config: s390-allmodconfig (https://download.01.org/0day-ci/archive/20250702/202507020528.N0LtekXt-lkp@intel.com/config)
> compiler: clang version 18.1.8 (https://github.com/llvm/llvm-project 3b5b5c1ec4a3095ab096dd780e84d7ab81f3d7ff)
> reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250702/202507020528.N0LtekXt-lkp@intel.com/reproduce)
I'm trying to follow your reproducer and installed binutils-s390x-linux-gnu.
However:
make CC=clang HOSTCC=clang W=1 ARCH=s390 arch/s390/
SYNC include/config/auto.conf.cmd
CALL scripts/checksyscalls.sh
VDSO arch/s390/kernel/vdso64/vdso64.so.dbg
ld: unrecognised emulation mode: elf64_s390
Supported emulations: elf_x86_64 elf32_x86_64 elf_i386 elf_iamcu i386pep i386pe
make[2]: *** [arch/s390/kernel/vdso64/Makefile:53: arch/s390/kernel/vdso64/vdso64.so.dbg] Error 1
make[1]: *** [arch/s390/Makefile:150: vdso_prepare] Error 2
make: *** [Makefile:248: __sub-make] Error 2
My linker can't do s390. So I need something else which your system has.
--
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [tip:master 19/19] include/linux/irq-entry-common.h:201:2: error: unexpected token
2025-07-02 12:32 ` Borislav Petkov
@ 2025-07-02 12:58 ` Mark Rutland
2025-07-02 13:09 ` Borislav Petkov
0 siblings, 1 reply; 16+ messages in thread
From: Mark Rutland @ 2025-07-02 12:58 UTC (permalink / raw)
To: Borislav Petkov
Cc: kernel test robot, Thomas Gleixner, llvm, oe-kbuild-all,
linux-kernel, x86, Linus Walleij, Jinjie Ruan
Hi Boris,
[ adding Linux and Jinjie, since this is almost certainly due to the
irqentry split ]
On Wed, Jul 02, 2025 at 02:32:40PM +0200, Borislav Petkov wrote:
> On Wed, Jul 02, 2025 at 05:56:06AM +0800, kernel test robot wrote:
> > tree: https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git master
> > head: 104f02a7798f7e8aba25545f9d485035532260b2
> > commit: 104f02a7798f7e8aba25545f9d485035532260b2 [19/19] Merge core/entry into tip/master
> > config: s390-allmodconfig (https://download.01.org/0day-ci/archive/20250702/202507020528.N0LtekXt-lkp@intel.com/config)
> > compiler: clang version 18.1.8 (https://github.com/llvm/llvm-project 3b5b5c1ec4a3095ab096dd780e84d7ab81f3d7ff)
> > reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250702/202507020528.N0LtekXt-lkp@intel.com/reproduce)
>
> I'm trying to follow your reproducer and installed binutils-s390x-linux-gnu.
>
> However:
>
> make CC=clang HOSTCC=clang W=1 ARCH=s390 arch/s390/
> SYNC include/config/auto.conf.cmd
> CALL scripts/checksyscalls.sh
> VDSO arch/s390/kernel/vdso64/vdso64.so.dbg
> ld: unrecognised emulation mode: elf64_s390
> Supported emulations: elf_x86_64 elf32_x86_64 elf_i386 elf_iamcu i386pep i386pe
> make[2]: *** [arch/s390/kernel/vdso64/Makefile:53: arch/s390/kernel/vdso64/vdso64.so.dbg] Error 1
> make[1]: *** [arch/s390/Makefile:150: vdso_prepare] Error 2
> make: *** [Makefile:248: __sub-make] Error 2
>
> My linker can't do s390. So I need something else which your system has.
IIUC you can build with `LLVM=1` rather than `CC=clang` to force the use of
LLD (which should support s390 even if you don't have a GNU LD that does).
I have script to use the kernel.org GCC/LLVM builds from:
https://www.kernel.org/pub/tools/crosstool/
https://cdn.kernel.org/pub/tools/llvm/
... and I can reproduce this with:
[mark@lakrids:~/src/linux]% git clean -qfdx
[mark@lakrids:~/src/linux]% usekorg-llvm 18.1.6 make LLVM=1 ARCH=s390 -s allmodconfig
[mark@lakrids:~/src/linux]% usekorg-llvm 18.1.6 make LLVM=1 ARCH=s390 -s
... where that last step blows up with:
| init/main.c:972:6: error: unexpected token
| 972 | if (WARN(!irqs_disabled(),
| | ^
... plus a whole bucnh of other gunk.
I'll take a look, and hopefully Linus and Jinie can too.
Mark.
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [tip:master 19/19] include/linux/irq-entry-common.h:201:2: error: unexpected token
2025-07-02 12:58 ` Mark Rutland
@ 2025-07-02 13:09 ` Borislav Petkov
2025-07-02 13:16 ` Mark Rutland
0 siblings, 1 reply; 16+ messages in thread
From: Borislav Petkov @ 2025-07-02 13:09 UTC (permalink / raw)
To: Mark Rutland
Cc: kernel test robot, Thomas Gleixner, llvm, oe-kbuild-all,
linux-kernel, x86, Linus Walleij, Jinjie Ruan
Hey,
On Wed, Jul 02, 2025 at 01:58:50PM +0100, Mark Rutland wrote:
> Hi Boris,
>
> [ adding Linux and Jinjie, since this is almost certainly due to the
> irqentry split ]
>
> On Wed, Jul 02, 2025 at 02:32:40PM +0200, Borislav Petkov wrote:
> > On Wed, Jul 02, 2025 at 05:56:06AM +0800, kernel test robot wrote:
> > > tree: https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git master
> > > head: 104f02a7798f7e8aba25545f9d485035532260b2
> > > commit: 104f02a7798f7e8aba25545f9d485035532260b2 [19/19] Merge core/entry into tip/master
> > > config: s390-allmodconfig (https://download.01.org/0day-ci/archive/20250702/202507020528.N0LtekXt-lkp@intel.com/config)
> > > compiler: clang version 18.1.8 (https://github.com/llvm/llvm-project 3b5b5c1ec4a3095ab096dd780e84d7ab81f3d7ff)
> > > reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250702/202507020528.N0LtekXt-lkp@intel.com/reproduce)
> >
> > I'm trying to follow your reproducer and installed binutils-s390x-linux-gnu.
> >
> > However:
> >
> > make CC=clang HOSTCC=clang W=1 ARCH=s390 arch/s390/
> > SYNC include/config/auto.conf.cmd
> > CALL scripts/checksyscalls.sh
> > VDSO arch/s390/kernel/vdso64/vdso64.so.dbg
> > ld: unrecognised emulation mode: elf64_s390
> > Supported emulations: elf_x86_64 elf32_x86_64 elf_i386 elf_iamcu i386pep i386pe
> > make[2]: *** [arch/s390/kernel/vdso64/Makefile:53: arch/s390/kernel/vdso64/vdso64.so.dbg] Error 1
> > make[1]: *** [arch/s390/Makefile:150: vdso_prepare] Error 2
> > make: *** [Makefile:248: __sub-make] Error 2
> >
> > My linker can't do s390. So I need something else which your system has.
>
> IIUC you can build with `LLVM=1` rather than `CC=clang` to force the use of
> LLD (which should support s390 even if you don't have a GNU LD that does).
I was just typing:
Nathan says:
"You need to supply CROSS_COMPILE=s390x-linux-gnu- or use LLVM=-19 to avoid the ld error."
:-)
> I have script to use the kernel.org GCC/LLVM builds from:
>
> https://www.kernel.org/pub/tools/crosstool/
> https://cdn.kernel.org/pub/tools/llvm/
>
> ... and I can reproduce this with:
>
> [mark@lakrids:~/src/linux]% git clean -qfdx
> [mark@lakrids:~/src/linux]% usekorg-llvm 18.1.6 make LLVM=1 ARCH=s390 -s allmodconfig
> [mark@lakrids:~/src/linux]% usekorg-llvm 18.1.6 make LLVM=1 ARCH=s390 -s
>
> ... where that last step blows up with:
>
> | init/main.c:972:6: error: unexpected token
> | 972 | if (WARN(!irqs_disabled(),
> | | ^
>
> ... plus a whole bucnh of other gunk.
>
> I'll take a look, and hopefully Linus and Jinie can too.
Thanks.
It looks to me like that BUGVERBOSE stuff in tip/core/bugs and it warns
because core/entry starts using it when it gets merged to the rest of the tip
pile.
Lemme show it to Peter.
Thx.
--
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [tip:master 19/19] include/linux/irq-entry-common.h:201:2: error: unexpected token
2025-07-02 13:09 ` Borislav Petkov
@ 2025-07-02 13:16 ` Mark Rutland
2025-07-02 13:24 ` Borislav Petkov
0 siblings, 1 reply; 16+ messages in thread
From: Mark Rutland @ 2025-07-02 13:16 UTC (permalink / raw)
To: Borislav Petkov
Cc: kernel test robot, Thomas Gleixner, llvm, oe-kbuild-all,
linux-kernel, x86, Linus Walleij, Jinjie Ruan
On Wed, Jul 02, 2025 at 03:09:15PM +0200, Borislav Petkov wrote:
> Hey,
>
> On Wed, Jul 02, 2025 at 01:58:50PM +0100, Mark Rutland wrote:
> > Hi Boris,
> >
> > [ adding Linux and Jinjie, since this is almost certainly due to the
> > irqentry split ]
I was wrong about the above, sorry for the noise!
> It looks to me like that BUGVERBOSE stuff in tip/core/bugs and it warns
> because core/entry starts using it when it gets merged to the rest of the tip
> pile.
Yep; my bisect fingers:
b940c7b8ea92 ("bugs/s390: Use 'cond_str' in __EMIT_BUG()")
| git bisect start
| # bad: [104f02a7798f7e8aba25545f9d485035532260b2] Merge core/entry into tip/master
| git bisect bad 104f02a7798f7e8aba25545f9d485035532260b2
| # bad: [959770cda97b75bc831267fd939408ec58139cb5] Merge locking/core into tip/master
| git bisect bad 959770cda97b75bc831267fd939408ec58139cb5
| # good: [86731a2a651e58953fc949573895f2fa6d456841] Linux 6.16-rc3
| git bisect good 86731a2a651e58953fc949573895f2fa6d456841
| # good: [7abdafd2343ab199367c8243d6a5f06a9aa6976b] Merge tag 'drm-fixes-2025-06-28' of https://gitlab.freedesktop.org/drm/kernel
| git bisect good 7abdafd2343ab199367c8243d6a5f06a9aa6976b
| # good: [2d41eb1b4a70fd8f3ca7f08ed209ae5c8037af62] Merge x86/kconfig into tip/master
| git bisect good 2d41eb1b4a70fd8f3ca7f08ed209ae5c8037af62
| # good: [b7770ed895ab888d0626802a83939f6a30c35576] Merge x86/bugs into tip/master
| git bisect good b7770ed895ab888d0626802a83939f6a30c35576
| # bad: [244efb663e9ead81d3d258d81f38a38af02e09de] Merge core/bugs into tip/master
| git bisect bad 244efb663e9ead81d3d258d81f38a38af02e09de
| # bad: [e7e26cfad96c57c81156693cbf63032d899fe7c9] bugs/s390: Remove private WARN_ON() implementation
| git bisect bad e7e26cfad96c57c81156693cbf63032d899fe7c9
| # good: [66e94df0dd272b057899b8cdbca906ea1306d7a1] bugs/LoongArch: Pass in 'cond_str' to __BUG_ENTRY()
| git bisect good 66e94df0dd272b057899b8cdbca906ea1306d7a1
| # bad: [4218dedd47c79946bc9e6214f50c0d16096873ce] bugs/riscv: Pass in 'cond_str' to __BUG_FLAGS()
| git bisect bad 4218dedd47c79946bc9e6214f50c0d16096873ce
| # good: [7d9e9021ad7e9dac89b8262fbf95630ead7a787a] bugs/s390: Pass in 'cond_str' to __EMIT_BUG()
| git bisect good 7d9e9021ad7e9dac89b8262fbf95630ead7a787a
| # bad: [b940c7b8ea921fae7a99d305e819883d8311669e] bugs/s390: Use 'cond_str' in __EMIT_BUG()
| git bisect bad b940c7b8ea921fae7a99d305e819883d8311669e
| # first bad commit: [b940c7b8ea921fae7a99d305e819883d8311669e] bugs/s390: Use 'cond_str' in __EMIT_BUG()
> Lemme show it to Peter.
Sounds like a plan.
Mark.
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [tip:master 19/19] include/linux/irq-entry-common.h:201:2: error: unexpected token
2025-07-02 13:16 ` Mark Rutland
@ 2025-07-02 13:24 ` Borislav Petkov
2025-07-02 14:16 ` Mark Rutland
0 siblings, 1 reply; 16+ messages in thread
From: Borislav Petkov @ 2025-07-02 13:24 UTC (permalink / raw)
To: Mark Rutland, Peter Zijlstra
Cc: kernel test robot, Thomas Gleixner, llvm, oe-kbuild-all,
linux-kernel, x86, Linus Walleij, Jinjie Ruan
On Wed, Jul 02, 2025 at 02:16:15PM +0100, Mark Rutland wrote:
> Sounds like a plan.
As we figured out on IRC:
https://lore.kernel.org/all/20250616-loongarch-fix-warn-cond-llvm-ias-v1-1-6c6d90bb4466@kernel.org/
"clang's integrated assembler only supports concatenating strings with
'.ascii'. There was discussion of allowing '.string' / '.asciz' but it
was decided against [1] because it was undesirable to match the behavior
of released binutils at the time, where"
and this seems to fix it here:
---
diff --git a/arch/s390/include/asm/bug.h b/arch/s390/include/asm/bug.h
index a185855ab158..46d9eb64bd18 100644
--- a/arch/s390/include/asm/bug.h
+++ b/arch/s390/include/asm/bug.h
@@ -9,7 +9,7 @@
#else
#define __BUGVERBOSE_LOCATION(file, line) \
.pushsection .rodata.str, "aMS", @progbits, 1; \
- 10002: .string file; \
+ 10002: .ascii file; \
.popsection; \
\
.long 10002b - .; \
I leave it to Mr. Z to sort out.
--
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette
^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [tip:master 19/19] include/linux/irq-entry-common.h:201:2: error: unexpected token
2025-07-02 13:24 ` Borislav Petkov
@ 2025-07-02 14:16 ` Mark Rutland
2025-07-02 14:54 ` Peter Zijlstra
0 siblings, 1 reply; 16+ messages in thread
From: Mark Rutland @ 2025-07-02 14:16 UTC (permalink / raw)
To: Borislav Petkov
Cc: Peter Zijlstra, kernel test robot, Thomas Gleixner, llvm,
oe-kbuild-all, linux-kernel, x86, Linus Walleij, Jinjie Ruan
On Wed, Jul 02, 2025 at 03:24:15PM +0200, Borislav Petkov wrote:
> On Wed, Jul 02, 2025 at 02:16:15PM +0100, Mark Rutland wrote:
> > Sounds like a plan.
>
> As we figured out on IRC:
>
> https://lore.kernel.org/all/20250616-loongarch-fix-warn-cond-llvm-ias-v1-1-6c6d90bb4466@kernel.org/
>
> "clang's integrated assembler only supports concatenating strings with
> '.ascii'. There was discussion of allowing '.string' / '.asciz' but it
> was decided against [1] because it was undesirable to match the behavior
> of released binutils at the time, where"
>
> and this seems to fix it here:
>
> ---
> diff --git a/arch/s390/include/asm/bug.h b/arch/s390/include/asm/bug.h
> index a185855ab158..46d9eb64bd18 100644
> --- a/arch/s390/include/asm/bug.h
> +++ b/arch/s390/include/asm/bug.h
> @@ -9,7 +9,7 @@
> #else
> #define __BUGVERBOSE_LOCATION(file, line) \
> .pushsection .rodata.str, "aMS", @progbits, 1; \
> - 10002: .string file; \
> + 10002: .ascii file; \
> .popsection; \
> \
> .long 10002b - .; \
>
IIUC this also needs a trailing "\0" as per the link above, or this
won't get a NUL-terminator (but will build just fine).
While looking at this I spotted that arm64 doesn't propagate the
cond_str down to __BUGVERBOSE_LOCATION(), which is why we don't
encounter the same problem today.
We should probably fix that, but it looks like it might need some more
header wrangling for ASM_BUG(). I thought we'd split that out to avoid
circular header dependencies, but I could be mistaken.
Mark.
>
> I leave it to Mr. Z to sort out.
>
> --
> Regards/Gruss,
> Boris.
>
> https://people.kernel.org/tglx/notes-about-netiquette
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [tip:master 19/19] include/linux/irq-entry-common.h:201:2: error: unexpected token
2025-07-02 14:16 ` Mark Rutland
@ 2025-07-02 14:54 ` Peter Zijlstra
2025-07-02 15:07 ` Peter Zijlstra
0 siblings, 1 reply; 16+ messages in thread
From: Peter Zijlstra @ 2025-07-02 14:54 UTC (permalink / raw)
To: Mark Rutland
Cc: Borislav Petkov, kernel test robot, Thomas Gleixner, llvm,
oe-kbuild-all, linux-kernel, x86, Linus Walleij, Jinjie Ruan
On Wed, Jul 02, 2025 at 03:16:01PM +0100, Mark Rutland wrote:
> On Wed, Jul 02, 2025 at 03:24:15PM +0200, Borislav Petkov wrote:
> > On Wed, Jul 02, 2025 at 02:16:15PM +0100, Mark Rutland wrote:
> > > Sounds like a plan.
> >
> > As we figured out on IRC:
> >
> > https://lore.kernel.org/all/20250616-loongarch-fix-warn-cond-llvm-ias-v1-1-6c6d90bb4466@kernel.org/
> >
> > "clang's integrated assembler only supports concatenating strings with
> > '.ascii'. There was discussion of allowing '.string' / '.asciz' but it
> > was decided against [1] because it was undesirable to match the behavior
> > of released binutils at the time, where"
> >
> > and this seems to fix it here:
> >
> > ---
> > diff --git a/arch/s390/include/asm/bug.h b/arch/s390/include/asm/bug.h
> > index a185855ab158..46d9eb64bd18 100644
> > --- a/arch/s390/include/asm/bug.h
> > +++ b/arch/s390/include/asm/bug.h
> > @@ -9,7 +9,7 @@
> > #else
> > #define __BUGVERBOSE_LOCATION(file, line) \
> > .pushsection .rodata.str, "aMS", @progbits, 1; \
> > - 10002: .string file; \
> > + 10002: .ascii file; \
> > .popsection; \
> > \
> > .long 10002b - .; \
> >
>
> IIUC this also needs a trailing "\0" as per the link above, or this
> won't get a NUL-terminator (but will build just fine).
Yup, I ran into this before. Let me go fix that commit.
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [tip:master 19/19] include/linux/irq-entry-common.h:201:2: error: unexpected token
2025-07-02 14:54 ` Peter Zijlstra
@ 2025-07-02 15:07 ` Peter Zijlstra
2025-07-02 15:41 ` Heiko Carstens
0 siblings, 1 reply; 16+ messages in thread
From: Peter Zijlstra @ 2025-07-02 15:07 UTC (permalink / raw)
To: Mark Rutland, hca
Cc: Borislav Petkov, kernel test robot, Thomas Gleixner, llvm,
oe-kbuild-all, linux-kernel, x86, Linus Walleij, Jinjie Ruan
On Wed, Jul 02, 2025 at 04:54:25PM +0200, Peter Zijlstra wrote:
> On Wed, Jul 02, 2025 at 03:16:01PM +0100, Mark Rutland wrote:
> > On Wed, Jul 02, 2025 at 03:24:15PM +0200, Borislav Petkov wrote:
> > > On Wed, Jul 02, 2025 at 02:16:15PM +0100, Mark Rutland wrote:
> > > > Sounds like a plan.
> > >
> > > As we figured out on IRC:
> > >
> > > https://lore.kernel.org/all/20250616-loongarch-fix-warn-cond-llvm-ias-v1-1-6c6d90bb4466@kernel.org/
> > >
> > > "clang's integrated assembler only supports concatenating strings with
> > > '.ascii'. There was discussion of allowing '.string' / '.asciz' but it
> > > was decided against [1] because it was undesirable to match the behavior
> > > of released binutils at the time, where"
> > >
> > > and this seems to fix it here:
> > >
> > > ---
> > > diff --git a/arch/s390/include/asm/bug.h b/arch/s390/include/asm/bug.h
> > > index a185855ab158..46d9eb64bd18 100644
> > > --- a/arch/s390/include/asm/bug.h
> > > +++ b/arch/s390/include/asm/bug.h
> > > @@ -9,7 +9,7 @@
> > > #else
> > > #define __BUGVERBOSE_LOCATION(file, line) \
> > > .pushsection .rodata.str, "aMS", @progbits, 1; \
> > > - 10002: .string file; \
> > > + 10002: .ascii file; \
> > > .popsection; \
> > > \
> > > .long 10002b - .; \
> > >
> >
> > IIUC this also needs a trailing "\0" as per the link above, or this
> > won't get a NUL-terminator (but will build just fine).
>
> Yup, I ran into this before. Let me go fix that commit.
+ e7e26cfad96c...2a20b2730147 core/bugs -> core/bugs (forced update)
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [tip:master 19/19] include/linux/irq-entry-common.h:201:2: error: unexpected token
2025-07-02 15:07 ` Peter Zijlstra
@ 2025-07-02 15:41 ` Heiko Carstens
2025-07-02 16:10 ` Peter Zijlstra
0 siblings, 1 reply; 16+ messages in thread
From: Heiko Carstens @ 2025-07-02 15:41 UTC (permalink / raw)
To: Peter Zijlstra
Cc: Mark Rutland, Borislav Petkov, kernel test robot, Thomas Gleixner,
llvm, oe-kbuild-all, linux-kernel, x86, Linus Walleij,
Jinjie Ruan, Nathan Chancellor
On Wed, Jul 02, 2025 at 05:07:39PM +0200, Peter Zijlstra wrote:
> > > > diff --git a/arch/s390/include/asm/bug.h b/arch/s390/include/asm/bug.h
> > > > index a185855ab158..46d9eb64bd18 100644
> > > > --- a/arch/s390/include/asm/bug.h
> > > > +++ b/arch/s390/include/asm/bug.h
> > > > @@ -9,7 +9,7 @@
> > > > #else
> > > > #define __BUGVERBOSE_LOCATION(file, line) \
> > > > .pushsection .rodata.str, "aMS", @progbits, 1; \
> > > > - 10002: .string file; \
> > > > + 10002: .ascii file; \
> > > > .popsection; \
> > > > \
> > > > .long 10002b - .; \
> > > >
> > >
> > > IIUC this also needs a trailing "\0" as per the link above, or this
> > > won't get a NUL-terminator (but will build just fine).
> >
> > Yup, I ran into this before. Let me go fix that commit.
>
> + e7e26cfad96c...2a20b2730147 core/bugs -> core/bugs (forced update)
Thank you! But wouldn't you also need to merge Nathan's patch [1] into
the loongarch commit (or maybe you are just about to do that)?
[1] https://lore.kernel.org/all/20250616-loongarch-fix-warn-cond-llvm-ias-v1-1-6c6d90bb4466@kernel.org/
[2] https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git/commit/?h=core/bugs&id=5d476f66e6add0b709a09d60feecff3a2d156800
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [tip:master 19/19] include/linux/irq-entry-common.h:201:2: error: unexpected token
2025-07-02 15:41 ` Heiko Carstens
@ 2025-07-02 16:10 ` Peter Zijlstra
2025-07-02 18:01 ` Nathan Chancellor
0 siblings, 1 reply; 16+ messages in thread
From: Peter Zijlstra @ 2025-07-02 16:10 UTC (permalink / raw)
To: Heiko Carstens
Cc: Mark Rutland, Borislav Petkov, kernel test robot, Thomas Gleixner,
llvm, oe-kbuild-all, linux-kernel, x86, Linus Walleij,
Jinjie Ruan, Nathan Chancellor
On Wed, Jul 02, 2025 at 05:41:37PM +0200, Heiko Carstens wrote:
> On Wed, Jul 02, 2025 at 05:07:39PM +0200, Peter Zijlstra wrote:
> > > > > diff --git a/arch/s390/include/asm/bug.h b/arch/s390/include/asm/bug.h
> > > > > index a185855ab158..46d9eb64bd18 100644
> > > > > --- a/arch/s390/include/asm/bug.h
> > > > > +++ b/arch/s390/include/asm/bug.h
> > > > > @@ -9,7 +9,7 @@
> > > > > #else
> > > > > #define __BUGVERBOSE_LOCATION(file, line) \
> > > > > .pushsection .rodata.str, "aMS", @progbits, 1; \
> > > > > - 10002: .string file; \
> > > > > + 10002: .ascii file; \
> > > > > .popsection; \
> > > > > \
> > > > > .long 10002b - .; \
> > > > >
> > > >
> > > > IIUC this also needs a trailing "\0" as per the link above, or this
> > > > won't get a NUL-terminator (but will build just fine).
> > >
> > > Yup, I ran into this before. Let me go fix that commit.
> >
> > + e7e26cfad96c...2a20b2730147 core/bugs -> core/bugs (forced update)
>
> Thank you! But wouldn't you also need to merge Nathan's patch [1] into
> the loongarch commit (or maybe you are just about to do that)?
>
> [1] https://lore.kernel.org/all/20250616-loongarch-fix-warn-cond-llvm-ias-v1-1-6c6d90bb4466@kernel.org/
> [2] https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git/commit/?h=core/bugs&id=5d476f66e6add0b709a09d60feecff3a2d156800
Uh, indeed. Let me go do so.
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [tip:master 19/19] include/linux/irq-entry-common.h:201:2: error: unexpected token
2025-07-02 16:10 ` Peter Zijlstra
@ 2025-07-02 18:01 ` Nathan Chancellor
2025-07-02 18:12 ` Borislav Petkov
0 siblings, 1 reply; 16+ messages in thread
From: Nathan Chancellor @ 2025-07-02 18:01 UTC (permalink / raw)
To: Peter Zijlstra
Cc: Heiko Carstens, Mark Rutland, Borislav Petkov, kernel test robot,
Thomas Gleixner, llvm, oe-kbuild-all, linux-kernel, x86,
Linus Walleij, Jinjie Ruan
On Wed, Jul 02, 2025 at 06:10:12PM +0200, Peter Zijlstra wrote:
> On Wed, Jul 02, 2025 at 05:41:37PM +0200, Heiko Carstens wrote:
> > On Wed, Jul 02, 2025 at 05:07:39PM +0200, Peter Zijlstra wrote:
> > > > > > diff --git a/arch/s390/include/asm/bug.h b/arch/s390/include/asm/bug.h
> > > > > > index a185855ab158..46d9eb64bd18 100644
> > > > > > --- a/arch/s390/include/asm/bug.h
> > > > > > +++ b/arch/s390/include/asm/bug.h
> > > > > > @@ -9,7 +9,7 @@
> > > > > > #else
> > > > > > #define __BUGVERBOSE_LOCATION(file, line) \
> > > > > > .pushsection .rodata.str, "aMS", @progbits, 1; \
> > > > > > - 10002: .string file; \
> > > > > > + 10002: .ascii file; \
> > > > > > .popsection; \
> > > > > > \
> > > > > > .long 10002b - .; \
> > > > > >
> > > > >
> > > > > IIUC this also needs a trailing "\0" as per the link above, or this
> > > > > won't get a NUL-terminator (but will build just fine).
> > > >
> > > > Yup, I ran into this before. Let me go fix that commit.
> > >
> > > + e7e26cfad96c...2a20b2730147 core/bugs -> core/bugs (forced update)
> >
> > Thank you! But wouldn't you also need to merge Nathan's patch [1] into
> > the loongarch commit (or maybe you are just about to do that)?
> >
> > [1] https://lore.kernel.org/all/20250616-loongarch-fix-warn-cond-llvm-ias-v1-1-6c6d90bb4466@kernel.org/
> > [2] https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git/commit/?h=core/bugs&id=5d476f66e6add0b709a09d60feecff3a2d156800
>
> Uh, indeed. Let me go do so.
Thanks Peter. Did something go awry with the latest rebase? It looks
like current core/bugs has the loongarch issue fixed but "bugs/s390: Use
'cond_str' in __EMIT_BUG()" seems to have reverted to the broken
version?
diff --git a/tmp/.psub.eKGNE0S0Yf b/tmp/.psub.w9BLv9qXti
index 0fb363b71ebb..f3ce9e3ce952 100644
--- a/tmp/.psub.eKGNE0S0Yf
+++ b/tmp/.psub.w9BLv9qXti
@@ -1,8 +1,8 @@
-commit d9f685d24d69b6b64cecb3dd70d7e51836bf531f
+commit 6540db6ce800aaeedc8d733d1e6d2f1c83c7b217
Author: Heiko Carstens <hca@linux.ibm.com>
AuthorDate: Tue May 20 15:39:27 2025 +0200
Commit: Peter Zijlstra <peterz@infradead.org>
-CommitDate: Wed Jul 2 16:55:06 2025 +0200
+CommitDate: Wed Jul 2 18:16:12 2025 +0200
bugs/s390: Use 'cond_str' in __EMIT_BUG()
@@ -32,7 +32,7 @@ CommitDate: Wed Jul 2 16:55:06 2025 +0200
Link: https://lore.kernel.org/r/20250617135042.1878068-3-hca@linux.ibm.com
diff --git a/arch/s390/include/asm/bug.h b/arch/s390/include/asm/bug.h
-index 30f8785a01f5..c39500eec300 100644
+index 30f8785a01f5..0c808dadbc22 100644
--- a/arch/s390/include/asm/bug.h
+++ b/arch/s390/include/asm/bug.h
@@ -2,52 +2,52 @@
@@ -48,7 +48,7 @@ index 30f8785a01f5..c39500eec300 100644
+#else
+#define __BUGVERBOSE_LOCATION(file, line) \
+ .pushsection .rodata.str, "aMS", @progbits, 1; \
-+ 10002: .ascii file "\0"; \
++ 10002: .string file; \
+ .popsection; \
+ \
+ .long 10002b - .; \
^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [tip:master 19/19] include/linux/irq-entry-common.h:201:2: error: unexpected token
2025-07-02 18:01 ` Nathan Chancellor
@ 2025-07-02 18:12 ` Borislav Petkov
2025-07-02 18:29 ` Borislav Petkov
0 siblings, 1 reply; 16+ messages in thread
From: Borislav Petkov @ 2025-07-02 18:12 UTC (permalink / raw)
To: Nathan Chancellor
Cc: Peter Zijlstra, Heiko Carstens, Mark Rutland, kernel test robot,
Thomas Gleixner, llvm, oe-kbuild-all, linux-kernel, x86,
Linus Walleij, Jinjie Ruan
On Wed, Jul 02, 2025 at 11:01:36AM -0700, Nathan Chancellor wrote:
> Thanks Peter. Did something go awry with the latest rebase? It looks
> like current core/bugs has the loongarch issue fixed but "bugs/s390: Use
> 'cond_str' in __EMIT_BUG()" seems to have reverted to the broken
> version?
Ah crap, lemme fix that.
--
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [tip:master 19/19] include/linux/irq-entry-common.h:201:2: error: unexpected token
2025-07-02 18:12 ` Borislav Petkov
@ 2025-07-02 18:29 ` Borislav Petkov
2025-07-02 18:38 ` Nathan Chancellor
0 siblings, 1 reply; 16+ messages in thread
From: Borislav Petkov @ 2025-07-02 18:29 UTC (permalink / raw)
To: Nathan Chancellor
Cc: Peter Zijlstra, Heiko Carstens, Mark Rutland, kernel test robot,
Thomas Gleixner, llvm, oe-kbuild-all, linux-kernel, x86,
Linus Walleij, Jinjie Ruan
On Wed, Jul 02, 2025 at 08:12:36PM +0200, Borislav Petkov wrote:
> On Wed, Jul 02, 2025 at 11:01:36AM -0700, Nathan Chancellor wrote:
> > Thanks Peter. Did something go awry with the latest rebase? It looks
> > like current core/bugs has the loongarch issue fixed but "bugs/s390: Use
> > 'cond_str' in __EMIT_BUG()" seems to have reverted to the broken
> > version?
>
> Ah crap, lemme fix that.
Should be fixed now... famous last words. :-P
git diff e0d1ec28743b a4585558a904
diff --git a/arch/s390/include/asm/bug.h b/arch/s390/include/asm/bug.h
index a185855ab158..acb4b13d98c5 100644
--- a/arch/s390/include/asm/bug.h
+++ b/arch/s390/include/asm/bug.h
@@ -9,7 +9,7 @@
#else
#define __BUGVERBOSE_LOCATION(file, line) \
.pushsection .rodata.str, "aMS", @progbits, 1; \
- 10002: .string file; \
+ 10002: .ascii file "\0"; \
.popsection; \
\
.long 10002b - .; \
Thanks!
--
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette
^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [tip:master 19/19] include/linux/irq-entry-common.h:201:2: error: unexpected token
2025-07-02 18:29 ` Borislav Petkov
@ 2025-07-02 18:38 ` Nathan Chancellor
2025-07-02 18:40 ` Borislav Petkov
0 siblings, 1 reply; 16+ messages in thread
From: Nathan Chancellor @ 2025-07-02 18:38 UTC (permalink / raw)
To: Borislav Petkov
Cc: Peter Zijlstra, Heiko Carstens, Mark Rutland, kernel test robot,
Thomas Gleixner, llvm, oe-kbuild-all, linux-kernel, x86,
Linus Walleij, Jinjie Ruan
On Wed, Jul 02, 2025 at 08:29:22PM +0200, Borislav Petkov wrote:
> Should be fixed now... famous last words. :-P
Thanks for sticking with it :) I can confirm that fad009b77942
builds correctly for me.
Cheers,
Nathan
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [tip:master 19/19] include/linux/irq-entry-common.h:201:2: error: unexpected token
2025-07-02 18:38 ` Nathan Chancellor
@ 2025-07-02 18:40 ` Borislav Petkov
0 siblings, 0 replies; 16+ messages in thread
From: Borislav Petkov @ 2025-07-02 18:40 UTC (permalink / raw)
To: Nathan Chancellor
Cc: Peter Zijlstra, Heiko Carstens, Mark Rutland, kernel test robot,
Thomas Gleixner, llvm, oe-kbuild-all, linux-kernel, x86,
Linus Walleij, Jinjie Ruan
On Wed, Jul 02, 2025 at 11:38:00AM -0700, Nathan Chancellor wrote:
> On Wed, Jul 02, 2025 at 08:29:22PM +0200, Borislav Petkov wrote:
> > Should be fixed now... famous last words. :-P
>
> Thanks for sticking with it :) I can confirm that fad009b77942
> builds correctly for me.
No, thank you for double-checking us! Much appreciated. :-D
--
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette
^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2025-07-02 18:40 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-07-01 21:56 [tip:master 19/19] include/linux/irq-entry-common.h:201:2: error: unexpected token kernel test robot
2025-07-02 12:32 ` Borislav Petkov
2025-07-02 12:58 ` Mark Rutland
2025-07-02 13:09 ` Borislav Petkov
2025-07-02 13:16 ` Mark Rutland
2025-07-02 13:24 ` Borislav Petkov
2025-07-02 14:16 ` Mark Rutland
2025-07-02 14:54 ` Peter Zijlstra
2025-07-02 15:07 ` Peter Zijlstra
2025-07-02 15:41 ` Heiko Carstens
2025-07-02 16:10 ` Peter Zijlstra
2025-07-02 18:01 ` Nathan Chancellor
2025-07-02 18:12 ` Borislav Petkov
2025-07-02 18:29 ` Borislav Petkov
2025-07-02 18:38 ` Nathan Chancellor
2025-07-02 18:40 ` Borislav Petkov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox