*/
#define _GNU_SOURCE
+#define _LGPL_SOURCE
#include <errno.h>
#include <fcntl.h>
#include <stdlib.h>
#include <common/common.h>
#include <common/kernel-ctl/kernel-ctl.h>
+#include <common/kernel-ctl/kernel-ioctl.h>
#include <common/sessiond-comm/sessiond-comm.h>
#include "consumer.h"
#include "kernel.h"
#include "kernel-consumer.h"
#include "kern-modules.h"
+#include "utils.h"
/*
* Add context on a kernel channel.
*/
int kernel_add_channel_context(struct ltt_kernel_channel *chan,
- struct lttng_kernel_context *ctx)
+ struct ltt_kernel_context *ctx)
{
int ret;
assert(ctx);
DBG("Adding context to channel %s", chan->channel->name);
- ret = kernctl_add_context(chan->fd, ctx);
+ ret = kernctl_add_context(chan->fd, &ctx->ctx);
if (ret < 0) {
if (errno != EEXIST) {
PERROR("add context ioctl");
goto error;
}
- chan->ctx = zmalloc(sizeof(struct lttng_kernel_context));
- if (chan->ctx == NULL) {
- PERROR("zmalloc event context");
- goto error;
- }
-
- memcpy(chan->ctx, ctx, sizeof(struct lttng_kernel_context));
+ cds_list_add_tail(&ctx->list, &chan->ctx_list);
return 0;
/*
* Create a kernel event, enable it to the kernel tracer and add it to the
* channel event list of the kernel session.
+ * We own filter_expression and filter.
*/
int kernel_create_event(struct lttng_event *ev,
struct ltt_kernel_channel *channel)
case ENOSYS:
WARN("Event type not implemented");
break;
+ case ENOENT:
+ WARN("Event %s not found!", ev->name);
+ break;
default:
PERROR("create event ioctl");
}
return ret;
}
+int kernel_enable_syscall(const char *syscall_name,
+ struct ltt_kernel_channel *channel)
+{
+ return kernctl_enable_syscall(channel->fd, syscall_name);
+}
+
+int kernel_disable_syscall(const char *syscall_name,
+ struct ltt_kernel_channel *channel)
+{
+ return kernctl_disable_syscall(channel->fd, syscall_name);
+}
+
+int kernel_track_pid(struct ltt_kernel_session *session, int pid)
+{
+ DBG("Kernel track PID %d for session id %" PRIu64 ".",
+ pid, session->id);
+ return kernctl_track_pid(session->fd, pid);
+}
+
+int kernel_untrack_pid(struct ltt_kernel_session *session, int pid)
+{
+ DBG("Kernel untrack PID %d for session id %" PRIu64 ".",
+ pid, session->id);
+ return kernctl_untrack_pid(session->fd, pid);
+}
+
/*
* Create kernel metadata, open from the kernel tracer and add it to the
* kernel session.
{
int ret;
struct lttng_kernel_tracer_version version;
+ struct lttng_kernel_tracer_abi_version abi_version;
ret = kernctl_tracer_version(tracer_fd, &version);
if (ret < 0) {
}
/* Validate version */
- if (version.major != KERN_MODULES_PRE_MAJOR
- && version.major != KERN_MODULES_MAJOR) {
+ if (version.major != VERSION_MAJOR) {
+ ERR("Kernel tracer major version (%d) is not compatible with lttng-tools major version (%d)",
+ version.major, VERSION_MAJOR);
goto error_version;
}
-
- DBG2("Kernel tracer version validated (major version %d)", version.major);
+ ret = kernctl_tracer_abi_version(tracer_fd, &abi_version);
+ if (ret < 0) {
+ ERR("Failed at getting lttng-modules ABI version");
+ goto error;
+ }
+ if (abi_version.major != LTTNG_MODULES_ABI_MAJOR_VERSION) {
+ ERR("Kernel tracer ABI version (%d.%d) is not compatible with expected ABI major version (%d.*)",
+ abi_version.major, abi_version.minor,
+ LTTNG_MODULES_ABI_MAJOR_VERSION);
+ goto error;
+ }
+ DBG2("Kernel tracer version validated (%d.%d, ABI %d.%d)",
+ version.major, version.minor,
+ abi_version.major, abi_version.minor);
return 0;
error_version:
- ERR("Kernel major version %d is not compatible (supporting <= %d)",
- version.major, KERN_MODULES_MAJOR)
ret = -1;
error:
struct lttng_ht_iter iter;
/* For each consumer socket. */
+ rcu_read_lock();
cds_lfht_for_each_entry(ksess->consumer->socks->ht, &iter.iter,
socket, node.node) {
struct ltt_kernel_channel *chan;
}
}
}
+ rcu_read_unlock();
}
/* Close any relayd session */
* Return 0 on success or else return a LTTNG_ERR code.
*/
int kernel_snapshot_record(struct ltt_kernel_session *ksess,
- struct snapshot_output *output, int wait, unsigned int nb_streams)
+ struct snapshot_output *output, int wait,
+ uint64_t nb_packets_per_stream)
{
int err, ret, saved_metadata_fd;
struct consumer_socket *socket;
struct lttng_ht_iter iter;
struct ltt_kernel_metadata *saved_metadata;
- uint64_t max_size_per_stream = 0;
assert(ksess);
assert(ksess->consumer);
goto error_open_stream;
}
- if (output->max_size > 0 && nb_streams > 0) {
- max_size_per_stream = output->max_size / nb_streams;
- }
-
/* Send metadata to consumer and snapshot everything. */
cds_lfht_for_each_entry(ksess->consumer->socks->ht, &iter.iter,
socket, node.node) {
/* For each channel, ask the consumer to snapshot it. */
cds_list_for_each_entry(chan, &ksess->channel_list.head, list) {
- if (max_size_per_stream &&
- chan->channel->attr.subbuf_size > max_size_per_stream) {
- ret = LTTNG_ERR_INVALID;
- DBG3("Kernel snapshot record maximum stream size %" PRIu64
- " is smaller than subbuffer size of %" PRIu64,
- max_size_per_stream, chan->channel->attr.subbuf_size);
- (void) kernel_consumer_destroy_metadata(socket,
- ksess->metadata);
- goto error_consumer;
- }
-
pthread_mutex_lock(socket->lock);
ret = consumer_snapshot_channel(socket, chan->fd, output, 0,
ksess->uid, ksess->gid,
DEFAULT_KERNEL_TRACE_DIR, wait,
- max_size_per_stream);
+ nb_packets_per_stream);
pthread_mutex_unlock(socket->lock);
if (ret < 0) {
ret = LTTNG_ERR_KERN_CONSUMER_FAIL;
pthread_mutex_lock(socket->lock);
ret = consumer_snapshot_channel(socket, ksess->metadata->fd, output,
1, ksess->uid, ksess->gid,
- DEFAULT_KERNEL_TRACE_DIR, wait, max_size_per_stream);
+ DEFAULT_KERNEL_TRACE_DIR, wait, 0);
pthread_mutex_unlock(socket->lock);
if (ret < 0) {
ret = LTTNG_ERR_KERN_CONSUMER_FAIL;
rcu_read_unlock();
return ret;
}
+
+/*
+ * Get the syscall mask array from the kernel tracer.
+ *
+ * Return 0 on success else a negative value. In both case, syscall_mask should
+ * be freed.
+ */
+int kernel_syscall_mask(int chan_fd, char **syscall_mask, uint32_t *nr_bits)
+{
+ assert(syscall_mask);
+ assert(nr_bits);
+
+ return kernctl_syscall_mask(chan_fd, syscall_mask, nr_bits);
+}
projects / lttng-tools.git / blobdiff