All of lore.kernel.org
 help / color / mirror / Atom feed
From: Steven Rostedt <rostedt@goodmis.org>
To: Chengming Zhou <zhouchengming@bytedance.com>
Cc: mingo@redhat.com, catalin.marinas@arm.com, will@kernel.org,
	broonie@kernel.org, mark.rutland@arm.com, tglx@linutronix.de,
	bp@alien8.de, dave.hansen@linux.intel.com,
	linux-arm-kernel@lists.infradead.org, x86@kernel.org,
	linux-kernel@vger.kernel.org, songmuchun@bytedance.com,
	qirui.001@bytedance.com
Subject: Re: [PATCH v2 1/2] ftrace: cleanup ftrace_graph_caller enable and disable
Date: Wed, 23 Feb 2022 20:17:25 -0500	[thread overview]
Message-ID: <20220223201725.4cbb6d8a@rorschach.local.home> (raw)
In-Reply-To: <20220223090132.10114-1-zhouchengming@bytedance.com>

On Wed, 23 Feb 2022 17:01:31 +0800
Chengming Zhou <zhouchengming@bytedance.com> wrote:

> diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
> index 7cc540e6de0c..c119ef7a9295 100644
> --- a/arch/x86/kernel/ftrace.c
> +++ b/arch/x86/kernel/ftrace.c
> @@ -615,18 +615,8 @@ int ftrace_disable_ftrace_graph_caller(void)
>  
>  	return ftrace_mod_jmp(ip, &ftrace_stub);
>  }
> -#else /* !CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS */
> -int ftrace_enable_ftrace_graph_caller(void)
> -{
> -	return 0;
> -}
> -
> -int ftrace_disable_ftrace_graph_caller(void)
> -{
> -	return 0;
> -}
> -#endif /* CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS */
> -#endif /* !CONFIG_DYNAMIC_FTRACE */
> +#endif /* !CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS */
> +#endif /* CONFIG_DYNAMIC_FTRACE */

Since you are cleaning this up, and the above starts with:

#ifdef CONFIG_DYNAMIC_FTRACE

#ifndef CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS


They were separate because of the #else that you just removed. I would
recommend consolidate them into a single #ifdef:

#if defined(CONFIG_DYNAMIC_FTRACE) && !defined(CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS)

[..]

#endif /* CONFIG_DYNAMIC_FTRACE && !CONFIG_HAVE_DYNAMI_FTRACE_WITH_ARGS */


-- Steve


>  
>  /*
>   * Hook the return address and push it in the stack of return addrs
> diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
> index f9feb197b2da..60ae009e6684 100644

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

WARNING: multiple messages have this Message-ID (diff)
From: Steven Rostedt <rostedt@goodmis.org>
To: Chengming Zhou <zhouchengming@bytedance.com>
Cc: mingo@redhat.com, catalin.marinas@arm.com, will@kernel.org,
	broonie@kernel.org, mark.rutland@arm.com, tglx@linutronix.de,
	bp@alien8.de, dave.hansen@linux.intel.com,
	linux-arm-kernel@lists.infradead.org, x86@kernel.org,
	linux-kernel@vger.kernel.org, songmuchun@bytedance.com,
	qirui.001@bytedance.com
Subject: Re: [PATCH v2 1/2] ftrace: cleanup ftrace_graph_caller enable and disable
Date: Wed, 23 Feb 2022 20:17:25 -0500	[thread overview]
Message-ID: <20220223201725.4cbb6d8a@rorschach.local.home> (raw)
In-Reply-To: <20220223090132.10114-1-zhouchengming@bytedance.com>

On Wed, 23 Feb 2022 17:01:31 +0800
Chengming Zhou <zhouchengming@bytedance.com> wrote:

> diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
> index 7cc540e6de0c..c119ef7a9295 100644
> --- a/arch/x86/kernel/ftrace.c
> +++ b/arch/x86/kernel/ftrace.c
> @@ -615,18 +615,8 @@ int ftrace_disable_ftrace_graph_caller(void)
>  
>  	return ftrace_mod_jmp(ip, &ftrace_stub);
>  }
> -#else /* !CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS */
> -int ftrace_enable_ftrace_graph_caller(void)
> -{
> -	return 0;
> -}
> -
> -int ftrace_disable_ftrace_graph_caller(void)
> -{
> -	return 0;
> -}
> -#endif /* CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS */
> -#endif /* !CONFIG_DYNAMIC_FTRACE */
> +#endif /* !CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS */
> +#endif /* CONFIG_DYNAMIC_FTRACE */

Since you are cleaning this up, and the above starts with:

#ifdef CONFIG_DYNAMIC_FTRACE

#ifndef CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS


They were separate because of the #else that you just removed. I would
recommend consolidate them into a single #ifdef:

#if defined(CONFIG_DYNAMIC_FTRACE) && !defined(CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS)

[..]

#endif /* CONFIG_DYNAMIC_FTRACE && !CONFIG_HAVE_DYNAMI_FTRACE_WITH_ARGS */


-- Steve


>  
>  /*
>   * Hook the return address and push it in the stack of return addrs
> diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
> index f9feb197b2da..60ae009e6684 100644

  parent reply	other threads:[~2022-02-24  1:18 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-02-23  9:01 [PATCH v2 1/2] ftrace: cleanup ftrace_graph_caller enable and disable Chengming Zhou
2022-02-23  9:01 ` Chengming Zhou
2022-02-23  9:01 ` [PATCH v2 2/2] arm64/ftrace: Make function graph use ftrace directly Chengming Zhou
2022-02-23  9:01   ` Chengming Zhou
2022-02-24  1:17 ` Steven Rostedt [this message]
2022-02-24  1:17   ` [PATCH v2 1/2] ftrace: cleanup ftrace_graph_caller enable and disable Steven Rostedt
2022-02-24  2:00   ` [External] " Chengming Zhou
2022-02-24  2:00     ` Chengming Zhou

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=20220223201725.4cbb6d8a@rorschach.local.home \
    --to=rostedt@goodmis.org \
    --cc=bp@alien8.de \
    --cc=broonie@kernel.org \
    --cc=catalin.marinas@arm.com \
    --cc=dave.hansen@linux.intel.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=mingo@redhat.com \
    --cc=qirui.001@bytedance.com \
    --cc=songmuchun@bytedance.com \
    --cc=tglx@linutronix.de \
    --cc=will@kernel.org \
    --cc=x86@kernel.org \
    --cc=zhouchengming@bytedance.com \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.