+++ /dev/null
-From 73755a7d233fcdf2d35ea943bb23f3e761fffbbd Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 20 Dec 2022 11:57:00 +0800
-Subject: perf debug: Set debug_peo_args and redirect_to_stderr variable to
- correct values in perf_quiet_option()
-
-From: Yang Jihong <yangjihong1@huawei.com>
-
-[ Upstream commit 188ac720d364035008a54d249cf47b4cc100f819 ]
-
-When perf uses quiet mode, perf_quiet_option() sets the 'debug_peo_args'
-variable to -1, and display_attr() incorrectly determines the value of
-'debug_peo_args'. As a result, unexpected information is displayed.
-
-Before:
-
- # perf record --quiet -- ls > /dev/null
- ------------------------------------------------------------
- perf_event_attr:
- size 128
- { sample_period, sample_freq } 4000
- sample_type IP|TID|TIME|PERIOD
- read_format ID|LOST
- disabled 1
- inherit 1
- mmap 1
- comm 1
- freq 1
- enable_on_exec 1
- task 1
- precise_ip 3
- sample_id_all 1
- exclude_guest 1
- mmap2 1
- comm_exec 1
- ksymbol 1
- bpf_event 1
- ------------------------------------------------------------
- ...
-
-After:
- # perf record --quiet -- ls > /dev/null
- #
-
-redirect_to_stderr is a similar problem.
-
-Fixes: f78eaef0e0493f60 ("perf tools: Allow to force redirect pr_debug to stderr.")
-Fixes: ccd26741f5e6bdf2 ("perf tool: Provide an option to print perf_event_open args and return value")
-Suggested-by: Adrian Hunter <adrian.hunter@intel.com>
-Reviewed-by: Adrian Hunter <adrian.hunter@intel.com>
-Signed-off-by: Yang Jihong <yangjihong1@huawei.com>
-Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
-Cc: Andi Kleen <ak@linux.intel.com>
-Cc: Carsten Haitzler <carsten.haitzler@arm.com>
-Cc: Ian Rogers <irogers@google.com>
-Cc: Ingo Molnar <mingo@redhat.com>
-Cc: Jiri Olsa <jolsa@kernel.org>
-Cc: Leo Yan <leo.yan@linaro.org>
-Cc: Mark Rutland <mark.rutland@arm.com>
-Cc: martin.lau@kernel.org
-Cc: Masami Hiramatsu <mhiramat@kernel.org>
-Cc: Namhyung Kim <namhyung@kernel.org>
-Cc: Peter Zijlstra <peterz@infradead.org>
-Cc: Ravi Bangoria <ravi.bangoria@amd.com>
-Cc: Ravi Bangoria <ravi.bangoria@linux.ibm.com>
-Link: https://lore.kernel.org/r/20221220035702.188413-2-yangjihong1@huawei.com
-Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- tools/perf/util/debug.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/tools/perf/util/debug.c b/tools/perf/util/debug.c
-index 3d6459626c2a..9f9875ba2edf 100644
---- a/tools/perf/util/debug.c
-+++ b/tools/perf/util/debug.c
-@@ -232,6 +232,10 @@ int perf_quiet_option(void)
- var++;
- }
-
-+ /* For debug variables that are used as bool types, set to 0. */
-+ redirect_to_stderr = 0;
-+ debug_peo_args = 0;
-+
- return 0;
- }
-
---
-2.35.1
-
+++ /dev/null
-From 25e0560ab7e86c2b9ddd753f22b26fdb0f928ccf Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 11 Jan 2021 20:40:14 +0800
-Subject: riscv/stacktrace: Fix stack output without ra on the stack top
-
-From: Chen Huang <chenhuang5@huawei.com>
-
-[ Upstream commit f766f77a74f5784d8d4d3c36b1900731f97d08d0 ]
-
-When a function doesn't have a callee, then it will not
-push ra into the stack, such as lkdtm_BUG() function,
-
-addi sp,sp,-16
-sd s0,8(sp)
-addi s0,sp,16
-ebreak
-
-The struct stackframe use {fp,ra} to get information from
-stack, if walk_stackframe() with pr_regs, we will obtain
-wrong value and bad stacktrace,
-
-[<ffffffe00066c56c>] lkdtm_BUG+0x6/0x8
----[ end trace 18da3fbdf08e25d5 ]---
-
-Correct the next fp and pc, after that, full stacktrace
-shown as expects,
-
-[<ffffffe00066c56c>] lkdtm_BUG+0x6/0x8
-[<ffffffe0008b24a4>] lkdtm_do_action+0x14/0x1c
-[<ffffffe00066c372>] direct_entry+0xc0/0x10a
-[<ffffffe000439f86>] full_proxy_write+0x42/0x6a
-[<ffffffe000309626>] vfs_write+0x7e/0x214
-[<ffffffe00030992a>] ksys_write+0x98/0xc0
-[<ffffffe000309960>] sys_write+0xe/0x16
-[<ffffffe0002014bc>] ret_from_syscall+0x0/0x2
----[ end trace 61917f3d9a9fadcd ]---
-
-Signed-off-by: Chen Huang <chenhuang5@huawei.com>
-Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
-Signed-off-by: Palmer Dabbelt <palmerdabbelt@google.com>
-Stable-dep-of: 5c3022e4a616 ("riscv: stacktrace: Fixup ftrace_graph_ret_addr retp argument")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/riscv/kernel/stacktrace.c | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/arch/riscv/kernel/stacktrace.c b/arch/riscv/kernel/stacktrace.c
-index 39cd3cf9f06b..3d1e184e39e9 100644
---- a/arch/riscv/kernel/stacktrace.c
-+++ b/arch/riscv/kernel/stacktrace.c
-@@ -63,9 +63,15 @@ static void notrace walk_stackframe(struct task_struct *task,
- /* Unwind stack frame */
- frame = (struct stackframe *)fp - 1;
- sp = fp;
-- fp = frame->fp;
-- pc = ftrace_graph_ret_addr(current, NULL, frame->ra,
-- (unsigned long *)(fp - 8));
-+ if (regs && (regs->epc == pc) && (frame->fp & 0x7)) {
-+ fp = frame->ra;
-+ pc = regs->ra;
-+ } else {
-+ fp = frame->fp;
-+ pc = ftrace_graph_ret_addr(current, NULL, frame->ra,
-+ (unsigned long *)(fp - 8));
-+ }
-+
- }
- }
-
---
-2.35.1
-
+++ /dev/null
-From 72dea6c020220e8f4916d698293730b8f3dc8b27 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 9 Nov 2022 01:49:36 -0500
-Subject: riscv: stacktrace: Fixup ftrace_graph_ret_addr retp argument
-
-From: Guo Ren <guoren@linux.alibaba.com>
-
-[ Upstream commit 5c3022e4a616d800cf5f4c3a981d7992179e44a1 ]
-
-The 'retp' is a pointer to the return address on the stack, so we
-must pass the current return address pointer as the 'retp'
-argument to ftrace_push_return_trace(). Not parent function's
-return address on the stack.
-
-Fixes: b785ec129bd9 ("riscv/ftrace: Add HAVE_FUNCTION_GRAPH_RET_ADDR_PTR support")
-Signed-off-by: Guo Ren <guoren@linux.alibaba.com>
-Signed-off-by: Guo Ren <guoren@kernel.org>
-Link: https://lore.kernel.org/r/20221109064937.3643993-2-guoren@kernel.org
-Cc: stable@vger.kernel.org
-Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/riscv/kernel/stacktrace.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/riscv/kernel/stacktrace.c b/arch/riscv/kernel/stacktrace.c
-index 3d1e184e39e9..75ed5b5b1f9b 100644
---- a/arch/riscv/kernel/stacktrace.c
-+++ b/arch/riscv/kernel/stacktrace.c
-@@ -69,7 +69,7 @@ static void notrace walk_stackframe(struct task_struct *task,
- } else {
- fp = frame->fp;
- pc = ftrace_graph_ret_addr(current, NULL, frame->ra,
-- (unsigned long *)(fp - 8));
-+ &frame->ra);
- }
-
- }
---
-2.35.1
-
asoc-rockchip-spdif-add-missing-clk_disable_unprepar.patch
asoc-rt5670-remove-unbalanced-pm_runtime_put.patch
pstore-switch-pmsg_lock-to-an-rt_mutex-to-avoid-prio.patch
-perf-debug-set-debug_peo_args-and-redirect_to_stderr.patch
pstore-make-sure-config_pstore_pmsg-selects-config_r.patch
usb-dwc3-core-defer-probe-on-ulpi_read_id-timeout.patch
hid-wacom-ensure-bootloader-pid-is-usable-in-hidraw-mode.patch
perf-probe-fix-to-get-the-dw_at_decl_file-and-dw_at_.patch
ravb-fix-failed-to-switch-device-to-config-mode-mess.patch
riscv-remove-unreachable-have_function_graph_ret_add.patch
-riscv-stacktrace-fix-stack-output-without-ra-on-the-.patch
-riscv-stacktrace-fixup-ftrace_graph_ret_addr-retp-ar.patch
driver-core-set-deferred_probe_timeout-to-a-longer-d.patch
ext4-goto-right-label-failed_mount3a.patch
ext4-correct-inconsistent-error-msg-in-nojournal-mod.patch
+++ /dev/null
-From 89c993022aa6a6726562fff7cb6f6bb78acd2520 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 20 Dec 2022 11:57:00 +0800
-Subject: perf debug: Set debug_peo_args and redirect_to_stderr variable to
- correct values in perf_quiet_option()
-
-From: Yang Jihong <yangjihong1@huawei.com>
-
-[ Upstream commit 188ac720d364035008a54d249cf47b4cc100f819 ]
-
-When perf uses quiet mode, perf_quiet_option() sets the 'debug_peo_args'
-variable to -1, and display_attr() incorrectly determines the value of
-'debug_peo_args'. As a result, unexpected information is displayed.
-
-Before:
-
- # perf record --quiet -- ls > /dev/null
- ------------------------------------------------------------
- perf_event_attr:
- size 128
- { sample_period, sample_freq } 4000
- sample_type IP|TID|TIME|PERIOD
- read_format ID|LOST
- disabled 1
- inherit 1
- mmap 1
- comm 1
- freq 1
- enable_on_exec 1
- task 1
- precise_ip 3
- sample_id_all 1
- exclude_guest 1
- mmap2 1
- comm_exec 1
- ksymbol 1
- bpf_event 1
- ------------------------------------------------------------
- ...
-
-After:
- # perf record --quiet -- ls > /dev/null
- #
-
-redirect_to_stderr is a similar problem.
-
-Fixes: f78eaef0e0493f60 ("perf tools: Allow to force redirect pr_debug to stderr.")
-Fixes: ccd26741f5e6bdf2 ("perf tool: Provide an option to print perf_event_open args and return value")
-Suggested-by: Adrian Hunter <adrian.hunter@intel.com>
-Reviewed-by: Adrian Hunter <adrian.hunter@intel.com>
-Signed-off-by: Yang Jihong <yangjihong1@huawei.com>
-Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
-Cc: Andi Kleen <ak@linux.intel.com>
-Cc: Carsten Haitzler <carsten.haitzler@arm.com>
-Cc: Ian Rogers <irogers@google.com>
-Cc: Ingo Molnar <mingo@redhat.com>
-Cc: Jiri Olsa <jolsa@kernel.org>
-Cc: Leo Yan <leo.yan@linaro.org>
-Cc: Mark Rutland <mark.rutland@arm.com>
-Cc: martin.lau@kernel.org
-Cc: Masami Hiramatsu <mhiramat@kernel.org>
-Cc: Namhyung Kim <namhyung@kernel.org>
-Cc: Peter Zijlstra <peterz@infradead.org>
-Cc: Ravi Bangoria <ravi.bangoria@amd.com>
-Cc: Ravi Bangoria <ravi.bangoria@linux.ibm.com>
-Link: https://lore.kernel.org/r/20221220035702.188413-2-yangjihong1@huawei.com
-Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- tools/perf/util/debug.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/tools/perf/util/debug.c b/tools/perf/util/debug.c
-index 682146d04379..112cb85f6086 100644
---- a/tools/perf/util/debug.c
-+++ b/tools/perf/util/debug.c
-@@ -232,6 +232,10 @@ int perf_quiet_option(void)
- var++;
- }
-
-+ /* For debug variables that are used as bool types, set to 0. */
-+ redirect_to_stderr = 0;
-+ debug_peo_args = 0;
-+
- return 0;
- }
-
---
-2.35.1
-
+++ /dev/null
-From e92954d051587a06c852db0cb6f3173e9f9f651e Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 11 Jan 2021 20:40:14 +0800
-Subject: riscv/stacktrace: Fix stack output without ra on the stack top
-
-From: Chen Huang <chenhuang5@huawei.com>
-
-[ Upstream commit f766f77a74f5784d8d4d3c36b1900731f97d08d0 ]
-
-When a function doesn't have a callee, then it will not
-push ra into the stack, such as lkdtm_BUG() function,
-
-addi sp,sp,-16
-sd s0,8(sp)
-addi s0,sp,16
-ebreak
-
-The struct stackframe use {fp,ra} to get information from
-stack, if walk_stackframe() with pr_regs, we will obtain
-wrong value and bad stacktrace,
-
-[<ffffffe00066c56c>] lkdtm_BUG+0x6/0x8
----[ end trace 18da3fbdf08e25d5 ]---
-
-Correct the next fp and pc, after that, full stacktrace
-shown as expects,
-
-[<ffffffe00066c56c>] lkdtm_BUG+0x6/0x8
-[<ffffffe0008b24a4>] lkdtm_do_action+0x14/0x1c
-[<ffffffe00066c372>] direct_entry+0xc0/0x10a
-[<ffffffe000439f86>] full_proxy_write+0x42/0x6a
-[<ffffffe000309626>] vfs_write+0x7e/0x214
-[<ffffffe00030992a>] ksys_write+0x98/0xc0
-[<ffffffe000309960>] sys_write+0xe/0x16
-[<ffffffe0002014bc>] ret_from_syscall+0x0/0x2
----[ end trace 61917f3d9a9fadcd ]---
-
-Signed-off-by: Chen Huang <chenhuang5@huawei.com>
-Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
-Signed-off-by: Palmer Dabbelt <palmerdabbelt@google.com>
-Stable-dep-of: 5c3022e4a616 ("riscv: stacktrace: Fixup ftrace_graph_ret_addr retp argument")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/riscv/kernel/stacktrace.c | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/arch/riscv/kernel/stacktrace.c b/arch/riscv/kernel/stacktrace.c
-index 19e46f4160cc..1a512a24879e 100644
---- a/arch/riscv/kernel/stacktrace.c
-+++ b/arch/riscv/kernel/stacktrace.c
-@@ -55,9 +55,15 @@ void notrace walk_stackframe(struct task_struct *task, struct pt_regs *regs,
- /* Unwind stack frame */
- frame = (struct stackframe *)fp - 1;
- sp = fp;
-- fp = frame->fp;
-- pc = ftrace_graph_ret_addr(current, NULL, frame->ra,
-- (unsigned long *)(fp - 8));
-+ if (regs && (regs->epc == pc) && (frame->fp & 0x7)) {
-+ fp = frame->ra;
-+ pc = regs->ra;
-+ } else {
-+ fp = frame->fp;
-+ pc = ftrace_graph_ret_addr(current, NULL, frame->ra,
-+ (unsigned long *)(fp - 8));
-+ }
-+
- }
- }
-
---
-2.35.1
-
+++ /dev/null
-From eacfe5acf0bf82c6079fc7250a2c8731b481e7a6 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 9 Nov 2022 01:49:36 -0500
-Subject: riscv: stacktrace: Fixup ftrace_graph_ret_addr retp argument
-
-From: Guo Ren <guoren@linux.alibaba.com>
-
-[ Upstream commit 5c3022e4a616d800cf5f4c3a981d7992179e44a1 ]
-
-The 'retp' is a pointer to the return address on the stack, so we
-must pass the current return address pointer as the 'retp'
-argument to ftrace_push_return_trace(). Not parent function's
-return address on the stack.
-
-Fixes: b785ec129bd9 ("riscv/ftrace: Add HAVE_FUNCTION_GRAPH_RET_ADDR_PTR support")
-Signed-off-by: Guo Ren <guoren@linux.alibaba.com>
-Signed-off-by: Guo Ren <guoren@kernel.org>
-Link: https://lore.kernel.org/r/20221109064937.3643993-2-guoren@kernel.org
-Cc: stable@vger.kernel.org
-Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/riscv/kernel/stacktrace.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/riscv/kernel/stacktrace.c b/arch/riscv/kernel/stacktrace.c
-index 1a512a24879e..a1ee7f33c205 100644
---- a/arch/riscv/kernel/stacktrace.c
-+++ b/arch/riscv/kernel/stacktrace.c
-@@ -61,7 +61,7 @@ void notrace walk_stackframe(struct task_struct *task, struct pt_regs *regs,
- } else {
- fp = frame->fp;
- pc = ftrace_graph_ret_addr(current, NULL, frame->ra,
-- (unsigned long *)(fp - 8));
-+ &frame->ra);
- }
-
- }
---
-2.35.1
-
asoc-rockchip-spdif-add-missing-clk_disable_unprepar.patch
asoc-rt5670-remove-unbalanced-pm_runtime_put.patch
pstore-switch-pmsg_lock-to-an-rt_mutex-to-avoid-prio.patch
-perf-debug-set-debug_peo_args-and-redirect_to_stderr.patch
pstore-make-sure-config_pstore_pmsg-selects-config_r.patch
alsa-hda-realtek-add-quirk-for-lenovo-tianyi510pro-14iob.patch
alsa-hda-hdmi-add-hp-device-0x8711-to-force-connect-list.patch
kvm-vmx-fix-the-spelling-of-cpu_based_use_tsc_offset.patch
kvm-nvmx-properly-expose-enable_usr_wait_pause-contr.patch
ravb-fix-failed-to-switch-device-to-config-mode-mess.patch
-riscv-stacktrace-fix-stack-output-without-ra-on-the-.patch
-riscv-stacktrace-fixup-ftrace_graph_ret_addr-retp-ar.patch
ext4-goto-right-label-failed_mount3a.patch
ext4-correct-inconsistent-error-msg-in-nojournal-mod.patch
mm-highmem-lift-memcpy_-to-from-_page-to-core.patch
projects / thirdparty / kernel / stable-queue.git / commitdiff
