LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Steven Rostedt <rostedt@goodmis.org>
To: Ilya Leoshkevich <iii@linux.ibm.com>
Cc: Ingo Molnar <mingo@redhat.com>,
	linux-kernel@vger.kernel.org, Heiko Carstens <hca@linux.ibm.com>,
	Sven Schnelle <svens@linux.ibm.com>,
	Vasily Gorbik <gor@linux.ibm.com>,
	linux-s390@vger.kernel.org
Subject: Re: [PATCH 1/2] ftrace: Introduce ftrace_need_init_nop()
Date: Fri, 30 Jul 2021 22:07:41 -0400	[thread overview]
Message-ID: <20210730220741.4da6fdf6@oasis.local.home> (raw)
In-Reply-To: <20210728212546.128248-2-iii@linux.ibm.com>

On Wed, 28 Jul 2021 23:25:45 +0200
Ilya Leoshkevich <iii@linux.ibm.com> wrote:

> Implementing live patching on s390 requires each function's prologue to
> contain a very special kind of nop, which gcc and clang don't generate.
> However, the current code assumes that if CC_USING_NOP_MCOUNT is
> defined, then whatever the compiler generates is good enough.
> 
> Move the CC_USING_NOP_MCOUNT check into the new ftrace_need_init_nop()
> macro, that the architectures can override.
> 
> An alternative solution is to disable using -mnop-mcount in the
> Makefile, however, this makes the build logic (even) more complicated
> and forces the arch-specific code to deal with the useless __fentry__
> symbol.
> 
> Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>

I'm fine with this patch, and also you taking it in via the s390 tree.

Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org>

-- Steve


> ---
>  include/linux/ftrace.h | 16 ++++++++++++++++
>  kernel/trace/ftrace.c  |  4 ++--
>  2 files changed, 18 insertions(+), 2 deletions(-)
> 
> diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
> index a69f363b61bf..f1ea8988a045 100644
> --- a/include/linux/ftrace.h
> +++ b/include/linux/ftrace.h
> @@ -643,6 +643,22 @@ static inline int ftrace_disable_ftrace_graph_caller(void) { return 0; }
>  extern int ftrace_make_nop(struct module *mod,
>  			   struct dyn_ftrace *rec, unsigned long addr);
>  
> +/**
> + * ftrace_need_init_nop - return whether nop call sites should be initialized
> + *
> + * Normally the compiler's -mnop-mcount generates suitable nops, so we don't
> + * need to call ftrace_init_nop() if the code is built with that flag.
> + * Architectures where this is not always the case may define their own
> + * condition.
> + *
> + * Return must be:
> + *  0       if ftrace_init_nop() should be called
> + *  Nonzero if ftrace_init_nop() should not be called
> + */
> +
> +#ifndef ftrace_need_init_nop
> +#define ftrace_need_init_nop() (!__is_defined(CC_USING_NOP_MCOUNT))
> +#endif
>  
>  /**
>   * ftrace_init_nop - initialize a nop call site
> diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
> index 7b180f61e6d3..7efbc8aaf7f6 100644
> --- a/kernel/trace/ftrace.c
> +++ b/kernel/trace/ftrace.c
> @@ -3100,6 +3100,7 @@ ops_references_rec(struct ftrace_ops *ops, struct dyn_ftrace *rec)
>  
>  static int ftrace_update_code(struct module *mod, struct ftrace_page *new_pgs)
>  {
> +	bool init_nop = ftrace_need_init_nop();
>  	struct ftrace_page *pg;
>  	struct dyn_ftrace *p;
>  	u64 start, stop;
> @@ -3138,8 +3139,7 @@ static int ftrace_update_code(struct module *mod, struct ftrace_page *new_pgs)
>  			 * Do the initial record conversion from mcount jump
>  			 * to the NOP instructions.
>  			 */
> -			if (!__is_defined(CC_USING_NOP_MCOUNT) &&
> -			    !ftrace_nop_initialize(mod, p))
> +			if (init_nop && !ftrace_nop_initialize(mod, p))
>  				break;
>  
>  			update_cnt++;


  reply	other threads:[~2021-07-31  2:09 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-28 21:25 [PATCH 0/2] s390/ftrace: implement hotpatching Ilya Leoshkevich
2021-07-28 21:25 ` [PATCH 1/2] ftrace: Introduce ftrace_need_init_nop() Ilya Leoshkevich
2021-07-31  2:07   ` Steven Rostedt [this message]
2021-07-31  6:47     ` Heiko Carstens
2021-07-28 21:25 ` [PATCH 2/2] s390/ftrace: implement hotpatching Ilya Leoshkevich
2021-07-31  6:47 ` [PATCH 0/2] " Heiko Carstens

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210730220741.4da6fdf6@oasis.local.home \
    --to=rostedt@goodmis.org \
    --cc=gor@linux.ibm.com \
    --cc=hca@linux.ibm.com \
    --cc=iii@linux.ibm.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-s390@vger.kernel.org \
    --cc=mingo@redhat.com \
    --cc=svens@linux.ibm.com \
    --subject='Re: [PATCH 1/2] ftrace: Introduce ftrace_need_init_nop()' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).