Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'perf-urgent-2020-04-25' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Ingo Molnar:
"Two changes:
- fix exit event records
- extend x86 PMU driver enumeration to add Intel Jasper Lake CPU
support"
* tag 'perf-urgent-2020-04-25' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf/core: fix parent pid/tid in task exit events
perf/x86/cstate: Add Jasper Lake CPU support
+11
-3
+1
arch/x86/events/intel/cstate.c
+1
arch/x86/events/intel/cstate.c
···
643
643
X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT_PLUS, &glm_cstates),
644
644
X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT_D, &glm_cstates),
645
645
X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT, &glm_cstates),
646
+
X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT_L, &glm_cstates),
646
647
647
648
X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_L, &icl_cstates),
648
649
X86_MATCH_INTEL_FAM6_MODEL(ICELAKE, &icl_cstates),
+10
-3
kernel/events/core.c
+10
-3
kernel/events/core.c
···
7491
7491
goto out;
7492
7492
7493
7493
task_event->event_id.pid = perf_event_pid(event, task);
7494
-
task_event->event_id.ppid = perf_event_pid(event, current);
7495
-
7496
7494
task_event->event_id.tid = perf_event_tid(event, task);
7497
-
task_event->event_id.ptid = perf_event_tid(event, current);
7495
+
7496
+
if (task_event->event_id.header.type == PERF_RECORD_EXIT) {
7497
+
task_event->event_id.ppid = perf_event_pid(event,
7498
+
task->real_parent);
7499
+
task_event->event_id.ptid = perf_event_pid(event,
7500
+
task->real_parent);
7501
+
} else { /* PERF_RECORD_FORK */
7502
+
task_event->event_id.ppid = perf_event_pid(event, current);
7503
+
task_event->event_id.ptid = perf_event_tid(event, current);
7504
+
}
7498
7505
7499
7506
task_event->event_id.time = perf_event_clock(event);
7500
7507