From: Sasha Levin Date: Thu, 4 Jun 2020 19:29:41 +0000 (-0400) Subject: Fixes for 4.9 X-Git-Tag: v5.7.1~22 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=60d9093cec0a107d2c9aa4bbd429e55fc1c16b67;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 4.9 Signed-off-by: Sasha Levin --- diff --git a/queue-4.9/s390-ftrace-save-traced-function-caller.patch b/queue-4.9/s390-ftrace-save-traced-function-caller.patch new file mode 100644 index 00000000000..036481e52b7 --- /dev/null +++ b/queue-4.9/s390-ftrace-save-traced-function-caller.patch @@ -0,0 +1,55 @@ +From 2aecbd8604087810b2b008da6dd501c30da208bf Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 10 Dec 2019 13:50:23 +0100 +Subject: s390/ftrace: save traced function caller + +From: Vasily Gorbik + +[ Upstream commit b4adfe55915d8363e244e42386d69567db1719b9 ] + +A typical backtrace acquired from ftraced function currently looks like +the following (e.g. for "path_openat"): + +arch_stack_walk+0x15c/0x2d8 +stack_trace_save+0x50/0x68 +stack_trace_call+0x15a/0x3b8 +ftrace_graph_caller+0x0/0x1c +0x3e0007e3c98 <- ftraced function caller (should be do_filp_open+0x7c/0xe8) +do_open_execat+0x70/0x1b8 +__do_execve_file.isra.0+0x7d8/0x860 +__s390x_sys_execve+0x56/0x68 +system_call+0xdc/0x2d8 + +Note random "0x3e0007e3c98" stack value as ftraced function caller. This +value causes either imprecise unwinder result or unwinding failure. +That "0x3e0007e3c98" comes from r14 of ftraced function stack frame, which +it haven't had a chance to initialize since the very first instruction +calls ftrace code ("ftrace_caller"). (ftraced function might never +save r14 as well). Nevertheless according to s390 ABI any function +is called with stack frame allocated for it and r14 contains return +address. "ftrace_caller" itself is called with "brasl %r0,ftrace_caller". +So, to fix this issue simply always save traced function caller onto +ftraced function stack frame. + +Reported-by: Sven Schnelle +Signed-off-by: Vasily Gorbik +Signed-off-by: Sasha Levin +--- + arch/s390/kernel/mcount.S | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/arch/s390/kernel/mcount.S b/arch/s390/kernel/mcount.S +index 802a4ded9a62..e9df35249f9f 100644 +--- a/arch/s390/kernel/mcount.S ++++ b/arch/s390/kernel/mcount.S +@@ -39,6 +39,7 @@ EXPORT_SYMBOL(_mcount) + ENTRY(ftrace_caller) + .globl ftrace_regs_caller + .set ftrace_regs_caller,ftrace_caller ++ stg %r14,(__SF_GPRS+8*8)(%r15) # save traced function caller + lgr %r1,%r15 + #ifndef CC_USING_HOTPATCH + aghi %r0,MCOUNT_RETURN_FIXUP +-- +2.25.1 + diff --git a/queue-4.9/series b/queue-4.9/series index 00ce3f37906..29792e7f364 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -1,3 +1,5 @@ scsi-scsi_devinfo-fixup-string-compare.patch usb-gadget-f_uac2-fix-error-handling-in-afunc_bind-again.patch esp6-fix-memleak-on-error-path-in-esp6_input.patch +spi-dw-use-smp_mb-to-avoid-sending-spi-data-error.patch +s390-ftrace-save-traced-function-caller.patch diff --git a/queue-4.9/spi-dw-use-smp_mb-to-avoid-sending-spi-data-error.patch b/queue-4.9/spi-dw-use-smp_mb-to-avoid-sending-spi-data-error.patch new file mode 100644 index 00000000000..5969d71f556 --- /dev/null +++ b/queue-4.9/spi-dw-use-smp_mb-to-avoid-sending-spi-data-error.patch @@ -0,0 +1,48 @@ +From 88c6461cf5f0e8102fc311852f4ac30892f13e43 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 3 Jan 2020 10:52:10 +0800 +Subject: spi: dw: use "smp_mb()" to avoid sending spi data error + +From: Xinwei Kong + +[ Upstream commit bfda044533b213985bc62bd7ca96f2b984d21b80 ] + +Because of out-of-order execution about some CPU architecture, +In this debug stage we find Completing spi interrupt enable -> +prodrucing TXEI interrupt -> running "interrupt_transfer" function +will prior to set "dw->rx and dws->rx_end" data, so this patch add +memory barrier to enable dw->rx and dw->rx_end to be visible and +solve to send SPI data error. +eg: +it will fix to this following low possibility error in testing environment +which using SPI control to connect TPM Modules + +kernel: tpm tpm0: Operation Timed out +kernel: tpm tpm0: tpm_relinquish_locality: : error -1 + +Signed-off-by: fengsheng +Signed-off-by: Xinwei Kong +Link: https://lore.kernel.org/r/1578019930-55858-1-git-send-email-kong.kongxinwei@hisilicon.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + drivers/spi/spi-dw.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/spi/spi-dw.c b/drivers/spi/spi-dw.c +index 16f0def9df82..babf0a337e96 100644 +--- a/drivers/spi/spi-dw.c ++++ b/drivers/spi/spi-dw.c +@@ -305,6 +305,9 @@ static int dw_spi_transfer_one(struct spi_master *master, + dws->len = transfer->len; + spin_unlock_irqrestore(&dws->buf_lock, flags); + ++ /* Ensure dw->rx and dw->rx_end are visible */ ++ smp_mb(); ++ + spi_enable_chip(dws, 0); + + /* Handle per transfer options for bpw and speed */ +-- +2.25.1 +