From: Todd Brandt <todd.e.brandt@linux.intel.com>
To: "Rafael J. Wysocki" <rafael@kernel.org>
Cc: "linux-pm@vger.kernel.org" <linux-pm@vger.kernel.org>,
Rafael Wysocki <rafael.j.wysocki@intel.com>,
"Rafael J. Wysocki" <rjw@rjwysocki.net>,
todd.e.brandt@intel.com
Subject: Re: [PATCH] PM: Fix crash on graph trace through x86 suspend
Date: Wed, 02 Mar 2016 16:43:32 -0800 [thread overview]
Message-ID: <1456965812.5488.4.camel@linux.intel.com> (raw)
In-Reply-To: <CAJZ5v0gX+FEHryK=dJvQ1kXO19Addk5nr4jid012CpZzVdE_tA@mail.gmail.com>
On Thu, 2016-03-03 at 01:19 +0100, Rafael J. Wysocki wrote:
> On Thu, Mar 3, 2016 at 1:05 AM, Todd Brandt
> <todd.e.brandt@linux.intel.com> wrote:
> > Pause/unpause graph tracing around do_suspend_lowlevel as it has
> > inconsistent call/return info after it jumps to the wakeup vector.
> > The graph trace buffer will otherwise become misaligned and
> > may eventually crash and hang on suspend.
> >
> > To reproduce the issue and test the fix:
> > Run a function_graph trace over suspend/resume and set the graph
> > function to suspend_devices_and_enter. This consistently hangs the
> > system without this fix.
> >
> > Signed-off-by: Todd Brandt <todd.e.brandt@linux.intel.com>
>
> OK
>
> I guess we'll need that in -stable, right?
Sure, it's pretty important. The new analyze_suspend features are going
to rely pretty heavily on full graph trace of suspend (all we can do is
standby and freeze now because of the bug). Thanks!
>
> > ---
> > arch/x86/kernel/acpi/sleep.c | 7 +++++++
> > 1 file changed, 7 insertions(+)
> >
> > diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
> > index d1daead..311360e 100644
> > --- a/arch/x86/kernel/acpi/sleep.c
> > +++ b/arch/x86/kernel/acpi/sleep.c
> > @@ -16,6 +16,7 @@
> > #include <asm/cacheflush.h>
> > #include <asm/realmode.h>
> >
> > +#include <linux/ftrace.h>
> > #include "../../realmode/rm/wakeup.h"
> > #include "sleep.h"
> >
> > @@ -107,7 +108,13 @@ int x86_acpi_suspend_lowlevel(void)
> > saved_magic = 0x123456789abcdef0L;
> > #endif /* CONFIG_64BIT */
> >
> > + /*
> > + * Pause/unpause graph tracing around do_suspend_lowlevel as it has
> > + * inconsistent call/return info after it jumps to the wakeup vector
> > + */
> > + pause_graph_tracing();
> > do_suspend_lowlevel();
> > + unpause_graph_tracing();
> > return 0;
> > }
> >
> > --
> > 2.1.4
> >
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-pm" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2016-03-03 0:43 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-03 0:05 [PATCH] PM: Fix crash on graph trace through x86 suspend Todd Brandt
2016-03-03 0:19 ` Rafael J. Wysocki
2016-03-03 0:43 ` Todd Brandt [this message]
2016-03-03 1:34 ` Rafael J. Wysocki
2016-03-03 1:36 ` Rafael J. Wysocki
2016-03-03 2:07 ` Steven Rostedt
2016-03-03 2:16 ` Rafael J. Wysocki
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=1456965812.5488.4.camel@linux.intel.com \
--to=todd.e.brandt@linux.intel.com \
--cc=linux-pm@vger.kernel.org \
--cc=rafael.j.wysocki@intel.com \
--cc=rafael@kernel.org \
--cc=rjw@rjwysocki.net \
--cc=todd.e.brandt@intel.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