X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fkernel-ctl%2Fkernel-ctl.c;h=5f25adf02dc269debabcbdad5d04729ec0d46eb3;hp=a387b93bf87f0334365c3217c95537cf1487e29b;hb=99930a9d179c900b48dd2bd033abee425775c22a;hpb=834978fd9e2392f20867351ca99bf7bdf31b4f56 diff --git a/src/common/kernel-ctl/kernel-ctl.c b/src/common/kernel-ctl/kernel-ctl.c index a387b93bf..5f25adf02 100644 --- a/src/common/kernel-ctl/kernel-ctl.c +++ b/src/common/kernel-ctl/kernel-ctl.c @@ -1,6 +1,7 @@ /* * Copyright (C) 2011 - Julien Desfossez * Mathieu Desnoyers + * 2016 - Jérémie Galarneau * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License, version 2 only, @@ -16,14 +17,31 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#define _LGPL_SOURCE #define __USE_LINUX_IOCTL_DEFS #include #include #include +#include +#include +#include +#include +#include #include "kernel-ctl.h" #include "kernel-ioctl.h" +#define LTTNG_IOCTL_CHECK(fildes, request, ...) ({ \ + int ret = ioctl(fildes, request, ##__VA_ARGS__);\ + assert(ret <= 0); \ + !ret ? 0 : -errno; \ +}) + +#define LTTNG_IOCTL_NO_CHECK(fildes, request, ...) ({ \ + int ret = ioctl(fildes, request, ##__VA_ARGS__);\ + ret >= 0 ? ret : -errno; \ +}) + /* * This flag indicates which version of the kernel ABI to use. The old * ABI (namespace _old) does not support a 32-bit user-space when the @@ -47,7 +65,7 @@ static inline int compat_ioctl_no_arg(int fd, unsigned long oldname, int ret; if (lttng_kernel_use_old_abi == -1) { - ret = ioctl(fd, newname); + ret = LTTNG_IOCTL_NO_CHECK(fd, newname); if (!ret) { lttng_kernel_use_old_abi = 0; goto end; @@ -55,9 +73,9 @@ static inline int compat_ioctl_no_arg(int fd, unsigned long oldname, lttng_kernel_use_old_abi = 1; } if (lttng_kernel_use_old_abi) { - ret = ioctl(fd, oldname); + ret = LTTNG_IOCTL_NO_CHECK(fd, oldname); } else { - ret = ioctl(fd, newname); + ret = LTTNG_IOCTL_NO_CHECK(fd, newname); } end: @@ -73,10 +91,12 @@ int kernctl_create_session(int fd) /* open the metadata global channel */ int kernctl_open_metadata(int fd, struct lttng_channel_attr *chops) { - struct lttng_kernel_old_channel old_channel; struct lttng_kernel_channel channel; if (lttng_kernel_use_old_abi) { + struct lttng_kernel_old_channel old_channel; + + memset(&old_channel, 0, sizeof(old_channel)); old_channel.overwrite = chops->overwrite; old_channel.subbuf_size = chops->subbuf_size; old_channel.num_subbuf = chops->num_subbuf; @@ -91,9 +111,11 @@ int kernctl_open_metadata(int fd, struct lttng_channel_attr *chops) */ memcpy(old_channel.padding, chops->padding, sizeof(chops->padding)); - return ioctl(fd, LTTNG_KERNEL_OLD_METADATA, &old_channel); + return LTTNG_IOCTL_NO_CHECK(fd, LTTNG_KERNEL_OLD_METADATA, + &old_channel); } + memset(&channel, 0, sizeof(channel)); channel.overwrite = chops->overwrite; channel.subbuf_size = chops->subbuf_size; channel.num_subbuf = chops->num_subbuf; @@ -102,13 +124,14 @@ int kernctl_open_metadata(int fd, struct lttng_channel_attr *chops) channel.output = chops->output; memcpy(channel.padding, chops->padding, sizeof(chops->padding)); - return ioctl(fd, LTTNG_KERNEL_METADATA, &channel); + return LTTNG_IOCTL_NO_CHECK(fd, LTTNG_KERNEL_METADATA, &channel); } int kernctl_create_channel(int fd, struct lttng_channel_attr *chops) { struct lttng_kernel_channel channel; + memset(&channel, 0, sizeof(channel)); if (lttng_kernel_use_old_abi) { struct lttng_kernel_old_channel old_channel; @@ -126,7 +149,8 @@ int kernctl_create_channel(int fd, struct lttng_channel_attr *chops) */ memcpy(old_channel.padding, chops->padding, sizeof(chops->padding)); - return ioctl(fd, LTTNG_KERNEL_OLD_CHANNEL, &old_channel); + return LTTNG_IOCTL_NO_CHECK(fd, LTTNG_KERNEL_OLD_CHANNEL, + &old_channel); } channel.overwrite = chops->overwrite; @@ -137,31 +161,7 @@ int kernctl_create_channel(int fd, struct lttng_channel_attr *chops) channel.output = chops->output; memcpy(channel.padding, chops->padding, sizeof(chops->padding)); - return ioctl(fd, LTTNG_KERNEL_CHANNEL, &channel); -} - -int kernctl_enable_syscall(int fd, const char *syscall_name) -{ - struct lttng_kernel_event event; - - memset(&event, 0, sizeof(event)); - strncpy(event.name, syscall_name, sizeof(event.name)); - event.name[sizeof(event.name) - 1] = '\0'; - event.instrumentation = LTTNG_KERNEL_SYSCALL; - event.u.syscall.enable = 1; - return ioctl(fd, LTTNG_KERNEL_EVENT, &event); -} - -int kernctl_disable_syscall(int fd, const char *syscall_name) -{ - struct lttng_kernel_event event; - - memset(&event, 0, sizeof(event)); - strncpy(event.name, syscall_name, sizeof(event.name)); - event.name[sizeof(event.name) - 1] = '\0'; - event.instrumentation = LTTNG_KERNEL_SYSCALL; - event.u.syscall.enable = 0; - return ioctl(fd, LTTNG_KERNEL_EVENT, &event); + return LTTNG_IOCTL_NO_CHECK(fd, LTTNG_KERNEL_CHANNEL, &channel); } int kernctl_syscall_mask(int fd, char **syscall_mask, uint32_t *nr_bits) @@ -182,7 +182,7 @@ int kernctl_syscall_mask(int fd, char **syscall_mask, uint32_t *nr_bits) } kmask_len.len = 0; - ret = ioctl(fd, LTTNG_KERNEL_SYSCALL_MASK, &kmask_len); + ret = LTTNG_IOCTL_CHECK(fd, LTTNG_KERNEL_SYSCALL_MASK, &kmask_len); if (ret) { goto end; } @@ -196,7 +196,7 @@ int kernctl_syscall_mask(int fd, char **syscall_mask, uint32_t *nr_bits) } kmask->len = kmask_len.len; - ret = ioctl(fd, LTTNG_KERNEL_SYSCALL_MASK, kmask); + ret = LTTNG_IOCTL_CHECK(fd, LTTNG_KERNEL_SYSCALL_MASK, kmask); if (ret) { goto end; } @@ -215,6 +215,64 @@ end: return ret; } +int kernctl_track_pid(int fd, int pid) +{ + return LTTNG_IOCTL_CHECK(fd, LTTNG_KERNEL_SESSION_TRACK_PID, pid); +} + +int kernctl_untrack_pid(int fd, int pid) +{ + return LTTNG_IOCTL_CHECK(fd, LTTNG_KERNEL_SESSION_UNTRACK_PID, pid); +} + +int kernctl_list_tracker_pids(int fd) +{ + return LTTNG_IOCTL_NO_CHECK(fd, LTTNG_KERNEL_SESSION_LIST_TRACKER_PIDS); +} + +int kernctl_session_regenerate_metadata(int fd) +{ + return LTTNG_IOCTL_CHECK(fd, LTTNG_KERNEL_SESSION_METADATA_REGEN); +} + +int kernctl_session_regenerate_statedump(int fd) +{ + return LTTNG_IOCTL_CHECK(fd, LTTNG_KERNEL_SESSION_STATEDUMP); +} + +int kernctl_session_set_name(int fd, const char *name) +{ + int ret; + struct lttng_kernel_session_name session_name; + + ret = lttng_strncpy(session_name.name, name, sizeof(session_name.name)); + if (ret) { + goto end; + } + + ret = LTTNG_IOCTL_CHECK( + fd, LTTNG_KERNEL_SESSION_SET_NAME, &session_name); +end: + return ret; +} + +int kernctl_session_set_creation_time(int fd, time_t time) +{ + int ret; + struct lttng_kernel_session_creation_time creation_time; + + ret = time_to_iso8601_str(time, creation_time.iso8601, + sizeof(creation_time.iso8601)); + if (ret) { + goto end; + } + + ret = LTTNG_IOCTL_CHECK(fd, LTTNG_KERNEL_SESSION_SET_CREATION_TIME, + &creation_time); +end: + return ret; +} + int kernctl_create_stream(int fd) { return compat_ioctl_no_arg(fd, LTTNG_KERNEL_OLD_STREAM, @@ -226,6 +284,7 @@ int kernctl_create_event(int fd, struct lttng_kernel_event *ev) if (lttng_kernel_use_old_abi) { struct lttng_kernel_old_event old_event; + memset(&old_event, 0, sizeof(old_event)); memcpy(old_event.name, ev->name, sizeof(old_event.name)); old_event.instrumentation = ev->instrumentation; switch (ev->instrumentation) { @@ -252,9 +311,10 @@ int kernctl_create_event(int fd, struct lttng_kernel_event *ev) break; } - return ioctl(fd, LTTNG_KERNEL_OLD_EVENT, &old_event); + return LTTNG_IOCTL_NO_CHECK(fd, LTTNG_KERNEL_OLD_EVENT, + &old_event); } - return ioctl(fd, LTTNG_KERNEL_EVENT, ev); + return LTTNG_IOCTL_NO_CHECK(fd, LTTNG_KERNEL_EVENT, ev); } int kernctl_add_context(int fd, struct lttng_kernel_context *ctx) @@ -262,6 +322,7 @@ int kernctl_add_context(int fd, struct lttng_kernel_context *ctx) if (lttng_kernel_use_old_abi) { struct lttng_kernel_old_context old_ctx; + memset(&old_ctx, 0, sizeof(old_ctx)); old_ctx.ctx = ctx->ctx; /* only type that uses the union */ if (ctx->ctx == LTTNG_KERNEL_CONTEXT_PERF_CPU_COUNTER) { @@ -273,20 +334,20 @@ int kernctl_add_context(int fd, struct lttng_kernel_context *ctx) ctx->u.perf_counter.name, sizeof(old_ctx.u.perf_counter.name)); } - return ioctl(fd, LTTNG_KERNEL_OLD_CONTEXT, &old_ctx); + return LTTNG_IOCTL_CHECK(fd, LTTNG_KERNEL_OLD_CONTEXT, &old_ctx); } - return ioctl(fd, LTTNG_KERNEL_CONTEXT, ctx); + return LTTNG_IOCTL_CHECK(fd, LTTNG_KERNEL_CONTEXT, ctx); } -/* Enable event, channel and session ioctl */ +/* Enable event, channel and session LTTNG_IOCTL_CHECK */ int kernctl_enable(int fd) { return compat_ioctl_no_arg(fd, LTTNG_KERNEL_OLD_ENABLE, LTTNG_KERNEL_ENABLE); } -/* Disable event, channel and session ioctl */ +/* Disable event, channel and session LTTNG_IOCTL_CHECK */ int kernctl_disable(int fd) { return compat_ioctl_no_arg(fd, LTTNG_KERNEL_OLD_DISABLE, @@ -305,6 +366,30 @@ int kernctl_stop_session(int fd) LTTNG_KERNEL_SESSION_STOP); } +int kernctl_filter(int fd, struct lttng_filter_bytecode *filter) +{ + struct lttng_kernel_filter_bytecode *kb; + uint32_t len; + int ret; + + /* Translate bytecode to kernel bytecode */ + kb = zmalloc(sizeof(*kb) + filter->len); + if (!kb) + return -ENOMEM; + kb->len = len = filter->len; + kb->reloc_offset = filter->reloc_table_offset; + kb->seqnum = filter->seqnum; + memcpy(kb->data, filter->data, len); + ret = LTTNG_IOCTL_CHECK(fd, LTTNG_KERNEL_FILTER, kb); + free(kb); + return ret; +} + +int kernctl_add_callsite(int fd, struct lttng_kernel_event_callsite *callsite) +{ + return LTTNG_IOCTL_CHECK(fd, LTTNG_KERNEL_ADD_CALLSITE, callsite); +} + int kernctl_tracepoint_list(int fd) { return compat_ioctl_no_arg(fd, LTTNG_KERNEL_OLD_TRACEPOINT_LIST, @@ -313,7 +398,7 @@ int kernctl_tracepoint_list(int fd) int kernctl_syscall_list(int fd) { - return ioctl(fd, LTTNG_KERNEL_SYSCALL_LIST); + return LTTNG_IOCTL_NO_CHECK(fd, LTTNG_KERNEL_SYSCALL_LIST); } int kernctl_tracer_version(int fd, struct lttng_kernel_tracer_version *v) @@ -321,7 +406,7 @@ int kernctl_tracer_version(int fd, struct lttng_kernel_tracer_version *v) int ret; if (lttng_kernel_use_old_abi == -1) { - ret = ioctl(fd, LTTNG_KERNEL_TRACER_VERSION, v); + ret = LTTNG_IOCTL_CHECK(fd, LTTNG_KERNEL_TRACER_VERSION, v); if (!ret) { lttng_kernel_use_old_abi = 0; goto end; @@ -331,7 +416,7 @@ int kernctl_tracer_version(int fd, struct lttng_kernel_tracer_version *v) if (lttng_kernel_use_old_abi) { struct lttng_kernel_old_tracer_version old_v; - ret = ioctl(fd, LTTNG_KERNEL_OLD_TRACER_VERSION, &old_v); + ret = LTTNG_IOCTL_CHECK(fd, LTTNG_KERNEL_OLD_TRACER_VERSION, &old_v); if (ret) { goto end; } @@ -339,54 +424,50 @@ int kernctl_tracer_version(int fd, struct lttng_kernel_tracer_version *v) v->minor = old_v.minor; v->patchlevel = old_v.patchlevel; } else { - ret = ioctl(fd, LTTNG_KERNEL_TRACER_VERSION, v); + ret = LTTNG_IOCTL_CHECK(fd, LTTNG_KERNEL_TRACER_VERSION, v); } end: return ret; } +int kernctl_tracer_abi_version(int fd, + struct lttng_kernel_tracer_abi_version *v) +{ + return LTTNG_IOCTL_CHECK(fd, LTTNG_KERNEL_TRACER_ABI_VERSION, v); +} + int kernctl_wait_quiescent(int fd) { return compat_ioctl_no_arg(fd, LTTNG_KERNEL_OLD_WAIT_QUIESCENT, LTTNG_KERNEL_WAIT_QUIESCENT); } -int kernctl_calibrate(int fd, struct lttng_kernel_calibrate *calibrate) +int kernctl_buffer_flush(int fd) { - int ret; - - if (lttng_kernel_use_old_abi == -1) { - ret = ioctl(fd, LTTNG_KERNEL_CALIBRATE, calibrate); - if (!ret) { - lttng_kernel_use_old_abi = 0; - goto end; - } - lttng_kernel_use_old_abi = 1; - } - if (lttng_kernel_use_old_abi) { - struct lttng_kernel_old_calibrate old_calibrate; - - old_calibrate.type = calibrate->type; - ret = ioctl(fd, LTTNG_KERNEL_OLD_CALIBRATE, &old_calibrate); - if (ret) { - goto end; - } - calibrate->type = old_calibrate.type; - } else { - ret = ioctl(fd, LTTNG_KERNEL_CALIBRATE, calibrate); - } + return LTTNG_IOCTL_CHECK(fd, RING_BUFFER_FLUSH); +} -end: - return ret; +int kernctl_buffer_flush_empty(int fd) +{ + return LTTNG_IOCTL_CHECK(fd, RING_BUFFER_FLUSH_EMPTY); } +int kernctl_buffer_clear(int fd) +{ + return LTTNG_IOCTL_CHECK(fd, RING_BUFFER_CLEAR); +} -int kernctl_buffer_flush(int fd) +/* returns the version of the metadata. */ +int kernctl_get_metadata_version(int fd, uint64_t *version) { - return ioctl(fd, RING_BUFFER_FLUSH); + return LTTNG_IOCTL_CHECK(fd, RING_BUFFER_GET_METADATA_VERSION, version); } +int kernctl_metadata_cache_dump(int fd) +{ + return LTTNG_IOCTL_CHECK(fd, RING_BUFFER_METADATA_CACHE_DUMP); +} /* Buffer operations */ @@ -395,13 +476,13 @@ int kernctl_buffer_flush(int fd) /* returns the length to mmap. */ int kernctl_get_mmap_len(int fd, unsigned long *len) { - return ioctl(fd, RING_BUFFER_GET_MMAP_LEN, len); + return LTTNG_IOCTL_CHECK(fd, RING_BUFFER_GET_MMAP_LEN, len); } /* returns the maximum size for sub-buffers. */ int kernctl_get_max_subbuf_size(int fd, unsigned long *len) { - return ioctl(fd, RING_BUFFER_GET_MAX_SUBBUF_SIZE, len); + return LTTNG_IOCTL_CHECK(fd, RING_BUFFER_GET_MAX_SUBBUF_SIZE, len); } /* @@ -412,32 +493,32 @@ int kernctl_get_max_subbuf_size(int fd, unsigned long *len) /* returns the offset of the subbuffer belonging to the mmap reader. */ int kernctl_get_mmap_read_offset(int fd, unsigned long *off) { - return ioctl(fd, RING_BUFFER_GET_MMAP_READ_OFFSET, off); + return LTTNG_IOCTL_CHECK(fd, RING_BUFFER_GET_MMAP_READ_OFFSET, off); } /* returns the size of the current sub-buffer, without padding (for mmap). */ int kernctl_get_subbuf_size(int fd, unsigned long *len) { - return ioctl(fd, RING_BUFFER_GET_SUBBUF_SIZE, len); + return LTTNG_IOCTL_CHECK(fd, RING_BUFFER_GET_SUBBUF_SIZE, len); } /* returns the size of the current sub-buffer, without padding (for mmap). */ int kernctl_get_padded_subbuf_size(int fd, unsigned long *len) { - return ioctl(fd, RING_BUFFER_GET_PADDED_SUBBUF_SIZE, len); + return LTTNG_IOCTL_CHECK(fd, RING_BUFFER_GET_PADDED_SUBBUF_SIZE, len); } /* Get exclusive read access to the next sub-buffer that can be read. */ int kernctl_get_next_subbuf(int fd) { - return ioctl(fd, RING_BUFFER_GET_NEXT_SUBBUF); + return LTTNG_IOCTL_CHECK(fd, RING_BUFFER_GET_NEXT_SUBBUF); } /* Release exclusive sub-buffer access, move consumer forward. */ int kernctl_put_next_subbuf(int fd) { - return ioctl(fd, RING_BUFFER_PUT_NEXT_SUBBUF); + return LTTNG_IOCTL_CHECK(fd, RING_BUFFER_PUT_NEXT_SUBBUF); } /* snapshot */ @@ -445,71 +526,100 @@ int kernctl_put_next_subbuf(int fd) /* Get a snapshot of the current ring buffer producer and consumer positions */ int kernctl_snapshot(int fd) { - return ioctl(fd, RING_BUFFER_SNAPSHOT); + return LTTNG_IOCTL_CHECK(fd, RING_BUFFER_SNAPSHOT); +} + +/* + * Get a snapshot of the current ring buffer producer and consumer positions, + * regardless of whether or not the two positions are contained within the + * same sub-buffer. + */ +int kernctl_snapshot_sample_positions(int fd) +{ + return LTTNG_IOCTL_CHECK(fd, RING_BUFFER_SNAPSHOT_SAMPLE_POSITIONS); } /* Get the consumer position (iteration start) */ int kernctl_snapshot_get_consumed(int fd, unsigned long *pos) { - return ioctl(fd, RING_BUFFER_SNAPSHOT_GET_CONSUMED, pos); + return LTTNG_IOCTL_CHECK(fd, RING_BUFFER_SNAPSHOT_GET_CONSUMED, pos); } /* Get the producer position (iteration end) */ int kernctl_snapshot_get_produced(int fd, unsigned long *pos) { - return ioctl(fd, RING_BUFFER_SNAPSHOT_GET_PRODUCED, pos); + return LTTNG_IOCTL_CHECK(fd, RING_BUFFER_SNAPSHOT_GET_PRODUCED, pos); } /* Get exclusive read access to the specified sub-buffer position */ int kernctl_get_subbuf(int fd, unsigned long *len) { - return ioctl(fd, RING_BUFFER_GET_SUBBUF, len); + return LTTNG_IOCTL_CHECK(fd, RING_BUFFER_GET_SUBBUF, len); } /* Release exclusive sub-buffer access */ int kernctl_put_subbuf(int fd) { - return ioctl(fd, RING_BUFFER_PUT_SUBBUF); + return LTTNG_IOCTL_CHECK(fd, RING_BUFFER_PUT_SUBBUF); } /* Returns the timestamp begin of the current sub-buffer. */ int kernctl_get_timestamp_begin(int fd, uint64_t *timestamp_begin) { - return ioctl(fd, LTTNG_RING_BUFFER_GET_TIMESTAMP_BEGIN, timestamp_begin); + return LTTNG_IOCTL_CHECK(fd, LTTNG_RING_BUFFER_GET_TIMESTAMP_BEGIN, + timestamp_begin); } /* Returns the timestamp end of the current sub-buffer. */ int kernctl_get_timestamp_end(int fd, uint64_t *timestamp_end) { - return ioctl(fd, LTTNG_RING_BUFFER_GET_TIMESTAMP_END, timestamp_end); + return LTTNG_IOCTL_CHECK(fd, LTTNG_RING_BUFFER_GET_TIMESTAMP_END, + timestamp_end); } /* Returns the number of discarded events in the current sub-buffer. */ int kernctl_get_events_discarded(int fd, uint64_t *events_discarded) { - return ioctl(fd, LTTNG_RING_BUFFER_GET_EVENTS_DISCARDED, events_discarded); + return LTTNG_IOCTL_CHECK(fd, LTTNG_RING_BUFFER_GET_EVENTS_DISCARDED, + events_discarded); } /* Returns the content size in the current sub-buffer. */ int kernctl_get_content_size(int fd, uint64_t *content_size) { - return ioctl(fd, LTTNG_RING_BUFFER_GET_CONTENT_SIZE, content_size); + return LTTNG_IOCTL_CHECK(fd, LTTNG_RING_BUFFER_GET_CONTENT_SIZE, + content_size); } /* Returns the packet size in the current sub-buffer. */ int kernctl_get_packet_size(int fd, uint64_t *packet_size) { - return ioctl(fd, LTTNG_RING_BUFFER_GET_PACKET_SIZE, packet_size); + return LTTNG_IOCTL_CHECK(fd, LTTNG_RING_BUFFER_GET_PACKET_SIZE, + packet_size); } /* Returns the stream id of the current sub-buffer. */ int kernctl_get_stream_id(int fd, uint64_t *stream_id) { - return ioctl(fd, LTTNG_RING_BUFFER_GET_STREAM_ID, stream_id); + return LTTNG_IOCTL_CHECK(fd, LTTNG_RING_BUFFER_GET_STREAM_ID, + stream_id); } /* Returns the current timestamp. */ int kernctl_get_current_timestamp(int fd, uint64_t *ts) { - return ioctl(fd, LTTNG_RING_BUFFER_GET_CURRENT_TIMESTAMP, ts); + return LTTNG_IOCTL_CHECK(fd, LTTNG_RING_BUFFER_GET_CURRENT_TIMESTAMP, + ts); +} + +/* Returns the packet sequence number of the current sub-buffer. */ +int kernctl_get_sequence_number(int fd, uint64_t *seq) +{ + return LTTNG_IOCTL_CHECK(fd, LTTNG_RING_BUFFER_GET_SEQ_NUM, seq); +} + +/* Returns the stream instance id. */ +int kernctl_get_instance_id(int fd, uint64_t *id) +{ + return LTTNG_IOCTL_CHECK(fd, LTTNG_RING_BUFFER_INSTANCE_ID, id); }