Re: [PATCH 0/2] [GIT PULL][v3.3] x86: Fix up CFI for the nested NMI

[Ingo Molnar <mingo@elte.hu>]

* Steven Rostedt <rostedt@goodmis.org> wrote:

> 
> Ingo,
> 
> Jan posted a patch that fixes the CFI annotations. I recommend getting
> this into 3.3 as this is new code and it would be nice to have CFI
> correct. It also does a little simplification of it as well.
> 
> The second patch is comment changes only (very low impact on messing
> anything up). I realized that the comments had some references to
> previous approaches that I tried, and I fixed them to reflect what
> the final result was. I also added some more comments to describe
> the code a bit better.
> 
> Thanks,
> 
> -- Steve
> 
> Please pull the latest tip/x86/urgent tree, which can be found at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
> tip/x86/urgent
> 
> Head SHA1: 79fb4ad63e8266ffac1f69bbb45a6f86570493e7
> 
> 
> Jan Beulich (1):
>       x86-64: Fix CFI annotations for NMI nesting code
> 
> Steven Rostedt (1):
>       x86: Fix the NMI nesting comments
> 
> ----
>  arch/x86/kernel/entry_64.S |   64 ++++++++++++++++++++++++--------------------
>  1 files changed, 35 insertions(+), 29 deletions(-)

I don't think we want a 30+ lines diffstat to this rather 
non-trivial NMI codepath - and it changes real instructions, not 
just the CFI annotations.

Also, the 'update comments' commit does not belong into 
x86/urgent either.

So either you do an obviously trivial patch that only adds CFI 
annotations and nothing else, or I can pull these bits into 
tip:x86/debug, for a v3.4 merge.

Thanks,

	Ingo