From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1755288AbdCTO0p (ORCPT <rfc822;w@1wt.eu>);
        Mon, 20 Mar 2017 10:26:45 -0400
Received: from mx1.redhat.com ([209.132.183.28]:56333 "EHLO mx1.redhat.com"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1755175AbdCTO0W (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Mon, 20 Mar 2017 10:26:22 -0400
DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 89581C04BD25
Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com
Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=jpoimboe@redhat.com
DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 89581C04BD25
Date: Mon, 20 Mar 2017 09:01:33 -0500
From: Josh Poimboeuf <jpoimboe@redhat.com>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: linux-kernel@vger.kernel.org, Ingo Molnar <mingo@kernel.org>,
        Andrew Morton <akpm@linux-foundation.org>,
        Thomas Gleixner <tglx@linutronix.de>,
        Peter Zijlstra <peterz@infradead.org>,
        Masami Hiramatsu <mhiramat@kernel.org>,
        "H. Peter Anvin" <hpa@zytor.com>,
        Andy Lutomirski <luto@amacapital.net>,
        Linus Torvalds <torvalds@linux-foundation.org>
Subject: Re: [PATCH 4/6 v3] ftrace/x86_32: Clean up ftrace_regs_caller
Message-ID: <20170320140133.gflfppx7bidzbl3t@treble>
References: <20170318210923.814509382@goodmis.org>
 <20170318211149.420869208@goodmis.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
In-Reply-To: <20170318211149.420869208@goodmis.org>
User-Agent: Mutt/1.6.0.1 (2016-04-01)
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Mon, 20 Mar 2017 14:01:37 +0000 (UTC)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Sat, Mar 18, 2017 at 05:09:27PM -0400, Steven Rostedt wrote:
> @@ -111,12 +114,11 @@ GLOBAL(ftrace_regs_call)
>  	popl	%es
>  	popl	%fs
>  	popl	%gs
> -	addl	$8, %esp			/* Skip orig_ax and ip */
> -	popf					/* Pop flags at end (no addl to corrupt flags) */
> -	jmp	.Lftrace_ret
>  
> -	popf
> -	jmp	ftrace_stub
> +	/* use lea to not affect flags */
> +	lea	3*4(%esp), %esp			/* Skip orig_ax, ip and flags */
> +
> +	jmp	.Lftrace_ret
>  #else /* ! CONFIG_DYNAMIC_FTRACE */
>  
>  ENTRY(mcount)

That last comment should be

  /* Skip orig_ax, ip and cs */

Otherwise:

  Reviewed-by: Josh Poimboeuf <jpoimboe@redhat.com>

-- 
Josh