Commit e1858800 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 9b3e59e3 f3bed55e

arch/x86/events/intel/cstate.c

+1 −0
Original line number Diff line number Diff line
@@ -643,6 +643,7 @@ static const struct x86_cpu_id intel_cstates_match[] __initconst = { 
	X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT_PLUS,	&glm_cstates),

	X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT_D,	&glm_cstates),

	X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT,	&glm_cstates),

	X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT_L,	&glm_cstates),



	X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_L,		&icl_cstates),

	X86_MATCH_INTEL_FAM6_MODEL(ICELAKE,		&icl_cstates),

kernel/events/core.c

+10 −3
Original line number Diff line number Diff line
@@ -7491,10 +7491,17 @@ static void perf_event_task_output(struct perf_event *event, 
		goto out;



	task_event->event_id.pid = perf_event_pid(event, task);

	task_event->event_id.ppid = perf_event_pid(event, current);



	task_event->event_id.tid = perf_event_tid(event, task);



	if (task_event->event_id.header.type == PERF_RECORD_EXIT) {

		task_event->event_id.ppid = perf_event_pid(event,

							task->real_parent);

		task_event->event_id.ptid = perf_event_pid(event,

							task->real_parent);

	} else {  /* PERF_RECORD_FORK */

		task_event->event_id.ppid = perf_event_pid(event, current);

		task_event->event_id.ptid = perf_event_tid(event, current);

	}



	task_event->event_id.time = perf_event_clock(event);

CRA Git | Maintained and supported by SUSTech CRA and CCSE