leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

perf/urgent fix:

Browse Source 
- Add missing initialization of perf_sample.cpumode in synthesized samples,
   affects jitdump, records for pre-existing threads and records synthesized
   from processor trace data, noticed while testing intel_pt events with
   'perf script' (Arnaldo Carvalho de Melo)
 
 Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJW+wpZAAoJENZQFvNTUqpAQ20P/RCpjUSKrYWDsZk2GuhfyrWE
 F/e3JwC9NVPyMvCzLCcqWELZHpXNTiKhEBLDmoLmBQlUj0yRSZCTKD6LelGBmQFI
 zOn7h4te5LHDX9Z5Syz27mYBDsWWJSua8zpGBQQpySmIADJT+iH5KZ3bo8513K3r
 9SDwVrig6LUNLQ61YmefSqJbFmw3MgldqL5AsdfeJHAOaPgSLXoxXywA/wBlw5ZK
 wg0Z90rhfEwjuxWCkHJ02H5QAuxWrulP1RbQNTU5ANHfjSdPDHyUFFkZINfvzH+X
 DtbiFCKL+qsIUJhkDmWxFqbPTnyRVwrcgF5UnrTsyQXDoizucRgC0orsXdzT85k5
 NUhaY+SNA/851jjM2108iY5zsjewNvkqLb75yERNRW+lucOkBtxZBq8IJNN63O/e
 IYgbArCaQzsEV+G02ftrX9HxQvMzJuSIoz2rmIkBsb+uEDIXdz+u8FtrYuqKj8h4
 MD6U0C0Zix1fhx6oDqJWss3H05KjLo2PWhTOM4gySicMeLRa3exakZCuJF/ftwfg
 9bQZBsrL6Q138KdSXCVzJEVTEFrOrbCejIYRK+q7GZTksXDmCDxSnT6Dq+49OIWb
 QNg5eqfMlX7PYj4LTEGKqQq7jyzsWGRb0jFP3yoQUS3ZGDmAwiBV+lX7BNsfmVWN
 zcH/S/qIj//IP2QwMjiR
 =Ov8b
 -----END PGP SIGNATURE-----

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

Pull perf/urgent fix from Arnaldo Carvalho de Melo:

 - Add missing initialization of perf_sample.cpumode in synthesized samples,
   affects jitdump, records for pre-existing threads and records synthesized
   from processor trace data, noticed while testing intel_pt events with
   'perf script' (Arnaldo Carvalho de Melo)

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ingo Molnar 2016-03-30 12:31:03 +02:00
commit f6343be96e
4 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tools/perf/util/event.c
View File

@ -56,13 +56,22 @@ const char *perf_event__name(unsigned int id)
return perf_event__names[id]; return perf_event__names[id];
} }
static struct perf_sample synth_sample = { static int perf_tool__process_synth_event(struct perf_tool *tool,
union perf_event *event,
struct machine *machine,
perf_event__handler_t process)
{
struct perf_sample synth_sample = {
.pid = -1, .pid = -1,
.tid = -1, .tid = -1,
.time = -1, .time = -1,
.stream_id = -1, .stream_id = -1,
.cpu = -1, .cpu = -1,
.period = 1, .period = 1,
.cpumode = event->header.misc & PERF_RECORD_MISC_CPUMODE_MASK,
};
return process(tool, event, &synth_sample, machine);
}; };
/* /*
@ -186,7 +195,7 @@ pid_t perf_event__synthesize_comm(struct perf_tool *tool,
if (perf_event__prepare_comm(event, pid, machine, &tgid, &ppid) != 0) if (perf_event__prepare_comm(event, pid, machine, &tgid, &ppid) != 0)
return -1; return -1;
if (process(tool, event, &synth_sample, machine) != 0) if (perf_tool__process_synth_event(tool, event, machine, process) != 0)
return -1; return -1;
return tgid; return tgid;
@ -218,7 +227,7 @@ static int perf_event__synthesize_fork(struct perf_tool *tool,
event->fork.header.size = (sizeof(event->fork) + machine->id_hdr_size); event->fork.header.size = (sizeof(event->fork) + machine->id_hdr_size);
if (process(tool, event, &synth_sample, machine) != 0) if (perf_tool__process_synth_event(tool, event, machine, process) != 0)
return -1; return -1;
return 0; return 0;
@ -344,7 +353,7 @@ out:
event->mmap2.pid = tgid; event->mmap2.pid = tgid;
event->mmap2.tid = pid; event->mmap2.tid = pid;
if (process(tool, event, &synth_sample, machine) != 0) { if (perf_tool__process_synth_event(tool, event, machine, process) != 0) {
rc = -1; rc = -1;
break; break;
} }
@ -402,7 +411,7 @@ int perf_event__synthesize_modules(struct perf_tool *tool,
memcpy(event->mmap.filename, pos->dso->long_name, memcpy(event->mmap.filename, pos->dso->long_name,
pos->dso->long_name_len + 1); pos->dso->long_name_len + 1);
if (process(tool, event, &synth_sample, machine) != 0) { if (perf_tool__process_synth_event(tool, event, machine, process) != 0) {
rc = -1; rc = -1;
break; break;
} }
@ -472,7 +481,7 @@ static int __event__synthesize_thread(union perf_event *comm_event,
/* /*
* Send the prepared comm event * Send the prepared comm event
*/ */
if (process(tool, comm_event, &synth_sample, machine) != 0) if (perf_tool__process_synth_event(tool, comm_event, machine, process) != 0)
break; break;
rc = 0; rc = 0;
@ -701,7 +710,7 @@ int perf_event__synthesize_kernel_mmap(struct perf_tool *tool,
event->mmap.len = map->end - event->mmap.start; event->mmap.len = map->end - event->mmap.start;
event->mmap.pid = machine->pid; event->mmap.pid = machine->pid;
err = process(tool, event, &synth_sample, machine); err = perf_tool__process_synth_event(tool, event, machine, process);
free(event); free(event);
return err; return err;

1
tools/perf/util/intel-bts.c
View File

@ -279,6 +279,7 @@ static int intel_bts_synth_branch_sample(struct intel_bts_queue *btsq,
event.sample.header.misc = PERF_RECORD_MISC_USER; event.sample.header.misc = PERF_RECORD_MISC_USER;
event.sample.header.size = sizeof(struct perf_event_header); event.sample.header.size = sizeof(struct perf_event_header);
sample.cpumode = PERF_RECORD_MISC_USER;
sample.ip = le64_to_cpu(branch->from); sample.ip = le64_to_cpu(branch->from);
sample.pid = btsq->pid; sample.pid = btsq->pid;
sample.tid = btsq->tid; sample.tid = btsq->tid;

3
tools/perf/util/intel-pt.c
View File

@ -979,6 +979,7 @@ static int intel_pt_synth_branch_sample(struct intel_pt_queue *ptq)
if (!pt->timeless_decoding) if (!pt->timeless_decoding)
sample.time = tsc_to_perf_time(ptq->timestamp, &pt->tc); sample.time = tsc_to_perf_time(ptq->timestamp, &pt->tc);
sample.cpumode = PERF_RECORD_MISC_USER;
sample.ip = ptq->state->from_ip; sample.ip = ptq->state->from_ip;
sample.pid = ptq->pid; sample.pid = ptq->pid;
sample.tid = ptq->tid; sample.tid = ptq->tid;
@ -1035,6 +1036,7 @@ static int intel_pt_synth_instruction_sample(struct intel_pt_queue *ptq)
if (!pt->timeless_decoding) if (!pt->timeless_decoding)
sample.time = tsc_to_perf_time(ptq->timestamp, &pt->tc); sample.time = tsc_to_perf_time(ptq->timestamp, &pt->tc);
sample.cpumode = PERF_RECORD_MISC_USER;
sample.ip = ptq->state->from_ip; sample.ip = ptq->state->from_ip;
sample.pid = ptq->pid; sample.pid = ptq->pid;
sample.tid = ptq->tid; sample.tid = ptq->tid;
@ -1092,6 +1094,7 @@ static int intel_pt_synth_transaction_sample(struct intel_pt_queue *ptq)
if (!pt->timeless_decoding) if (!pt->timeless_decoding)
sample.time = tsc_to_perf_time(ptq->timestamp, &pt->tc); sample.time = tsc_to_perf_time(ptq->timestamp, &pt->tc);
sample.cpumode = PERF_RECORD_MISC_USER;
sample.ip = ptq->state->from_ip; sample.ip = ptq->state->from_ip;
sample.pid = ptq->pid; sample.pid = ptq->pid;
sample.tid = ptq->tid; sample.tid = ptq->tid;

2
tools/perf/util/jitdump.c
View File

@ -417,6 +417,7 @@ static int jit_repipe_code_load(struct jit_buf_desc *jd, union jr_entry *jr)
* use first address as sample address * use first address as sample address
*/ */
memset(&sample, 0, sizeof(sample)); memset(&sample, 0, sizeof(sample));
sample.cpumode = PERF_RECORD_MISC_USER;
sample.pid = pid; sample.pid = pid;
sample.tid = tid; sample.tid = tid;
sample.time = id->time; sample.time = id->time;
@ -505,6 +506,7 @@ static int jit_repipe_code_move(struct jit_buf_desc *jd, union jr_entry *jr)
* use first address as sample address * use first address as sample address
*/ */
memset(&sample, 0, sizeof(sample)); memset(&sample, 0, sizeof(sample));
sample.cpumode = PERF_RECORD_MISC_USER;
sample.pid = pid; sample.pid = pid;
sample.tid = tid; sample.tid = tid;
sample.time = id->time; sample.time = id->time;