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

[Jan Beulich]

>>> On 23.01.13 at 21:00, Steven Rostedt <rostedt@xxxxxxxxxxx> wrote:
> 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").
> 
> This change never made it in. Would you like to send a patch, or would
> you want me to do it?

Let me do so - I have a patch pending for the CFI part of this
already, and simply forgot that folding the two operations would
be the simpler solution to the issue.

Jan

--
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/