Re: [PATCH 2/5 v2] ftrace/x86-32: Move the ftrace specific code out of entry_32.S

Path	csiph.com!aioe.org!bofh.it!news.nic.it!robomod
From	Steven Rostedt <rostedt@goodmis.org>
Newsgroups	linux.kernel
Subject	Re: [PATCH 2/5 v2] ftrace/x86-32: Move the ftrace specific code out of entry_32.S
Date	Fri, 17 Mar 2017 14:40:02 +0100
Message-ID	<tm0gO-77w-9@gated-at.bofh.it> (permalink)
References	<tlHnP-1ze-5@gated-at.bofh.it> <tlHnQ-1ze-21@gated-at.bofh.it>
X-Mailer	Claws Mail 3.14.0 (GTK+ 2.24.31; x86_64-pc-linux-gnu)
MIME-Version	1.0
Content-Type	text/plain; charset=US-ASCII
Content-Transfer-Encoding	7bit
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	61
Organization	linux.* mail to news gateway
X-Original-Cc	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>, Josh Poimboeuf <jpoimboe@redhat.com>, Linus Torvalds <torvalds@linux-foundation.org>
X-Original-Date	Fri, 17 Mar 2017 09:21:44 -0400
X-Original-Message-ID	<20170317092144.6d0f74f4@gandalf.local.home>
X-Original-References	<20170316172008.086705006@goodmis.org> <20170316172056.326861206@goodmis.org>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1603311

Show key headers only | View raw

On Thu, 16 Mar 2017 13:20:10 -0400
Steven Rostedt <rostedt@goodmis.org> wrote:

> From: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
> 
> The function tracing hook code for ftrace is not an entry point from
> userspace and does not belong in the entry_*.S files. It has already been
> moved out of entry_64.S. This moves it out of entry_32.S into its own
> ftrace_32.S file.
> 
> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
> ---
>  Makefile                    |  12 +--
>  arch/x86/entry/entry_32.S   | 168 ------------------------------------------
>  arch/x86/kernel/Makefile    |   1 +
>  arch/x86/kernel/ftrace_32.S | 176 ++++++++++++++++++++++++++++++++++++++++++++
>  4 files changed, 183 insertions(+), 174 deletions(-)
>  create mode 100644 arch/x86/kernel/ftrace_32.S
> 
> diff --git a/Makefile b/Makefile
> index b841fb36beb2..7df32471c206 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -653,6 +653,12 @@ KBUILD_CFLAGS += $(call cc-ifversion, -lt, 0409, \
>  # Tell gcc to never replace conditional load with a non-conditional one
>  KBUILD_CFLAGS	+= $(call cc-option,--param=allow-store-data-races=0)
>  
> +# check for 'asm goto'
> +ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC) $(KBUILD_CFLAGS)), y)
> +	KBUILD_CFLAGS += -DCC_HAVE_ASM_GOTO
> +	KBUILD_AFLAGS += -DCC_HAVE_ASM_GOTO
> +endif
> +
>  include scripts/Makefile.gcc-plugins
>  
>  ifdef CONFIG_READABLE_ASM
> @@ -798,12 +804,6 @@ KBUILD_CFLAGS   += $(call cc-option,-Werror=incompatible-pointer-types)
>  # use the deterministic mode of AR if available
>  KBUILD_ARFLAGS := $(call ar-option,D)
>  
> -# check for 'asm goto'
> -ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC) $(KBUILD_CFLAGS)), y)
> -	KBUILD_CFLAGS += -DCC_HAVE_ASM_GOTO
> -	KBUILD_AFLAGS += -DCC_HAVE_ASM_GOTO
> -endif

Nobody noticed that I accidentally committed someone else's change. :-p

 See http://lkml.kernel.org/r/20170310162411.GA18175@glebfm.cloud.tilaa.com

I was testing his patch during development, and forgot to revert it.

/me rebases.

-- Steve

> -
>  include scripts/Makefile.kasan
>  include scripts/Makefile.extrawarn
>  include scripts/Makefile.ubsan
> diff --git a/arch/x86/entry/entry_32.S b/arch/x86/entry/entry_32.S

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH 2/5 v2] ftrace/x86-32: Move the ftrace specific code out of entry_32.S Steven Rostedt <rostedt@goodmis.org> - 2017-03-16 18:30 +0100
  Re: [PATCH 2/5 v2] ftrace/x86-32: Move the ftrace specific code out  of entry_32.S Steven Rostedt <rostedt@goodmis.org> - 2017-03-17 14:40 +0100

csiph-web