| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <1431909055-21442-15-git-send-email-namhyung@kernel.org>
Date: Mon, 18 May 2015 09:30:29 +0900
From: Namhyung Kim <namhyung@...nel.org>
To: Arnaldo Carvalho de Melo <acme@...nel.org>
Cc: Ingo Molnar <mingo@...nel.org>,
Peter Zijlstra <a.p.zijlstra@...llo.nl>,
Jiri Olsa <jolsa@...hat.com>,
LKML <linux-kernel@...r.kernel.org>,
David Ahern <dsahern@...il.com>,
Adrian Hunter <adrian.hunter@...el.com>,
Andi Kleen <andi@...stfloor.org>,
Frederic Weisbecker <fweisbec@...il.com>,
Stephane Eranian <eranian@...gle.com>
Subject: [PATCH 14/40] perf tools: Introduce machine__find*_thread_by_time()
With data file indexing is enabled, it needs to search thread based on
sample time since sample processing is done after other (task, comm and
mmap) events are processed. This can be a problem if a session is very
long and pid is recycled - in that case it'll only see the last one.
So keep thread start time in it, and search thread based on the time.
This patch introduces machine__find{,new}_thread_by_time() function
for this. It'll first search current thread rbtree and then dead
thread tree and list. If it couldn't find anyone, it'll create a new
thread.
The sample timestamp of 0 means that this is called from synthesized
event so just use current rbtree. The timestamp will be -1 if sample
didn't record the timestamp so will see current threads automatically.
Cc: Frederic Weisbecker <fweisbec@...il.com>
Signed-off-by: Namhyung Kim <namhyung@...nel.org>
---
tools/perf/tests/dwarf-unwind.c | 8 +--
tools/perf/tests/hists_common.c | 3 +-
tools/perf/tests/hists_link.c | 2 +-
tools/perf/util/event.c | 6 +-
tools/perf/util/machine.c | 126 +++++++++++++++++++++++++++++++++++++++-
tools/perf/util/machine.h | 10 +++-
tools/perf/util/thread.c | 4 ++
tools/perf/util/thread.h | 1 +
8 files changed, 148 insertions(+), 12 deletions(-)
diff --git a/tools/perf/tests/dwarf-unwind.c b/tools/perf/tests/dwarf-unwind.c
index 9b748e1ad46e..1926799bfcdb 100644
--- a/tools/perf/tests/dwarf-unwind.c
+++ b/tools/perf/tests/dwarf-unwind.c
@@ -16,10 +16,10 @@
static int mmap_handler(struct perf_tool *tool __maybe_unused,
union perf_event *event,
- struct perf_sample *sample __maybe_unused,
+ struct perf_sample *sample,
struct machine *machine)
{
- return machine__process_mmap2_event(machine, event, NULL);
+ return machine__process_mmap2_event(machine, event, sample);
}
static int init_live_machine(struct machine *machine)
@@ -66,12 +66,10 @@ static int unwind_entry(struct unwind_entry *entry, void *arg)
__attribute__ ((noinline))
static int unwind_thread(struct thread *thread)
{
- struct perf_sample sample;
+ struct perf_sample sample = { .time = -1ULL, };
unsigned long cnt = 0;
int err = -1;
- memset(&sample, 0, sizeof(sample));
-
if (test__arch_unwind_sample(&sample, thread)) {
pr_debug("failed to get unwind sample\n");
goto out;
diff --git a/tools/perf/tests/hists_common.c b/tools/perf/tests/hists_common.c
index 456f884eb27b..2fd9cb71b258 100644
--- a/tools/perf/tests/hists_common.c
+++ b/tools/perf/tests/hists_common.c
@@ -80,6 +80,7 @@ static struct {
struct machine *setup_fake_machine(struct machines *machines)
{
struct machine *machine = machines__find(machines, HOST_KERNEL_ID);
+ struct perf_sample sample = { .time = -1ULL, };
size_t i;
if (machine == NULL) {
@@ -114,7 +115,7 @@ struct machine *setup_fake_machine(struct machines *machines)
strcpy(fake_mmap_event.mmap.filename,
fake_mmap_info[i].filename);
- machine__process_mmap_event(machine, &fake_mmap_event, NULL);
+ machine__process_mmap_event(machine, &fake_mmap_event, &sample);
}
for (i = 0; i < ARRAY_SIZE(fake_symbols); i++) {
diff --git a/tools/perf/tests/hists_link.c b/tools/perf/tests/hists_link.c
index 27bae90c9a95..cacc8617bf02 100644
--- a/tools/perf/tests/hists_link.c
+++ b/tools/perf/tests/hists_link.c
@@ -64,7 +64,7 @@ static int add_hist_entries(struct perf_evlist *evlist, struct machine *machine)
struct perf_evsel *evsel;
struct addr_location al;
struct hist_entry *he;
- struct perf_sample sample = { .period = 1, };
+ struct perf_sample sample = { .period = 1, .time = -1ULL, };
size_t i = 0, k;
/*
diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index a513a51f7330..819a2d75411c 100644
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -9,6 +9,7 @@
#include "strlist.h"
#include "thread.h"
#include "thread_map.h"
+#include "session.h"
#include "symbol/kallsyms.h"
static const char *perf_event__names[] = {
@@ -929,9 +930,10 @@ 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, sample->pid,
- sample->tid);
+ struct thread *thread;
+ thread = machine__findnew_thread_by_time(machine, sample->pid,
+ sample->tid, sample->time);
if (thread == NULL)
return -1;
diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
index ae07b84a40f5..9e2f4e8663d5 100644
--- a/tools/perf/util/machine.c
+++ b/tools/perf/util/machine.c
@@ -466,6 +466,120 @@ struct thread *machine__find_thread(struct machine *machine, pid_t pid,
return th;
}
+static struct thread *
+__machine__findnew_thread_by_time(struct machine *machine, pid_t pid, pid_t tid,
+ u64 timestamp, bool create)
+{
+ struct thread *curr, *pos, *new;
+ struct thread *th = NULL;
+ struct rb_node **p;
+ struct rb_node *parent = NULL;
+
+ if (!perf_has_index)
+ return ____machine__findnew_thread(machine, pid, tid, create);
+
+ /* lookup current thread first */
+ curr = ____machine__findnew_thread(machine, pid, tid, false);
+ if (curr && timestamp >= curr->start_time)
+ return curr;
+
+ /* and then check dead threads tree & list */
+ p = &machine->dead_threads.rb_node;
+ while (*p != NULL) {
+ parent = *p;
+ th = rb_entry(parent, struct thread, rb_node);
+
+ if (th->tid == tid) {
+ list_for_each_entry(pos, &th->tid_node, tid_node) {
+ if (timestamp >= pos->start_time &&
+ pos->start_time > th->start_time) {
+ th = pos;
+ break;
+ }
+ }
+
+ if (timestamp >= th->start_time) {
+ machine__update_thread_pid(machine, th, pid);
+ return th;
+ }
+ break;
+ }
+
+ if (tid < th->tid)
+ p = &(*p)->rb_left;
+ else
+ p = &(*p)->rb_right;
+ }
+
+ if (!create)
+ return NULL;
+
+ if (!curr && !*p) {
+ /* found no thread. create one as current thread */
+ return __machine__findnew_thread(machine, pid, tid);
+ }
+
+ new = thread__new(pid, tid);
+ if (new == NULL)
+ return NULL;
+
+ new->dead = true;
+ new->start_time = timestamp;
+
+ if (*p) {
+ list_for_each_entry(pos, &th->tid_node, tid_node) {
+ /* sort by time */
+ if (timestamp >= pos->start_time) {
+ th = pos;
+ break;
+ }
+ }
+ list_add_tail(&new->tid_node, &th->tid_node);
+ } else {
+ rb_link_node(&new->rb_node, parent, p);
+ rb_insert_color(&new->rb_node, &machine->dead_threads);
+ }
+
+ thread__get(new);
+
+ /*
+ * We have to initialize map_groups separately
+ * after rb tree is updated.
+ *
+ * The reason is that we call machine__findnew_thread
+ * within thread__init_map_groups to find the thread
+ * leader and that would screwed the rb tree.
+ */
+ if (thread__init_map_groups(new, machine))
+ thread__zput(new);
+
+ return new;
+}
+
+struct thread *machine__find_thread_by_time(struct machine *machine, pid_t pid,
+ pid_t tid, u64 timestamp)
+{
+ struct thread *th;
+
+ pthread_rwlock_rdlock(&machine->threads_lock);
+ th = thread__get(__machine__findnew_thread_by_time(machine, pid, tid,
+ timestamp, false));
+ pthread_rwlock_unlock(&machine->threads_lock);
+ return th;
+}
+
+struct thread *machine__findnew_thread_by_time(struct machine *machine, pid_t pid,
+ pid_t tid, u64 timestamp)
+{
+ struct thread *th;
+
+ pthread_rwlock_wrlock(&machine->threads_lock);
+ th = thread__get(__machine__findnew_thread_by_time(machine, pid, tid,
+ timestamp, true));
+ pthread_rwlock_unlock(&machine->threads_lock);
+ return th;
+}
+
struct comm *machine__thread_exec_comm(struct machine *machine,
struct thread *thread)
{
@@ -1249,7 +1363,7 @@ int machine__process_mmap2_event(struct machine *machine,
}
thread = machine__findnew_thread(machine, event->mmap2.pid,
- event->mmap2.tid);
+ event->mmap2.tid);
if (thread == NULL)
goto out_problem;
@@ -1366,6 +1480,16 @@ static void __machine__remove_thread(struct machine *machine, struct thread *th,
pos = rb_entry(parent, struct thread, rb_node);
if (pos->tid == th->tid) {
+ struct thread *old;
+
+ /* sort by time */
+ list_for_each_entry(old, &pos->tid_node, tid_node) {
+ if (th->start_time >= old->start_time) {
+ pos = old;
+ break;
+ }
+ }
+
list_add_tail(&th->tid_node, &pos->tid_node);
goto out;
}
diff --git a/tools/perf/util/machine.h b/tools/perf/util/machine.h
index 53cdd1aad3ff..863c0e90ceb1 100644
--- a/tools/perf/util/machine.h
+++ b/tools/perf/util/machine.h
@@ -69,8 +69,6 @@ static inline bool machine__kernel_ip(struct machine *machine, u64 ip)
return ip >= kernel_start;
}
-struct thread *machine__find_thread(struct machine *machine, pid_t pid,
- pid_t tid);
struct comm *machine__thread_exec_comm(struct machine *machine,
struct thread *thread);
@@ -154,6 +152,14 @@ static inline bool machine__is_host(struct machine *machine)
struct thread *__machine__findnew_thread(struct machine *machine, pid_t pid, pid_t tid);
struct thread *machine__findnew_thread(struct machine *machine, pid_t pid, pid_t tid);
+struct thread *machine__find_thread(struct machine *machine, pid_t pid,
+ pid_t tid);
+struct thread *machine__findnew_thread_by_time(struct machine *machine,
+ pid_t pid, pid_t tid,
+ u64 timestamp);
+struct thread *machine__find_thread_by_time(struct machine *machine,
+ pid_t pid, pid_t tid,
+ u64 timestamp);
size_t machine__fprintf(struct machine *machine, FILE *fp);
diff --git a/tools/perf/util/thread.c b/tools/perf/util/thread.c
index ccf1808348fe..c8c927488ea0 100644
--- a/tools/perf/util/thread.c
+++ b/tools/perf/util/thread.c
@@ -161,6 +161,9 @@ int __thread__set_comm(struct thread *thread, const char *str, u64 timestamp,
/* Override the default :tid entry */
if (!thread->comm_set) {
+ if (!thread->start_time)
+ thread->start_time = timestamp;
+
err = comm__override(curr, str, timestamp, exec);
if (err)
return err;
@@ -261,6 +264,7 @@ int thread__fork(struct thread *thread, struct thread *parent, u64 timestamp)
}
thread->ppid = parent->tid;
+ thread->start_time = timestamp;
return thread__clone_map_groups(thread, parent);
}
diff --git a/tools/perf/util/thread.h b/tools/perf/util/thread.h
index d6f6f150f3ff..60250db7f77b 100644
--- a/tools/perf/util/thread.h
+++ b/tools/perf/util/thread.h
@@ -28,6 +28,7 @@ struct thread {
struct list_head comm_list;
int comm_len;
u64 db_id;
+ u64 start_time;
void *priv;
struct thread_stack *ts;
--
2.4.0
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists