14 files changed, 55 insertions, 32 deletions

diff --git a/tools/perf/builtin-inject.c b/tools/perf/builtin-inject.c
index 1d8de2e4a407..0d4ae1dd7b60 100644
--- a/tools/perf/builtin-inject.c
+++ b/tools/perf/builtin-inject.c
@@ -198,7 +198,7 @@ static int perf_event__inject_buildid(struct perf_tool *tool,
 
         cpumode = event->header.misc & PERF_RECORD_MISC_CPUMODE_MASK;
 
-        thread = machine__findnew_thread(machine, event->ip.pid);
+        thread = machine__findnew_thread(machine, event->ip.pid, event->ip.pid);
         if (thread == NULL) {
                 pr_err("problem processing %d event, skipping it.\n",
                        event->header.type);
diff --git a/tools/perf/builtin-kmem.c b/tools/perf/builtin-kmem.c
index b49f5c58e152..c32477837cb0 100644
--- a/tools/perf/builtin-kmem.c
+++ b/tools/perf/builtin-kmem.c
@@ -305,7 +305,8 @@ static int process_sample_event(struct perf_tool *tool __maybe_unused,
                                 struct perf_evsel *evsel,
                                 struct machine *machine)
 {
-        struct thread *thread = machine__findnew_thread(machine, event->ip.pid);
+        struct thread *thread = machine__findnew_thread(machine, event->ip.pid,
+                                                        event->ip.pid);
 
         if (thread == NULL) {
                 pr_debug("problem processing %d event, skipping it.\n",
diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c
index 6cd4de59be21..47b35407c2f2 100644
--- a/tools/perf/builtin-kvm.c
+++ b/tools/perf/builtin-kvm.c
@@ -815,7 +815,7 @@ static int process_sample_event(struct perf_tool *tool,
         if (skip_sample(kvm, sample))
                 return 0;
 
-        thread = machine__findnew_thread(machine, sample->tid);
+        thread = machine__findnew_thread(machine, sample->pid, sample->tid);
         if (thread == NULL) {
                 pr_debug("problem processing %d event, skipping it.\n",
                         event->header.type);
diff --git a/tools/perf/builtin-lock.c b/tools/perf/builtin-lock.c
index 76543a4a7a30..ee33ba2f05dd 100644
--- a/tools/perf/builtin-lock.c
+++ b/tools/perf/builtin-lock.c
@@ -805,7 +805,8 @@ static int process_sample_event(struct perf_tool *tool __maybe_unused,
                                 struct perf_evsel *evsel,
                                 struct machine *machine)
 {
-        struct thread *thread = machine__findnew_thread(machine, sample->tid);
+        struct thread *thread = machine__findnew_thread(machine, sample->pid,
+                                                        sample->tid);
 
         if (thread == NULL) {
                 pr_debug("problem processing %d event, skipping it.\n",
diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c
index f809cc7fb7d9..d8c51b2f263f 100644
--- a/tools/perf/builtin-sched.c
+++ b/tools/perf/builtin-sched.c
@@ -724,8 +724,10 @@ static int replay_fork_event(struct perf_sched *sched,
 {
         struct thread *child, *parent;
 
-        child = machine__findnew_thread(machine, event->fork.tid);
-        parent = machine__findnew_thread(machine, event->fork.ptid);
+        child = machine__findnew_thread(machine, event->fork.pid,
+                                        event->fork.tid);
+        parent = machine__findnew_thread(machine, event->fork.ppid,
+                                         event->fork.ptid);
 
         if (child == NULL || parent == NULL) {
                 pr_debug("thread does not exist on fork event: child %p, parent %p\n",
@@ -934,8 +936,8 @@ static int latency_switch_event(struct perf_sched *sched,
                 return -1;
         }
 
-        sched_out = machine__findnew_thread(machine, prev_pid);
-        sched_in = machine__findnew_thread(machine, next_pid);
+        sched_out = machine__findnew_thread(machine, 0, prev_pid);
+        sched_in = machine__findnew_thread(machine, 0, next_pid);
 
         out_events = thread_atoms_search(&sched->atom_root, sched_out, &sched->cmp_pid);
         if (!out_events) {
@@ -978,7 +980,7 @@ static int latency_runtime_event(struct perf_sched *sched,
 {
         const u32 pid      = perf_evsel__intval(evsel, sample, "pid");
         const u64 runtime  = perf_evsel__intval(evsel, sample, "runtime");
-        struct thread *thread = machine__findnew_thread(machine, pid);
+        struct thread *thread = machine__findnew_thread(machine, 0, pid);
         struct work_atoms *atoms = thread_atoms_search(&sched->atom_root, thread, &sched->cmp_pid);
         u64 timestamp = sample->time;
         int cpu = sample->cpu;
@@ -1016,7 +1018,7 @@ static int latency_wakeup_event(struct perf_sched *sched,
         if (!success)
                 return 0;
 
-        wakee = machine__findnew_thread(machine, pid);
+        wakee = machine__findnew_thread(machine, 0, pid);
         atoms = thread_atoms_search(&sched->atom_root, wakee, &sched->cmp_pid);
         if (!atoms) {
                 if (thread_atoms_insert(sched, wakee))
@@ -1070,7 +1072,7 @@ static int latency_migrate_task_event(struct perf_sched *sched,
         if (sched->profile_cpu == -1)
                 return 0;
 
-        migrant = machine__findnew_thread(machine, pid);
+        migrant = machine__findnew_thread(machine, 0, pid);
         atoms = thread_atoms_search(&sched->atom_root, migrant, &sched->cmp_pid);
         if (!atoms) {
                 if (thread_atoms_insert(sched, migrant))
@@ -1289,8 +1291,8 @@ static int map_switch_event(struct perf_sched *sched, struct perf_evsel *evsel,
                 return -1;
         }
 
-        sched_out = machine__findnew_thread(machine, prev_pid);
-        sched_in = machine__findnew_thread(machine, next_pid);
+        sched_out = machine__findnew_thread(machine, 0, prev_pid);
+        sched_in = machine__findnew_thread(machine, 0, next_pid);
 
         sched->curr_thread[this_cpu] = sched_in;
 
diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index 2ad9d5b6fb3c..d82712f169b3 100644
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -501,7 +501,8 @@ static int process_sample_event(struct perf_tool *tool __maybe_unused,
                                 struct machine *machine)
 {
         struct addr_location al;
-        struct thread *thread = machine__findnew_thread(machine, event->ip.tid);
+        struct thread *thread = machine__findnew_thread(machine, event->ip.pid,
+                                                        event->ip.tid);
 
         if (thread == NULL) {
                 pr_debug("problem processing %d event, skipping it.\n",
diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index b72afc73f9a7..88387c565687 100644
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -521,7 +521,8 @@ static int trace__sys_enter(struct trace *trace, struct perf_evsel *evsel,
         if (sc->filtered)
                 return 0;
 
-        thread = machine__findnew_thread(&trace->host, sample->tid);
+        thread = machine__findnew_thread(&trace->host, sample->pid,
+                                         sample->tid);
         ttrace = thread__trace(thread, trace->output);
         if (ttrace == NULL)
                 return -1;
@@ -572,7 +573,8 @@ static int trace__sys_exit(struct trace *trace, struct perf_evsel *evsel,
         if (sc->filtered)
                 return 0;
 
-        thread = machine__findnew_thread(&trace->host, sample->tid);
+        thread = machine__findnew_thread(&trace->host, sample->pid,
+                                         sample->tid);
         ttrace = thread__trace(thread, trace->output);
         if (ttrace == NULL)
                 return -1;
@@ -628,7 +630,9 @@ static int trace__sched_stat_runtime(struct trace *trace, struct perf_evsel *evs
 {
         u64 runtime = perf_evsel__intval(evsel, sample, "runtime");
         double runtime_ms = (double)runtime / NSEC_PER_MSEC;
-        struct thread *thread = machine__findnew_thread(&trace->host, sample->tid);
+        struct thread *thread = machine__findnew_thread(&trace->host,
+                                                        sample->pid,
+                                                        sample->tid);
         struct thread_trace *ttrace = thread__trace(thread, trace->output);
 
         if (ttrace == NULL)
diff --git a/tools/perf/tests/code-reading.c b/tools/perf/tests/code-reading.c
index df9afd9cab4c..6fb781d5586c 100644
--- a/tools/perf/tests/code-reading.c
+++ b/tools/perf/tests/code-reading.c
@@ -257,7 +257,7 @@ static int process_sample_event(struct machine *machine,
                 return -1;
         }
 
-        thread = machine__findnew_thread(machine, sample.pid);
+        thread = machine__findnew_thread(machine, sample.pid, sample.pid);
         if (!thread) {
                 pr_debug("machine__findnew_thread failed\n");
                 return -1;
@@ -446,7 +446,7 @@ static int do_test_code_reading(bool try_kcore)
                 goto out_err;
         }
 
-        thread = machine__findnew_thread(machine, pid);
+        thread = machine__findnew_thread(machine, pid, pid);
         if (!thread) {
                 pr_debug("machine__findnew_thread failed\n");
                 goto out_err;
diff --git a/tools/perf/tests/hists_link.c b/tools/perf/tests/hists_link.c
index 50bfb01183ea..87f9f7280c40 100644
--- a/tools/perf/tests/hists_link.c
+++ b/tools/perf/tests/hists_link.c
@@ -88,7 +88,8 @@ static struct machine *setup_fake_machine(struct machines *machines)
         for (i = 0; i < ARRAY_SIZE(fake_threads); i++) {
                 struct thread *thread;
 
-                thread = machine__findnew_thread(machine, fake_threads[i].pid);
+                thread = machine__findnew_thread(machine, fake_threads[i].pid,
+                                                 fake_threads[i].pid);
                 if (thread == NULL)
                         goto out;
 
diff --git a/tools/perf/util/build-id.c b/tools/perf/util/build-id.c
index 5295625c0c00..0f9d27a6bc8f 100644
--- a/tools/perf/util/build-id.c
+++ b/tools/perf/util/build-id.c
@@ -24,7 +24,8 @@ int build_id__mark_dso_hit(struct perf_tool *tool __maybe_unused,
 {
         struct addr_location al;
         u8 cpumode = event->header.misc & PERF_RECORD_MISC_CPUMODE_MASK;
-        struct thread *thread = machine__findnew_thread(machine, event->ip.pid);
+        struct thread *thread = machine__findnew_thread(machine, event->ip.pid,
+                                                        event->ip.pid);
 
         if (thread == NULL) {
                 pr_err("problem processing %d event, skipping it.\n",
@@ -47,7 +48,9 @@ static int perf_event__exit_del_thread(struct perf_tool *tool __maybe_unused,
                                        __maybe_unused,
                                        struct machine *machine)
 {
-        struct thread *thread = machine__findnew_thread(machine, event->fork.tid);
+        struct thread *thread = machine__findnew_thread(machine,
+                                                        event->fork.pid,
+                                                        event->fork.tid);
 
         dump_printf("(%d:%d):(%d:%d)\n", event->fork.pid, event->fork.tid,
                     event->fork.ppid, event->fork.ptid);
diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index 49713ae46551..61cecf9caff1 100644
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -686,7 +686,8 @@ int perf_event__preprocess_sample(const union perf_event *event,
                                   struct perf_sample *sample)
 {
         u8 cpumode = event->header.misc & PERF_RECORD_MISC_CPUMODE_MASK;
-        struct thread *thread = machine__findnew_thread(machine, event->ip.pid);
+        struct thread *thread = machine__findnew_thread(machine, event->ip.pid,
+                                                        event->ip.pid);
 
         if (thread == NULL)
                 return -1;
diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
index 59486c180626..1dca61f0512d 100644
--- a/tools/perf/util/machine.c
+++ b/tools/perf/util/machine.c
@@ -32,7 +32,8 @@ int machine__init(struct machine *machine, const char *root_dir, pid_t pid)
                 return -ENOMEM;
 
         if (pid != HOST_KERNEL_ID) {
-                struct thread *thread = machine__findnew_thread(machine, pid);
+                struct thread *thread = machine__findnew_thread(machine, 0,
+                                                                pid);
                 char comm[64];
 
                 if (thread == NULL)
@@ -302,9 +303,10 @@ static struct thread *__machine__findnew_thread(struct machine *machine,
         return th;
 }
 
-struct thread *machine__findnew_thread(struct machine *machine, pid_t tid)
+struct thread *machine__findnew_thread(struct machine *machine, pid_t pid,
+                                       pid_t tid)
 {
-        return __machine__findnew_thread(machine, 0, tid, true);
+        return __machine__findnew_thread(machine, pid, tid, true);
 }
 
 struct thread *machine__find_thread(struct machine *machine, pid_t tid)
@@ -314,7 +316,9 @@ struct thread *machine__find_thread(struct machine *machine, pid_t tid)
 
 int machine__process_comm_event(struct machine *machine, union perf_event *event)
 {
-        struct thread *thread = machine__findnew_thread(machine, event->comm.tid);
+        struct thread *thread = machine__findnew_thread(machine,
+                                                        event->comm.pid,
+                                                        event->comm.tid);
 
         if (dump_trace)
                 perf_event__fprintf_comm(event, stdout);
@@ -1012,7 +1016,8 @@ int machine__process_mmap_event(struct machine *machine, union perf_event *event
                 return 0;
         }
 
-        thread = machine__findnew_thread(machine, event->mmap.pid);
+        thread = machine__findnew_thread(machine, event->mmap.pid,
+                                         event->mmap.pid);
         if (thread == NULL)
                 goto out_problem;
 
@@ -1051,13 +1056,16 @@ static void machine__remove_thread(struct machine *machine, struct thread *th)
 int machine__process_fork_event(struct machine *machine, union perf_event *event)
 {
         struct thread *thread = machine__find_thread(machine, event->fork.tid);
-        struct thread *parent = machine__findnew_thread(machine, event->fork.ptid);
+        struct thread *parent = machine__findnew_thread(machine,
+                                                        event->fork.ppid,
+                                                        event->fork.ptid);
 
         /* if a thread currently exists for the thread id remove it */
         if (thread != NULL)
                 machine__remove_thread(machine, thread);
 
-        thread = machine__findnew_thread(machine, event->fork.tid);
+        thread = machine__findnew_thread(machine, event->fork.pid,
+                                         event->fork.tid);
         if (dump_trace)
                 perf_event__fprintf_task(event, stdout);
 
diff --git a/tools/perf/util/machine.h b/tools/perf/util/machine.h
index 603ffba999d9..0df925ba6a44 100644
--- a/tools/perf/util/machine.h
+++ b/tools/perf/util/machine.h
@@ -106,7 +106,8 @@ static inline bool machine__is_host(struct machine *machine)
         return machine ? machine->pid == HOST_KERNEL_ID : false;
 }
 
-struct thread *machine__findnew_thread(struct machine *machine, pid_t tid);
+struct thread *machine__findnew_thread(struct machine *machine, pid_t pid,
+                                       pid_t tid);
 
 size_t machine__fprintf(struct machine *machine, FILE *fp);
 
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index de16a7736859..57b6f38f246a 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -1099,7 +1099,7 @@ void perf_event_header__bswap(struct perf_event_header *self)
 
 struct thread *perf_session__findnew(struct perf_session *session, pid_t pid)
 {
-        return machine__findnew_thread(&session->machines.host, pid);
+        return machine__findnew_thread(&session->machines.host, 0, pid);
 }
 
 static struct thread *perf_session__register_idle_thread(struct perf_session *self)