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

Commit 54c801ff authored by Alexander Yarygin's avatar Alexander Yarygin Committed by Arnaldo Carvalho de Melo
Browse files

perf kvm: Add skip_event() for --duration option 



Current code skips output of the x86 specific HLT event in order to
avoid flooding the output with enabled --duration option. The events to
be skipped should be architecture dependent, though.

Let's add an architecture specific array of events to be skipped and
introduce a skip_event() function checking against that array.

Reviewed-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Reviewed-by: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarAlexander Yarygin <yarygin@linux.vnet.ibm.com>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Cornelia Huck <cornelia.huck@de.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1404397747-20939-4-git-send-email-yarygin@linux.vnet.ibm.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 9daa8123

tools/perf/arch/x86/util/kvm-stat.c

+5 −0
Original line number Diff line number Diff line
@@ -136,6 +136,11 @@ struct kvm_reg_events_ops kvm_reg_events_ops[] = { 
	{ NULL, NULL },

};



const char * const kvm_skip_events[] = {

	"HLT",

	NULL,

};



int cpu_isa_init(struct perf_kvm_stat *kvm, const char *cpuid)

{

	if (strstr(cpuid, "Intel")) {

tools/perf/builtin-kvm.c

+12 −1
Original line number Diff line number Diff line
@@ -261,6 +261,17 @@ static bool update_kvm_event(struct kvm_event *event, int vcpu_id, 
	return true;

}



static bool skip_event(const char *event)

{

	const char * const *skip_events;



	for (skip_events = kvm_skip_events; *skip_events; skip_events++)

		if (!strcmp(event, *skip_events))

			return true;



	return false;

}



static bool handle_end_event(struct perf_kvm_stat *kvm,

			     struct vcpu_event_record *vcpu_record,

			     struct event_key *key,
@@ -312,7 +323,7 @@ static bool handle_end_event(struct perf_kvm_stat *kvm, 
		char decode[DECODE_STR_LEN];



		kvm->events_ops->decode_key(kvm, &event->key, decode);

		if (strcmp(decode, "HLT")) {

		if (!skip_event(decode)) {

			pr_info("%" PRIu64 " VM %d, vcpu %d: %s event took %" PRIu64 "usec\n",

				 sample->time, sample->pid, vcpu_record->vcpu_id,

				 decode, time_diff/1000);

tools/perf/util/kvm-stat.h

+1 −0
Original line number Diff line number Diff line
@@ -126,5 +126,6 @@ int cpu_isa_init(struct perf_kvm_stat *kvm, const char *cpuid); 


extern const char * const kvm_events_tp[];

extern struct kvm_reg_events_ops kvm_reg_events_ops[];

extern const char * const kvm_skip_events[];



#endif /* __PERF_KVM_STAT_H */