Commit c66994c9 authored by Todd E Brandt's avatar Todd E Brandt Committed by Luis Henriques

PM / sleep / x86: Fix crash on graph trace through x86 suspend

commit 92f9e179 upstream.

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: default avatarTodd Brandt <todd.e.brandt@linux.intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: default avatarLuis Henriques <luis.henriques@canonical.com>
parent 0e1da5ac
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#include <asm/realmode.h> #include <asm/realmode.h>
#include <linux/ftrace.h>
#include "../../realmode/rm/wakeup.h" #include "../../realmode/rm/wakeup.h"
#include "sleep.h" #include "sleep.h"
...@@ -107,7 +108,13 @@ int x86_acpi_suspend_lowlevel(void) ...@@ -107,7 +108,13 @@ int x86_acpi_suspend_lowlevel(void)
saved_magic = 0x123456789abcdef0L; saved_magic = 0x123456789abcdef0L;
#endif /* CONFIG_64BIT */ #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(); do_suspend_lowlevel();
unpause_graph_tracing();
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment