Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

arm64: die(): pass 'err' as long

Recently, we reworked a lot of code to consistentlt pass ESR_ELx as a
64-bit quantity. However, we missed that this can be passed into die()
and __die() as the 'err' parameter where it is truncated to a 32-bit
int.

As notify_die() already takes 'err' as a long, this patch changes die()
and __die() to also take 'err' as a long, ensuring that the full value
of ESR_ELx is retained.

At the same time, die() is updated to consistently log 'err' as a
zero-padded 64-bit quantity.

Subsequent patches will pass the ESR_ELx value to die() for a number of
exceptions.

Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Reviewed-by: Mark Brown <broonie@kernel.org>
Reviewed-by: Anshuman Khandual <anshuman.khandual@arm.com>
Cc: Alexandru Elisei <alexandru.elisei@arm.com>
Cc: Amit Daniel Kachhap <amit.kachhap@arm.com>
Cc: James Morse <james.morse@arm.com>
Cc: Will Deacon <will@kernel.org>
Link: https://lore.kernel.org/r/20220913101732.3925290-3-mark.rutland@arm.com
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>

authored by

Mark Rutland and committed by
Catalin Marinas
18906ff9 b502c87d

+4 -4
+1 -1
arch/arm64/include/asm/system_misc.h
··· 18 18 19 19 struct pt_regs; 20 20 21 - void die(const char *msg, struct pt_regs *regs, int err); 21 + void die(const char *msg, struct pt_regs *regs, long err); 22 22 23 23 struct siginfo; 24 24 void arm64_notify_die(const char *str, struct pt_regs *regs,
+3 -3
arch/arm64/kernel/traps.c
··· 180 180 181 181 #define S_SMP " SMP" 182 182 183 - static int __die(const char *str, int err, struct pt_regs *regs) 183 + static int __die(const char *str, long err, struct pt_regs *regs) 184 184 { 185 185 static int die_counter; 186 186 int ret; 187 187 188 - pr_emerg("Internal error: %s: %x [#%d]" S_PREEMPT S_SMP "\n", 188 + pr_emerg("Internal error: %s: %016lx [#%d]" S_PREEMPT S_SMP "\n", 189 189 str, err, ++die_counter); 190 190 191 191 /* trap and error numbers are mostly meaningless on ARM */ ··· 206 206 /* 207 207 * This function is protected against re-entrancy. 208 208 */ 209 - void die(const char *str, struct pt_regs *regs, int err) 209 + void die(const char *str, struct pt_regs *regs, long err) 210 210 { 211 211 int ret; 212 212 unsigned long flags;