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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
