Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
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: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Reviewed-by: David Ahern <dsahern@gmail.com>
Signed-off-by: Alexander 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: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Alexander Yarygin 2014-07-03 18:29:06 +04:00 • committed by Arnaldo Carvalho de Melo
parent 9daa81239e
commit 54c801ff71
3 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
tools/perf/arch/x86/util/kvm-stat.c
View file

@ -136,6 +136,11 @@ struct kvm_reg_events_ops kvm_reg_events_ops[] = {
{ NULL, NULL }, { NULL, NULL },
}; };
const char * const kvm_skip_events[] = {
"HLT",
NULL,
};
int cpu_isa_init(struct perf_kvm_stat *kvm, const char *cpuid) int cpu_isa_init(struct perf_kvm_stat *kvm, const char *cpuid)
{ {
if (strstr(cpuid, "Intel")) { if (strstr(cpuid, "Intel")) {

13
tools/perf/builtin-kvm.c
View file

@ -261,6 +261,17 @@ static bool update_kvm_event(struct kvm_event *event, int vcpu_id,
return true; 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, static bool handle_end_event(struct perf_kvm_stat *kvm,
struct vcpu_event_record *vcpu_record, struct vcpu_event_record *vcpu_record,
struct event_key *key, struct event_key *key,
@ -312,7 +323,7 @@ static bool handle_end_event(struct perf_kvm_stat *kvm,
char decode[DECODE_STR_LEN]; char decode[DECODE_STR_LEN];
kvm->events_ops->decode_key(kvm, &event->key, decode); 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", pr_info("%" PRIu64 " VM %d, vcpu %d: %s event took %" PRIu64 "usec\n",
sample->time, sample->pid, vcpu_record->vcpu_id, sample->time, sample->pid, vcpu_record->vcpu_id,
decode, time_diff/1000); decode, time_diff/1000);

1
tools/perf/util/kvm-stat.h
View file

@ -126,5 +126,6 @@ int cpu_isa_init(struct perf_kvm_stat *kvm, const char *cpuid);
extern const char * const kvm_events_tp[]; extern const char * const kvm_events_tp[];
extern struct kvm_reg_events_ops kvm_reg_events_ops[]; extern struct kvm_reg_events_ops kvm_reg_events_ops[];
extern const char * const kvm_skip_events[];
#endif /* __PERF_KVM_STAT_H */ #endif /* __PERF_KVM_STAT_H */