* [PATCH v2 0/2] Fix listener and add trace file validation @ 2021-02-19 5:31 Tzvetomir Stoyanov (VMware) 2021-02-19 5:31 ` [PATCH v2 1/2] trace-cmd: Add validation for reading and writing trace.dat files Tzvetomir Stoyanov (VMware) 2021-02-19 5:31 ` [PATCH v2 2/2] trace-cmd: Fix broken listener and add error checks Tzvetomir Stoyanov (VMware) 0 siblings, 2 replies; 9+ messages in thread From: Tzvetomir Stoyanov (VMware) @ 2021-02-19 5:31 UTC (permalink / raw) To: rostedt; +Cc: linux-trace-devel Added checks for trace file consistency when reading and writing it. Fixed broken tarce-cmd listener. v2 changes: - Converted file states from bitmask to enum - Added return value of collect_metadata_from_client() to track any errors Tzvetomir Stoyanov (VMware) (2): trace-cmd: Add validation for reading and writing trace.dat files trace-cmd: Fix broken listener and add error checks .../include/private/trace-cmd-private.h | 23 ++- lib/trace-cmd/trace-input.c | 27 +++- lib/trace-cmd/trace-output.c | 138 +++++++++++++++--- tracecmd/trace-listen.c | 30 ++-- tracecmd/trace-record.c | 33 ++++- tracecmd/trace-split.c | 2 +- 6 files changed, 201 insertions(+), 52 deletions(-) -- 2.29.2 ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v2 1/2] trace-cmd: Add validation for reading and writing trace.dat files 2021-02-19 5:31 [PATCH v2 0/2] Fix listener and add trace file validation Tzvetomir Stoyanov (VMware) @ 2021-02-19 5:31 ` Tzvetomir Stoyanov (VMware) 2021-02-23 22:18 ` Steven Rostedt 2021-02-24 23:18 ` Steven Rostedt 2021-02-19 5:31 ` [PATCH v2 2/2] trace-cmd: Fix broken listener and add error checks Tzvetomir Stoyanov (VMware) 1 sibling, 2 replies; 9+ messages in thread From: Tzvetomir Stoyanov (VMware) @ 2021-02-19 5:31 UTC (permalink / raw) To: rostedt; +Cc: linux-trace-devel trace.dat files have multiple sections, which must be in strict order. A new logic is implemented, which checks the order of all mandatory sections when reading and writing trace files. This validation is useful when the file is constructed in different machines - host / guest or listener tracing. In those use cases, part of the file is generated in the client machine and is transferred to the server as a sequence of bytes. The server should validate the format of the received portion of the file and the order of the sections in it. Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com> --- .../include/private/trace-cmd-private.h | 23 ++- lib/trace-cmd/trace-input.c | 27 +++- lib/trace-cmd/trace-output.c | 138 +++++++++++++++--- tracecmd/trace-record.c | 2 +- tracecmd/trace-split.c | 2 +- 5 files changed, 155 insertions(+), 37 deletions(-) diff --git a/lib/trace-cmd/include/private/trace-cmd-private.h b/lib/trace-cmd/include/private/trace-cmd-private.h index eddfd9eb..fc968cc9 100644 --- a/lib/trace-cmd/include/private/trace-cmd-private.h +++ b/lib/trace-cmd/include/private/trace-cmd-private.h @@ -95,6 +95,20 @@ static inline int tracecmd_host_bigendian(void) /* --- Opening and Reading the trace.dat file --- */ +enum { + TRACECMD_FILE_INIT, + TRACECMD_FILE_HEADERS, + TRACECMD_FILE_FTRACE_EVENTS, + TRACECMD_FILE_ALL_EVENTS, + TRACECMD_FILE_KALLSYMS, + TRACECMD_FILE_PRINTK, + TRACECMD_FILE_CMD_LINES, + TRACECMD_FILE_CPU_COUNT, + TRACECMD_FILE_OPTIONS, + TRACECMD_FILE_CPU_LATENCY, + TRACECMD_FILE_CPU_FLYRECORD, +}; + enum { TRACECMD_OPTION_DONE, TRACECMD_OPTION_DATE, @@ -115,9 +129,7 @@ enum { enum { TRACECMD_FL_IGNORE_DATE = (1 << 0), TRACECMD_FL_BUFFER_INSTANCE = (1 << 1), - TRACECMD_FL_LATENCY = (1 << 2), - TRACECMD_FL_IN_USECS = (1 << 3), - TRACECMD_FL_FLYRECORD = (1 << 4), + TRACECMD_FL_IN_USECS = (1 << 2), }; struct tracecmd_ftrace { @@ -150,6 +162,7 @@ int tracecmd_copy_headers(struct tracecmd_input *handle, int fd); void tracecmd_set_flag(struct tracecmd_input *handle, int flag); void tracecmd_clear_flag(struct tracecmd_input *handle, int flag); unsigned long tracecmd_get_flags(struct tracecmd_input *handle); +unsigned long tracecmd_get_file_state(struct tracecmd_input *handle); unsigned long long tracecmd_get_tsync_peer(struct tracecmd_input *handle); int tracecmd_enable_tsync(struct tracecmd_input *handle, bool enable); @@ -273,6 +286,7 @@ struct tracecmd_option *tracecmd_add_buffer_option(struct tracecmd_output *handl const char *name, int cpus); int tracecmd_write_cpus(struct tracecmd_output *handle, int cpus); +int tracecmd_write_cmdlines(struct tracecmd_output *handle); int tracecmd_write_options(struct tracecmd_output *handle); int tracecmd_append_options(struct tracecmd_output *handle); int tracecmd_update_option(struct tracecmd_output *handle, @@ -500,7 +514,4 @@ void *tracecmd_record_page(struct tracecmd_input *handle, void *tracecmd_record_offset(struct tracecmd_input *handle, struct tep_record *record); -int save_tracing_file_data(struct tracecmd_output *handle, - const char *filename); - #endif /* _TRACE_CMD_PRIVATE_H */ diff --git a/lib/trace-cmd/trace-input.c b/lib/trace-cmd/trace-input.c index 76bcb215..9ef7b9f1 100644 --- a/lib/trace-cmd/trace-input.c +++ b/lib/trace-cmd/trace-input.c @@ -102,6 +102,7 @@ struct host_trace_info { struct tracecmd_input { struct tep_handle *pevent; + unsigned long file_state; struct tep_plugin_list *plugin_list; struct tracecmd_input *parent; unsigned long flags; @@ -161,6 +162,11 @@ unsigned long tracecmd_get_flags(struct tracecmd_input *handle) return handle->flags; } +unsigned long tracecmd_get_file_state(struct tracecmd_input *handle) +{ + return handle->file_state; +} + #if DEBUG_RECORD static void remove_record(struct page *page, struct tep_record *record) { @@ -782,34 +788,40 @@ int tracecmd_read_headers(struct tracecmd_input *handle) ret = read_header_files(handle); if (ret < 0) return -1; + handle->file_state = TRACECMD_FILE_HEADERS; + tep_set_long_size(handle->pevent, handle->long_size); ret = read_ftrace_files(handle, NULL); if (ret < 0) return -1; + handle->file_state = TRACECMD_FILE_FTRACE_EVENTS; ret = read_event_files(handle, NULL); if (ret < 0) return -1; + handle->file_state = TRACECMD_FILE_ALL_EVENTS; ret = read_proc_kallsyms(handle); if (ret < 0) return -1; + handle->file_state = TRACECMD_FILE_KALLSYMS; ret = read_ftrace_printk(handle); if (ret < 0) return -1; + handle->file_state = TRACECMD_FILE_PRINTK; if (read_and_parse_cmdlines(handle) < 0) return -1; + handle->file_state = TRACECMD_FILE_CMD_LINES; if (read_cpus(handle) < 0) return -1; + handle->file_state = TRACECMD_FILE_CPU_COUNT; if (read_options_type(handle) < 0) return -1; - tep_set_long_size(handle->pevent, handle->long_size); - return 0; } @@ -2657,6 +2669,7 @@ static int read_options_type(struct tracecmd_input *handle) if (strncmp(buf, "options", 7) == 0) { if (handle_options(handle) < 0) return -1; + handle->file_state = TRACECMD_FILE_OPTIONS; if (do_read_check(handle, buf, 10)) return -1; } @@ -2665,9 +2678,9 @@ static int read_options_type(struct tracecmd_input *handle) * Check if this is a latency report or flyrecord. */ if (strncmp(buf, "latency", 7) == 0) - handle->flags |= TRACECMD_FL_LATENCY; + handle->file_state = TRACECMD_FILE_CPU_LATENCY; else if (strncmp(buf, "flyrecord", 9) == 0) - handle->flags |= TRACECMD_FL_FLYRECORD; + handle->file_state = TRACECMD_FILE_CPU_FLYRECORD; else return -1; @@ -2688,11 +2701,11 @@ static int read_cpu_data(struct tracecmd_input *handle) /* * Check if this is a latency report or not. */ - if (handle->flags & TRACECMD_FL_LATENCY) + if (handle->file_state == TRACECMD_FILE_CPU_LATENCY) return 1; /* We expect this to be flyrecord */ - if (!(handle->flags & TRACECMD_FL_FLYRECORD)) + if (handle->file_state != TRACECMD_FILE_CPU_FLYRECORD) return -1; cpus = handle->cpus; @@ -3153,6 +3166,8 @@ struct tracecmd_input *tracecmd_alloc_fd(int fd, int flags) handle->header_files_start = lseek64(handle->fd, handle->header_files_start, SEEK_SET); + handle->file_state = TRACECMD_FILE_INIT; + return handle; failed_read: diff --git a/lib/trace-cmd/trace-output.c b/lib/trace-cmd/trace-output.c index 588f79a5..732e3b44 100644 --- a/lib/trace-cmd/trace-output.c +++ b/lib/trace-cmd/trace-output.c @@ -54,10 +54,10 @@ struct tracecmd_output { int cpus; struct tep_handle *pevent; char *tracing_dir; - int options_written; int nr_options; bool quiet; - struct list_head options; + unsigned long file_state; + struct list_head options; struct tracecmd_msg_handle *msg_handle; }; @@ -797,8 +797,8 @@ static int read_ftrace_printk(struct tracecmd_output *handle) return -1; } -int save_tracing_file_data(struct tracecmd_output *handle, - const char *filename) +static int save_tracing_file_data(struct tracecmd_output *handle, + const char *filename) { unsigned long long endian8; char *file = NULL; @@ -836,6 +836,33 @@ out_free: return ret; } +static int check_out_state(struct tracecmd_output *handle, int new_state) +{ + if (!handle) + return -1; + + switch (new_state) { + case TRACECMD_FILE_HEADERS: + case TRACECMD_FILE_FTRACE_EVENTS: + case TRACECMD_FILE_ALL_EVENTS: + case TRACECMD_FILE_KALLSYMS: + case TRACECMD_FILE_PRINTK: + case TRACECMD_FILE_CMD_LINES: + case TRACECMD_FILE_CPU_COUNT: + case TRACECMD_FILE_OPTIONS: + if (handle->file_state == (new_state - 1)) + return 0; + break; + case TRACECMD_FILE_CPU_LATENCY: + case TRACECMD_FILE_CPU_FLYRECORD: + if (handle->file_state == TRACECMD_FILE_OPTIONS) + return 0; + break; + } + + return -1; +} + static struct tracecmd_output * create_file_fd(int fd, struct tracecmd_input *ihandle, const char *tracing_dir, @@ -905,20 +932,30 @@ create_file_fd(int fd, struct tracecmd_input *ihandle, endian4 = convert_endian_4(handle, handle->page_size); if (do_write_check(handle, &endian4, 4)) goto out_free; + handle->file_state = TRACECMD_FILE_INIT; if (ihandle) return handle; if (read_header_files(handle)) goto out_free; + handle->file_state = TRACECMD_FILE_HEADERS; + if (read_ftrace_files(handle)) goto out_free; + handle->file_state = TRACECMD_FILE_FTRACE_EVENTS; + if (read_event_files(handle, list)) goto out_free; + handle->file_state = TRACECMD_FILE_ALL_EVENTS; + if (read_proc_kallsyms(handle, kallsyms)) goto out_free; + handle->file_state = TRACECMD_FILE_KALLSYMS; + if (read_ftrace_printk(handle)) goto out_free; + handle->file_state = TRACECMD_FILE_PRINTK; return handle; @@ -973,10 +1010,10 @@ tracecmd_add_option_v(struct tracecmd_output *handle, int i, size = 0; /* - * We can only add options before they were written. + * We can only add options before tracing data were written. * This may change in the future. */ - if (handle->options_written) + if (handle->file_state > TRACECMD_FILE_OPTIONS) return NULL; for (i = 0; i < count; i++) @@ -1038,8 +1075,20 @@ tracecmd_add_option(struct tracecmd_output *handle, int tracecmd_write_cpus(struct tracecmd_output *handle, int cpus) { + int ret; + + ret = check_out_state(handle, TRACECMD_FILE_CPU_COUNT); + if (ret < 0) { + warning("Cannot write CPU count into the file, unexpected state 0x%X", + handle->file_state); + return ret; + } cpus = convert_endian_4(handle, cpus); - return do_write_check(handle, &cpus, 4); + ret = do_write_check(handle, &cpus, 4); + if (ret < 0) + return ret; + handle->file_state = TRACECMD_FILE_CPU_COUNT; + return 0; } int tracecmd_write_options(struct tracecmd_output *handle) @@ -1048,10 +1097,17 @@ int tracecmd_write_options(struct tracecmd_output *handle) unsigned short option; unsigned short endian2; unsigned int endian4; + int ret; /* If already written, ignore */ - if (handle->options_written) + if (handle->file_state == TRACECMD_FILE_OPTIONS) return 0; + ret = check_out_state(handle, TRACECMD_FILE_OPTIONS); + if (ret < 0) { + warning("Cannot write options into the file, unexpected state 0x%X", + handle->file_state); + return ret; + } if (do_write_check(handle, "options ", 10)) return -1; @@ -1078,7 +1134,7 @@ int tracecmd_write_options(struct tracecmd_output *handle) if (do_write_check(handle, &option, 2)) return -1; - handle->options_written = 1; + handle->file_state = TRACECMD_FILE_OPTIONS; return 0; } @@ -1092,9 +1148,11 @@ int tracecmd_append_options(struct tracecmd_output *handle) off_t offset; int r; - /* If already written, ignore */ - if (handle->options_written) - return 0; + /* We can append only if options are already written and tracing data + * is not yet written + */ + if (handle->file_state != TRACECMD_FILE_OPTIONS) + return -1; if (lseek64(handle->fd, 0, SEEK_END) == (off_t)-1) return -1; @@ -1128,8 +1186,6 @@ int tracecmd_append_options(struct tracecmd_output *handle) if (do_write_check(handle, &option, 2)) return -1; - handle->options_written = 1; - return 0; } @@ -1145,7 +1201,7 @@ int tracecmd_update_option(struct tracecmd_output *handle, return -1; } - if (!handle->options_written) { + if (handle->file_state < TRACECMD_FILE_OPTIONS) { /* Hasn't been written yet. Just update current pointer */ option->size = size; memcpy(option->data, data, size); @@ -1203,10 +1259,28 @@ tracecmd_add_buffer_option(struct tracecmd_output *handle, const char *name, return option; } +int tracecmd_write_cmdlines(struct tracecmd_output *handle) +{ + int ret; + + ret = check_out_state(handle, TRACECMD_FILE_CMD_LINES); + if (ret < 0) { + warning("Cannot write command lines into the file, unexpected state 0x%X", + handle->file_state); + return ret; + } + ret = save_tracing_file_data(handle, "saved_cmdlines"); + if (ret < 0) + return ret; + handle->file_state = TRACECMD_FILE_CMD_LINES; + return 0; +} + struct tracecmd_output *tracecmd_create_file_latency(const char *output_file, int cpus) { struct tracecmd_output *handle; char *path; + int ret; handle = create_file(output_file, NULL, NULL, NULL, &all_event_list); if (!handle) @@ -1215,7 +1289,7 @@ struct tracecmd_output *tracecmd_create_file_latency(const char *output_file, in /* * Save the command lines; */ - if (save_tracing_file_data(handle, "saved_cmdlines") < 0) + if (tracecmd_write_cmdlines(handle) < 0) goto out_free; if (tracecmd_write_cpus(handle, cpus) < 0) @@ -1224,6 +1298,13 @@ struct tracecmd_output *tracecmd_create_file_latency(const char *output_file, in if (tracecmd_write_options(handle) < 0) goto out_free; + ret = check_out_state(handle, TRACECMD_FILE_CPU_LATENCY); + if (ret < 0) { + warning("Cannot write latency data into the file, unexpected state 0x%X", + handle->file_state); + goto out_free; + } + if (do_write_check(handle, "latency ", 10)) goto out_free; @@ -1235,6 +1316,8 @@ struct tracecmd_output *tracecmd_create_file_latency(const char *output_file, in put_tracing_file(path); + handle->file_state = TRACECMD_FILE_CPU_LATENCY; + return handle; out_free: @@ -1255,6 +1338,13 @@ int tracecmd_write_cpu_data(struct tracecmd_output *handle, int ret; int i; + ret = check_out_state(handle, TRACECMD_FILE_CPU_FLYRECORD); + if (ret < 0) { + warning("Cannot write trace data into the file, unexpected state 0x%X", + handle->file_state); + goto out_free; + } + if (do_write_check(handle, "flyrecord", 10)) goto out_free; @@ -1340,6 +1430,8 @@ int tracecmd_write_cpu_data(struct tracecmd_output *handle, free(offsets); free(sizes); + handle->file_state = TRACECMD_FILE_CPU_FLYRECORD; + return 0; out_free: @@ -1356,7 +1448,7 @@ int tracecmd_append_cpu_data(struct tracecmd_output *handle, /* * Save the command lines; */ - ret = save_tracing_file_data(handle, "saved_cmdlines"); + ret = tracecmd_write_cmdlines(handle); if (ret) return ret; @@ -1404,7 +1496,6 @@ struct tracecmd_output *tracecmd_get_output_handle_fd(int fd) { struct tracecmd_output *handle = NULL; struct tracecmd_input *ihandle; - struct tep_handle *pevent; int fd2; /* Move the file descriptor to the beginning */ @@ -1417,9 +1508,10 @@ struct tracecmd_output *tracecmd_get_output_handle_fd(int fd) return NULL; /* get a input handle from this */ - ihandle = tracecmd_alloc_fd(fd2, 0); + ihandle = tracecmd_alloc_fd(fd2, TRACECMD_FL_LOAD_NO_PLUGINS); if (!ihandle) return NULL; + tracecmd_read_headers(ihandle); /* move the file descriptor to the end */ if (lseek(fd, 0, SEEK_END) == (off_t)-1) @@ -1432,11 +1524,11 @@ struct tracecmd_output *tracecmd_get_output_handle_fd(int fd) handle->fd = fd; - /* get endian and page size */ - pevent = tracecmd_get_tep(ihandle); - /* Use the pevent of the ihandle for later writes */ + /* get tep, state, endian and page size */ + handle->file_state = tracecmd_get_file_state(ihandle); + /* Use the tep of the ihandle for later writes */ handle->pevent = tracecmd_get_tep(ihandle); - tep_ref(pevent); + tep_ref(handle->pevent); handle->page_size = tracecmd_page_size(ihandle); list_head_init(&handle->options); diff --git a/tracecmd/trace-record.c b/tracecmd/trace-record.c index efd96d27..9396042d 100644 --- a/tracecmd/trace-record.c +++ b/tracecmd/trace-record.c @@ -3770,7 +3770,7 @@ static void setup_agent(struct buffer_instance *instance, network_handle = tracecmd_create_init_fd_msg(instance->msg_handle, listed_events); add_options(network_handle, ctx); - save_tracing_file_data(network_handle, "saved_cmdlines"); + tracecmd_write_cmdlines(network_handle); tracecmd_write_cpus(network_handle, instance->cpu_count); tracecmd_write_options(network_handle); tracecmd_msg_finish_sending_data(instance->msg_handle); diff --git a/tracecmd/trace-split.c b/tracecmd/trace-split.c index c707a5d5..8366d128 100644 --- a/tracecmd/trace-split.c +++ b/tracecmd/trace-split.c @@ -510,7 +510,7 @@ void trace_split (int argc, char **argv) if (!handle) die("error reading %s", input_file); - if (tracecmd_get_flags(handle) & TRACECMD_FL_LATENCY) + if (tracecmd_get_file_state(handle) == TRACECMD_FILE_CPU_LATENCY) die("trace-cmd split does not work with latency traces\n"); page_size = tracecmd_page_size(handle); -- 2.29.2 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH v2 1/2] trace-cmd: Add validation for reading and writing trace.dat files 2021-02-19 5:31 ` [PATCH v2 1/2] trace-cmd: Add validation for reading and writing trace.dat files Tzvetomir Stoyanov (VMware) @ 2021-02-23 22:18 ` Steven Rostedt 2021-02-24 5:22 ` Tzvetomir Stoyanov 2021-02-24 23:18 ` Steven Rostedt 1 sibling, 1 reply; 9+ messages in thread From: Steven Rostedt @ 2021-02-23 22:18 UTC (permalink / raw) To: Tzvetomir Stoyanov (VMware); +Cc: linux-trace-devel On Fri, 19 Feb 2021 07:31:55 +0200 "Tzvetomir Stoyanov (VMware)" <tz.stoyanov@gmail.com> wrote: > trace.dat files have multiple sections, which must be in strict order. A > new logic is implemented, which checks the order of all mandatory > sections when reading and writing trace files. This validation is > useful when the file is constructed in different machines - > host / guest or listener tracing. In those use cases, part of the file > is generated in the client machine and is transferred to the server as > a sequence of bytes. The server should validate the format of the received > portion of the file and the order of the sections in it. > > Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com> > --- > /* --- Opening and Reading the trace.dat file --- */ > > +enum { > + TRACECMD_FILE_INIT, > + TRACECMD_FILE_HEADERS, > + TRACECMD_FILE_FTRACE_EVENTS, > + TRACECMD_FILE_ALL_EVENTS, > + TRACECMD_FILE_KALLSYMS, > + TRACECMD_FILE_PRINTK, > + TRACECMD_FILE_CMD_LINES, > + TRACECMD_FILE_CPU_COUNT, > + TRACECMD_FILE_OPTIONS, > + TRACECMD_FILE_CPU_LATENCY, > + TRACECMD_FILE_CPU_FLYRECORD, I still really don't think we want to make LATENCY and FLYRECORD states. Because they are not a state of the trace.dat file, but a type. Unless we document here that they are the last states of the file, and once reached, the state can not change. But is that the case? We may want states about reading > +}; > + > enum { > TRACECMD_OPTION_DONE, > TRACECMD_OPTION_DATE, > @@ -115,9 +129,7 @@ enum { > enum { > TRACECMD_FL_IGNORE_DATE = (1 << 0), > TRACECMD_FL_BUFFER_INSTANCE = (1 << 1), > - TRACECMD_FL_LATENCY = (1 << 2), > - TRACECMD_FL_IN_USECS = (1 << 3), > - TRACECMD_FL_FLYRECORD = (1 << 4), > + TRACECMD_FL_IN_USECS = (1 << 2), > }; > > @@ -2665,9 +2678,9 @@ static int read_options_type(struct tracecmd_input *handle) > * Check if this is a latency report or flyrecord. > */ > if (strncmp(buf, "latency", 7) == 0) > - handle->flags |= TRACECMD_FL_LATENCY; > + handle->file_state = TRACECMD_FILE_CPU_LATENCY; > else if (strncmp(buf, "flyrecord", 9) == 0) > - handle->flags |= TRACECMD_FL_FLYRECORD; > + handle->file_state = TRACECMD_FILE_CPU_FLYRECORD; What happens when we change states after this? Or is this going to always be the last state of the file? What if we want to change the state after we read the CPUs, or for the latency, we may want to change the state after reading the trace file. The more I think about this, the more having them be states does not make sense. They are the type of file, and should stay as flags. What benefit do you see for keeping them a state? -- Steve ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2 1/2] trace-cmd: Add validation for reading and writing trace.dat files 2021-02-23 22:18 ` Steven Rostedt @ 2021-02-24 5:22 ` Tzvetomir Stoyanov 2021-02-24 23:08 ` Steven Rostedt 0 siblings, 1 reply; 9+ messages in thread From: Tzvetomir Stoyanov @ 2021-02-24 5:22 UTC (permalink / raw) To: Steven Rostedt; +Cc: Linux Trace Devel Hi Steven On Wed, Feb 24, 2021 at 12:18 AM Steven Rostedt <rostedt@goodmis.org> wrote: > > On Fri, 19 Feb 2021 07:31:55 +0200 > "Tzvetomir Stoyanov (VMware)" <tz.stoyanov@gmail.com> wrote: > > > trace.dat files have multiple sections, which must be in strict order. A > > new logic is implemented, which checks the order of all mandatory > > sections when reading and writing trace files. This validation is > > useful when the file is constructed in different machines - > > host / guest or listener tracing. In those use cases, part of the file > > is generated in the client machine and is transferred to the server as > > a sequence of bytes. The server should validate the format of the received > > portion of the file and the order of the sections in it. > > > > Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com> > > --- > > > /* --- Opening and Reading the trace.dat file --- */ > > > > +enum { > > + TRACECMD_FILE_INIT, > > + TRACECMD_FILE_HEADERS, > > + TRACECMD_FILE_FTRACE_EVENTS, > > + TRACECMD_FILE_ALL_EVENTS, > > + TRACECMD_FILE_KALLSYMS, > > + TRACECMD_FILE_PRINTK, > > + TRACECMD_FILE_CMD_LINES, > > + TRACECMD_FILE_CPU_COUNT, > > + TRACECMD_FILE_OPTIONS, > > + TRACECMD_FILE_CPU_LATENCY, > > + TRACECMD_FILE_CPU_FLYRECORD, > > I still really don't think we want to make LATENCY and FLYRECORD states. > Because they are not a state of the trace.dat file, but a type. I considered these as states, as any of the previous states, that indicate what kind of data is currently in the file. We can replace both with a single TRACECMD_FILE_CPU_DATA state, and use the old TRACECMD_FL_ flags to find what kind of tracing data is in the file. > > Unless we document here that they are the last states of the file, and once > reached, the state can not change. This is true for the current tarce.dat file format - they are the last states and as for the all other states - once reached, previously written data cannot be changed. May be I cannot understand your point here, may be you mean that once these final states are reached, the tracing data is still not written in the file (read from the file) ? In that case may be it is more logical to add additional state, to indicate that all trace data is in the file, regardless of its type (cpu / latency) ? > > But is that the case? We may want states about reading > I use the same logic for both reading and writing the file. When reading a file and if one of the TRACECMD_FILE_CPU_ states is reached, the tracing data is ready to be read. > > +}; > > + > > enum { > > TRACECMD_OPTION_DONE, > > TRACECMD_OPTION_DATE, > > @@ -115,9 +129,7 @@ enum { > > enum { > > TRACECMD_FL_IGNORE_DATE = (1 << 0), > > TRACECMD_FL_BUFFER_INSTANCE = (1 << 1), > > - TRACECMD_FL_LATENCY = (1 << 2), > > - TRACECMD_FL_IN_USECS = (1 << 3), > > - TRACECMD_FL_FLYRECORD = (1 << 4), > > + TRACECMD_FL_IN_USECS = (1 << 2), > > }; > > > > > @@ -2665,9 +2678,9 @@ static int read_options_type(struct tracecmd_input *handle) > > * Check if this is a latency report or flyrecord. > > */ > > if (strncmp(buf, "latency", 7) == 0) > > - handle->flags |= TRACECMD_FL_LATENCY; > > + handle->file_state = TRACECMD_FILE_CPU_LATENCY; > > else if (strncmp(buf, "flyrecord", 9) == 0) > > - handle->flags |= TRACECMD_FL_FLYRECORD; > > + handle->file_state = TRACECMD_FILE_CPU_FLYRECORD; > > What happens when we change states after this? Or is this going to always > be the last state of the file? > > What if we want to change the state after we read the CPUs, or for the > latency, we may want to change the state after reading the trace file. > > The more I think about this, the more having them be states does not make > sense. They are the type of file, and should stay as flags. > > What benefit do you see for keeping them a state? > > -- Steve -- Tzvetomir (Ceco) Stoyanov VMware Open Source Technology Center ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2 1/2] trace-cmd: Add validation for reading and writing trace.dat files 2021-02-24 5:22 ` Tzvetomir Stoyanov @ 2021-02-24 23:08 ` Steven Rostedt 0 siblings, 0 replies; 9+ messages in thread From: Steven Rostedt @ 2021-02-24 23:08 UTC (permalink / raw) To: Tzvetomir Stoyanov; +Cc: Linux Trace Devel On Wed, 24 Feb 2021 07:22:09 +0200 Tzvetomir Stoyanov <tz.stoyanov@gmail.com> wrote: > > > --- > > > > > /* --- Opening and Reading the trace.dat file --- */ > > > > > > +enum { > > > + TRACECMD_FILE_INIT, > > > + TRACECMD_FILE_HEADERS, > > > + TRACECMD_FILE_FTRACE_EVENTS, > > > + TRACECMD_FILE_ALL_EVENTS, > > > + TRACECMD_FILE_KALLSYMS, > > > + TRACECMD_FILE_PRINTK, > > > + TRACECMD_FILE_CMD_LINES, > > > + TRACECMD_FILE_CPU_COUNT, > > > + TRACECMD_FILE_OPTIONS, > > > + TRACECMD_FILE_CPU_LATENCY, > > > + TRACECMD_FILE_CPU_FLYRECORD, > > > > I still really don't think we want to make LATENCY and FLYRECORD states. > > Because they are not a state of the trace.dat file, but a type. > > I considered these as states, as any of the previous states, that indicate > what kind of data is currently in the file. We can replace both with a single > TRACECMD_FILE_CPU_DATA state, and use the old TRACECMD_FL_ > flags to find what kind of tracing data is in the file. I just realized that the flags were only used by trace-input and not trace-output (which is what I was thinking it was). But I guess once you get to the latency or flyrecord state, that would be the last state for reading. > > > > > Unless we document here that they are the last states of the file, and once > > reached, the state can not change. > > This is true for the current tarce.dat file format - they are the last states > and as for the all other states - once reached, previously written data > cannot be changed. May be I cannot understand your point here, may > be you mean that once these final states are reached, the tracing data > is still not written in the file (read from the file) ? In that case may be it > is more logical to add additional state, to indicate that all trace data is > in the file, regardless of its type (cpu / latency) ? I think because the states are used for both reading and writing, I was thinking the flags were too, but looking at the previous code, I see it's not. My concern was for the writing of the file, and that appears to not be an issue. That said, there's some minor fixes in the patch I'll reply with a separate email. -- Steve ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2 1/2] trace-cmd: Add validation for reading and writing trace.dat files 2021-02-19 5:31 ` [PATCH v2 1/2] trace-cmd: Add validation for reading and writing trace.dat files Tzvetomir Stoyanov (VMware) 2021-02-23 22:18 ` Steven Rostedt @ 2021-02-24 23:18 ` Steven Rostedt 2021-02-26 4:02 ` Tzvetomir Stoyanov 1 sibling, 1 reply; 9+ messages in thread From: Steven Rostedt @ 2021-02-24 23:18 UTC (permalink / raw) To: Tzvetomir Stoyanov (VMware); +Cc: linux-trace-devel On Fri, 19 Feb 2021 07:31:55 +0200 "Tzvetomir Stoyanov (VMware)" <tz.stoyanov@gmail.com> wrote: > diff --git a/lib/trace-cmd/include/private/trace-cmd-private.h b/lib/trace-cmd/include/private/trace-cmd-private.h > index eddfd9eb..fc968cc9 100644 > --- a/lib/trace-cmd/include/private/trace-cmd-private.h > +++ b/lib/trace-cmd/include/private/trace-cmd-private.h > @@ -95,6 +95,20 @@ static inline int tracecmd_host_bigendian(void) > > /* --- Opening and Reading the trace.dat file --- */ > > +enum { > + TRACECMD_FILE_INIT, > + TRACECMD_FILE_HEADERS, > + TRACECMD_FILE_FTRACE_EVENTS, > + TRACECMD_FILE_ALL_EVENTS, > + TRACECMD_FILE_KALLSYMS, > + TRACECMD_FILE_PRINTK, > + TRACECMD_FILE_CMD_LINES, > + TRACECMD_FILE_CPU_COUNT, > + TRACECMD_FILE_OPTIONS, > + TRACECMD_FILE_CPU_LATENCY, > + TRACECMD_FILE_CPU_FLYRECORD, > +}; > + > enum { > TRACECMD_OPTION_DONE, > TRACECMD_OPTION_DATE, > @@ -115,9 +129,7 @@ enum { > enum { > TRACECMD_FL_IGNORE_DATE = (1 << 0), > TRACECMD_FL_BUFFER_INSTANCE = (1 << 1), > - TRACECMD_FL_LATENCY = (1 << 2), > - TRACECMD_FL_IN_USECS = (1 << 3), > - TRACECMD_FL_FLYRECORD = (1 << 4), > + TRACECMD_FL_IN_USECS = (1 << 2), > }; > > struct tracecmd_ftrace { > @@ -150,6 +162,7 @@ int tracecmd_copy_headers(struct tracecmd_input *handle, int fd); > void tracecmd_set_flag(struct tracecmd_input *handle, int flag); > void tracecmd_clear_flag(struct tracecmd_input *handle, int flag); > unsigned long tracecmd_get_flags(struct tracecmd_input *handle); > +unsigned long tracecmd_get_file_state(struct tracecmd_input *handle); > unsigned long long tracecmd_get_tsync_peer(struct tracecmd_input *handle); > int tracecmd_enable_tsync(struct tracecmd_input *handle, bool enable); > > @@ -273,6 +286,7 @@ struct tracecmd_option *tracecmd_add_buffer_option(struct tracecmd_output *handl > const char *name, int cpus); > > int tracecmd_write_cpus(struct tracecmd_output *handle, int cpus); > +int tracecmd_write_cmdlines(struct tracecmd_output *handle); > int tracecmd_write_options(struct tracecmd_output *handle); > int tracecmd_append_options(struct tracecmd_output *handle); > int tracecmd_update_option(struct tracecmd_output *handle, > @@ -500,7 +514,4 @@ void *tracecmd_record_page(struct tracecmd_input *handle, > void *tracecmd_record_offset(struct tracecmd_input *handle, > struct tep_record *record); > > -int save_tracing_file_data(struct tracecmd_output *handle, > - const char *filename); This turning into a static function looks unrelated to this patch, and should be a separate clean up patch. > - > #endif /* _TRACE_CMD_PRIVATE_H */ > diff --git a/lib/trace-cmd/trace-input.c b/lib/trace-cmd/trace-input.c > index 76bcb215..9ef7b9f1 100644 > --- a/lib/trace-cmd/trace-input.c > +++ b/lib/trace-cmd/trace-input.c > @@ -102,6 +102,7 @@ struct host_trace_info { > > struct tracecmd_input { > struct tep_handle *pevent; > + unsigned long file_state; > struct tep_plugin_list *plugin_list; > struct tracecmd_input *parent; > unsigned long flags; > @@ -161,6 +162,11 @@ unsigned long tracecmd_get_flags(struct tracecmd_input *handle) > return handle->flags; > } > > +unsigned long tracecmd_get_file_state(struct tracecmd_input *handle) > +{ > + return handle->file_state; > +} > + > #if DEBUG_RECORD > static void remove_record(struct page *page, struct tep_record *record) > { > @@ -782,34 +788,40 @@ int tracecmd_read_headers(struct tracecmd_input *handle) > ret = read_header_files(handle); > if (ret < 0) > return -1; > + handle->file_state = TRACECMD_FILE_HEADERS; > + tep_set_long_size(handle->pevent, handle->long_size); The moving of setting long size also looks to be unrelated to (or perhaps it's just a dependency of) this patch. That change should also be in a separate patch. > > ret = read_ftrace_files(handle, NULL); > if (ret < 0) > return -1; > + handle->file_state = TRACECMD_FILE_FTRACE_EVENTS; > > ret = read_event_files(handle, NULL); > if (ret < 0) > return -1; > + handle->file_state = TRACECMD_FILE_ALL_EVENTS; > > ret = read_proc_kallsyms(handle); > if (ret < 0) > return -1; > + handle->file_state = TRACECMD_FILE_KALLSYMS; > > ret = read_ftrace_printk(handle); > if (ret < 0) > return -1; > + handle->file_state = TRACECMD_FILE_PRINTK; > > if (read_and_parse_cmdlines(handle) < 0) > return -1; > + handle->file_state = TRACECMD_FILE_CMD_LINES; > > if (read_cpus(handle) < 0) > return -1; > + handle->file_state = TRACECMD_FILE_CPU_COUNT; > > if (read_options_type(handle) < 0) > return -1; > > - tep_set_long_size(handle->pevent, handle->long_size); > - > return 0; > } > > @@ -2657,6 +2669,7 @@ static int read_options_type(struct tracecmd_input *handle) > if (strncmp(buf, "options", 7) == 0) { > if (handle_options(handle) < 0) > return -1; > + handle->file_state = TRACECMD_FILE_OPTIONS; > if (do_read_check(handle, buf, 10)) > return -1; > } > @@ -2665,9 +2678,9 @@ static int read_options_type(struct tracecmd_input *handle) > * Check if this is a latency report or flyrecord. > */ > if (strncmp(buf, "latency", 7) == 0) > - handle->flags |= TRACECMD_FL_LATENCY; > + handle->file_state = TRACECMD_FILE_CPU_LATENCY; > else if (strncmp(buf, "flyrecord", 9) == 0) > - handle->flags |= TRACECMD_FL_FLYRECORD; > + handle->file_state = TRACECMD_FILE_CPU_FLYRECORD; > else > return -1; > > @@ -2688,11 +2701,11 @@ static int read_cpu_data(struct tracecmd_input *handle) > /* > * Check if this is a latency report or not. > */ > - if (handle->flags & TRACECMD_FL_LATENCY) > + if (handle->file_state == TRACECMD_FILE_CPU_LATENCY) > return 1; > > /* We expect this to be flyrecord */ > - if (!(handle->flags & TRACECMD_FL_FLYRECORD)) > + if (handle->file_state != TRACECMD_FILE_CPU_FLYRECORD) > return -1; > > cpus = handle->cpus; > @@ -3153,6 +3166,8 @@ struct tracecmd_input *tracecmd_alloc_fd(int fd, int flags) > handle->header_files_start = > lseek64(handle->fd, handle->header_files_start, SEEK_SET); > > + handle->file_state = TRACECMD_FILE_INIT; > + > return handle; > > failed_read: > diff --git a/lib/trace-cmd/trace-output.c b/lib/trace-cmd/trace-output.c > index 588f79a5..732e3b44 100644 > --- a/lib/trace-cmd/trace-output.c > +++ b/lib/trace-cmd/trace-output.c > @@ -54,10 +54,10 @@ struct tracecmd_output { > int cpus; > struct tep_handle *pevent; > char *tracing_dir; > - int options_written; > int nr_options; > bool quiet; > - struct list_head options; > + unsigned long file_state; > + struct list_head options; > struct tracecmd_msg_handle *msg_handle; > }; > > @@ -797,8 +797,8 @@ static int read_ftrace_printk(struct tracecmd_output *handle) > return -1; > } > > -int save_tracing_file_data(struct tracecmd_output *handle, > - const char *filename) > +static int save_tracing_file_data(struct tracecmd_output *handle, > + const char *filename) > { > unsigned long long endian8; > char *file = NULL; > @@ -836,6 +836,33 @@ out_free: > return ret; > } > > +static int check_out_state(struct tracecmd_output *handle, int new_state) > +{ > + if (!handle) > + return -1; > + > + switch (new_state) { > + case TRACECMD_FILE_HEADERS: > + case TRACECMD_FILE_FTRACE_EVENTS: > + case TRACECMD_FILE_ALL_EVENTS: > + case TRACECMD_FILE_KALLSYMS: > + case TRACECMD_FILE_PRINTK: > + case TRACECMD_FILE_CMD_LINES: > + case TRACECMD_FILE_CPU_COUNT: > + case TRACECMD_FILE_OPTIONS: > + if (handle->file_state == (new_state - 1)) > + return 0; > + break; > + case TRACECMD_FILE_CPU_LATENCY: > + case TRACECMD_FILE_CPU_FLYRECORD: > + if (handle->file_state == TRACECMD_FILE_OPTIONS) > + return 0; > + break; > + } > + > + return -1; > +} > + > static struct tracecmd_output * > create_file_fd(int fd, struct tracecmd_input *ihandle, > const char *tracing_dir, > @@ -905,20 +932,30 @@ create_file_fd(int fd, struct tracecmd_input *ihandle, > endian4 = convert_endian_4(handle, handle->page_size); > if (do_write_check(handle, &endian4, 4)) > goto out_free; > + handle->file_state = TRACECMD_FILE_INIT; > > if (ihandle) > return handle; > > if (read_header_files(handle)) > goto out_free; > + handle->file_state = TRACECMD_FILE_HEADERS; > + > if (read_ftrace_files(handle)) > goto out_free; > + handle->file_state = TRACECMD_FILE_FTRACE_EVENTS; > + > if (read_event_files(handle, list)) > goto out_free; > + handle->file_state = TRACECMD_FILE_ALL_EVENTS; > + > if (read_proc_kallsyms(handle, kallsyms)) > goto out_free; > + handle->file_state = TRACECMD_FILE_KALLSYMS; > + > if (read_ftrace_printk(handle)) > goto out_free; > + handle->file_state = TRACECMD_FILE_PRINTK; > > return handle; > > @@ -973,10 +1010,10 @@ tracecmd_add_option_v(struct tracecmd_output *handle, > int i, size = 0; > > /* > - * We can only add options before they were written. > + * We can only add options before tracing data were written. > * This may change in the future. > */ > - if (handle->options_written) > + if (handle->file_state > TRACECMD_FILE_OPTIONS) > return NULL; > > for (i = 0; i < count; i++) > @@ -1038,8 +1075,20 @@ tracecmd_add_option(struct tracecmd_output *handle, > > int tracecmd_write_cpus(struct tracecmd_output *handle, int cpus) > { > + int ret; > + > + ret = check_out_state(handle, TRACECMD_FILE_CPU_COUNT); > + if (ret < 0) { > + warning("Cannot write CPU count into the file, unexpected state 0x%X", > + handle->file_state); > + return ret; > + } > cpus = convert_endian_4(handle, cpus); > - return do_write_check(handle, &cpus, 4); > + ret = do_write_check(handle, &cpus, 4); > + if (ret < 0) > + return ret; > + handle->file_state = TRACECMD_FILE_CPU_COUNT; > + return 0; > } > > int tracecmd_write_options(struct tracecmd_output *handle) > @@ -1048,10 +1097,17 @@ int tracecmd_write_options(struct tracecmd_output *handle) > unsigned short option; > unsigned short endian2; > unsigned int endian4; > + int ret; > > /* If already written, ignore */ > - if (handle->options_written) > + if (handle->file_state == TRACECMD_FILE_OPTIONS) > return 0; > + ret = check_out_state(handle, TRACECMD_FILE_OPTIONS); > + if (ret < 0) { I wonder if we should keep the old logic, which using states is the equivalent of: if (handle->file_state >= TRACECMD_FILE_OPTIONS) return 0; And not even bother with the check, as the old logic would not error nor warn if this was called in a later state after options. > + warning("Cannot write options into the file, unexpected state 0x%X", > + handle->file_state); > + return ret; > + } > > if (do_write_check(handle, "options ", 10)) > return -1; > @@ -1078,7 +1134,7 @@ int tracecmd_write_options(struct tracecmd_output *handle) > if (do_write_check(handle, &option, 2)) > return -1; > > - handle->options_written = 1; > + handle->file_state = TRACECMD_FILE_OPTIONS; > > return 0; > } > @@ -1092,9 +1148,11 @@ int tracecmd_append_options(struct tracecmd_output *handle) > off_t offset; > int r; > > - /* If already written, ignore */ > - if (handle->options_written) > - return 0; > + /* We can append only if options are already written and tracing data > + * is not yet written > + */ Nit. The above is "Linux networking" comment style, which is not normal Linux style that we follow. It should be: /* * We can append only if options are already written and tracing data * is not yet written */ > + if (handle->file_state != TRACECMD_FILE_OPTIONS) > + return -1; > > if (lseek64(handle->fd, 0, SEEK_END) == (off_t)-1) > return -1; > @@ -1128,8 +1186,6 @@ int tracecmd_append_options(struct tracecmd_output *handle) > if (do_write_check(handle, &option, 2)) > return -1; > > - handle->options_written = 1; > - > return 0; > } > > @@ -1145,7 +1201,7 @@ int tracecmd_update_option(struct tracecmd_output *handle, > return -1; > } > > - if (!handle->options_written) { > + if (handle->file_state < TRACECMD_FILE_OPTIONS) { > /* Hasn't been written yet. Just update current pointer */ > option->size = size; > memcpy(option->data, data, size); > @@ -1203,10 +1259,28 @@ tracecmd_add_buffer_option(struct tracecmd_output *handle, const char *name, > return option; > } > > +int tracecmd_write_cmdlines(struct tracecmd_output *handle) > +{ > + int ret; > + > + ret = check_out_state(handle, TRACECMD_FILE_CMD_LINES); > + if (ret < 0) { > + warning("Cannot write command lines into the file, unexpected state 0x%X", > + handle->file_state); > + return ret; > + } > + ret = save_tracing_file_data(handle, "saved_cmdlines"); > + if (ret < 0) > + return ret; > + handle->file_state = TRACECMD_FILE_CMD_LINES; > + return 0; > +} > + > struct tracecmd_output *tracecmd_create_file_latency(const char *output_file, int cpus) > { > struct tracecmd_output *handle; > char *path; > + int ret; > > handle = create_file(output_file, NULL, NULL, NULL, &all_event_list); > if (!handle) > @@ -1215,7 +1289,7 @@ struct tracecmd_output *tracecmd_create_file_latency(const char *output_file, in > /* > * Save the command lines; > */ > - if (save_tracing_file_data(handle, "saved_cmdlines") < 0) > + if (tracecmd_write_cmdlines(handle) < 0) > goto out_free; > > if (tracecmd_write_cpus(handle, cpus) < 0) > @@ -1224,6 +1298,13 @@ struct tracecmd_output *tracecmd_create_file_latency(const char *output_file, in > if (tracecmd_write_options(handle) < 0) > goto out_free; > > + ret = check_out_state(handle, TRACECMD_FILE_CPU_LATENCY); > + if (ret < 0) { > + warning("Cannot write latency data into the file, unexpected state 0x%X", > + handle->file_state); > + goto out_free; > + } > + > if (do_write_check(handle, "latency ", 10)) > goto out_free; > > @@ -1235,6 +1316,8 @@ struct tracecmd_output *tracecmd_create_file_latency(const char *output_file, in > > put_tracing_file(path); > > + handle->file_state = TRACECMD_FILE_CPU_LATENCY; > + > return handle; > > out_free: > @@ -1255,6 +1338,13 @@ int tracecmd_write_cpu_data(struct tracecmd_output *handle, > int ret; > int i; > > + ret = check_out_state(handle, TRACECMD_FILE_CPU_FLYRECORD); > + if (ret < 0) { > + warning("Cannot write trace data into the file, unexpected state 0x%X", > + handle->file_state); > + goto out_free; > + } > + > if (do_write_check(handle, "flyrecord", 10)) > goto out_free; > > @@ -1340,6 +1430,8 @@ int tracecmd_write_cpu_data(struct tracecmd_output *handle, > free(offsets); > free(sizes); > > + handle->file_state = TRACECMD_FILE_CPU_FLYRECORD; > + > return 0; > > out_free: > @@ -1356,7 +1448,7 @@ int tracecmd_append_cpu_data(struct tracecmd_output *handle, > /* > * Save the command lines; > */ > - ret = save_tracing_file_data(handle, "saved_cmdlines"); > + ret = tracecmd_write_cmdlines(handle); > if (ret) > return ret; > > @@ -1404,7 +1496,6 @@ struct tracecmd_output *tracecmd_get_output_handle_fd(int fd) > { > struct tracecmd_output *handle = NULL; > struct tracecmd_input *ihandle; > - struct tep_handle *pevent; > int fd2; > > /* Move the file descriptor to the beginning */ > @@ -1417,9 +1508,10 @@ struct tracecmd_output *tracecmd_get_output_handle_fd(int fd) > return NULL; > > /* get a input handle from this */ > - ihandle = tracecmd_alloc_fd(fd2, 0); > + ihandle = tracecmd_alloc_fd(fd2, TRACECMD_FL_LOAD_NO_PLUGINS); This change looks like it belongs in a separate patch. > if (!ihandle) > return NULL; > + tracecmd_read_headers(ihandle); > > /* move the file descriptor to the end */ > if (lseek(fd, 0, SEEK_END) == (off_t)-1) > @@ -1432,11 +1524,11 @@ struct tracecmd_output *tracecmd_get_output_handle_fd(int fd) > > handle->fd = fd; > > - /* get endian and page size */ > - pevent = tracecmd_get_tep(ihandle); > - /* Use the pevent of the ihandle for later writes */ > + /* get tep, state, endian and page size */ > + handle->file_state = tracecmd_get_file_state(ihandle); > + /* Use the tep of the ihandle for later writes */ > handle->pevent = tracecmd_get_tep(ihandle); > - tep_ref(pevent); > + tep_ref(handle->pevent); > handle->page_size = tracecmd_page_size(ihandle); > list_head_init(&handle->options); > > diff --git a/tracecmd/trace-record.c b/tracecmd/trace-record.c > index efd96d27..9396042d 100644 > --- a/tracecmd/trace-record.c > +++ b/tracecmd/trace-record.c > @@ -3770,7 +3770,7 @@ static void setup_agent(struct buffer_instance *instance, > network_handle = tracecmd_create_init_fd_msg(instance->msg_handle, > listed_events); > add_options(network_handle, ctx); > - save_tracing_file_data(network_handle, "saved_cmdlines"); > + tracecmd_write_cmdlines(network_handle); Yeah, I think the above change should be a separate patch. Thanks! -- Steve > tracecmd_write_cpus(network_handle, instance->cpu_count); > tracecmd_write_options(network_handle); > tracecmd_msg_finish_sending_data(instance->msg_handle); > diff --git a/tracecmd/trace-split.c b/tracecmd/trace-split.c > index c707a5d5..8366d128 100644 > --- a/tracecmd/trace-split.c > +++ b/tracecmd/trace-split.c > @@ -510,7 +510,7 @@ void trace_split (int argc, char **argv) > if (!handle) > die("error reading %s", input_file); > > - if (tracecmd_get_flags(handle) & TRACECMD_FL_LATENCY) > + if (tracecmd_get_file_state(handle) == TRACECMD_FILE_CPU_LATENCY) > die("trace-cmd split does not work with latency traces\n"); > > page_size = tracecmd_page_size(handle); ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2 1/2] trace-cmd: Add validation for reading and writing trace.dat files 2021-02-24 23:18 ` Steven Rostedt @ 2021-02-26 4:02 ` Tzvetomir Stoyanov 2021-02-26 5:02 ` Steven Rostedt 0 siblings, 1 reply; 9+ messages in thread From: Tzvetomir Stoyanov @ 2021-02-26 4:02 UTC (permalink / raw) To: Steven Rostedt; +Cc: Linux Trace Devel Hi Steven, On Thu, Feb 25, 2021 at 1:18 AM Steven Rostedt <rostedt@goodmis.org> wrote: > > On Fri, 19 Feb 2021 07:31:55 +0200 > "Tzvetomir Stoyanov (VMware)" <tz.stoyanov@gmail.com> wrote: > > > diff --git a/lib/trace-cmd/include/private/trace-cmd-private.h b/lib/trace-cmd/include/private/trace-cmd-private.h > > index eddfd9eb..fc968cc9 100644 > > --- a/lib/trace-cmd/include/private/trace-cmd-private.h > > +++ b/lib/trace-cmd/include/private/trace-cmd-private.h > > @@ -95,6 +95,20 @@ static inline int tracecmd_host_bigendian(void) > > > > /* --- Opening and Reading the trace.dat file --- */ > > > > +enum { > > + TRACECMD_FILE_INIT, > > + TRACECMD_FILE_HEADERS, > > + TRACECMD_FILE_FTRACE_EVENTS, > > + TRACECMD_FILE_ALL_EVENTS, > > + TRACECMD_FILE_KALLSYMS, > > + TRACECMD_FILE_PRINTK, > > + TRACECMD_FILE_CMD_LINES, > > + TRACECMD_FILE_CPU_COUNT, > > + TRACECMD_FILE_OPTIONS, > > + TRACECMD_FILE_CPU_LATENCY, > > + TRACECMD_FILE_CPU_FLYRECORD, > > +}; > > + > > enum { > > TRACECMD_OPTION_DONE, > > TRACECMD_OPTION_DATE, > > @@ -115,9 +129,7 @@ enum { > > enum { > > TRACECMD_FL_IGNORE_DATE = (1 << 0), > > TRACECMD_FL_BUFFER_INSTANCE = (1 << 1), > > - TRACECMD_FL_LATENCY = (1 << 2), > > - TRACECMD_FL_IN_USECS = (1 << 3), > > - TRACECMD_FL_FLYRECORD = (1 << 4), > > + TRACECMD_FL_IN_USECS = (1 << 2), > > }; > > > > struct tracecmd_ftrace { > > @@ -150,6 +162,7 @@ int tracecmd_copy_headers(struct tracecmd_input *handle, int fd); > > void tracecmd_set_flag(struct tracecmd_input *handle, int flag); > > void tracecmd_clear_flag(struct tracecmd_input *handle, int flag); > > unsigned long tracecmd_get_flags(struct tracecmd_input *handle); > > +unsigned long tracecmd_get_file_state(struct tracecmd_input *handle); > > unsigned long long tracecmd_get_tsync_peer(struct tracecmd_input *handle); > > int tracecmd_enable_tsync(struct tracecmd_input *handle, bool enable); > > > > @@ -273,6 +286,7 @@ struct tracecmd_option *tracecmd_add_buffer_option(struct tracecmd_output *handl > > const char *name, int cpus); > > > > int tracecmd_write_cpus(struct tracecmd_output *handle, int cpus); > > +int tracecmd_write_cmdlines(struct tracecmd_output *handle); > > int tracecmd_write_options(struct tracecmd_output *handle); > > int tracecmd_append_options(struct tracecmd_output *handle); > > int tracecmd_update_option(struct tracecmd_output *handle, > > @@ -500,7 +514,4 @@ void *tracecmd_record_page(struct tracecmd_input *handle, > > void *tracecmd_record_offset(struct tracecmd_input *handle, > > struct tep_record *record); > > > > -int save_tracing_file_data(struct tracecmd_output *handle, > > - const char *filename); > > This turning into a static function looks unrelated to this patch, and > should be a separate clean up patch. I think it is logically from this patch. The only usage of this function outside of its file is for fixing the forgotten "saved_cmdlines" in the trace-cmd agent. This patches introduces a new API for that, tracecmd_write_cmdlines(), that should be used for saving the cmdlines as it has additional validations. I replaced the old way of saving the cmdlines with the new API in the whole code, which makes no sense to have save_tracing_file_data() non static. > > > - > > #endif /* _TRACE_CMD_PRIVATE_H */ > > diff --git a/lib/trace-cmd/trace-input.c b/lib/trace-cmd/trace-input.c > > index 76bcb215..9ef7b9f1 100644 > > --- a/lib/trace-cmd/trace-input.c > > +++ b/lib/trace-cmd/trace-input.c > > @@ -102,6 +102,7 @@ struct host_trace_info { > > > > struct tracecmd_input { > > struct tep_handle *pevent; > > + unsigned long file_state; > > struct tep_plugin_list *plugin_list; > > struct tracecmd_input *parent; > > unsigned long flags; > > @@ -161,6 +162,11 @@ unsigned long tracecmd_get_flags(struct tracecmd_input *handle) > > return handle->flags; > > } > > > > +unsigned long tracecmd_get_file_state(struct tracecmd_input *handle) > > +{ > > + return handle->file_state; > > +} > > + > > #if DEBUG_RECORD > > static void remove_record(struct page *page, struct tep_record *record) > > { > > @@ -782,34 +788,40 @@ int tracecmd_read_headers(struct tracecmd_input *handle) > > ret = read_header_files(handle); > > if (ret < 0) > > return -1; > > + handle->file_state = TRACECMD_FILE_HEADERS; > > + tep_set_long_size(handle->pevent, handle->long_size); > > The moving of setting long size also looks to be unrelated to (or perhaps > it's just a dependency of) this patch. That change should also be in a > separate patch. It is related. This patch changes the behaviour of reading and parsing the trace.dat file headers in case of partially written file, the use case of listener and agent. As the long size information is already available at that moment, when the TRACECMD_FILE_HEADERS state is reached, it should be applied. Otherwise it could be lost, in case some of the headers after that are still not present in the file - which may be a valid and expected situation. When the tracecmd_get_output_handle_fd() is used to read a partially written file, there is one important change - tracecmd_read_headers() is called, to get the state of that partial file. Without the above "set long size" change, the tep hanlder used in tracecmd_get_output_handle_fd() could be with invalid long size, even though the long size is in the file. > > > > > ret = read_ftrace_files(handle, NULL); > > if (ret < 0) > > return -1; > > + handle->file_state = TRACECMD_FILE_FTRACE_EVENTS; > > > > ret = read_event_files(handle, NULL); > > if (ret < 0) > > return -1; > > + handle->file_state = TRACECMD_FILE_ALL_EVENTS; > > > > ret = read_proc_kallsyms(handle); > > if (ret < 0) > > return -1; > > + handle->file_state = TRACECMD_FILE_KALLSYMS; > > > > ret = read_ftrace_printk(handle); > > if (ret < 0) > > return -1; > > + handle->file_state = TRACECMD_FILE_PRINTK; > > > > if (read_and_parse_cmdlines(handle) < 0) > > return -1; > > + handle->file_state = TRACECMD_FILE_CMD_LINES; > > > > if (read_cpus(handle) < 0) > > return -1; > > + handle->file_state = TRACECMD_FILE_CPU_COUNT; > > > > if (read_options_type(handle) < 0) > > return -1; > > > > - tep_set_long_size(handle->pevent, handle->long_size); > > - > > return 0; > > } > > > > @@ -2657,6 +2669,7 @@ static int read_options_type(struct tracecmd_input *handle) > > if (strncmp(buf, "options", 7) == 0) { > > if (handle_options(handle) < 0) > > return -1; > > + handle->file_state = TRACECMD_FILE_OPTIONS; > > if (do_read_check(handle, buf, 10)) > > return -1; > > } > > @@ -2665,9 +2678,9 @@ static int read_options_type(struct tracecmd_input *handle) > > * Check if this is a latency report or flyrecord. > > */ > > if (strncmp(buf, "latency", 7) == 0) > > - handle->flags |= TRACECMD_FL_LATENCY; > > + handle->file_state = TRACECMD_FILE_CPU_LATENCY; > > else if (strncmp(buf, "flyrecord", 9) == 0) > > - handle->flags |= TRACECMD_FL_FLYRECORD; > > + handle->file_state = TRACECMD_FILE_CPU_FLYRECORD; > > else > > return -1; > > > > @@ -2688,11 +2701,11 @@ static int read_cpu_data(struct tracecmd_input *handle) > > /* > > * Check if this is a latency report or not. > > */ > > - if (handle->flags & TRACECMD_FL_LATENCY) > > + if (handle->file_state == TRACECMD_FILE_CPU_LATENCY) > > return 1; > > > > /* We expect this to be flyrecord */ > > - if (!(handle->flags & TRACECMD_FL_FLYRECORD)) > > + if (handle->file_state != TRACECMD_FILE_CPU_FLYRECORD) > > return -1; > > > > cpus = handle->cpus; > > @@ -3153,6 +3166,8 @@ struct tracecmd_input *tracecmd_alloc_fd(int fd, int flags) > > handle->header_files_start = > > lseek64(handle->fd, handle->header_files_start, SEEK_SET); > > > > + handle->file_state = TRACECMD_FILE_INIT; > > + > > return handle; > > > > failed_read: > > diff --git a/lib/trace-cmd/trace-output.c b/lib/trace-cmd/trace-output.c > > index 588f79a5..732e3b44 100644 > > --- a/lib/trace-cmd/trace-output.c > > +++ b/lib/trace-cmd/trace-output.c > > @@ -54,10 +54,10 @@ struct tracecmd_output { > > int cpus; > > struct tep_handle *pevent; > > char *tracing_dir; > > - int options_written; > > int nr_options; > > bool quiet; > > - struct list_head options; > > + unsigned long file_state; > > + struct list_head options; > > struct tracecmd_msg_handle *msg_handle; > > }; > > > > @@ -797,8 +797,8 @@ static int read_ftrace_printk(struct tracecmd_output *handle) > > return -1; > > } > > > > -int save_tracing_file_data(struct tracecmd_output *handle, > > - const char *filename) > > +static int save_tracing_file_data(struct tracecmd_output *handle, > > + const char *filename) > > { > > unsigned long long endian8; > > char *file = NULL; > > @@ -836,6 +836,33 @@ out_free: > > return ret; > > } > > > > +static int check_out_state(struct tracecmd_output *handle, int new_state) > > +{ > > + if (!handle) > > + return -1; > > + > > + switch (new_state) { > > + case TRACECMD_FILE_HEADERS: > > + case TRACECMD_FILE_FTRACE_EVENTS: > > + case TRACECMD_FILE_ALL_EVENTS: > > + case TRACECMD_FILE_KALLSYMS: > > + case TRACECMD_FILE_PRINTK: > > + case TRACECMD_FILE_CMD_LINES: > > + case TRACECMD_FILE_CPU_COUNT: > > + case TRACECMD_FILE_OPTIONS: > > + if (handle->file_state == (new_state - 1)) > > + return 0; > > + break; > > + case TRACECMD_FILE_CPU_LATENCY: > > + case TRACECMD_FILE_CPU_FLYRECORD: > > + if (handle->file_state == TRACECMD_FILE_OPTIONS) > > + return 0; > > + break; > > + } > > + > > + return -1; > > +} > > + > > static struct tracecmd_output * > > create_file_fd(int fd, struct tracecmd_input *ihandle, > > const char *tracing_dir, > > @@ -905,20 +932,30 @@ create_file_fd(int fd, struct tracecmd_input *ihandle, > > endian4 = convert_endian_4(handle, handle->page_size); > > if (do_write_check(handle, &endian4, 4)) > > goto out_free; > > + handle->file_state = TRACECMD_FILE_INIT; > > > > if (ihandle) > > return handle; > > > > if (read_header_files(handle)) > > goto out_free; > > + handle->file_state = TRACECMD_FILE_HEADERS; > > + > > if (read_ftrace_files(handle)) > > goto out_free; > > + handle->file_state = TRACECMD_FILE_FTRACE_EVENTS; > > + > > if (read_event_files(handle, list)) > > goto out_free; > > + handle->file_state = TRACECMD_FILE_ALL_EVENTS; > > + > > if (read_proc_kallsyms(handle, kallsyms)) > > goto out_free; > > + handle->file_state = TRACECMD_FILE_KALLSYMS; > > + > > if (read_ftrace_printk(handle)) > > goto out_free; > > + handle->file_state = TRACECMD_FILE_PRINTK; > > > > return handle; > > > > @@ -973,10 +1010,10 @@ tracecmd_add_option_v(struct tracecmd_output *handle, > > int i, size = 0; > > > > /* > > - * We can only add options before they were written. > > + * We can only add options before tracing data were written. > > * This may change in the future. > > */ > > - if (handle->options_written) > > + if (handle->file_state > TRACECMD_FILE_OPTIONS) > > return NULL; > > > > for (i = 0; i < count; i++) > > @@ -1038,8 +1075,20 @@ tracecmd_add_option(struct tracecmd_output *handle, > > > > int tracecmd_write_cpus(struct tracecmd_output *handle, int cpus) > > { > > + int ret; > > + > > + ret = check_out_state(handle, TRACECMD_FILE_CPU_COUNT); > > + if (ret < 0) { > > + warning("Cannot write CPU count into the file, unexpected state 0x%X", > > + handle->file_state); > > + return ret; > > + } > > cpus = convert_endian_4(handle, cpus); > > - return do_write_check(handle, &cpus, 4); > > + ret = do_write_check(handle, &cpus, 4); > > + if (ret < 0) > > + return ret; > > + handle->file_state = TRACECMD_FILE_CPU_COUNT; > > + return 0; > > } > > > > int tracecmd_write_options(struct tracecmd_output *handle) > > @@ -1048,10 +1097,17 @@ int tracecmd_write_options(struct tracecmd_output *handle) > > unsigned short option; > > unsigned short endian2; > > unsigned int endian4; > > + int ret; > > > > /* If already written, ignore */ > > - if (handle->options_written) > > + if (handle->file_state == TRACECMD_FILE_OPTIONS) > > return 0; > > + ret = check_out_state(handle, TRACECMD_FILE_OPTIONS); > > + if (ret < 0) { > > I wonder if we should keep the old logic, which using states is the > equivalent of: > > if (handle->file_state >= TRACECMD_FILE_OPTIONS) > return 0; > > And not even bother with the check, as the old logic would not error nor > warn if this was called in a later state after options. We should not use the old logic here. This patch changes the way partially written trace.dat files are processed. Handlers to such files are created by tracecmd_get_output_handle_fd(), which now tracks the state of the partial file - what headers are already written. In the old logic, options_written is always false for partial files, even though the options could already be in the file. That just worked because tracecmd_write_options() is never called in such cases, where options are already in the file. But with the new logic, the state of the partial file reflects its content, this should be taken into account. > > > + warning("Cannot write options into the file, unexpected state 0x%X", > > + handle->file_state); > > + return ret; > > + } > > > > if (do_write_check(handle, "options ", 10)) > > return -1; > > @@ -1078,7 +1134,7 @@ int tracecmd_write_options(struct tracecmd_output *handle) > > if (do_write_check(handle, &option, 2)) > > return -1; > > > > - handle->options_written = 1; > > + handle->file_state = TRACECMD_FILE_OPTIONS; > > > > return 0; > > } > > @@ -1092,9 +1148,11 @@ int tracecmd_append_options(struct tracecmd_output *handle) > > off_t offset; > > int r; > > > > - /* If already written, ignore */ > > - if (handle->options_written) > > - return 0; > > + /* We can append only if options are already written and tracing data > > + * is not yet written > > + */ > > Nit. The above is "Linux networking" comment style, which is not normal > Linux style that we follow. It should be: > > /* > * We can append only if options are already written and tracing data > * is not yet written > */ > > > + if (handle->file_state != TRACECMD_FILE_OPTIONS) > > + return -1; > > > > if (lseek64(handle->fd, 0, SEEK_END) == (off_t)-1) > > return -1; > > @@ -1128,8 +1186,6 @@ int tracecmd_append_options(struct tracecmd_output *handle) > > if (do_write_check(handle, &option, 2)) > > return -1; > > > > - handle->options_written = 1; > > - > > return 0; > > } > > > > @@ -1145,7 +1201,7 @@ int tracecmd_update_option(struct tracecmd_output *handle, > > return -1; > > } > > > > - if (!handle->options_written) { > > + if (handle->file_state < TRACECMD_FILE_OPTIONS) { > > /* Hasn't been written yet. Just update current pointer */ > > option->size = size; > > memcpy(option->data, data, size); > > @@ -1203,10 +1259,28 @@ tracecmd_add_buffer_option(struct tracecmd_output *handle, const char *name, > > return option; > > } > > > > +int tracecmd_write_cmdlines(struct tracecmd_output *handle) > > +{ > > + int ret; > > + > > + ret = check_out_state(handle, TRACECMD_FILE_CMD_LINES); > > + if (ret < 0) { > > + warning("Cannot write command lines into the file, unexpected state 0x%X", > > + handle->file_state); > > + return ret; > > + } > > + ret = save_tracing_file_data(handle, "saved_cmdlines"); > > + if (ret < 0) > > + return ret; > > + handle->file_state = TRACECMD_FILE_CMD_LINES; > > + return 0; > > +} > > + > > struct tracecmd_output *tracecmd_create_file_latency(const char *output_file, int cpus) > > { > > struct tracecmd_output *handle; > > char *path; > > + int ret; > > > > handle = create_file(output_file, NULL, NULL, NULL, &all_event_list); > > if (!handle) > > @@ -1215,7 +1289,7 @@ struct tracecmd_output *tracecmd_create_file_latency(const char *output_file, in > > /* > > * Save the command lines; > > */ > > - if (save_tracing_file_data(handle, "saved_cmdlines") < 0) > > + if (tracecmd_write_cmdlines(handle) < 0) > > goto out_free; > > > > if (tracecmd_write_cpus(handle, cpus) < 0) > > @@ -1224,6 +1298,13 @@ struct tracecmd_output *tracecmd_create_file_latency(const char *output_file, in > > if (tracecmd_write_options(handle) < 0) > > goto out_free; > > > > + ret = check_out_state(handle, TRACECMD_FILE_CPU_LATENCY); > > + if (ret < 0) { > > + warning("Cannot write latency data into the file, unexpected state 0x%X", > > + handle->file_state); > > + goto out_free; > > + } > > + > > if (do_write_check(handle, "latency ", 10)) > > goto out_free; > > > > @@ -1235,6 +1316,8 @@ struct tracecmd_output *tracecmd_create_file_latency(const char *output_file, in > > > > put_tracing_file(path); > > > > + handle->file_state = TRACECMD_FILE_CPU_LATENCY; > > + > > return handle; > > > > out_free: > > @@ -1255,6 +1338,13 @@ int tracecmd_write_cpu_data(struct tracecmd_output *handle, > > int ret; > > int i; > > > > + ret = check_out_state(handle, TRACECMD_FILE_CPU_FLYRECORD); > > + if (ret < 0) { > > + warning("Cannot write trace data into the file, unexpected state 0x%X", > > + handle->file_state); > > + goto out_free; > > + } > > + > > if (do_write_check(handle, "flyrecord", 10)) > > goto out_free; > > > > @@ -1340,6 +1430,8 @@ int tracecmd_write_cpu_data(struct tracecmd_output *handle, > > free(offsets); > > free(sizes); > > > > + handle->file_state = TRACECMD_FILE_CPU_FLYRECORD; > > + > > return 0; > > > > out_free: > > @@ -1356,7 +1448,7 @@ int tracecmd_append_cpu_data(struct tracecmd_output *handle, > > /* > > * Save the command lines; > > */ > > - ret = save_tracing_file_data(handle, "saved_cmdlines"); > > + ret = tracecmd_write_cmdlines(handle); > > if (ret) > > return ret; > > > > @@ -1404,7 +1496,6 @@ struct tracecmd_output *tracecmd_get_output_handle_fd(int fd) > > { > > struct tracecmd_output *handle = NULL; > > struct tracecmd_input *ihandle; > > - struct tep_handle *pevent; > > int fd2; > > > > /* Move the file descriptor to the beginning */ > > @@ -1417,9 +1508,10 @@ struct tracecmd_output *tracecmd_get_output_handle_fd(int fd) > > return NULL; > > > > /* get a input handle from this */ > > - ihandle = tracecmd_alloc_fd(fd2, 0); > > + ihandle = tracecmd_alloc_fd(fd2, TRACECMD_FL_LOAD_NO_PLUGINS); > > This change looks like it belongs in a separate patch. Yes, I'll put it into its own patch, It is just an optimization. When these flags were introduced recently, I did not check what should the default state in all use cases. > > > if (!ihandle) > > return NULL; > > + tracecmd_read_headers(ihandle); > > > > /* move the file descriptor to the end */ > > if (lseek(fd, 0, SEEK_END) == (off_t)-1) > > @@ -1432,11 +1524,11 @@ struct tracecmd_output *tracecmd_get_output_handle_fd(int fd) > > > > handle->fd = fd; > > > > - /* get endian and page size */ > > - pevent = tracecmd_get_tep(ihandle); > > - /* Use the pevent of the ihandle for later writes */ > > + /* get tep, state, endian and page size */ > > + handle->file_state = tracecmd_get_file_state(ihandle); > > + /* Use the tep of the ihandle for later writes */ > > handle->pevent = tracecmd_get_tep(ihandle); > > - tep_ref(pevent); > > + tep_ref(handle->pevent); > > handle->page_size = tracecmd_page_size(ihandle); > > list_head_init(&handle->options); > > > > diff --git a/tracecmd/trace-record.c b/tracecmd/trace-record.c > > index efd96d27..9396042d 100644 > > --- a/tracecmd/trace-record.c > > +++ b/tracecmd/trace-record.c > > @@ -3770,7 +3770,7 @@ static void setup_agent(struct buffer_instance *instance, > > network_handle = tracecmd_create_init_fd_msg(instance->msg_handle, > > listed_events); > > add_options(network_handle, ctx); > > - save_tracing_file_data(network_handle, "saved_cmdlines"); > > + tracecmd_write_cmdlines(network_handle); > > Yeah, I think the above change should be a separate patch. I think it should be part of this patch, as using the new tracecmd_write_cmdlines() API is an important part of the file validation. Thanks! > > Thanks! > > -- Steve > > > tracecmd_write_cpus(network_handle, instance->cpu_count); > > tracecmd_write_options(network_handle); > > tracecmd_msg_finish_sending_data(instance->msg_handle); > > diff --git a/tracecmd/trace-split.c b/tracecmd/trace-split.c > > index c707a5d5..8366d128 100644 > > --- a/tracecmd/trace-split.c > > +++ b/tracecmd/trace-split.c > > @@ -510,7 +510,7 @@ void trace_split (int argc, char **argv) > > if (!handle) > > die("error reading %s", input_file); > > > > - if (tracecmd_get_flags(handle) & TRACECMD_FL_LATENCY) > > + if (tracecmd_get_file_state(handle) == TRACECMD_FILE_CPU_LATENCY) > > die("trace-cmd split does not work with latency traces\n"); > > > > page_size = tracecmd_page_size(handle); > -- Tzvetomir (Ceco) Stoyanov VMware Open Source Technology Center ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2 1/2] trace-cmd: Add validation for reading and writing trace.dat files 2021-02-26 4:02 ` Tzvetomir Stoyanov @ 2021-02-26 5:02 ` Steven Rostedt 0 siblings, 0 replies; 9+ messages in thread From: Steven Rostedt @ 2021-02-26 5:02 UTC (permalink / raw) To: Tzvetomir Stoyanov; +Cc: Linux Trace Devel On Fri, 26 Feb 2021 06:02:17 +0200 Tzvetomir Stoyanov <tz.stoyanov@gmail.com> wrote: > Hi Steven, > > On Thu, Feb 25, 2021 at 1:18 AM Steven Rostedt <rostedt@goodmis.org> wrote: > > > > On Fri, 19 Feb 2021 07:31:55 +0200 > > "Tzvetomir Stoyanov (VMware)" <tz.stoyanov@gmail.com> wrote: > > > > > diff --git a/lib/trace-cmd/include/private/trace-cmd-private.h b/lib/trace-cmd/include/private/trace-cmd-private.h > > > index eddfd9eb..fc968cc9 100644 > > > --- a/lib/trace-cmd/include/private/trace-cmd-private.h > > > +++ b/lib/trace-cmd/include/private/trace-cmd-private.h > > > @@ -95,6 +95,20 @@ static inline int tracecmd_host_bigendian(void) > > > > > > /* --- Opening and Reading the trace.dat file --- */ > > > > > > +enum { > > > + TRACECMD_FILE_INIT, > > > + TRACECMD_FILE_HEADERS, > > > + TRACECMD_FILE_FTRACE_EVENTS, > > > + TRACECMD_FILE_ALL_EVENTS, > > > + TRACECMD_FILE_KALLSYMS, > > > + TRACECMD_FILE_PRINTK, > > > + TRACECMD_FILE_CMD_LINES, > > > + TRACECMD_FILE_CPU_COUNT, > > > + TRACECMD_FILE_OPTIONS, > > > + TRACECMD_FILE_CPU_LATENCY, > > > + TRACECMD_FILE_CPU_FLYRECORD, > > > +}; > > > + > > > enum { > > > TRACECMD_OPTION_DONE, > > > TRACECMD_OPTION_DATE, > > > @@ -115,9 +129,7 @@ enum { > > > enum { > > > TRACECMD_FL_IGNORE_DATE = (1 << 0), > > > TRACECMD_FL_BUFFER_INSTANCE = (1 << 1), > > > - TRACECMD_FL_LATENCY = (1 << 2), > > > - TRACECMD_FL_IN_USECS = (1 << 3), > > > - TRACECMD_FL_FLYRECORD = (1 << 4), > > > + TRACECMD_FL_IN_USECS = (1 << 2), > > > }; > > > > > > struct tracecmd_ftrace { > > > @@ -150,6 +162,7 @@ int tracecmd_copy_headers(struct tracecmd_input *handle, int fd); > > > void tracecmd_set_flag(struct tracecmd_input *handle, int flag); > > > void tracecmd_clear_flag(struct tracecmd_input *handle, int flag); > > > unsigned long tracecmd_get_flags(struct tracecmd_input *handle); > > > +unsigned long tracecmd_get_file_state(struct tracecmd_input *handle); > > > unsigned long long tracecmd_get_tsync_peer(struct tracecmd_input *handle); > > > int tracecmd_enable_tsync(struct tracecmd_input *handle, bool enable); > > > > > > @@ -273,6 +286,7 @@ struct tracecmd_option *tracecmd_add_buffer_option(struct tracecmd_output *handl > > > const char *name, int cpus); > > > > > > int tracecmd_write_cpus(struct tracecmd_output *handle, int cpus); > > > +int tracecmd_write_cmdlines(struct tracecmd_output *handle); > > > int tracecmd_write_options(struct tracecmd_output *handle); > > > int tracecmd_append_options(struct tracecmd_output *handle); > > > int tracecmd_update_option(struct tracecmd_output *handle, > > > @@ -500,7 +514,4 @@ void *tracecmd_record_page(struct tracecmd_input *handle, > > > void *tracecmd_record_offset(struct tracecmd_input *handle, > > > struct tep_record *record); > > > > > > -int save_tracing_file_data(struct tracecmd_output *handle, > > > - const char *filename); > > > > This turning into a static function looks unrelated to this patch, and > > should be a separate clean up patch. > > I think it is logically from this patch. The only usage of this function > outside of its file is for fixing the forgotten "saved_cmdlines" in > the trace-cmd agent. This patches introduces a new API for that, > tracecmd_write_cmdlines(), that should be used for saving the > cmdlines as it has additional validations. I replaced the old way > of saving the cmdlines with the new API in the whole code, which > makes no sense to have save_tracing_file_data() non static. It can be logically from this patch, but read the change log and look at the change. Remember, commits should do "one thing". If I do a git blame, and come up with this patch for this update, would the change log make sense to me? Probably not. If anything, the creation of the "tracecmd_write_cmdlines()" looks like it should be a separate patch (before this one), and include the static function change. > > > @@ -782,34 +788,40 @@ int tracecmd_read_headers(struct tracecmd_input *handle) > > > ret = read_header_files(handle); > > > if (ret < 0) > > > return -1; > > > + handle->file_state = TRACECMD_FILE_HEADERS; > > > + tep_set_long_size(handle->pevent, handle->long_size); > > > > The moving of setting long size also looks to be unrelated to (or perhaps > > it's just a dependency of) this patch. That change should also be in a > > separate patch. > > It is related. This patch changes the behaviour of reading and Related is fine, but is it part of the "do one thing" of a commit? It looks like it can easily be broken out as its own stand alone patch, and it changes the logic outside of what the change log is stating. > parsing the trace.dat file headers in case of partially written file, > the use case of listener and agent. As the long size information > is already available at that moment, when the > TRACECMD_FILE_HEADERS state is reached, it should be applied. > Otherwise it could be lost, in case some of the headers after that are > still not present in the file - which may be a valid and expected situation. > When the tracecmd_get_output_handle_fd() is used to read a partially > written file, there is one important change - tracecmd_read_headers() > is called, to get the state of that partial file. Without the above > "set long size" > change, the tep hanlder used in tracecmd_get_output_handle_fd() could be > with invalid long size, even though the long size is in the file. I'm saying, make this change a separate patch before this patch, and state why it is being made. Again, I read the change log, and I don't associate what is in there with this change. > > > @@ -1048,10 +1097,17 @@ int tracecmd_write_options(struct tracecmd_output *handle) > > > unsigned short option; > > > unsigned short endian2; > > > unsigned int endian4; > > > + int ret; > > > > > > /* If already written, ignore */ > > > - if (handle->options_written) > > > + if (handle->file_state == TRACECMD_FILE_OPTIONS) > > > return 0; > > > + ret = check_out_state(handle, TRACECMD_FILE_OPTIONS); > > > + if (ret < 0) { > > > > I wonder if we should keep the old logic, which using states is the > > equivalent of: > > > > if (handle->file_state >= TRACECMD_FILE_OPTIONS) > > return 0; > > > > And not even bother with the check, as the old logic would not error nor > > warn if this was called in a later state after options. > > We should not use the old logic here. This patch changes the way partially > written trace.dat files are processed. Handlers to such files are created by > tracecmd_get_output_handle_fd(), which now tracks the state of the partial > file - what headers are already written. In the old logic, options_written is > always false for partial files, even though the options could already be in > the file. That just worked because tracecmd_write_options() is never called > in such cases, where options are already in the file. But with the new logic, > the state of the partial file reflects its content, this should be > taken into account. Hmm, have you tested all the trace-cmd commands (like split, restore, etc) to make sure they still work? There might be some dependencies on these, and those commands are critical, but rarely tested. > > > index efd96d27..9396042d 100644 > > > --- a/tracecmd/trace-record.c > > > +++ b/tracecmd/trace-record.c > > > @@ -3770,7 +3770,7 @@ static void setup_agent(struct buffer_instance *instance, > > > network_handle = tracecmd_create_init_fd_msg(instance->msg_handle, > > > listed_events); > > > add_options(network_handle, ctx); > > > - save_tracing_file_data(network_handle, "saved_cmdlines"); > > > + tracecmd_write_cmdlines(network_handle); > > > > Yeah, I think the above change should be a separate patch. > > I think it should be part of this patch, as using the new > tracecmd_write_cmdlines() API is an important part of > the file validation. What you just said, is "this change is required for the file validation", which is correct, but I don't see it as part of the validation code. It's not validating anything. It's a needed change for the validation, but not part of the validation. See what I'm trying to say. Every change should be associated with what is described in the change log. If it is something that is needed to accomplish what is in the change log, then it should be a separate patch ahead of this change. I see three things being done in this patch. All to achieve a common purpose, but still three changes. 1) The tracecmd_write_cmdlines() update 2) The moving of the tep_set_long_size() 3) The validation logic. The three together accomplish the goal, but they are three different steps that can be made. In the kernel you will be asked to separate things like this out as well. -- Steve ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v2 2/2] trace-cmd: Fix broken listener and add error checks 2021-02-19 5:31 [PATCH v2 0/2] Fix listener and add trace file validation Tzvetomir Stoyanov (VMware) 2021-02-19 5:31 ` [PATCH v2 1/2] trace-cmd: Add validation for reading and writing trace.dat files Tzvetomir Stoyanov (VMware) @ 2021-02-19 5:31 ` Tzvetomir Stoyanov (VMware) 1 sibling, 0 replies; 9+ messages in thread From: Tzvetomir Stoyanov (VMware) @ 2021-02-19 5:31 UTC (permalink / raw) To: rostedt; +Cc: linux-trace-devel The trace-cmd listener was broken by recent changes in writing saved command lines in the trace file. There was no error checking in that flow, so the trace-cmd listener indicates successful trace session, even though the output trace file was broken. Fixed the listener logic and added more error checks. Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com> --- tracecmd/trace-listen.c | 30 ++++++++++++++++++++---------- tracecmd/trace-record.c | 31 ++++++++++++++++++++++++++----- 2 files changed, 46 insertions(+), 15 deletions(-) diff --git a/tracecmd/trace-listen.c b/tracecmd/trace-listen.c index 7798fe4f..0ae1c948 100644 --- a/tracecmd/trace-listen.c +++ b/tracecmd/trace-listen.c @@ -531,20 +531,22 @@ static int *create_all_readers(const char *node, const char *port, return NULL; } -static void +static int collect_metadata_from_client(struct tracecmd_msg_handle *msg_handle, int ofd) { char buf[BUFSIZ]; int n, s, t; int ifd = msg_handle->fd; + int ret = 0; do { n = read(ifd, buf, BUFSIZ); if (n < 0) { if (errno == EINTR) continue; - pdie("reading client"); + ret = -errno; + break; } t = n; s = 0; @@ -553,12 +555,16 @@ collect_metadata_from_client(struct tracecmd_msg_handle *msg_handle, if (s < 0) { if (errno == EINTR) break; - pdie("writing to file"); + ret = -errno; + goto out; } t -= s; s = n - t; } while (t); } while (n > 0 && !tracecmd_msg_done(msg_handle)); + +out: + return ret; } static void stop_all_readers(int cpus, int *pid_array) @@ -597,8 +603,12 @@ static int put_together_file(int cpus, int ofd, const char *node, } if (write_options) { - tracecmd_write_cpus(handle, cpus); - tracecmd_write_options(handle); + ret = tracecmd_write_cpus(handle, cpus); + if (ret) + goto out; + ret = tracecmd_write_options(handle); + if (ret) + goto out; } ret = tracecmd_write_cpu_data(handle, cpus, temp_files); @@ -635,10 +645,9 @@ static int process_client(struct tracecmd_msg_handle *msg_handle, /* Now we are ready to start reading data from the client */ if (msg_handle->version == V3_PROTOCOL) - tracecmd_msg_collect_data(msg_handle, ofd); + ret = tracecmd_msg_collect_data(msg_handle, ofd); else - collect_metadata_from_client(msg_handle, ofd); - + ret = collect_metadata_from_client(msg_handle, ofd); stop_msg_handle = NULL; /* wait a little to let our readers finish reading */ @@ -652,8 +661,9 @@ static int process_client(struct tracecmd_msg_handle *msg_handle, /* wait a little to have the readers clean up */ sleep(1); - ret = put_together_file(cpus, ofd, node, port, - msg_handle->version < V3_PROTOCOL); + if (!ret) + ret = put_together_file(cpus, ofd, node, port, + msg_handle->version < V3_PROTOCOL); destroy_all_readers(cpus, pid_array, node, port); diff --git a/tracecmd/trace-record.c b/tracecmd/trace-record.c index 9396042d..f6131692 100644 --- a/tracecmd/trace-record.c +++ b/tracecmd/trace-record.c @@ -3590,22 +3590,36 @@ static void add_options(struct tracecmd_output *handle, struct common_record_con static struct tracecmd_msg_handle * setup_connection(struct buffer_instance *instance, struct common_record_context *ctx) { - struct tracecmd_msg_handle *msg_handle; - struct tracecmd_output *network_handle; + struct tracecmd_msg_handle *msg_handle = NULL; + struct tracecmd_output *network_handle = NULL; + int ret; msg_handle = setup_network(instance); /* Now create the handle through this socket */ if (msg_handle->version == V3_PROTOCOL) { network_handle = tracecmd_create_init_fd_msg(msg_handle, listed_events); + if (!network_handle) + goto error; tracecmd_set_quiet(network_handle, quiet); add_options(network_handle, ctx); - tracecmd_write_cpus(network_handle, instance->cpu_count); - tracecmd_write_options(network_handle); - tracecmd_msg_finish_sending_data(msg_handle); + ret = tracecmd_write_cmdlines(network_handle); + if (ret) + goto error; + ret = tracecmd_write_cpus(network_handle, instance->cpu_count); + if (ret) + goto error; + ret = tracecmd_write_options(network_handle); + if (ret) + goto error; + ret = tracecmd_msg_finish_sending_data(msg_handle); + if (ret) + goto error; } else { network_handle = tracecmd_create_init_fd_glob(msg_handle->fd, listed_events); + if (!network_handle) + goto error; tracecmd_set_quiet(network_handle, quiet); } @@ -3613,6 +3627,13 @@ setup_connection(struct buffer_instance *instance, struct common_record_context /* OK, we are all set, let'r rip! */ return msg_handle; + +error: + if (msg_handle) + tracecmd_msg_handle_close(msg_handle); + if (network_handle) + tracecmd_output_close(network_handle); + return NULL; } static void finish_network(struct tracecmd_msg_handle *msg_handle) -- 2.29.2 ^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2021-02-26 5:03 UTC | newest] Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2021-02-19 5:31 [PATCH v2 0/2] Fix listener and add trace file validation Tzvetomir Stoyanov (VMware) 2021-02-19 5:31 ` [PATCH v2 1/2] trace-cmd: Add validation for reading and writing trace.dat files Tzvetomir Stoyanov (VMware) 2021-02-23 22:18 ` Steven Rostedt 2021-02-24 5:22 ` Tzvetomir Stoyanov 2021-02-24 23:08 ` Steven Rostedt 2021-02-24 23:18 ` Steven Rostedt 2021-02-26 4:02 ` Tzvetomir Stoyanov 2021-02-26 5:02 ` Steven Rostedt 2021-02-19 5:31 ` [PATCH v2 2/2] trace-cmd: Fix broken listener and add error checks Tzvetomir Stoyanov (VMware)
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).