Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83bf9702 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-core-for-mingo' of... 

Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/core

Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:

  * Check maximum frequency rate for record/top, emitting better error
    messages, from Jiri Olsa.

  * Disable live kvm command if timerfd is not supported, from David Ahern.

  * Add usage to 'perf list', from David Ahern.

  * Fix detection of non-core features, from David Ahern.

  * Consolidate __hists__add_*entry(), cleanup from Namhyung Kim.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 87968f94 316c7136

tools/perf/Makefile.perf

+2 −2
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ LIB_H += util/cache.h 
LIB_H += util/callchain.h

LIB_H += util/build-id.h

LIB_H += util/debug.h

LIB_H += util/sysfs.h

LIB_H += util/fs.h

LIB_H += util/pmu.h

LIB_H += util/event.h

LIB_H += util/evsel.h
@@ -304,7 +304,7 @@ LIB_OBJS += $(OUTPUT)util/annotate.o 
LIB_OBJS += $(OUTPUT)util/build-id.o

LIB_OBJS += $(OUTPUT)util/config.o

LIB_OBJS += $(OUTPUT)util/ctype.o

LIB_OBJS += $(OUTPUT)util/sysfs.o

LIB_OBJS += $(OUTPUT)util/fs.o

LIB_OBJS += $(OUTPUT)util/pmu.o

LIB_OBJS += $(OUTPUT)util/environment.o

LIB_OBJS += $(OUTPUT)util/event.o

tools/perf/builtin-annotate.c

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ static int perf_evsel__add_sample(struct perf_evsel *evsel, 
		return 0;

	}



	he = __hists__add_entry(&evsel->hists, al, NULL, 1, 1, 0);

	he = __hists__add_entry(&evsel->hists, al, NULL, NULL, NULL, 1, 1, 0);

	if (he == NULL)

		return -ENOMEM;

tools/perf/builtin-diff.c

+2 −1
Original line number Diff line number Diff line
@@ -307,7 +307,8 @@ static int hists__add_entry(struct hists *hists, 
			    struct addr_location *al, u64 period,

			    u64 weight, u64 transaction)

{

	if (__hists__add_entry(hists, al, NULL, period, weight, transaction) != NULL)

	if (__hists__add_entry(hists, al, NULL, NULL, NULL, period, weight,

			       transaction) != NULL)

		return 0;

	return -ENOMEM;

}

tools/perf/builtin-kvm.c

+12 −0
Original line number Diff line number Diff line
@@ -20,7 +20,9 @@ 
#include "util/data.h"



#include <sys/prctl.h>

#ifdef HAVE_TIMERFD_SUPPORT

#include <sys/timerfd.h>

#endif



#include <termios.h>

#include <semaphore.h>
@@ -337,6 +339,7 @@ static void init_kvm_event_record(struct perf_kvm_stat *kvm) 
		INIT_LIST_HEAD(&kvm->kvm_events_cache[i]);

}



#ifdef HAVE_TIMERFD_SUPPORT

static void clear_events_cache_stats(struct list_head *kvm_events_cache)

{

	struct list_head *head;
@@ -358,6 +361,7 @@ static void clear_events_cache_stats(struct list_head *kvm_events_cache) 
		}

	}

}

#endif



static int kvm_events_hash_fn(u64 key)

{
@@ -783,6 +787,7 @@ static void print_result(struct perf_kvm_stat *kvm) 
		pr_info("\nLost events: %" PRIu64 "\n\n", kvm->lost_events);

}



#ifdef HAVE_TIMERFD_SUPPORT

static int process_lost_event(struct perf_tool *tool,

			      union perf_event *event __maybe_unused,

			      struct perf_sample *sample __maybe_unused,
@@ -793,6 +798,7 @@ static int process_lost_event(struct perf_tool *tool, 
	kvm->lost_events++;

	return 0;

}

#endif



static bool skip_sample(struct perf_kvm_stat *kvm,

			struct perf_sample *sample)
@@ -872,6 +878,7 @@ static bool verify_vcpu(int vcpu) 
	return true;

}



#ifdef HAVE_TIMERFD_SUPPORT

/* keeping the max events to a modest level to keep

 * the processing of samples per mmap smooth.

 */
@@ -1213,6 +1220,7 @@ static int kvm_live_open_events(struct perf_kvm_stat *kvm) 
out:

	return rc;

}

#endif



static int read_events(struct perf_kvm_stat *kvm)

{
@@ -1379,6 +1387,7 @@ kvm_events_report(struct perf_kvm_stat *kvm, int argc, const char **argv) 
	return kvm_events_report_vcpu(kvm);

}



#ifdef HAVE_TIMERFD_SUPPORT

static struct perf_evlist *kvm_live_event_list(void)

{

	struct perf_evlist *evlist;
@@ -1566,6 +1575,7 @@ static int kvm_events_live(struct perf_kvm_stat *kvm, 


	return err;

}

#endif



static void print_kvm_stat_usage(void)

{
@@ -1604,8 +1614,10 @@ static int kvm_cmd_stat(const char *file_name, int argc, const char **argv) 
	if (!strncmp(argv[1], "rep", 3))

		return kvm_events_report(&kvm, argc - 1 , argv + 1);



#ifdef HAVE_TIMERFD_SUPPORT

	if (!strncmp(argv[1], "live", 4))

		return kvm_events_live(&kvm, argc - 1 , argv + 1);

#endif



perf_stat:

	return cmd_stat(argc, argv, NULL);

tools/perf/builtin-list.c

+48 −36
Original line number Diff line number Diff line
@@ -14,18 +14,31 @@ 
#include "util/parse-events.h"

#include "util/cache.h"

#include "util/pmu.h"

#include "util/parse-options.h"



int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused)

{

	int i;

	const struct option list_options[] = {

		OPT_END()

	};

	const char * const list_usage[] = {

		"perf list [hw|sw|cache|tracepoint|pmu|event_glob]",

		NULL

	};



	argc = parse_options(argc, argv, list_options, list_usage,

			     PARSE_OPT_STOP_AT_NON_OPTION);



	setup_pager();



	if (argc == 1)

	if (argc == 0) {

		print_events(NULL, false);

	else {

		int i;

		return 0;

	}



		for (i = 1; i < argc; ++i) {

			if (i > 2)

	for (i = 0; i < argc; ++i) {

		if (i)

			putchar('\n');

		if (strncmp(argv[i], "tracepoint", 10) == 0)

			print_tracepoint_events(NULL, NULL, false);
@@ -60,6 +73,5 @@ int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused) 
			free(s);

		}

	}

	}

	return 0;

}