Re: [PATCH][GIT PULL][3.8] x86: Don't clobber top of pt_regs innested NMI

[Steven Rostedt]

On Mon, 2012-11-05 at 08:58 +0000, Jan Beulich wrote:
> >>> On 02.11.12 at 20:19, Steven Rostedt <rostedt@xxxxxxxxxxx> wrote:
> > @@ -1842,8 +1851,12 @@ nmi_swapgs:
> >  	SWAPGS_UNSAFE_STACK
> >  nmi_restore:
> >  	RESTORE_ALL 8
> > +
> > +	/* Pop the extra iret frame */
> > +	addq $(5*8), %rsp
> 
> This could (for code efficiency) and should (for CFI annotation
> correctness) be folded into the RESTORE_ALL above (by
> converting "8" to "6*8").

Hi Jan,

This change never made it in. Would you like to send a patch, or would
you want me to do it?

-- Steve

> 
> Jan
> 
> > +
> >  	/* Clear the NMI executing stack variable */
> > -	movq $0, 10*8(%rsp)
> > +	movq $0, 5*8(%rsp)
> >  	jmp irq_return
> >  	CFI_ENDPROC
> >  END(nmi)
> 


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