Ksawlii/kernel_samsung_a53x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
commit 18906ff9af6517c20763ed63dab602a4150794f7 upstream.

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>
Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Mark Rutland 2023-10-11 10:05:32 +00:00 • committed by Ksawlii
parent 6041cc2f42
commit 57dfdfa428
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm64/include/asm/system_misc.h
View file

@ -18,7 +18,7 @@
struct pt_regs; struct pt_regs;
void die(const char *msg, struct pt_regs *regs, int err); void die(const char *msg, struct pt_regs *regs, long err);
struct siginfo; struct siginfo;
void arm64_notify_die(const char *str, struct pt_regs *regs, void arm64_notify_die(const char *str, struct pt_regs *regs,

6
arch/arm64/kernel/traps.c
View file

@ -187,12 +187,12 @@ static inline void secdbg_dump_kernel_instr_ext(struct pt_regs *regs)
#define S_SMP " SMP" #define S_SMP " SMP"
static int __die(const char *str, int err, struct pt_regs *regs) static int __die(const char *str, long err, struct pt_regs *regs)
{ {
static int die_counter; static int die_counter;
int ret; int ret;
pr_emerg("Internal error: %s: %x [#%d]" S_PREEMPT S_SMP "\n", pr_emerg("Internal error: %s: %016lx [#%d]" S_PREEMPT S_SMP "\n",
str, err, ++die_counter); str, err, ++die_counter);
/* trap and error numbers are mostly meaningless on ARM */ /* trap and error numbers are mostly meaningless on ARM */
@ -218,7 +218,7 @@ static DEFINE_RAW_SPINLOCK(die_lock);
/* /*
* This function is protected against re-entrancy. * This function is protected against re-entrancy.
*/ */
void die(const char *str, struct pt_regs *regs, int err) void die(const char *str, struct pt_regs *regs, long err)
{ {
int ret; int ret;
unsigned long flags; unsigned long flags;