iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

exit: Remove calls of do_exit after noreturn versions of die

Browse Source 
On nds32, openrisc, s390, sh, and xtensa the function die never
returns.  Mark die __noreturn so that no one expects die to return.
Remove the do_exit calls after die as they will never be reached.

Cc: Jonas Bonn <jonas@southpole.se>
Cc: Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>
Cc: Stafford Horne <shorne@gmail.com>
Cc: openrisc@lists.librecores.org
Cc: Nick Hu <nickhu@andestech.com>
Cc: Greentime Hu <green.hu@gmail.com>
Cc: Vincent Chen <deanbo422@gmail.com>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: linux-s390@vger.kernel.org
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: Rich Felker <dalias@libc.org>
Cc: linux-sh@vger.kernel.org
Cc: linux-xtensa@linux-xtensa.org
Cc: Chris Zankel <chris@zankel.net>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Fixes: 2.3.16
Fixes: 2.3.99-pre8
Fixes: 3f65ce4d14 ("[PATCH] xtensa: Architecture support for Tensilica Xtensa Part 5")
Fixes: 664eec400b ("nds32: MMU fault handling and page table management")
Fixes: 61e85e3675 ("OpenRISC: Memory management")
Link: https://lkml.kernel.org/r/20211020174406.17889-2-ebiederm@xmission.com
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
This commit is contained in:
Eric W. Biederman
2021-10-20 12:43:48 -05:00
parent 6ab80d88f8
commit 9fd5a04d8e
11 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/nds32/kernel/traps.c
View File

@ -118,7 +118,7 @@ DEFINE_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 __noreturn die(const char *str, struct pt_regs *regs, int err)
{ {
struct task_struct *tsk = current; struct task_struct *tsk = current;
static int die_counter; static int die_counter;

6
arch/nds32/mm/fault.c
View File

@ -13,7 +13,7 @@
#include <asm/tlbflush.h> #include <asm/tlbflush.h>
extern void die(const char *str, struct pt_regs *regs, long err); extern void __noreturn die(const char *str, struct pt_regs *regs, long err);
/* /*
* This is useful to dump out the page tables associated with * This is useful to dump out the page tables associated with
@ -299,10 +299,6 @@ no_context:
show_pte(mm, addr); show_pte(mm, addr);
die("Oops", regs, error_code); die("Oops", regs, error_code);
bust_spinlocks(0);
do_exit(SIGKILL);
return;
/* /*
* We ran out of memory, or some other thing happened to us that made * We ran out of memory, or some other thing happened to us that made

2
arch/openrisc/kernel/traps.c
View File

@ -197,7 +197,7 @@ void nommu_dump_state(struct pt_regs *regs,
} }
/* This is normally the 'Oops' routine */ /* This is normally the 'Oops' routine */
void die(const char *str, struct pt_regs *regs, long err) void __noreturn die(const char *str, struct pt_regs *regs, long err)
{ {
console_verbose(); console_verbose();

4
arch/openrisc/mm/fault.c
View File

@ -32,7 +32,7 @@ unsigned long pte_errors; /* updated by do_page_fault() */
*/ */
volatile pgd_t *current_pgd[NR_CPUS]; volatile pgd_t *current_pgd[NR_CPUS];
extern void die(char *, struct pt_regs *, long); extern void __noreturn die(char *, struct pt_regs *, long);
/* /*
* This routine handles page faults. It determines the address, * This routine handles page faults. It determines the address,
@ -248,8 +248,6 @@ no_context:
die("Oops", regs, write_acc); die("Oops", regs, write_acc);
do_exit(SIGKILL);
/* /*
* We ran out of memory, or some other thing happened to us that made * We ran out of memory, or some other thing happened to us that made
* us unable to handle the page fault gracefully. * us unable to handle the page fault gracefully.

2
arch/s390/include/asm/kdebug.h
View File

@ -23,6 +23,6 @@ enum die_val {
DIE_NMI_IPI, DIE_NMI_IPI,
}; };
extern void die(struct pt_regs *, const char *); extern void __noreturn die(struct pt_regs *, const char *);
#endif #endif

2
arch/s390/kernel/dumpstack.c
View File

@ -192,7 +192,7 @@ void show_regs(struct pt_regs *regs)
static DEFINE_SPINLOCK(die_lock); static DEFINE_SPINLOCK(die_lock);
void die(struct pt_regs *regs, const char *str) void __noreturn die(struct pt_regs *regs, const char *str)
{ {
static int die_counter; static int die_counter;

2
arch/s390/mm/fault.c
View File

@ -260,7 +260,6 @@ static noinline void do_no_context(struct pt_regs *regs)
" in virtual user address space\n"); " in virtual user address space\n");
dump_fault_info(regs); dump_fault_info(regs);
die(regs, "Oops"); die(regs, "Oops");
do_exit(SIGKILL);
} }
static noinline void do_low_address(struct pt_regs *regs) static noinline void do_low_address(struct pt_regs *regs)
@ -270,7 +269,6 @@ static noinline void do_low_address(struct pt_regs *regs)
if (regs->psw.mask & PSW_MASK_PSTATE) { if (regs->psw.mask & PSW_MASK_PSTATE) {
/* Low-address protection hit in user mode 'cannot happen'. */ /* Low-address protection hit in user mode 'cannot happen'. */
die (regs, "Low-address protection"); die (regs, "Low-address protection");
do_exit(SIGKILL);
} }
do_no_context(regs); do_no_context(regs);

2
arch/sh/kernel/traps.c
View File

@ -20,7 +20,7 @@
static DEFINE_SPINLOCK(die_lock); static DEFINE_SPINLOCK(die_lock);
void die(const char *str, struct pt_regs *regs, long err) void __noreturn die(const char *str, struct pt_regs *regs, long err)
{ {
static int die_counter; static int die_counter;

2
arch/sh/mm/fault.c
View File

@ -238,8 +238,6 @@ no_context(struct pt_regs *regs, unsigned long error_code,
show_fault_oops(regs, address); show_fault_oops(regs, address);
die("Oops", regs, error_code); die("Oops", regs, error_code);
bust_spinlocks(0);
do_exit(SIGKILL);
} }
static void static void

2
arch/xtensa/kernel/traps.c
View File

@ -527,7 +527,7 @@ void show_stack(struct task_struct *task, unsigned long *sp, const char *loglvl)
DEFINE_SPINLOCK(die_lock); DEFINE_SPINLOCK(die_lock);
void die(const char * str, struct pt_regs * regs, long err) void __noreturn die(const char * str, struct pt_regs * regs, long err)
{ {
static int die_counter; static int die_counter;
const char *pr = ""; const char *pr = "";

3
arch/xtensa/mm/fault.c
View File

@ -238,7 +238,7 @@ bad_page_fault:
void void
bad_page_fault(struct pt_regs *regs, unsigned long address, int sig) bad_page_fault(struct pt_regs *regs, unsigned long address, int sig)
{ {
extern void die(const char*, struct pt_regs*, long); extern void __noreturn die(const char*, struct pt_regs*, long);
const struct exception_table_entry *entry; const struct exception_table_entry *entry;
/* Are we prepared to handle this kernel fault? */ /* Are we prepared to handle this kernel fault? */
@ -257,5 +257,4 @@ bad_page_fault(struct pt_regs *regs, unsigned long address, int sig)
"address %08lx\n pc = %08lx, ra = %08lx\n", "address %08lx\n pc = %08lx, ra = %08lx\n",
address, regs->pc, regs->areg[0]); address, regs->pc, regs->areg[0]);
die("Oops", regs, sig); die("Oops", regs, sig);
do_exit(sig);
} }