mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Neil Horman <nhorman@tuxdriver.com>
To: Alexander van Heukelum <heukelum@fastmail.fm>
Cc: Ingo Molnar <mingo@elte.hu>,
	kexec@lists.infradead.org, linux-kernel@vger.kernel.org,
	vgoyal@redhat.com, hbabu@us.ibm.com, hpa@zytor.com,
	akpm@linux-foundation.org, ebiederm@xmission.com,
	tglx@linutronix.de
Subject: Re: [PATCH 2/7] x86, dumpstack: let signr=0 signal no do_exit
Date: Wed, 22 Oct 2008 07:01:26 -0400	[thread overview]
Message-ID: <20081022110126.GC18951@hmsreliant.think-freely.org> (raw)
In-Reply-To: <1224669614-25863-3-git-send-email-heukelum@fastmail.fm>

On Wed, Oct 22, 2008 at 12:00:09PM +0200, Alexander van Heukelum wrote:
> Change oops_end such that signr=0 signals that do_exit
> is not to be called.
> 
> Currently, each use of __die is soon followed by a call
> to oops_end and 'regs' is set to NULL if oops_end is expected
> not to call do_exit. Change all such pairs to set signr=0
> instead. On x86_64 oops_end is used 'bare' in die_nmi; use
> signr=0 instead of regs=NULL there, too.
> 
> Signed-off-by: Alexander van Heukelum <heukelum@fastmail.fm>

Acked-by: Neil Horman <nhorman@tuxdriver.com>

> ---
>  arch/x86/kernel/dumpstack_32.c |    7 ++++---
>  arch/x86/kernel/dumpstack_64.c |    9 +++++----
>  arch/x86/mm/fault.c            |   11 +++++++----
>  3 files changed, 16 insertions(+), 11 deletions(-)
> 
> diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c
> index 5493d31..7c22f99 100644
> --- a/arch/x86/kernel/dumpstack_32.c
> +++ b/arch/x86/kernel/dumpstack_32.c
> @@ -318,7 +318,7 @@ void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr)
>  	__raw_spin_unlock(&die_lock);
>  	raw_local_irq_restore(flags);
>  
> -	if (!regs)
> +	if (!signr)
>  		return;
>  
>  	if (in_interrupt())
> @@ -371,17 +371,18 @@ int __kprobes __die(const char *str, struct pt_regs *regs, long err)
>  void die(const char *str, struct pt_regs *regs, long err)
>  {
>  	unsigned long flags = oops_begin();
> +	int sig = SIGSEGV;
>  
>  	if (die_nest_count < 3) {
>  		report_bug(regs->ip, regs);
>  
>  		if (__die(str, regs, err))
> -			regs = NULL;
> +			sig = 0;
>  	} else {
>  		printk(KERN_EMERG "Recursive die() failure, output suppressed\n");
>  	}
>  
> -	oops_end(flags, regs, SIGSEGV);
> +	oops_end(flags, regs, sig);
>  }
>  
>  static DEFINE_SPINLOCK(nmi_print_lock);
> diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c
> index 96a5db7..ffefea6 100644
> --- a/arch/x86/kernel/dumpstack_64.c
> +++ b/arch/x86/kernel/dumpstack_64.c
> @@ -465,7 +465,7 @@ void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr)
>  		/* Nest count reaches zero, release the lock. */
>  		__raw_spin_unlock(&die_lock);
>  	raw_local_irq_restore(flags);
> -	if (!regs) {
> +	if (!signr) {
>  		oops_exit();
>  		return;
>  	}
> @@ -509,13 +509,14 @@ int __kprobes __die(const char *str, struct pt_regs *regs, long err)
>  void die(const char *str, struct pt_regs *regs, long err)
>  {
>  	unsigned long flags = oops_begin();
> +	int sig = SIGSEGV;
>  
>  	if (!user_mode(regs))
>  		report_bug(regs->ip, regs);
>  
>  	if (__die(str, regs, err))
> -		regs = NULL;
> -	oops_end(flags, regs, SIGSEGV);
> +		sig = 0;
> +	oops_end(flags, regs, sig);
>  }
>  
>  notrace __kprobes void
> @@ -539,7 +540,7 @@ die_nmi(char *str, struct pt_regs *regs, int do_panic)
>  		crash_kexec(regs);
>  	if (do_panic || panic_on_oops)
>  		panic("Non maskable interrupt");
> -	oops_end(flags, NULL, SIGBUS);
> +	oops_end(flags, regs, 0);
>  	nmi_exit();
>  	local_irq_enable();
>  	do_exit(SIGBUS);
> diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
> index 8e52e68..ed9ee30 100644
> --- a/arch/x86/mm/fault.c
> +++ b/arch/x86/mm/fault.c
> @@ -415,6 +415,7 @@ static noinline void pgtable_bad(unsigned long address, struct pt_regs *regs,
>  				 unsigned long error_code)
>  {
>  	unsigned long flags = oops_begin();
> +	int sig = SIGKILL;
>  	struct task_struct *tsk;
>  
>  	printk(KERN_ALERT "%s: Corrupted page table at address %lx\n",
> @@ -425,8 +426,8 @@ static noinline void pgtable_bad(unsigned long address, struct pt_regs *regs,
>  	tsk->thread.trap_no = 14;
>  	tsk->thread.error_code = error_code;
>  	if (__die("Bad pagetable", regs, error_code))
> -		regs = NULL;
> -	oops_end(flags, regs, SIGKILL);
> +		sig = 0;
> +	oops_end(flags, regs, sig);
>  }
>  #endif
>  
> @@ -594,6 +595,7 @@ void __kprobes do_page_fault(struct pt_regs *regs, unsigned long error_code)
>  
>  #ifdef CONFIG_X86_64
>  	unsigned long flags;
> +	int sig;
>  #endif
>  
>  	tsk = current;
> @@ -868,11 +870,12 @@ no_context:
>  	bust_spinlocks(0);
>  	do_exit(SIGKILL);
>  #else
> +	sig = SIGKILL;
>  	if (__die("Oops", regs, error_code))
> -		regs = NULL;
> +		sig = 0;
>  	/* Executive summary in case the body of the oops scrolled away */
>  	printk(KERN_EMERG "CR2: %016lx\n", address);
> -	oops_end(flags, regs, SIGKILL);
> +	oops_end(flags, regs, sig);
>  #endif
>  
>  /*
> -- 
> 1.5.4.3
> 
> 

-- 
/****************************************************
 * Neil Horman <nhorman@tuxdriver.com>
 * Software Engineer, Red Hat
 ****************************************************/

  parent reply	other threads:[~2008-10-22 11:03 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-10-17 21:00 [PATCH] kexec: fix hang on i386 when panic occurs while console_sem is held Neil Horman
2008-10-20 12:13 ` Ingo Molnar
2008-10-20 13:42   ` Neil Horman
2008-10-20 15:07     ` [PATCH] x86, dumpstack: some more unification Alexander van Heukelum
2008-10-20 15:08       ` [PATCH] x86: make oops_begin and oops_end equal Alexander van Heukelum
2008-10-20 15:11         ` [PATCH] x86, dumpstack: make die and die_nmi equal Alexander van Heukelum
2008-10-21 14:59           ` Neil Horman
2008-10-22 10:00             ` [PATCH 0/7] x86, dumpstack: unify oops_begin, oops_end, die_nmi and die Alexander van Heukelum
2008-10-22 10:00               ` [PATCH 1/7] i386, dumpstack: Move crash_kexec before bust_spinlocks(0) in oops_end Alexander van Heukelum
2008-10-22 10:00                 ` [PATCH 2/7] x86, dumpstack: let signr=0 signal no do_exit Alexander van Heukelum
2008-10-22 10:00                   ` [PATCH 3/7] x86_64, dumpstack: move kexec_crash from __die to oops_end Alexander van Heukelum
2008-10-22 10:00                     ` [PATCH 4/7] x86, dumpstack: always call oops_exit from oops_end Alexander van Heukelum
2008-10-22 10:00                       ` [PATCH 5/7] i386, dumpstack: use x86_64's method to account die_nest_count Alexander van Heukelum
2008-10-22 10:00                         ` [PATCH 6/7] i386, dumpstack: use oops_begin/oops_end in die_nmi Alexander van Heukelum
2008-10-22 10:00                           ` [PATCH 7/7] i386, dumpstack: unify die() Alexander van Heukelum
2008-10-22 13:37                             ` Neil Horman
2008-10-22 12:36                           ` [PATCH 6/7] i386, dumpstack: use oops_begin/oops_end in die_nmi Neil Horman
2008-10-22 11:18                         ` [PATCH 5/7] i386, dumpstack: use x86_64's method to account die_nest_count Neil Horman
2008-10-22 11:14                       ` [PATCH 4/7] x86, dumpstack: always call oops_exit from oops_end Neil Horman
2008-10-22 11:11                     ` [PATCH 3/7] x86_64, dumpstack: move kexec_crash from __die to oops_end Neil Horman
2008-10-22 11:01                   ` Neil Horman [this message]
2008-10-22 10:49                 ` [PATCH 1/7] i386, dumpstack: Move crash_kexec before bust_spinlocks(0) in oops_end Neil Horman
2008-10-21 14:45         ` [PATCH] x86: make oops_begin and oops_end equal Neil Horman
2008-10-22 10:18           ` Alexander van Heukelum
2008-10-22 10:45             ` Neil Horman
2008-10-22 12:02               ` Ingo Molnar
2008-10-22 19:19                 ` Neil Horman
2008-10-23  9:22                   ` Alexander van Heukelum
2008-10-20 16:51       ` [PATCH] x86, dumpstack: some more unification Neil Horman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20081022110126.GC18951@hmsreliant.think-freely.org \
    --to=nhorman@tuxdriver.com \
    --cc=akpm@linux-foundation.org \
    --cc=ebiederm@xmission.com \
    --cc=hbabu@us.ibm.com \
    --cc=heukelum@fastmail.fm \
    --cc=hpa@zytor.com \
    --cc=kexec@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=tglx@linutronix.de \
    --cc=vgoyal@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®