From: He Zhe <zhe.he@windriver.com>
To: catalin.marinas@arm.com, will@kernel.org, mark.rutland@arm.com,
tglx@linutronix.de, bp@alien8.de, dave.hansen@linux.intel.com,
keescook@chromium.org, alexander.shishkin@linux.intel.com,
jolsa@kernel.org, namhyung@kernel.org, benh@kernel.crashing.org,
paulus@samba.org, borntraeger@linux.ibm.com, svens@linux.ibm.com,
hpa@zytor.com
Cc: x86@kernel.org, linux-arm-kernel@lists.infradead.org,
linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org,
linux-s390@vger.kernel.org, linux-perf-users@vger.kernel.org,
linux-kernel@vger.kernel.org, zhe.he@windriver.com
Subject: [PATCH RFC 4/8] powerpc: stacktrace: Make callbacks use new prototype with frame info
Date: Mon, 18 Apr 2022 21:22:13 +0800 [thread overview]
Message-ID: <20220418132217.1573072-5-zhe.he@windriver.com> (raw)
In-Reply-To: <20220418132217.1573072-1-zhe.he@windriver.com>
stack_trace_consume_fn has been changed to
bool (*stack_trace_consume_fn)(void *cookie, struct frame_info *fi);
to be able to pass more information.
Turn to use pc in struct frame_info in arch_stack_walk callbacks without
functinoal change.
Signed-off-by: He Zhe <zhe.he@windriver.com>
---
arch/powerpc/kernel/stacktrace.c | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/arch/powerpc/kernel/stacktrace.c b/arch/powerpc/kernel/stacktrace.c
index a2443d61728e..8640e9acfa29 100644
--- a/arch/powerpc/kernel/stacktrace.c
+++ b/arch/powerpc/kernel/stacktrace.c
@@ -28,9 +28,13 @@ void __no_sanitize_address arch_stack_walk(stack_trace_consume_fn consume_entry,
struct task_struct *task, struct pt_regs *regs)
{
unsigned long sp;
+ struct frame_info fi;
- if (regs && !consume_entry(cookie, regs->nip))
- return;
+ if (regs) {
+ fi.pc = regs->nip;
+ if (!consume_entry(cookie, &fi))
+ return;
+ }
if (regs)
sp = regs->gpr[1];
@@ -41,15 +45,15 @@ void __no_sanitize_address arch_stack_walk(stack_trace_consume_fn consume_entry,
for (;;) {
unsigned long *stack = (unsigned long *) sp;
- unsigned long newsp, ip;
+ unsigned long newsp;
if (!validate_sp(sp, task, STACK_FRAME_OVERHEAD))
return;
newsp = stack[0];
- ip = stack[STACK_FRAME_LR_SAVE];
+ fi.pc = stack[STACK_FRAME_LR_SAVE];
- if (!consume_entry(cookie, ip))
+ if (!consume_entry(cookie, &fi))
return;
sp = newsp;
@@ -71,6 +75,7 @@ int __no_sanitize_address arch_stack_walk_reliable(stack_trace_consume_fn consum
unsigned long stack_end;
int graph_idx = 0;
bool firstframe;
+ struct frame_info fi;
stack_end = stack_page + THREAD_SIZE;
if (!is_idle_task(task)) {
@@ -159,7 +164,8 @@ int __no_sanitize_address arch_stack_walk_reliable(stack_trace_consume_fn consum
return -EINVAL;
#endif
- if (!consume_entry(cookie, ip))
+ fi.pc = ip;
+ if (!consume_entry(cookie, &fi))
return -EINVAL;
}
return 0;
--
2.25.1
next prev parent reply other threads:[~2022-04-18 14:38 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-18 13:22 [PATCH RFC 0/8] hardened usercopy and stacktrace improvement He Zhe
2022-04-18 13:22 ` [PATCH RFC 1/8] stacktrace: Change callback prototype to pass more information He Zhe
2022-04-19 13:09 ` Mark Rutland
2022-04-19 14:13 ` He Zhe
2022-04-18 13:22 ` [PATCH RFC 2/8] arm64: stacktrace: Add arch_within_stack_frames He Zhe
2022-04-18 21:59 ` Kees Cook
2022-04-19 14:01 ` He Zhe
2022-04-20 7:32 ` David Laight
2022-04-19 14:40 ` Mark Rutland
2022-04-21 9:20 ` He Zhe
2022-04-18 13:22 ` [PATCH RFC 3/8] arm64: stacktrace: Make callbacks use new prototype with frame info He Zhe
2022-04-18 13:22 ` He Zhe [this message]
2022-04-18 13:22 ` [PATCH RFC 5/8] riscv: " He Zhe
2022-04-18 13:22 ` [PATCH RFC 6/8] s390: " He Zhe
2022-04-18 13:22 ` [PATCH RFC 7/8] x86: " He Zhe
2022-04-18 13:22 ` [PATCH RFC 8/8] lkdtm: usercopy: Make USERCOPY_STACK_FRAME_x able to work for all archs He Zhe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220418132217.1573072-5-zhe.he@windriver.com \
--to=zhe.he@windriver.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=benh@kernel.crashing.org \
--cc=borntraeger@linux.ibm.com \
--cc=bp@alien8.de \
--cc=catalin.marinas@arm.com \
--cc=dave.hansen@linux.intel.com \
--cc=hpa@zytor.com \
--cc=jolsa@kernel.org \
--cc=keescook@chromium.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=linux-s390@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mark.rutland@arm.com \
--cc=namhyung@kernel.org \
--cc=paulus@samba.org \
--cc=svens@linux.ibm.com \
--cc=tglx@linutronix.de \
--cc=will@kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).