2023-08-01 06:45:25

by Tiezhu Yang

Subject: [PATCH] LoongArch: Remove noreturn attribute for die()

If notify_die() returns NOTIFY_STOP, there is no need to call
make_task_dead(), we can remove noreturn attribute for die(),
this is similar with arm64, riscv and csky.

While at it, modify the die() declaration in ptrace.h to fix
the following checkpatch warnings:

WARNING: function definition argument 'const char *' should also have an identifier name
WARNING: function definition argument 'struct pt_regs *' should also have an identifier name

Signed-off-by: Tiezhu Yang <[email protected]>
---
arch/loongarch/include/asm/ptrace.h | 2 +-
arch/loongarch/kernel/traps.c | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/arch/loongarch/include/asm/ptrace.h b/arch/loongarch/include/asm/ptrace.h
index 35f0958..2101301 100644
--- a/arch/loongarch/include/asm/ptrace.h
+++ b/arch/loongarch/include/asm/ptrace.h
@@ -162,7 +162,7 @@ static inline void regs_set_return_value(struct pt_regs *regs, unsigned long val
#define instruction_pointer(regs) ((regs)->csr_era)
#define profile_pc(regs) instruction_pointer(regs)

-extern void die(const char *, struct pt_regs *) __noreturn;
+void die(const char *str, struct pt_regs *regs);

static inline void die_if_kernel(const char *str, struct pt_regs *regs)
{
diff --git a/arch/loongarch/kernel/traps.c b/arch/loongarch/kernel/traps.c
index 8fb5e7a..bbdfc5b 100644
--- a/arch/loongarch/kernel/traps.c
+++ b/arch/loongarch/kernel/traps.c
@@ -383,16 +383,15 @@ void show_registers(struct pt_regs *regs)

static DEFINE_RAW_SPINLOCK(die_lock);

-void __noreturn die(const char *str, struct pt_regs *regs)
+void die(const char *str, struct pt_regs *regs)
{
static int die_counter;
- int sig = SIGSEGV;
+ int ret;

oops_enter();

- if (notify_die(DIE_OOPS, str, regs, 0, current->thread.trap_nr,
- SIGSEGV) == NOTIFY_STOP)
- sig = 0;
+ ret = notify_die(DIE_OOPS, str, regs, 0,
+ current->thread.trap_nr, SIGSEGV);

console_verbose();
raw_spin_lock_irq(&die_lock);
@@ -414,7 +413,8 @@ void __noreturn die(const char *str, struct pt_regs *regs)
if (panic_on_oops)
panic("Fatal exception");

- make_task_dead(sig);
+ if (ret != NOTIFY_STOP)
+ make_task_dead(SIGSEGV);
}

static inline void setup_vint_size(unsigned int size)
--
2.1.0

2023-08-14 06:19:44

by Tiezhu Yang

Subject: Re: [PATCH] LoongArch: Remove noreturn attribute for die()

On 08/01/2023 02:33 PM, Tiezhu Yang wrote:
> If notify_die() returns NOTIFY_STOP, there is no need to call
> make_task_dead(), we can remove noreturn attribute for die(),
> this is similar with arm64, riscv and csky.
>
> While at it, modify the die() declaration in ptrace.h to fix
> the following checkpatch warnings:
>
> WARNING: function definition argument 'const char *' should also have an identifier name
> WARNING: function definition argument 'struct pt_regs *' should also have an identifier name
>
> Signed-off-by: Tiezhu Yang <[email protected]>
> ---
> arch/loongarch/include/asm/ptrace.h | 2 +-
> arch/loongarch/kernel/traps.c | 12 ++++++------
> 2 files changed, 7 insertions(+), 7 deletions(-)

There is a similar patch for MIPS, here is the discussion,
https://lore.kernel.org/all/[email protected]/

As suggested by Maciej W. Rozycki, I will update the commit message and
split it into two patches, then I will send v2 later.

Thanks,
Tiezhu