Re: [PATCH v5 05/21] perf kvm: Move functions used in util out of builtin

[Arnaldo Carvalho de Melo <acme@kernel.org>]

On Wed, Oct 30, 2024 at 06:42:36PM -0700, Ian Rogers wrote:
> The util library code is used by the python module but doesn't have
> access to the builtin files. Make a util/kvm-stat.c to match the
> kvm-stat.h file that declares the functions and move the functions
> there.

Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com>
 
> Signed-off-by: Ian Rogers <irogers@google.com>
> ---
>  tools/perf/builtin-kvm.c   | 61 ---------------------------------
>  tools/perf/util/Build      |  1 +
>  tools/perf/util/kvm-stat.c | 70 ++++++++++++++++++++++++++++++++++++++
>  tools/perf/util/kvm-stat.h |  3 ++
>  tools/perf/util/python.c   | 30 ----------------
>  5 files changed, 74 insertions(+), 91 deletions(-)
>  create mode 100644 tools/perf/util/kvm-stat.c
> 
> diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c
> index 099ce3ebf67c..e50cd04e3725 100644
> --- a/tools/perf/builtin-kvm.c
> +++ b/tools/perf/builtin-kvm.c
> @@ -615,67 +615,6 @@ static const char *get_filename_for_perf_kvm(void)
>  
>  #if defined(HAVE_KVM_STAT_SUPPORT) && defined(HAVE_LIBTRACEEVENT)
>  
> -void exit_event_get_key(struct evsel *evsel,
> -			struct perf_sample *sample,
> -			struct event_key *key)
> -{
> -	key->info = 0;
> -	key->key  = evsel__intval(evsel, sample, kvm_exit_reason);
> -}
> -
> -bool kvm_exit_event(struct evsel *evsel)
> -{
> -	return evsel__name_is(evsel, kvm_exit_trace);
> -}
> -
> -bool exit_event_begin(struct evsel *evsel,
> -		      struct perf_sample *sample, struct event_key *key)
> -{
> -	if (kvm_exit_event(evsel)) {
> -		exit_event_get_key(evsel, sample, key);
> -		return true;
> -	}
> -
> -	return false;
> -}
> -
> -bool kvm_entry_event(struct evsel *evsel)
> -{
> -	return evsel__name_is(evsel, kvm_entry_trace);
> -}
> -
> -bool exit_event_end(struct evsel *evsel,
> -		    struct perf_sample *sample __maybe_unused,
> -		    struct event_key *key __maybe_unused)
> -{
> -	return kvm_entry_event(evsel);
> -}
> -
> -static const char *get_exit_reason(struct perf_kvm_stat *kvm,
> -				   struct exit_reasons_table *tbl,
> -				   u64 exit_code)
> -{
> -	while (tbl->reason != NULL) {
> -		if (tbl->exit_code == exit_code)
> -			return tbl->reason;
> -		tbl++;
> -	}
> -
> -	pr_err("unknown kvm exit code:%lld on %s\n",
> -		(unsigned long long)exit_code, kvm->exit_reasons_isa);
> -	return "UNKNOWN";
> -}
> -
> -void exit_event_decode_key(struct perf_kvm_stat *kvm,
> -			   struct event_key *key,
> -			   char *decode)
> -{
> -	const char *exit_reason = get_exit_reason(kvm, key->exit_reasons,
> -						  key->key);
> -
> -	scnprintf(decode, KVM_EVENT_NAME_LEN, "%s", exit_reason);
> -}
> -
>  static bool register_kvm_events_ops(struct perf_kvm_stat *kvm)
>  {
>  	struct kvm_reg_events_ops *events_ops = kvm_reg_events_ops;
> diff --git a/tools/perf/util/Build b/tools/perf/util/Build
> index 1eedead5f2f2..650974413849 100644
> --- a/tools/perf/util/Build
> +++ b/tools/perf/util/Build
> @@ -120,6 +120,7 @@ perf-util-y += spark.o
>  perf-util-y += topdown.o
>  perf-util-y += iostat.o
>  perf-util-y += stream.o
> +perf-util-y += kvm-stat.o
>  perf-util-$(CONFIG_AUXTRACE) += auxtrace.o
>  perf-util-$(CONFIG_AUXTRACE) += intel-pt-decoder/
>  perf-util-$(CONFIG_AUXTRACE) += intel-pt.o
> diff --git a/tools/perf/util/kvm-stat.c b/tools/perf/util/kvm-stat.c
> new file mode 100644
> index 000000000000..38ace736db5c
> --- /dev/null
> +++ b/tools/perf/util/kvm-stat.c
> @@ -0,0 +1,70 @@
> +// SPDX-License-Identifier: GPL-2.0
> +#include "debug.h"
> +#include "evsel.h"
> +#include "kvm-stat.h"
> +
> +#if defined(HAVE_KVM_STAT_SUPPORT) && defined(HAVE_LIBTRACEEVENT)
> +
> +bool kvm_exit_event(struct evsel *evsel)
> +{
> +	return evsel__name_is(evsel, kvm_exit_trace);
> +}
> +
> +void exit_event_get_key(struct evsel *evsel,
> +			struct perf_sample *sample,
> +			struct event_key *key)
> +{
> +	key->info = 0;
> +	key->key  = evsel__intval(evsel, sample, kvm_exit_reason);
> +}
> +
> +
> +bool exit_event_begin(struct evsel *evsel,
> +		      struct perf_sample *sample, struct event_key *key)
> +{
> +	if (kvm_exit_event(evsel)) {
> +		exit_event_get_key(evsel, sample, key);
> +		return true;
> +	}
> +
> +	return false;
> +}
> +
> +bool kvm_entry_event(struct evsel *evsel)
> +{
> +	return evsel__name_is(evsel, kvm_entry_trace);
> +}
> +
> +bool exit_event_end(struct evsel *evsel,
> +		    struct perf_sample *sample __maybe_unused,
> +		    struct event_key *key __maybe_unused)
> +{
> +	return kvm_entry_event(evsel);
> +}
> +
> +static const char *get_exit_reason(struct perf_kvm_stat *kvm,
> +				   struct exit_reasons_table *tbl,
> +				   u64 exit_code)
> +{
> +	while (tbl->reason != NULL) {
> +		if (tbl->exit_code == exit_code)
> +			return tbl->reason;
> +		tbl++;
> +	}
> +
> +	pr_err("unknown kvm exit code:%lld on %s\n",
> +		(unsigned long long)exit_code, kvm->exit_reasons_isa);
> +	return "UNKNOWN";
> +}
> +
> +void exit_event_decode_key(struct perf_kvm_stat *kvm,
> +			   struct event_key *key,
> +			   char *decode)
> +{
> +	const char *exit_reason = get_exit_reason(kvm, key->exit_reasons,
> +						  key->key);
> +
> +	scnprintf(decode, KVM_EVENT_NAME_LEN, "%s", exit_reason);
> +}
> +
> +#endif
> diff --git a/tools/perf/util/kvm-stat.h b/tools/perf/util/kvm-stat.h
> index 3e9ac754c3d1..4249542544bb 100644
> --- a/tools/perf/util/kvm-stat.h
> +++ b/tools/perf/util/kvm-stat.h
> @@ -115,6 +115,8 @@ struct kvm_reg_events_ops {
>  	struct kvm_events_ops *ops;
>  };
>  
> +#if defined(HAVE_KVM_STAT_SUPPORT) && defined(HAVE_LIBTRACEEVENT)
> +
>  void exit_event_get_key(struct evsel *evsel,
>  			struct perf_sample *sample,
>  			struct event_key *key);
> @@ -127,6 +129,7 @@ bool exit_event_end(struct evsel *evsel,
>  void exit_event_decode_key(struct perf_kvm_stat *kvm,
>  			   struct event_key *key,
>  			   char *decode);
> +#endif
>  
>  bool kvm_exit_event(struct evsel *evsel);
>  bool kvm_entry_event(struct evsel *evsel);
> diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c
> index 298f43981fc5..ab67abf3b607 100644
> --- a/tools/perf/util/python.c
> +++ b/tools/perf/util/python.c
> @@ -1306,36 +1306,6 @@ PyMODINIT_FUNC PyInit_perf(void)
>  /* The following are stubs to avoid dragging in builtin-* objects. */
>  /* TODO: move the code out of the builtin-* file into util. */
>  
> -bool kvm_entry_event(struct evsel *evsel __maybe_unused)
> -{
> -	return false;
> -}
> -
> -bool kvm_exit_event(struct evsel *evsel __maybe_unused)
> -{
> -	return false;
> -}
> -
> -bool exit_event_begin(struct evsel *evsel __maybe_unused,
> -		      struct perf_sample *sample  __maybe_unused,
> -		      struct event_key *key  __maybe_unused)
> -{
> -	return false;
> -}
> -
> -bool exit_event_end(struct evsel *evsel __maybe_unused,
> -		    struct perf_sample *sample __maybe_unused,
> -		    struct event_key *key __maybe_unused)
> -{
> -	return false;
> -}
> -
> -void exit_event_decode_key(struct perf_kvm_stat *kvm __maybe_unused,
> -			   struct event_key *key __maybe_unused,
> -			   char *decode __maybe_unused)
> -{
> -}
> -
>  int find_scripts(char **scripts_array  __maybe_unused, char **scripts_path_array  __maybe_unused,
>  		int num  __maybe_unused, int pathlen __maybe_unused)
>  {
> -- 
> 2.47.0.163.g1226f6d8fa-goog
>