kexec.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: Geoff Levand <geoff@infradead.org>
To: AKASHI Takahiro <takahiro.akashi@linaro.org>,
	catalin.marinas@arm.com, will.deacon@arm.com
Cc: kexec@lists.infradead.org, james.morse@arm.com,
	linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH v21 3/8] arm64: kdump: implement machine_crash_shutdown()
Date: Wed, 06 Jul 2016 10:28:57 -0700	[thread overview]
Message-ID: <1467826137.8880.35.camel@infradead.org> (raw)
In-Reply-To: <20160706075226.27609-4-takahiro.akashi@linaro.org>

On Wed, 2016-07-06 at 16:52 +0900, AKASHI Takahiro wrote:
> --- a/arch/arm64/include/asm/smp.h
> +++ b/arch/arm64/include/asm/smp.h
> @@ -136,6 +136,10 @@ static inline void cpu_panic_kernel(void)
>   */
>  bool cpus_are_stuck_in_kernel(void);
>  
> +#ifdef CONFIG_KEXEC_CORE
> +extern void smp_send_crash_stop(void);
> +#endif

It seems this could be simplified by removing these
conditionals, then move the conditionals that are
around the smp_send_crash_stop definition to inside
that definition.

> diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c
> index 62ff3c0..51e0b73 100644
> --- a/arch/arm64/kernel/smp.c
> +++ b/arch/arm64/kernel/smp.c
> @@ -800,6 +803,28 @@ static void ipi_cpu_stop(unsigned int cpu)
>  > 	> 	> cpu_relax();
>  }
>  
> +#ifdef CONFIG_KEXEC_CORE
> +static atomic_t waiting_for_crash_ipi;
> +
> +static void ipi_cpu_crash_stop(unsigned int cpu, struct pt_regs *regs)
> +{
> +> 	> crash_save_cpu(regs, cpu);
> +
> +> 	> atomic_dec(&waiting_for_crash_ipi);
> +
> +> 	> local_irq_disable();
> +
> +#ifdef CONFIG_HOTPLUG_CPU
> +> 	> if (cpu_ops[cpu]->cpu_die)
> +> 	> 	> cpu_ops[cpu]->cpu_die(cpu);
> +#endif
> +
> +> 	> /* just in case */
> +> 	> while (1)
> +> 	> 	> wfi();
> +}
> +#endif

 /*
>   * Main handler for inter-processor interrupts
>   */
> @@ -830,6 +855,14 @@ void handle_IPI(int ipinr, struct pt_regs *regs)
>  > 	> 	> irq_exit();
>  > 	> 	> break;
>  
> +#ifdef CONFIG_KEXEC_CORE
> +> 	> case IPI_CPU_CRASH_STOP:
> +> 	> 	> irq_enter();
> +> 	> 	> ipi_cpu_crash_stop(cpu, regs);
> +
> +> 	> 	> unreachable();
> +#endif

It seems like you could simplifiy with something like:

	case IPI_CPU_CRASH_STOP:
		if (IS_ENABLED(CONFIG_KEXEC_CORE) {
			irq_enter();
			ipi_cpu_crash_stop(cpu, regs);
			unreachable();
		}

Then move the CONFIG_KEXEC_CORE conditional around
ipi_cpu_crash_stop to just around crash_save_cpu().

 -Geoff

_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

  reply	other threads:[~2016-07-06 17:28 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-07-06  7:52 [PATCH v21 0/8] arm64: kdump support AKASHI Takahiro
2016-07-06  7:52 ` [PATCH v21 1/8] arm64: kdump: reserve memory for crash dump kernel AKASHI Takahiro
2016-07-06 17:00   ` Geoff Levand
2016-07-07  0:19     ` AKASHI Takahiro
2016-07-06 18:11   ` Thiago Jung Bauermann
2016-07-07  1:17     ` AKASHI Takahiro
2016-07-06  7:52 ` [PATCH v21 2/8] arm64: limit memory regions based on DT property, usable-memory AKASHI Takahiro
2016-07-06 17:48   ` Geoff Levand
2016-07-06  7:52 ` [PATCH v21 3/8] arm64: kdump: implement machine_crash_shutdown() AKASHI Takahiro
2016-07-06 17:28   ` Geoff Levand [this message]
2016-07-07  0:43     ` AKASHI Takahiro
2016-07-07 16:42       ` Geoff Levand
2016-07-06  7:52 ` [PATCH v21 4/8] arm64: kdump: add kdump support AKASHI Takahiro
2016-07-06 17:38   ` Geoff Levand
2016-07-07  0:49     ` AKASHI Takahiro
2016-07-06  7:52 ` [PATCH v21 5/8] arm64: kdump: add VMCOREINFO's for user-space coredump tools AKASHI Takahiro
2016-07-06  7:52 ` [PATCH v21 6/8] arm64: kdump: enable kdump in the arm64 defconfig AKASHI Takahiro
2016-07-06  7:52 ` [PATCH v21 7/8] arm64: kdump: update a kernel doc AKASHI Takahiro
2016-07-06 17:44   ` Geoff Levand
2016-07-07  0:51     ` AKASHI Takahiro
2016-07-06  7:52 ` [PATCH v21 8/8] Documentation: dt: usable-memory and elfcorehdr nodes for arm64 kexec AKASHI Takahiro
2016-07-06 17:46   ` Geoff Levand
2016-07-06 19:29   ` Thiago Jung Bauermann
2016-07-07  2:00     ` AKASHI Takahiro
2016-07-07 18:46       ` Thiago Jung Bauermann

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=1467826137.8880.35.camel@infradead.org \
    --to=geoff@infradead.org \
    --cc=catalin.marinas@arm.com \
    --cc=james.morse@arm.com \
    --cc=kexec@lists.infradead.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=takahiro.akashi@linaro.org \
    --cc=will.deacon@arm.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;
as well as URLs for NNTP newsgroup(s).