linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Anton Blanchard <anton@samba.org>
To: benh@kernel.crashing.org
Cc: linuxppc-dev@ozlabs.org
Subject: [PATCH 8/8] powerpc/kdump: Disable ftrace during kexec
Date: Fri, 7 Jan 2011 15:00:36 +1100	[thread overview]
Message-ID: <20110107150036.5b21b394@kryten> (raw)
In-Reply-To: <20110107145255.72cf30ba@kryten>


We should disable ftrace during kexec, some of the tracers are very invasive
and we do not want them going off while doing the low level work of swapping
one kernel out for another. This mirrors what we do on x86.

Even though we cannot return from a kexec on powerpc (since we do not implement
CONFIG_KEXEC_JUMP), add the restore code in case we do one day.

Signed-off-by: Anton Blanchard <anton@samba.org>
---

Index: powerpc.git/arch/powerpc/kernel/machine_kexec.c
===================================================================
--- powerpc.git.orig/arch/powerpc/kernel/machine_kexec.c	2011-01-07 12:51:56.222461754 +1100
+++ powerpc.git/arch/powerpc/kernel/machine_kexec.c	2011-01-07 12:52:02.012644243 +1100
@@ -15,6 +15,7 @@
 #include <linux/memblock.h>
 #include <linux/of.h>
 #include <linux/irq.h>
+#include <linux/ftrace.h>
 
 #include <asm/machdep.h>
 #include <asm/prom.h>
@@ -82,8 +83,14 @@ void arch_crash_save_vmcoreinfo(void)
  */
 void machine_kexec(struct kimage *image)
 {
+	int save_ftrace_enabled;
+
+	save_ftrace_enabled = __ftrace_enabled_save();
+
 	default_machine_kexec(image);
 
+	__ftrace_enabled_restore(save_ftrace_enabled);
+
 	/* Fall back to normal restart if we're still alive. */
 	machine_restart(NULL);
 	for(;;);

      parent reply	other threads:[~2011-01-07  4:00 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-01-07  3:52 [PATCH 0/8]: Some kexec/kdump cleanups Anton Blanchard
2011-01-07  3:54 ` [PATCH 1/8] powerpc: Move all ppc_md kexec function pointers together Anton Blanchard
2011-01-07  3:54 ` [PATCH 2/8] powerpc/kexec: Remove ppc_md.machine_kexec_cleanup Anton Blanchard
2011-01-07  3:55 ` [PATCH 3/8] powerpc/kexec: Remove ppc_md.machine_kexec Anton Blanchard
2011-01-07  3:56 ` [PATCH 4/8] powerpc/kdump: Remove ppc_md.machine_crash_shutdown Anton Blanchard
2011-01-07  3:57 ` [PATCH 5/8] powerpc/kexec: Don't initialise kexec hooks to default handlers Anton Blanchard
2011-01-07  3:58 ` [PATCH 6/8] powerpc/kexec: Remove empty ppc_md.machine_kexec_prepare Anton Blanchard
2011-01-07  3:59 ` [PATCH 7/8] powerpc/kdump: Move crash_kexec_stop_spus to kdump crash handler Anton Blanchard
2011-01-21  2:43   ` Anton Blanchard
2011-01-07  4:00 ` Anton Blanchard [this message]

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=20110107150036.5b21b394@kryten \
    --to=anton@samba.org \
    --cc=benh@kernel.crashing.org \
    --cc=linuxppc-dev@ozlabs.org \
    /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).