From: Robert Richter <robert.richter@amd.com>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: wyang1 <Wei.Yang@windriver.com>, Ingo Molnar <mingo@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
<linux-kernel@vger.kernel.org>,
<oprofile-list@lists.sourceforge.net>
Subject: Re: [PATCH] x86, 32-bit: Fix invalid stack address while in softirq
Date: Thu, 6 Sep 2012 17:02:46 +0200 [thread overview]
Message-ID: <20120906150246.GZ8285@erda.amd.com> (raw)
In-Reply-To: <1346937282.1680.15.camel@gandalf.local.home>
On 06.09.12 09:14:42, Steven Rostedt wrote:
> On Thu, 2012-09-06 at 12:04 +0200, Robert Richter wrote:
>
> > please take a look at this. Not sure if Linus want to look at this too
> > and if we need more optimization here.
>
> It could probably go either way. Although the function has several
> lines, it looks like the actual assembly produced wouldn't be much. I
> took a quick look at where kernel_stack_pointer() is used, and I didn't
> find any hot paths. This is why I think it can either be a called
> function or static inline without much difference.
The main reason for putting it into ptrace.c was struct thread_info
which requires the inclusion of linux/thread_info.h. I didn't want to
add this to ptrace.h.
>
> >
> > #define GET_IP(regs) ((regs)->ip)
> > #define GET_FP(regs) ((regs)->bp)
> > diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
> > index c4c6a5c..5a9a8c9 100644
> > --- a/arch/x86/kernel/ptrace.c
> > +++ b/arch/x86/kernel/ptrace.c
> > @@ -165,6 +165,27 @@ static inline bool invalid_selector(u16 value)
> >
> > #define FLAG_MASK FLAG_MASK_32
> >
> > +/*
> > + * X86_32 CPUs don't save ss and esp if the CPU is already in kernel mode
> > + * when it traps. The previous stack will be directly underneath the saved
> > + * registers, and 'sp/ss' won't even have been saved. Thus the '®s->sp'.
> > + *
> > + * This is valid only for kernel mode traps.
> > + */
> > +unsigned long kernel_stack_pointer(struct pt_regs *regs)
> > +{
> > + unsigned long context = (unsigned long)regs & ~(THREAD_SIZE - 1);
> > + unsigned long sp = (unsigned long)®s->sp;
> > + struct thread_info *tinfo;
> > +
>
> Please add some comments to why you did this. Having this info in just
> the change log is not enough. Reading it with the code makes much more
> sense.
Yes, will update the comment here.
>
> > + if (context == (sp & ~(THREAD_SIZE - 1)))
> > + return sp;
> > +
> > + tinfo = (struct thread_info *)context;
> > +
> > + return tinfo->previous_esp;
> > +}
> > +
> > static unsigned long *pt_regs_access(struct pt_regs *regs, unsigned long regno)
> > {
> > BUILD_BUG_ON(offsetof(struct pt_regs, bx) != 0);
> > diff --git a/arch/x86/oprofile/backtrace.c b/arch/x86/oprofile/backtrace.c
> > index d6aa6e8..5b5741e 100644
> > --- a/arch/x86/oprofile/backtrace.c
> > +++ b/arch/x86/oprofile/backtrace.c
> > @@ -113,7 +113,7 @@ x86_backtrace(struct pt_regs * const regs, unsigned int depth)
> >
> > if (!user_mode_vm(regs)) {
> > unsigned long stack = kernel_stack_pointer(regs);
> > - if (depth)
> > + if (depth & stack)
>
> Can other users of kernel_stack_pointer() be nailed by a return of NULL?
It would be save here too, but dump_trace() falls back to the current
stack in case there is no stack address given which we don't want with
oprofile.
I was looking at all users of kernel_stack_pointer() and could not
find any direct pointer dereference of the sp. The only potential
problems I found could arise here:
arch/x86/kernel/kprobes.c:resume_execution()
arch/x86/kernel/time.c:profile_pc()
It is not quite clear if we really need code here that checks the
pointer. Since a NULL pointer access has the same effect as if the
stack address would be wrong which would be the case without the
patch, I rather tend not to change the code here.
Thanks,
-Robert
--
Advanced Micro Devices, Inc.
Operating System Research Center
next prev parent reply other threads:[~2012-09-06 15:03 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-27 1:32 [PATCH 1/1] x86/oprofile: Fix the calltrace upon profiling some specified events with oprofile Wei.Yang
2012-08-28 9:17 ` Robert Richter
2012-09-03 5:28 ` wyang1
2012-09-04 10:24 ` Robert Richter
2012-09-06 1:30 ` wyang1
2012-09-06 10:04 ` [PATCH] x86, 32-bit: Fix invalid stack address while in softirq Robert Richter
2012-09-06 13:14 ` Steven Rostedt
2012-09-06 15:02 ` Robert Richter [this message]
2012-09-06 15:14 ` Steven Rostedt
2012-09-06 15:34 ` Robert Richter
2012-09-06 15:36 ` Robert Richter
2012-09-06 15:54 ` Steven Rostedt
2012-09-07 5:21 ` wyang1
2012-09-12 13:50 ` [PATCH -v2] " Robert Richter
2012-09-12 14:04 ` Steven Rostedt
2012-10-01 12:21 ` Robert Richter
2012-11-01 21:34 ` [tip:x86/urgent] x86-32: " tip-bot for Robert Richter
2012-11-13 15:17 ` Ingo Molnar
2012-11-13 15:56 ` Robert Richter
2012-11-15 21:53 ` tip-bot for Robert Richter
2012-11-21 7:34 ` tip-bot for Robert Richter
2012-11-21 7:35 ` [tip:x86/urgent] x86-32: Export kernel_stack_pointer() for modules tip-bot for H. Peter Anvin
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=20120906150246.GZ8285@erda.amd.com \
--to=robert.richter@amd.com \
--cc=Wei.Yang@windriver.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=oprofile-list@lists.sourceforge.net \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
--cc=torvalds@linux-foundation.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).