| 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
| ||
|
Date: Wed, 27 Jan 2010 02:28:00 -0600
From: Tom Zanussi <tzanussi@...il.com>
To: linux-kernel@...r.kernel.org
Cc: mingo@...e.hu, fweisbec@...il.com, rostedt@...dmis.org,
k-keiichi@...jp.nec.com
Subject: [PATCH 09/12] perf tools: save syscall map
Read the exported syscall metadata and save it in the trace file for
post-processing tools.
Signed-off-by: Tom Zanussi <tzanussi@...il.com>
---
tools/perf/util/trace-event-info.c | 25 ++++++++++++++
tools/perf/util/trace-event-parse.c | 63 +++++++++++++++++++++++++++++++++++
tools/perf/util/trace-event-read.c | 18 ++++++++++
tools/perf/util/trace-event.h | 10 +++++
4 files changed, 116 insertions(+), 0 deletions(-)
diff --git a/tools/perf/util/trace-event-info.c b/tools/perf/util/trace-event-info.c
index 5ea8973..6a6e5cc 100644
--- a/tools/perf/util/trace-event-info.c
+++ b/tools/perf/util/trace-event-info.c
@@ -461,6 +461,30 @@ out:
put_tracing_file(path);
}
+static void read_syscall_map(void)
+{
+ unsigned int size, check_size;
+ char *path;
+ struct stat st;
+ int ret;
+
+ path = get_tracing_file("syscall_map");
+ ret = stat(path, &st);
+ if (ret < 0) {
+ /* not found */
+ size = 0;
+ write_or_die(&size, 4);
+ goto out;
+ }
+ size = get_size(path);
+ write_or_die(&size, 4);
+ check_size = copy_file(path);
+ if (size != check_size)
+ die("error in size of file '%s'", path);
+out:
+ put_tracing_file(path);
+}
+
static struct tracepoint_path *
get_tracepoints_path(struct perf_event_attr *pattrs, int nb_events)
{
@@ -523,6 +547,7 @@ int read_tracing_data(int fd, struct perf_event_attr *pattrs, int nb_events)
read_event_files(tps);
read_proc_kallsyms();
read_ftrace_printk();
+ read_syscall_map();
return 0;
}
diff --git a/tools/perf/util/trace-event-parse.c b/tools/perf/util/trace-event-parse.c
index c1299ff..31bb6f2 100644
--- a/tools/perf/util/trace-event-parse.c
+++ b/tools/perf/util/trace-event-parse.c
@@ -336,6 +336,69 @@ void print_printk(void)
}
}
+static struct syscall_metadata *syscalls;
+static int syscall_count;
+
+void parse_syscall_map(char *file, int size __unused)
+{
+ struct syscall_list {
+ struct syscall_list *next;
+ char *name;
+ int nr;
+ } *list = NULL, *item;
+ char *line;
+ char *next = NULL;
+ int i;
+
+ line = strtok_r(file, "\n", &next);
+ while (line) {
+ item = malloc_or_die(sizeof(*item));
+ sscanf(line, "%d:%as", &item->nr,
+ (float *)(void *)&item->name); /* workaround gcc warning */
+ item->next = list;
+ list = item;
+ line = strtok_r(NULL, "\n", &next);
+ syscall_count++;
+ }
+
+ syscalls = malloc_or_die(sizeof(*syscalls) * syscall_count);
+
+ i = 0;
+ while (list) {
+ syscalls[i].nr = list->nr;
+ syscalls[i].name = list->name;
+ i++;
+ item = list;
+ list = list->next;
+ free(item);
+ }
+}
+
+int nr_syscalls(void)
+{
+ return syscall_count;
+}
+
+const struct syscall_metadata *syscall_at_idx(int idx)
+{
+ if (idx >= syscall_count)
+ return NULL;
+
+ return &syscalls[idx];
+}
+
+const struct syscall_metadata *find_syscall(int syscall_nr)
+{
+ int i;
+
+ for (i = 0; i < syscall_count; i++) {
+ if (syscalls[i].nr == syscall_nr)
+ return &syscalls[i];
+ }
+
+ return NULL;
+}
+
static struct event *alloc_event(void)
{
struct event *event;
diff --git a/tools/perf/util/trace-event-read.c b/tools/perf/util/trace-event-read.c
index 1744422..70fcaec 100644
--- a/tools/perf/util/trace-event-read.c
+++ b/tools/perf/util/trace-event-read.c
@@ -171,6 +171,23 @@ static void read_ftrace_printk(void)
free(buf);
}
+static void read_syscall_map(void)
+{
+ unsigned int size;
+ char *buf;
+
+ size = read4();
+ if (!size)
+ return;
+
+ buf = malloc_or_die(size);
+ read_or_die(buf, size);
+
+ parse_syscall_map(buf, size);
+
+ free(buf);
+}
+
static void read_header_files(void)
{
unsigned long long size;
@@ -498,6 +515,7 @@ void trace_report(int fd)
read_event_files();
read_proc_kallsyms();
read_ftrace_printk();
+ read_syscall_map();
if (show_funcs) {
print_funcs();
diff --git a/tools/perf/util/trace-event.h b/tools/perf/util/trace-event.h
index c3269b9..5313ad8 100644
--- a/tools/perf/util/trace-event.h
+++ b/tools/perf/util/trace-event.h
@@ -178,6 +178,16 @@ int parse_event_file(char *buf, unsigned long size, char *sys);
void print_event(int cpu, void *data, int size, unsigned long long nsecs,
char *comm);
+struct syscall_metadata {
+ char *name;
+ int nr;
+};
+
+void parse_syscall_map(char *file, int size);
+int nr_syscalls(void);
+const struct syscall_metadata *syscall_at_idx(int idx);
+const struct syscall_metadata *find_syscall(int syscall_nr);
+
extern int file_bigendian;
extern int host_bigendian;
--
1.6.4.GIT
--
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