diff options
| author | Todd E Brandt <todd.e.brandt@linux.intel.com> | 2016-03-02 16:05:29 -0800 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2016-04-01 01:54:36 +0100 |
| commit | 32592edb940df95dce3b8fcc62fbaf4c1e5522bf (patch) | |
| tree | 8984edb2c748d561225fe8905c0bdb5b1875bcbd /arch/x86 | |
| parent | c7f2c4c4c6d4776db352e3994e61b3d92fee0420 (diff) | |
PM / sleep / x86: Fix crash on graph trace through x86 suspend
commit 92f9e179a702a6adbc11e2fedc76ecd6ffc9e3f7 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: Todd Brandt <todd.e.brandt@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kernel/acpi/sleep.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c index 103b6ab368d3..0d56eaa629ff 100644 --- a/arch/x86/kernel/acpi/sleep.c +++ b/arch/x86/kernel/acpi/sleep.c @@ -15,6 +15,7 @@ #include <asm/pgtable.h> #include <asm/cacheflush.h> +#include <linux/ftrace.h> #include "realmode/wakeup.h" #include "sleep.h" @@ -102,7 +103,13 @@ int 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; } |