If a trace file version 7 is detected, read compresses sections of it.
Read the compression header, check if the comporession algorithm and
version, used to compress the file, are supported and use it to
uncompress these secions from the file:
- ftrace events format
- format of recorded events
- information of the mapping of function addresses to the function names
- trace_printk() format strings
- information of the mapping a PID to a process name
Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@xxxxxxxxx>
---
lib/trace-cmd/trace-input.c | 293 +++++++++++++++++++++++++++---------
1 file changed, 221 insertions(+), 72 deletions(-)
diff --git a/lib/trace-cmd/trace-input.c b/lib/trace-cmd/trace-input.c
index b2a03ab8..b96b0192 100644
--- a/lib/trace-cmd/trace-input.c
+++ b/lib/trace-cmd/trace-input.c
@@ -135,6 +135,11 @@ struct tracecmd_input {
long long ts_offset;
struct tsc2nsec tsc_calc;
+ struct tracecmd_compress_proto *z_proto;
+ char *z_buffer;
+ unsigned long z_buffer_size;
+ unsigned long z_pointer;
+
struct host_trace_info host;
double ts2secs;
char * cpustats;
@@ -254,12 +259,52 @@ static ssize_t do_read(struct tracecmd_input *handle, void *data, size_t size)
return tot;
}
+static ssize_t do_read_compressed(struct tracecmd_input *handle, void *data, size_t size)
+{
+ int ret;
+ int s;
+
+ if (handle->z_buffer) {
+ if (handle->z_pointer + size > handle->z_buffer_size)
+ s = handle->z_buffer_size - handle->z_pointer;
+ else
+ s = size;
+ memcpy(data, handle->z_buffer + handle->z_pointer, s);
+ handle->z_pointer += s;
+ ret = s;
+ } else {
+ ret = do_read(handle, data, size);
+ }
+
+ return ret;
+}
+
+static int do_lseek(struct tracecmd_input *handle, int offset, int whence)
+{
+ int ret;
+
+ if (handle->z_buffer) {
+ if (whence != SEEK_CUR)
+ return -1;
+ if (offset < 0 && handle->z_pointer < (-offset))
+ return -1;
+ if (offset > 0 && handle->z_pointer + offset > handle->z_buffer_size)
+ return -1;
+ handle->z_pointer += offset;
+ ret = 0;
+ } else {
+ ret = lseek(handle->fd, offset, whence);
+ }
+
+ return ret;
+}
+
static ssize_t
do_read_check(struct tracecmd_input *handle, void *data, size_t size)
{
ssize_t ret;
- ret = do_read(handle, data, size);
+ ret = do_read_compressed(handle, data, size);
if (ret < 0)
return ret;
if (ret != size)
@@ -277,7 +322,7 @@ static char *read_string(struct tracecmd_input *handle)
ssize_t r;
for (;;) {
- r = do_read(handle, buf, BUFSIZ);
+ r = do_read_compressed(handle, buf, BUFSIZ);
if (r < 0)
goto fail;
if (!r)
@@ -306,7 +351,7 @@ static char *read_string(struct tracecmd_input *handle)
}
/* move the file descriptor to the end of the string */
- r = lseek(handle->fd, -(r - (i+1)), SEEK_CUR);
+ r = do_lseek(handle, -(r - (i+1)), SEEK_CUR);
if (r < 0)
goto fail;
@@ -358,6 +403,54 @@ static int read8(struct tracecmd_input *handle, unsigned long long *size)
return 0;
}
+static void uncompress_reset(struct tracecmd_input *handle)
+{
+ free(handle->z_buffer);
+ handle->z_buffer = NULL;
+ handle->z_buffer_size = 0;
+ handle->z_pointer = 0;
+}
+
+static int uncompress_block(struct tracecmd_input *handle)
+{
+ unsigned int s_compressed;
+ unsigned int s_uncompressed;
+ char *bytes = NULL;
+ int ret;
+
+ if (handle->file_version < 7 || !handle->z_proto)
+ return 0;
+ uncompress_reset(handle);
+
+ if (read4(handle, &s_compressed) < 0)
+ return -1;
+ if (read4(handle, &s_uncompressed) < 0)
+ return -1;
+
+ handle->z_buffer = malloc(s_uncompressed);
+ if (!handle->z_buffer)
+ return -1;
+ bytes = malloc(s_compressed);
+ if (!bytes)
+ goto error;
+
+ if (do_read(handle, bytes, s_compressed) != s_compressed)
+ goto error;
+ ret = tracecmd_uncompress_data(handle->z_proto, bytes, s_compressed,
+ handle->z_buffer, &s_uncompressed);
+ if (ret)
+ goto error;
+ free(bytes);
+ handle->z_buffer_size = s_uncompressed;
+ handle->z_pointer = 0;
+ return 0;
+error:
+ uncompress_reset(handle);
+ free(bytes);
+ return -1;
+
+}
+
static int read_header_files(struct tracecmd_input *handle)
{
struct tep_handle *pevent = handle->pevent;
@@ -601,34 +694,40 @@ static int read_ftrace_files(struct tracecmd_input *handle, const char *regex)
}
}
- if (read4(handle, &count) < 0)
+ if (uncompress_block(handle))
return -1;
+ ret = read4(handle, &count);
+ if (ret < 0)
+ goto out;
+
for (i = 0; i < count; i++) {
- if (read8(handle, &size) < 0)
- return -1;
+ ret = read8(handle, &size);
+ if (ret < 0)
+ goto out;
ret = read_ftrace_file(handle, size, print_all, ereg);
if (ret < 0)
- return -1;
+ goto out;
}
handle->event_files_start =
lseek64(handle->fd, 0, SEEK_CUR);
+ handle->file_state = TRACECMD_FILE_FTRACE_EVENTS;
+ ret = 0;
+out:
if (sreg) {
regfree(sreg);
regfree(ereg);
}
-
- handle->file_state = TRACECMD_FILE_FTRACE_EVENTS;
-
- return 0;
+ uncompress_reset(handle);
+ return ret;
}
static int read_event_files(struct tracecmd_input *handle, const char *regex)
{
unsigned long long size;
- char *system;
+ char *system = NULL;
regex_t spreg;
regex_t epreg;
regex_t *sreg = NULL;
@@ -653,13 +752,19 @@ static int read_event_files(struct tracecmd_input *handle, const char *regex)
return -1;
}
- if (read4(handle, &systems) < 0)
+ if (uncompress_block(handle))
return -1;
+ ret = read4(handle, &systems);
+ if (ret < 0)
+ goto out;
+
for (i = 0; i < systems; i++) {
system = read_string(handle);
- if (!system)
- return -1;
+ if (!system) {
+ ret = -1;
+ goto out;
+ }
sys_printed = 0;
print_all = 0;
@@ -686,103 +791,117 @@ static int read_event_files(struct tracecmd_input *handle, const char *regex)
}
}
- if (read4(handle, &count) < 0)
- goto failed;
+ ret = read4(handle, &count);
+ if (ret < 0)
+ goto out;
for (x=0; x < count; x++) {
- if (read8(handle, &size) < 0)
- goto failed;
+ ret = read8(handle, &size);
+ if (ret < 0)
+ goto out;
ret = read_event_file(handle, system, size,
print_all, &sys_printed,
reg);
if (ret < 0)
- goto failed;
+ goto out;
}
free(system);
- }
-
- if (sreg) {
- regfree(sreg);
- regfree(ereg);
+ system = NULL;
}
handle->file_state = TRACECMD_FILE_ALL_EVENTS;
-
- return 0;
-
- failed:
+ ret = 0;
+ out:
+ uncompress_reset(handle);
if (sreg) {
regfree(sreg);
regfree(ereg);
}
free(system);
- return -1;
+ return ret;
}
static int read_proc_kallsyms(struct tracecmd_input *handle)
{
- struct tep_handle *pevent = handle->pevent;
+ struct tep_handle *tep = handle->pevent;
unsigned int size;
- char *buf;
+ char *buf = NULL;
+ int ret;
if (handle->file_state >= TRACECMD_FILE_KALLSYMS)
return 0;
- if (read4(handle, &size) < 0)
+ if (uncompress_block(handle))
return -1;
- if (!size)
- return 0; /* OK? */
- buf = malloc(size+1);
- if (!buf)
- return -1;
- if (do_read_check(handle, buf, size)){
- free(buf);
- return -1;
+ ret = read4(handle, &size);
+ if (ret < 0)
+ goto out;
+ if (!size) {
+ handle->file_state = TRACECMD_FILE_KALLSYMS;
+ goto out; /* OK? */
}
- buf[size] = 0;
-
- tep_parse_kallsyms(pevent, buf);
- free(buf);
+ buf = malloc(size+1);
+ if (!buf) {
+ ret = -1;
+ goto out;
+ }
+ ret = do_read_check(handle, buf, size);
+ if (ret < 0)
+ goto out;
+ buf[size] = 0;
+ tep_parse_kallsyms(tep, buf);
handle->file_state = TRACECMD_FILE_KALLSYMS;
-
- return 0;
+ ret = 0;
+out:
+ free(buf);
+ uncompress_reset(handle);
+ return ret;
}
static int read_ftrace_printk(struct tracecmd_input *handle)
{
unsigned int size;
- char *buf;
+ char *buf = NULL;
+ int ret;
if (handle->file_state >= TRACECMD_FILE_PRINTK)
return 0;
- if (read4(handle, &size) < 0)
+ if (uncompress_block(handle))
return -1;
- if (!size)
- return 0; /* OK? */
+
+ ret = read4(handle, &size);
+ if (ret < 0)
+ goto out;
+ if (!size) {
+ handle->file_state = TRACECMD_FILE_PRINTK;
+ goto out; /* OK? */
+ }
buf = malloc(size + 1);
- if (!buf)
- return -1;
- if (do_read_check(handle, buf, size)) {
- free(buf);
- return -1;
+ if (!buf) {
+ ret = -1;
+ goto out;
}
+ ret = do_read_check(handle, buf, size);
+ if (ret < 0)
+ goto out;
buf[size] = 0;
tep_parse_printk_formats(handle->pevent, buf);
-
- free(buf);
-
handle->file_state = TRACECMD_FILE_PRINTK;
+ ret = 0;
- return 0;
+out:
+ free(buf);
+ uncompress_reset(handle);
+ return ret;
}
static int read_and_parse_cmdlines(struct tracecmd_input *handle);
@@ -2962,20 +3081,30 @@ static int read_and_parse_cmdlines(struct tracecmd_input *handle)
{
struct tep_handle *pevent = handle->pevent;
unsigned long long size;
- char *cmdlines;
+ char *cmdlines = NULL;
+ int ret;
if (handle->file_state >= TRACECMD_FILE_CMD_LINES)
return 0;
- if (read_data_and_size(handle, &cmdlines, &size) < 0)
+ if (uncompress_block(handle))
return -1;
+
+ ret = read_data_and_size(handle, &cmdlines, &size);
+ if (ret < 0)
+ goto out;
+ if (!size) {
+ handle->file_state = TRACECMD_FILE_CMD_LINES;
+ goto out;
+ }
cmdlines[size] = 0;
tep_parse_saved_cmdlines(pevent, cmdlines);
- free(cmdlines);
-
handle->file_state = TRACECMD_FILE_CMD_LINES;
-
- return 0;
+ ret = 0;
+out:
+ free(cmdlines);
+ uncompress_reset(handle);
+ return ret;
}
static void extract_trace_clock(struct tracecmd_input *handle, char *line)
@@ -3256,7 +3385,8 @@ struct tracecmd_input *tracecmd_alloc_fd(int fd, int flags)
struct tracecmd_input *handle;
char test[] = TRACECMD_MAGIC;
unsigned int page_size;
- char *version;
+ char *str = NULL;
+ char *zver;
char buf[BUFSIZ];
unsigned long ver;
@@ -3279,11 +3409,11 @@ struct tracecmd_input *tracecmd_alloc_fd(int fd, int flags)
if (memcmp(buf, "tracing", 7) != 0)
goto failed_read;
- version = read_string(handle);
- if (!version)
+ str = read_string(handle);
+ if (!str)
goto failed_read;
- pr_stat("version = %s\n", version);
- ver = strtol(version, NULL, 10);
+ pr_stat("version = %s\n", str);
+ ver = strtol(str, NULL, 10);
if (!ver && errno)
goto failed_read;
if (!tracecmd_is_version_supported(ver)) {
@@ -3291,7 +3421,8 @@ struct tracecmd_input *tracecmd_alloc_fd(int fd, int flags)
goto failed_read;
}
handle->file_version = ver;
- free(version);
+ free(str);
+ str = NULL;
if (do_read_check(handle, buf, 1))
goto failed_read;
@@ -3325,11 +3456,29 @@ struct tracecmd_input *tracecmd_alloc_fd(int fd, int flags)
handle->header_files_start =
lseek64(handle->fd, handle->header_files_start, SEEK_SET);
+ if (handle->file_version >= 7) {
+ str = read_string(handle);
+ if (!str)
+ goto failed_read;
+ zver = strchr(str, ' ');
+ if (!zver)
+ goto failed_read;
+ *zver = '\0';
+ handle->z_proto = tracecmd_compress_proto_get(str, zver + 1);
+ if (!handle->z_proto) {
+ tracecmd_warning("Unsupported file compression %s %s", str, zver + 1);
+ goto failed_read;
+ }
+ free(str);
+ str = NULL;
+ }
+
handle->file_state = TRACECMD_FILE_INIT;
return handle;
failed_read:
+ free(str);
free(handle);
return NULL;
--
2.30.2
|