From: Greg Kroah-Hartman Date: Mon, 26 Jun 2017 07:00:34 +0000 (+0200) Subject: 3.18-stable patches X-Git-Tag: v3.18.59~30 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f225c1c8658a942b4f294ee7c0628b14dad2f560;p=thirdparty%2Fkernel%2Fstable-queue.git 3.18-stable patches added patches: input-i8042-add-fujitsu-lifebook-ah544-to-notimeout-list.patch powerpc-kprobes-pause-function_graph-tracing-during-jprobes-handling.patch --- diff --git a/queue-3.18/input-i8042-add-fujitsu-lifebook-ah544-to-notimeout-list.patch b/queue-3.18/input-i8042-add-fujitsu-lifebook-ah544-to-notimeout-list.patch new file mode 100644 index 00000000000..e38de8888a8 --- /dev/null +++ b/queue-3.18/input-i8042-add-fujitsu-lifebook-ah544-to-notimeout-list.patch @@ -0,0 +1,40 @@ +From 817ae460c784f32cd45e60b2b1b21378c3c6a847 Mon Sep 17 00:00:00 2001 +From: Daniel Drake +Date: Mon, 19 Jun 2017 19:48:52 -0700 +Subject: Input: i8042 - add Fujitsu Lifebook AH544 to notimeout list + +From: Daniel Drake + +commit 817ae460c784f32cd45e60b2b1b21378c3c6a847 upstream. + +Without this quirk, the touchpad is not responsive on this product, with +the following message repeated in the logs: + + psmouse serio1: bad data from KBC - timeout + +Add it to the notimeout list alongside other similar Fujitsu laptops. + +Signed-off-by: Daniel Drake +Signed-off-by: Dmitry Torokhov +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/input/serio/i8042-x86ia64io.h | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/drivers/input/serio/i8042-x86ia64io.h ++++ b/drivers/input/serio/i8042-x86ia64io.h +@@ -688,6 +688,13 @@ static const struct dmi_system_id __init + DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK U574"), + }, + }, ++ { ++ /* Fujitsu UH554 laptop */ ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK UH544"), ++ }, ++ }, + { } + }; + diff --git a/queue-3.18/powerpc-kprobes-pause-function_graph-tracing-during-jprobes-handling.patch b/queue-3.18/powerpc-kprobes-pause-function_graph-tracing-during-jprobes-handling.patch new file mode 100644 index 00000000000..ae0cdc3d893 --- /dev/null +++ b/queue-3.18/powerpc-kprobes-pause-function_graph-tracing-during-jprobes-handling.patch @@ -0,0 +1,57 @@ +From a9f8553e935f26cb5447f67e280946b0923cd2dc Mon Sep 17 00:00:00 2001 +From: "Naveen N. Rao" +Date: Thu, 1 Jun 2017 16:18:15 +0530 +Subject: powerpc/kprobes: Pause function_graph tracing during jprobes handling + +From: Naveen N. Rao + +commit a9f8553e935f26cb5447f67e280946b0923cd2dc upstream. + +This fixes a crash when function_graph and jprobes are used together. +This is essentially commit 237d28db036e ("ftrace/jprobes/x86: Fix +conflict between jprobes and function graph tracing"), but for powerpc. + +Jprobes breaks function_graph tracing since the jprobe hook needs to use +jprobe_return(), which never returns back to the hook, but instead to +the original jprobe'd function. The solution is to momentarily pause +function_graph tracing before invoking the jprobe hook and re-enable it +when returning back to the original jprobe'd function. + +Fixes: 6794c78243bf ("powerpc64: port of the function graph tracer") +Signed-off-by: Naveen N. Rao +Acked-by: Masami Hiramatsu +Acked-by: Steven Rostedt (VMware) +Signed-off-by: Michael Ellerman +Signed-off-by: Greg Kroah-Hartman + +--- + arch/powerpc/kernel/kprobes.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +--- a/arch/powerpc/kernel/kprobes.c ++++ b/arch/powerpc/kernel/kprobes.c +@@ -514,6 +514,15 @@ int __kprobes setjmp_pre_handler(struct + #endif + #endif + ++ /* ++ * jprobes use jprobe_return() which skips the normal return ++ * path of the function, and this messes up the accounting of the ++ * function graph tracer. ++ * ++ * Pause function graph tracing while performing the jprobe function. ++ */ ++ pause_graph_tracing(); ++ + return 1; + } + +@@ -536,6 +545,8 @@ int __kprobes longjmp_break_handler(stru + * saved regs... + */ + memcpy(regs, &kcb->jprobe_saved_regs, sizeof(struct pt_regs)); ++ /* It's OK to start function graph tracing again */ ++ unpause_graph_tracing(); + preempt_enable_no_resched(); + return 1; + } diff --git a/queue-3.18/series b/queue-3.18/series index 236f24a5c25..71e689a3bb0 100644 --- a/queue-3.18/series +++ b/queue-3.18/series @@ -4,3 +4,5 @@ lib-cmdline.c-fix-get_options-overflow-while-parsing-ranges.patch kvm-ppc-book3s-hv-preserve-userspace-htm-state-properly.patch cifs-improve-readdir-verbosity.patch signal-only-reschedule-timers-on-signals-timers-have-sent.patch +powerpc-kprobes-pause-function_graph-tracing-during-jprobes-handling.patch +input-i8042-add-fujitsu-lifebook-ah544-to-notimeout-list.patch