|
@@ -743,16 +743,24 @@ static bool verify_vcpu(int vcpu)
|
|
static s64 perf_kvm__mmap_read_idx(struct perf_kvm_stat *kvm, int idx,
|
|
static s64 perf_kvm__mmap_read_idx(struct perf_kvm_stat *kvm, int idx,
|
|
u64 *mmap_time)
|
|
u64 *mmap_time)
|
|
{
|
|
{
|
|
|
|
+ struct perf_evlist *evlist = kvm->evlist;
|
|
union perf_event *event;
|
|
union perf_event *event;
|
|
|
|
+ struct perf_mmap *md;
|
|
|
|
+ u64 end, start;
|
|
u64 timestamp;
|
|
u64 timestamp;
|
|
s64 n = 0;
|
|
s64 n = 0;
|
|
int err;
|
|
int err;
|
|
|
|
|
|
*mmap_time = ULLONG_MAX;
|
|
*mmap_time = ULLONG_MAX;
|
|
- while ((event = perf_evlist__mmap_read(kvm->evlist, idx)) != NULL) {
|
|
|
|
- err = perf_evlist__parse_sample_timestamp(kvm->evlist, event, ×tamp);
|
|
|
|
|
|
+ md = &evlist->mmap[idx];
|
|
|
|
+ err = perf_mmap__read_init(md, false, &start, &end);
|
|
|
|
+ if (err < 0)
|
|
|
|
+ return (err == -EAGAIN) ? 0 : -1;
|
|
|
|
+
|
|
|
|
+ while ((event = perf_mmap__read_event(md, false, &start, end)) != NULL) {
|
|
|
|
+ err = perf_evlist__parse_sample_timestamp(evlist, event, ×tamp);
|
|
if (err) {
|
|
if (err) {
|
|
- perf_evlist__mmap_consume(kvm->evlist, idx);
|
|
|
|
|
|
+ perf_mmap__consume(md, false);
|
|
pr_err("Failed to parse sample\n");
|
|
pr_err("Failed to parse sample\n");
|
|
return -1;
|
|
return -1;
|
|
}
|
|
}
|
|
@@ -762,7 +770,7 @@ static s64 perf_kvm__mmap_read_idx(struct perf_kvm_stat *kvm, int idx,
|
|
* FIXME: Here we can't consume the event, as perf_session__queue_event will
|
|
* FIXME: Here we can't consume the event, as perf_session__queue_event will
|
|
* point to it, and it'll get possibly overwritten by the kernel.
|
|
* point to it, and it'll get possibly overwritten by the kernel.
|
|
*/
|
|
*/
|
|
- perf_evlist__mmap_consume(kvm->evlist, idx);
|
|
|
|
|
|
+ perf_mmap__consume(md, false);
|
|
|
|
|
|
if (err) {
|
|
if (err) {
|
|
pr_err("Failed to enqueue sample: %d\n", err);
|
|
pr_err("Failed to enqueue sample: %d\n", err);
|
|
@@ -779,6 +787,7 @@ static s64 perf_kvm__mmap_read_idx(struct perf_kvm_stat *kvm, int idx,
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ perf_mmap__read_done(md);
|
|
return n;
|
|
return n;
|
|
}
|
|
}
|
|
|
|
|