Add VM kernel tracing over vsock sockets
v4 cover Add VM kernel tracing over vsock sockets
This patchset adds support for tracing guest kernels to trace-cmd.
Changes in v4:
- detect and use splice(2) on vsock sockets if possible
- switch port numbers to unsigned int
- trace-cmd record --date flag is now set for all guests if provided by the user
- removed grow_cap and exponential buffer size growth
Changes in v3:
- addressed Steven's feedback
- detect and disable guest tracing if <linux/vm_sockets.h> is not available
- the --date flag is now treated as global for all guest instances
- fixed a bug that caused --date to be ignored for host tracing data when tracing guests
Changes in v2:
- rebased on top of protocol V3
- fixed system clock timestamps with the --date flag
Slavomir Kaslev (6):
trace-cmd: Minor refactoring
trace-cmd: Add tracecmd_create_recorder_virt function
trace-cmd: Add TRACE_REQ and TRACE_RESP messages
trace-cmd: Add buffer instance flags for tracing in guest and agent
context
trace-cmd: Add VM kernel tracing over vsock sockets transport
trace-cmd: Use splice(2) for vsock sockets if available
Steven Rostedt (VMware) (1):
trace-cmd: Detect if vsock sockets are available
Tzvetomir Stoyanov (1):
trace-cmd: Use unsigned int for trace-cmd client ports
Makefile | 7 + include/trace-cmd/trace-cmd.h | 17 +- lib/trace-cmd/trace-recorder.c | 53 ++- tracecmd/Makefile | 6 +- tracecmd/include/trace-local.h | 18 + tracecmd/trace-agent.c | 230 ++++++++++ tracecmd/trace-cmd.c | 3 + tracecmd/trace-msg.c | 210 ++++++++- tracecmd/trace-record.c | 803 +++++++++++++++++++++++++++++---- tracecmd/trace-usage.c | 13 +- 10 files changed, 1243 insertions(+), 117 deletions(-) create mode 100644 tracecmd/trace-agent.c
Signature · 1 line
2.19.1
PATCH v4 1/8 trace-cmd: Minor refactoring
Pass struct common_record_context in trace-record.c instead of explicitly passing necessary options through additional arguments.
--- tracecmd/trace-record.c | 91 +++++++++++++++++++++-------------------- 1 file changed, 46 insertions(+), 45 deletions(-)
tracecmd/trace-record.c +46 -45
@@ -191,6 +191,36 @@ enum { RESET_HIGH_PRIO = 100000, }; +enum trace_cmd { + CMD_extract, + CMD_start, + CMD_stream, + CMD_profile, + CMD_record, + CMD_record_agent, +}; + +struct common_record_context { +enum trace_cmd curr_cmd; +struct buffer_instance *instance; +const char *output; +char *date2ts; +char *max_graph_depth; +int data_flags; + +int record_all; +int total_disable; +int disable; +int events; +int global; +int filtered; +int date; +int manual; +int topt; +int do_child; +int run_command; +}; +static void add_reset_file (const char *file,const char *val,int prio) {struct reset_file *reset;
@@ -2880,10 +2910,10 @@ again:return msg_handle; } -static void add_options (struct tracecmd_output *handle,char *date2ts,int flags); +static void add_options (struct tracecmd_output *handle,struct common_record_context *ctx);static struct tracecmd_msg_handle * -setup_connection (struct buffer_instance *instance,char *date2ts,int flags) +setup_connection (struct buffer_instance *instance,struct common_record_context *ctx) {struct tracecmd_msg_handle *msg_handle;struct tracecmd_output *network_handle;
@@ -2893,7 +2923,7 @@ setup_connection(struct buffer_instance *instance, char *date2ts, int flags)/* Now create the handle through this socket */ if (msg_handle->version ==V3_PROTOCOL ) { network_handle =tracecmd_create_init_fd_msg (msg_handle, listed_events); -add_options (network_handle, date2ts, flags); +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);
@@ -2915,7 +2945,7 @@ static void finish_network(struct tracecmd_msg_handle *msg_handle)free (host); } -void start_threads (enum trace_type type,int global,char *date2ts,int flags) +void start_threads (enum trace_type type,struct common_record_context *ctx) {struct buffer_instance *instance;int *brass =NULL ;
@@ -2937,7 +2967,7 @@ void start_threads(enum trace_type type, int global, char *date2ts, int flags)int x, pid;if (host) { - instance->msg_handle =setup_connection (instance, date2ts, flags); + instance->msg_handle =setup_connection (instance, ctx);if (!instance->msg_handle)die ("Failed to make connection" ); }
@@ -2952,7 +2982,7 @@ void start_threads(enum trace_type type, int global, char *date2ts, int flags) brass[0 ], instance->cpu_count, hooks, handle_init, - global); + ctx->global);if (!pids[i].stream)die ("Creating stream for %d" , i); }else
@@ -3091,19 +3121,19 @@ enum { DATA_FL_OFFSET = 2, }; -static void add_options (struct tracecmd_output *handle,char *date2ts,int flags) +static void add_options (struct tracecmd_output *handle,struct common_record_context *ctx) {int type =0 ; -if (date2ts) { -if (flags &DATA_FL_DATE ) +if (ctx->date2ts) { +if (ctx->data_flags &DATA_FL_DATE ) type =TRACECMD_OPTION_DATE ; -else if (flags &DATA_FL_OFFSET ) +else if (ctx->data_flags &DATA_FL_OFFSET ) type =TRACECMD_OPTION_OFFSET ; }if (type) -tracecmd_add_option (handle, type,strlen (date2ts)+1 , date2ts); +tracecmd_add_option (handle, type,strlen (ctx->date2ts)+1 , ctx->date2ts);tracecmd_add_option (handle,TRACECMD_OPTION_TRACECLOCK ,0 ,NULL );add_option_hooks (handle);
@@ -3111,7 +3141,7 @@ static void add_options(struct tracecmd_output *handle, char *date2ts, int flags } -static void record_data (char *date2ts,int flags) +static void record_data (struct common_record_context *ctx) {struct tracecmd_option **buffer_options;struct tracecmd_output *handle;
@@ -3166,7 +3196,7 @@ static void record_data(char *date2ts, int flags)if (!handle)die ("Error creating output file" ); -add_options (handle, date2ts, flags); +add_options (handle, ctx);/* Only record the top instance under TRACECMD_OPTION_CPUSTAT*/ if (!no_top_instance () && !top_instance.msg_handle) {
@@ -4469,35 +4499,6 @@ void trace_reset(int argc, char **argv)exit (0 ); } -enum trace_cmd { - CMD_extract, - CMD_start, - CMD_stream, - CMD_profile, - CMD_record -}; - -struct common_record_context { -enum trace_cmd curr_cmd; -struct buffer_instance *instance; -const char *output; -char *date2ts; -char *max_graph_depth; -int data_flags; - -int record_all; -int total_disable; -int disable; -int events; -int global; -int filtered; -int date; -int manual; -int topt; -int do_child; -int run_command; -}; -static void init_common_record_context (struct common_record_context *ctx,enum trace_cmd curr_cmd) {
@@ -4986,7 +4987,7 @@ static void record_trace(int argc, char **argv,if (type & (TRACE_TYPE_RECORD |TRACE_TYPE_STREAM )) {signal (SIGINT , finish);if (!latency) -start_threads (type, ctx->global, ctx->date2ts, ctx->data_flags); +start_threads (type, ctx); }else {update_task_filter ();tracecmd_enable_tracing ();
@@ -5017,7 +5018,7 @@ static void record_trace(int argc, char **argv,tracecmd_disable_all_tracing (0 );if (IS_RECORD (ctx)) { -record_data (ctx->date2ts, ctx->data_flags); +record_data (ctx);delete_thread_data (); }else print_stats ();
@@ -5097,7 +5098,7 @@ void trace_extract(int argc, char **argv) ctx.date2ts =get_date_to_ts (); } -record_data (ctx.date2ts, ctx.data_flags); +record_data (&ctx);delete_thread_data ();destroy_stats ();finalize_record_trace (&ctx);
Signature · 1 line
2.19.1
PATCH v4 2/8 trace-cmd: Detect if vsock sockets are available
In reply to Slavomir KaslevFrom: "Steven Rostedt (VMware)" <[email protected]>
Detect and define VSOCK if vsock sockets are available on the system. This macro is used to disable VM remote tracing features on older kernels.
--- Makefile | 7 +++++++ 1 file changed, 7 insertions(+)
Makefile +7 -0
@@ -205,6 +205,13 @@ CFLAGS ?= -g -Wall CPPFLAGS ?= LDFLAGS ?= +VSOCK_DEFINED := $(shell if (echo "\#include <linux/vm_sockets.h>" | $(CC) -E - >/dev/null 2>&1) ; then echo 1; else echo 0 ; fi) + +export VSOCK_DEFINED +ifeq ($(VSOCK_DEFINED), 1) +CFLAGS += -DVSOCK +endif + export CFLAGS export INCLUDES
Signature · 1 line
2.19.1
PATCH v4 3/8 trace-cmd: Add tracecmd_create_recorder_virt function
In reply to Slavomir KaslevAdd tracecmd_create_recorder_virt function that will be used for tracing VM guests.
--- include/trace-cmd/trace-cmd.h | 1 + lib/trace-cmd/trace-recorder.c | 53 ++++++++++++++++++++++++---------- 2 files changed, 39 insertions(+), 15 deletions(-)
include/trace-cmd/trace-cmd.h +1 -0
@@ -277,6 +277,7 @@ enum {void tracecmd_free_recorder (struct tracecmd_recorder *recorder);struct tracecmd_recorder *tracecmd_create_recorder (const char *file,int cpu,unsigned flags);struct tracecmd_recorder *tracecmd_create_recorder_fd (int fd,int cpu,unsigned flags); +struct tracecmd_recorder *tracecmd_create_recorder_virt (const char *file,int cpu,unsigned flags,int trace_fd);struct tracecmd_recorder *tracecmd_create_recorder_maxkb (const char *file,int cpu,unsigned flags,int maxkb);struct tracecmd_recorder *tracecmd_create_buffer_recorder_fd (int fd,int cpu,unsigned flags,const char *buffer);struct tracecmd_recorder *tracecmd_create_buffer_recorder (const char *file,int cpu,unsigned flags,const char *buffer);
lib/trace-cmd/trace-recorder.c +38 -15
81 lines not on this page · raw message
Signature · 1 line
2.19.1
PATCH v4 4/8 trace-cmd: Use unsigned int for trace-cmd client ports
In reply to Slavomir KaslevFrom: Tzvetomir Stoyanov <[email protected]>
By definition, communication ports used by trace-cmd clients are 32 bit unsigned integers. These ports are generated randomly, and in some implementations can overlap the signed integer range. This patch converts all client ports in trace-cmd to be unsigned 32 bit integers.
--- include/trace-cmd/trace-cmd.h | 2 +- tracecmd/trace-msg.c | 4 ++-- tracecmd/trace-record.c | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-)
include/trace-cmd/trace-cmd.h +1 -1
@@ -322,7 +322,7 @@ void tracecmd_msg_handle_close(struct tracecmd_msg_handle *msg_handle);/* for clients */ int tracecmd_msg_send_init_data (struct tracecmd_msg_handle *msg_handle, -int **client_ports); +unsigned int **client_ports);int tracecmd_msg_data_send (struct tracecmd_msg_handle *msg_handle,const char *buf,int size);int tracecmd_msg_finish_sending_data (struct tracecmd_msg_handle *msg_handle);
tracecmd/trace-msg.c +2 -2
@@ -386,12 +386,12 @@ static int tracecmd_msg_wait_for_msg(int fd, struct tracecmd_msg *msg) }int tracecmd_msg_send_init_data (struct tracecmd_msg_handle *msg_handle, -int **client_ports) +unsigned int **client_ports) {struct tracecmd_msg send_msg;struct tracecmd_msg recv_msg;int fd = msg_handle->fd; -int *ports; +unsigned int *ports;int i, cpus;int ret;
tracecmd/trace-record.c +3 -3
@@ -74,7 +74,7 @@ static int buffers;static int clear_function_filters;static char *host; -static int *client_ports; +static unsigned int *client_ports;static int sfd;/* Max size to let a per cpu file get */
@@ -2545,7 +2545,7 @@ static void connect_port(int cpu)int s;char buf[BUFSIZ ]; -snprintf (buf,BUFSIZ ,"%d" , client_ports[cpu]); +snprintf (buf,BUFSIZ ,"%u" , client_ports[cpu]);memset (&hints,0 ,sizeof (hints)); hints.ai_family =AF_UNSPEC ;
@@ -2755,7 +2755,7 @@ static void communicate_with_listener_v1(struct tracecmd_msg_handle *msg_handle)/* No options */ write (msg_handle->fd,"0" ,2 ); - client_ports =malloc (sizeof (int ) * local_cpu_count); + client_ports =malloc (local_cpu_count *sizeof (*client_ports));if (!client_ports)die ("Failed to allocate client ports for %d cpus" , local_cpu_count);
Signature · 1 line
2.19.1
PATCH v4 5/8 trace-cmd: Add TRACE_REQ and TRACE_RESP messages
In reply to Slavomir KaslevAdd TRACE_REQ and TRACE_RESP messages which are used for initiating guest VM tracing.
--- include/trace-cmd/trace-cmd.h | 14 +++ tracecmd/trace-msg.c | 206 +++++++++++++++++++++++++++++++++- 2 files changed, 219 insertions(+), 1 deletion(-)
include/trace-cmd/trace-cmd.h +14 -0
@@ -337,6 +337,20 @@ int tracecmd_msg_collect_data(struct tracecmd_msg_handle *msg_handle, int ofd);bool tracecmd_msg_done (struct tracecmd_msg_handle *msg_handle);void tracecmd_msg_set_done (struct tracecmd_msg_handle *msg_handle); +int tracecmd_msg_send_trace_req (struct tracecmd_msg_handle *msg_handle, +int argc,char **argv); +int tracecmd_msg_recv_trace_req (struct tracecmd_msg_handle *msg_handle, +int *argc,char ***argv); + +int tracecmd_msg_send_trace_resp (struct tracecmd_msg_handle *msg_handle, +int nr_cpus,int page_size, +unsigned int *ports); +int tracecmd_msg_recv_trace_resp (struct tracecmd_msg_handle *msg_handle, +int *nr_cpus,int *page_size, +unsigned int **ports); + +int tracecmd_msg_wait_close (struct tracecmd_msg_handle *msg_handle); +/* --- Plugin handling --- */ extern struct tep_plugin_option trace_ftrace_options[];
tracecmd/trace-msg.c +205 -1
233 lines not on this page · raw message
Signature · 1 line
2.19.1
Re: [PATCH v4 5/8] trace-cmd: Add TRACE_REQ and TRACE_RESP messages
Quoted 2 lines · On Wed, 16 Jan 2019 15:43:04 +0200 Slavomir Kaslev <[email protected]> wrote:
Add
TRACE_REQandTRACE_RESPmessages which are used for initiating guest VM tracing.
I'm OK with this patch but a couple of things that will need to be addressed in the future.
Quoted 85 lines
tracecmd/trace-msg.c +48
-1@@ -16,6 +16,7 @@#include <stdio.h> #include <stdlib.h> #include <stdarg.h> +#include <string.h> #include <unistd.h> #include <arpa/inet.h> #include <sys/types.h> @@ -79,6 +80,16 @@ struct tracecmd_msg_rinit {be32 cpus; } __attribute__((packed)); +struct tracecmd_msg_trace_req { +be32 flags; +be32 argc; +} __attribute__((packed)); + +struct tracecmd_msg_trace_resp { +be32 cpus; +be32 page_size; +} __attribute__((packed)); +struct tracecmd_msg_header {be32 size;be32 cmd;@@ -90,7 +101,9 @@ struct tracecmd_msg_header {C (TINIT ,1 ,sizeof (struct tracecmd_msg_tinit )), \C (RINIT ,2 ,sizeof (struct tracecmd_msg_rinit )), \C (SEND_DATA ,3 ,0 ), \ -C (FIN_DATA ,4 ,0 ), +C (FIN_DATA ,4 ,0 ), \ +C (TRACE_REQ ,5 ,sizeof (struct tracecmd_msg_trace_req )), \ +C (TRACE_RESP ,6 ,sizeof (struct tracecmd_msg_trace_resp )), #undef C #define C(a,b,c) MSG_##a = b@@ -122,6 +135,8 @@ struct tracecmd_msg {union {struct tracecmd_msg_tinit tinit;struct tracecmd_msg_rinit rinit; +struct tracecmd_msg_trace_req trace_req; +struct tracecmd_msg_trace_resp trace_resp; };union {struct tracecmd_msg_opt *opt;@@ -715,3 +730,192 @@ error:msg_free (&msg);return ret; } + +static int make_trace_req (struct tracecmd_msg *msg,int argc,char **argv) +{ +size_t args_size =0 ; +char *p; +int i; + +for (i =0 ; i < argc; i++) + args_size +=strlen (argv[i]) +1 ; + + msg->hdr.size =htonl (ntohl (msg->hdr.size) + args_size); + msg->trace_req.argc =htonl (argc); + msg->buf =calloc (args_size,1 ); +if (!msg->buf) +return -ENOMEM ; + + p = msg->buf; +for (i =0 ; i < argc; i++) + p =stpcpy (p, argv[i]) +1 ; + +return 0 ; +} + +int tracecmd_msg_send_trace_req (struct tracecmd_msg_handle *msg_handle, +int argc,char **argv) +{ +struct tracecmd_msg msg; +int ret; + +tracecmd_msg_init (MSG_TRACE_REQ , &msg); + ret =make_trace_req (&msg, argc, argv); +if (ret)
tracecmd/trace-msg.c error: · line 774
Quoted 10 lines
tracecmd/trace-msg.c +10
-0+return ret; + +return tracecmd_msg_send (msg_handle->fd, &msg); +} + +/* +* NOTE: On success, the returned `argv` should be freed with: +* free(argv[0]); +* free(argv); +*/
All non static functions should have some form of "kerneldoc" documentation, that also explains the above. Each of the non static functions in this file should have it. But we can add another patch for that in the future (let's just not forget ;-)
Quoted 27 lines
tracecmd/trace-msg.c +27
-0+int tracecmd_msg_recv_trace_req (struct tracecmd_msg_handle *msg_handle, +int *argc,char ***argv) +{ +struct tracecmd_msg msg; +char *p, *buf_end, **args; +int i, ret, nr_args; +size_t buf_len; + + ret =tracecmd_msg_recv (msg_handle->fd, &msg); +if (ret <0 ) +return ret; + +if (ntohl (msg.hdr.cmd) !=MSG_TRACE_REQ ) + goto out; + +if (ntohl (msg.trace_req.argc) <0 ) + goto out; + + buf_len =ntohl (msg.hdr.size) -MSG_HDR_LEN -ntohl (msg.hdr.cmd_size); + buf_end = (char *)msg.buf + buf_len; + p = msg.buf; + nr_args =ntohl (msg.trace_req.argc); + args =calloc (nr_args,sizeof (*args)); +if (!args) { + ret = -ENOMEM ; + goto out; + }
tracecmd/trace-msg.c error: · line 811
Quoted 10 lines
tracecmd/trace-msg.c +10
-0+for (i =0 ; i < nr_args; i++) { +if (p >= buf_end) { + ret =-1 ; +free (args); + goto out; + } + + args[i] = p; + p =strchr (p,'\0' ); + p++;
As I'm looking at this, I realized we need to go through this code again and add protections against a rouge guest. Currently, we are just assuming that the guest is friendly, but I'm sure there's going to be use cases where that will not be the case.
We need to add a check before this loop that msg.buf ends with '\0', to make sure that p doesn't go past the end even on the last iteration (which isn't checked by that if (p >= buf_end)).
I'll take this patch, but add a check on top of this.
Thanks,
-- Steve
Quoted 110 lines
tracecmd/trace-msg.c +110
-0+ } + +/* +* On success we're passing msg.buf to the caller through argv[0] so we +* reset it here to avoid getting it freed below. +*/ + msg.buf =NULL ; + *argc = nr_args; + *argv = args; + ret =0 ; + +out: +msg_free (&msg); +return ret; +} + +static int make_trace_resp (struct tracecmd_msg *msg, +int page_size,int nr_cpus,unsigned int *ports) +{ +int ports_size = nr_cpus *sizeof (*msg->port_array); +int i; + + msg->hdr.size =htonl (ntohl (msg->hdr.size) + ports_size); + msg->trace_resp.cpus =htonl (nr_cpus); + msg->trace_resp.page_size =htonl (page_size); + + msg->port_array =malloc (ports_size); +if (!msg->port_array) +return -ENOMEM ; + +for (i =0 ; i < nr_cpus; i++) + msg->port_array[i] =htonl (ports[i]); + +return 0 ; +} + +int tracecmd_msg_send_trace_resp (struct tracecmd_msg_handle *msg_handle, +int nr_cpus,int page_size, +unsigned int *ports) +{ +struct tracecmd_msg msg; +int ret; + +tracecmd_msg_init (MSG_TRACE_RESP , &msg); + ret =make_trace_resp (&msg, page_size, nr_cpus, ports); +if (ret <0 ) +return ret; + +return tracecmd_msg_send (msg_handle->fd, &msg); +} + +int tracecmd_msg_recv_trace_resp (struct tracecmd_msg_handle *msg_handle, +int *nr_cpus,int *page_size, +unsigned int **ports) +{ +struct tracecmd_msg msg; +size_t buf_len; +int i, ret; + + ret =tracecmd_msg_recv (msg_handle->fd, &msg); +if (ret <0 ) +return ret; + +if (ntohl (msg.hdr.cmd) !=MSG_TRACE_RESP ) { + ret =-1 ; + goto out; + } + + buf_len =ntohl (msg.hdr.size) -MSG_HDR_LEN -ntohl (msg.hdr.cmd_size); +if (buf_len <=0 || + buf_len !=sizeof (*msg.port_array) *ntohl (msg.trace_resp.cpus)) { + ret =-1 ; + goto out; + } + + *nr_cpus =ntohl (msg.trace_resp.cpus); + *page_size =ntohl (msg.trace_resp.page_size); + *ports =calloc (*nr_cpus,sizeof (**ports)); +if (!*ports) { + ret = -ENOMEM ; + goto out; + } +for (i =0 ; i < *nr_cpus; i++) + (*ports)[i] =ntohl (msg.port_array[i]); + + ret =0 ; + +out: +msg_free (&msg); +return ret; +} + +int tracecmd_msg_wait_close (struct tracecmd_msg_handle *msg_handle) +{ +struct tracecmd_msg msg; +int ret; + +memset (&msg,0 ,sizeof (msg)); +for (;;) { + ret =tracecmd_msg_wait_for_msg (msg_handle->fd, &msg); +msg_free (&msg); + +if (ret == -ECONNABORTED ) +return 0 ; +if (ret <0 ) +return ret; + } + +return -1 ; +}
PATCH v4 6/8 trace-cmd: Add buffer instance flags for tracing in guest and agent context
In reply to Slavomir KaslevAdd BUFFER_FL_GUEST and BUFFER_FL_AGENT flags to differentiate when trace-record.c is being called to trace guest or the VM tracing agent.
Also disable functions talking to the local tracefs when called in recording guest instances context.
--- tracecmd/include/trace-local.h | 2 ++ tracecmd/trace-record.c | 55 ++++++++++++++++++++++++++++++++-- 2 files changed, 55 insertions(+), 2 deletions(-)
tracecmd/include/trace-local.h +2 -0
@@ -149,6 +149,8 @@ char *strstrip(char *str);enum buffer_instance_flags {BUFFER_FL_KEEP =1 <<0 ,BUFFER_FL_PROFILE =1 <<1 , +BUFFER_FL_GUEST =1 <<2 , +BUFFER_FL_AGENT =1 <<3 , };struct func_list {
tracecmd/trace-record.c +53 -2
169 lines not on this page · raw message
Signature · 1 line
2.19.1
PATCH v4 7/8 trace-cmd: Add VM kernel tracing over vsock sockets transport
In reply to Slavomir KaslevTo test, start a VM and assign it a valid (> 2) unused CID:
you@host # qemu-system-x86_64 \ -name guest2 --uuid
7edfdf4a-cb9e-11e8-b38a-173b58342476 \ -m 4096 -boot d -enable-kvm -smp 3
-net nic -net user -hda $HOME/vm/guest2.img \ -device
vhost-vsock-pci,id=vhost-vsock-pci0,guest-cid=3and start trace-cmd agent on the guest as root:
you@guest2 # trace-cmd agent
Finally, start trace-cmd record on the host (running as root is only necessary if the host will be traced too):
you@host $ trace-cmd record -A guest2 -e irq -e sched
--- tracecmd/Makefile | 6 +- tracecmd/include/trace-local.h | 16 + tracecmd/trace-agent.c | 230 +++++++++++++ tracecmd/trace-cmd.c | 3 + tracecmd/trace-record.c | 606 ++++++++++++++++++++++++++++++--- tracecmd/trace-usage.c | 13 +- 6 files changed, 822 insertions(+), 52 deletions(-) create mode 100644 tracecmd/trace-agent.c
tracecmd/Makefile +5 -1
@@ -33,13 +33,17 @@ TRACE_CMD_OBJS += trace-output.o TRACE_CMD_OBJS += trace-usage.o TRACE_CMD_OBJS += trace-msg.o +ifeq ($(VSOCK_DEFINED), 1) +TRACE_CMD_OBJS += trace-agent.o +endif + ALL_OBJS := $(TRACE_CMD_OBJS:%.o=$(bdir)/%.o) all_objs := $(sort $(ALL_OBJS)) all_deps := $(all_objs:$(bdir)/%.o=$(bdir)/.%.d) CONFIG_INCLUDES = -CONFIG_LIBS = +CONFIG_LIBS = -lrt CONFIG_FLAGS = all: $(TARGETS)
tracecmd/include/trace-local.h +16 -0
@@ -12,6 +12,8 @@#include "trace-cmd.h" #include "event-utils.h" +#define TRACE_AGENT_DEFAULT_PORT 823 +extern int debug;extern int quiet;
@@ -64,6 +66,8 @@ void trace_split(int argc, char **argv);void trace_listen (int argc,char **argv); +void trace_agent (int argc,char **argv); +void trace_restore (int argc,char **argv);void trace_clear (int argc,char **argv);
@@ -88,6 +92,10 @@ void trace_list(int argc, char **argv);void trace_usage (int argc,char **argv); +int trace_record_agent (struct tracecmd_msg_handle *msg_handle, +int cpus,int *fds, +int argc,char **argv); +struct hook_list ; void trace_init_profile(struct tracecmd_input *handle, struct hook_list *hooks,
@@ -176,6 +184,7 @@ struct buffer_instance {struct func_list *notrace_funcs;const char *clock; +unsigned int *client_ports;struct trace_seq *s_save;struct trace_seq *s_print;
@@ -190,6 +199,13 @@ struct buffer_instance {int tracing_on_fd;int buffer_size;int cpu_count; + +int argc; +char **argv; + +int cid; +int port; +int *fds; };extern struct buffer_instance top_instance;
tracecmd/trace-agent.c new file +230 -0
230 lines not on this page · raw message
tracecmd/trace-cmd.c +3 -0
@@ -83,6 +83,9 @@ struct command commands[] = { {"hist", trace_hist}, {"mem", trace_mem}, {"listen", trace_listen}, +#ifdef VSOCK + {"agent", trace_agent}, +#endif {"split", trace_split}, {"restore", trace_restore}, {"stack", trace_stack},
tracecmd/trace-record.c +556 -50
858 lines not on this page · raw message
tracecmd/trace-usage.c +12 -1
@@ -231,11 +231,22 @@ static struct usage_help usage_help[] = {"listen on a network socket for trace clients" ," %s listen -p port[-D][-o file][-d dir][-l logfile]\n" " Creates a socket to listen for clients.\n" -" -D create it in daemon mode.\n" +" -p port number to listen on.\n" +" -D run in daemon mode.\n" " -o file name to use for clients.\n" " -d directory to store client files.\n" " -l logfile to write messages to.\n" }, +#ifdef VSOCK + { +"agent" , +"listen on a vsock socket for trace clients" , +" %s agent -p port[-D]\n" +" Creates a vsock socket to listen for clients.\n" +" -p port number to listen on.\n" +" -D run in daemon mode.\n" + }, +#endif {"list" , "list the available events, plugins or options",
Signature · 1 line
2.19.1
PATCH v4 8/8 trace-cmd: Use splice(2) for vsock sockets if available
In reply to Slavomir KaslevDetect if splice(2) reading is supported for vsock sockets (Linux 4.20 and later) and use it, or fallback to read/write-ing otherwise.
--- tracecmd/trace-record.c | 59 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 56 insertions(+), 3 deletions(-)
tracecmd/trace-record.c +56 -3
@@ -2658,12 +2658,61 @@ static int open_vsock(unsigned int cid, unsigned int port)return sd; } + +static int try_splice_read_vsock (void ) +{ +int ret, sd, brass[2 ]; + + sd =socket (AF_VSOCK ,SOCK_STREAM ,0 ); +if (sd <0 ) +return sd; + + ret =pipe (brass); +if (ret <0 ) + goto out_close_sd; + +/* +* On kernels that don't support splice reading from vsock sockets +* this will fail with EINVAL, or ENOTCONN otherwise. +* Technically, it should never succeed but if it does, claim splice +* reading is supported. +*/ + ret =splice (sd,NULL , brass[1 ],NULL ,10 ,0 ); +if (ret <0 ) + ret = errno !=EINVAL ; +else + ret =1 ; + +close (brass[0 ]); +close (brass[1 ]); +out_close_sd: +close (sd); +return ret; +} + +static bool can_splice_read_vsock (void ) +{ +static bool initialized, res; + +if (initialized) +return res; + + res =try_splice_read_vsock () >0 ; + initialized = true; +return res; +} +#else static inline int open_vsock (unsigned int cid,unsigned int port) {die ("vsock is not supported" );return -1 ; } + +static bool can_splice_read_vsock (void ) +{ +return false; +}#endif static int do_accept (int sd)
@@ -2868,13 +2917,16 @@ create_recorder_instance(struct buffer_instance *instance, const char *file, intif (instance->flags &BUFFER_FL_GUEST ) {int sd; +unsigned int flags; sd =open_vsock (instance->cid, instance->client_ports[cpu]);if (sd <0 )die ("Failed to connect to agent" ); -return tracecmd_create_recorder_virt ( - file, cpu, recorder_flags |TRACECMD_RECORD_NOSPLICE , sd); + flags = recorder_flags; +if (!can_splice_read_vsock ()) + flags |=TRACECMD_RECORD_NOSPLICE ; +return tracecmd_create_recorder_virt (file, cpu, flags, sd); }if (brass)
@@ -2928,7 +2980,8 @@ static int create_recorder(struct buffer_instance *instance, int cpu,if (instance->flags &BUFFER_FL_AGENT ) { fd =do_accept (instance->fds[cpu]); - flags |=TRACECMD_RECORD_NOSPLICE ; +if (!can_splice_read_vsock ()) + flags |=TRACECMD_RECORD_NOSPLICE ; }else { fd =connect_port (host, instance->client_ports[cpu]); }
Signature · 1 line
2.19.1