From: akpm@linux-foundation•org
To: paulus@samba•org
Cc: linuxppc-dev@ozlabs•org, akpm@linux-foundation•org,
carll@us•ibm.com, cel@us•ibm.com
Subject: [patch 1/4] powerpc: fix for OProfile callgraph for Power 64 bit user apps
Date: Wed, 14 May 2008 16:12:52 -0700 [thread overview]
Message-ID: <200805142312.m4ENCqLg026256@imap1.linux-foundation.org> (raw)
From: Carl Love <cel@us•ibm.com>
Fix the 64 bit user code backtrace which currently may hang the system.
Signed-off-by: Carl Love <carll@us•ibm.com>
Cc: Maynard Johnson <maynardj@us•ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation•org>
---
arch/powerpc/oprofile/backtrace.c | 33 ++++++++++++++++++++++------
1 file changed, 27 insertions(+), 6 deletions(-)
diff -puN arch/powerpc/oprofile/backtrace.c~powerpc-fix-for-oprofile-callgraph-for-power-64-bit-user-apps arch/powerpc/oprofile/backtrace.c
--- a/arch/powerpc/oprofile/backtrace.c~powerpc-fix-for-oprofile-callgraph-for-power-64-bit-user-apps
+++ a/arch/powerpc/oprofile/backtrace.c
@@ -53,19 +53,40 @@ static unsigned int user_getsp32(unsigne
#ifdef CONFIG_PPC64
static unsigned long user_getsp64(unsigned long sp, int is_first)
{
- unsigned long stack_frame[3];
+ unsigned long stk_frm_lr;
+ unsigned long stk_frm_sp;
+ unsigned long size;
+
+ /* Issue the __copy_from_user_inatomic() third argument currently
+ * only takes sizes 1, 2, 4 or 8 bytes. Don't read more then the
+ * first 48 bytes of the stack frame. That is all that is
+ * guaranteed to exist. Reading more may cause the system to hang.
+ *
+ * 64 bit stack frame layout:
+ * 0-7 bytes is the pointer to previous stack
+ * 8-15 bytes condition register save area
+ * 16-23 bytes link register save area
+ */
+ size = sizeof(unsigned long);
+ if (!access_ok(VERIFY_READ, (void __user *)sp, size))
+ return 0;
- if (!access_ok(VERIFY_READ, (void __user *)sp, sizeof(stack_frame)))
+ if (__copy_from_user_inatomic(&stk_frm_sp, (void __user *)sp,
+ size))
return 0;
- if (__copy_from_user_inatomic(stack_frame, (void __user *)sp,
- sizeof(stack_frame)))
+ /* get the LR from the user stack */
+ if (!access_ok(VERIFY_READ, (void __user *)(sp+16), size))
+ return 0;
+
+ if (__copy_from_user_inatomic(&stk_frm_lr, (void __user *)(sp+16),
+ size))
return 0;
if (!is_first)
- oprofile_add_trace(STACK_LR64(stack_frame));
+ oprofile_add_trace(stk_frm_lr);
- return STACK_SP(stack_frame);
+ return stk_frm_sp;
}
#endif
_
next reply other threads:[~2008-05-14 23:13 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-14 23:12 akpm [this message]
2008-05-15 0:20 ` [patch 1/4] powerpc: fix for OProfile callgraph for Power 64 bit user apps Michael Ellerman
2008-05-15 3:58 ` Paul Mackerras
2008-05-15 14:50 ` Carl Love
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=200805142312.m4ENCqLg026256@imap1.linux-foundation.org \
--to=akpm@linux-foundation$(echo .)org \
--cc=carll@us$(echo .)ibm.com \
--cc=cel@us$(echo .)ibm.com \
--cc=linuxppc-dev@ozlabs$(echo .)org \
--cc=paulus@samba$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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