lkml.org 
[lkml]   [2016]   [Mar]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16.y-ckt 105/142] PM / sleep / x86: Fix crash on graph trace through x86 suspend
    Date
    3.16.7-ckt26 -stable review patch.  If anyone has any objections, please let me know.

    ---8<------------------------------------------------------------

    From: Todd E Brandt <todd.e.brandt@linux.intel.com>

    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>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    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 31368207837c..8255d2fe8cfa 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;
    }

    \
     
     \ /
      Last update: 2016-03-22 12:41    [W:3.697 / U:0.384 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site