X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=ltt-sessiond%2Fkernel-ctl.c;h=cfea8942da7f421d4eeaf272f59b51261fe08e3e;hp=f3fdc0e72423e30eabac4850571048861daaf974;hb=50ecdf72034d220d3b0300d0caa13e6946be555b;hpb=2ef84c95c5158ce40e77229fb5705524ff22be7b

diff --git a/ltt-sessiond/kernel-ctl.c b/ltt-sessiond/kernel-ctl.c
index f3fdc0e72..cfea8942d 100644
--- a/ltt-sessiond/kernel-ctl.c
+++ b/ltt-sessiond/kernel-ctl.c
@@ -3,8 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation; only version 2
+ * of the License.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,16 +18,83 @@
 
 #define _GNU_SOURCE
 #include <errno.h>
+#include <fcntl.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 
 #include "lttngerr.h"
-#include "ltt-sessiond.h"
-#include "libkernelctl.h"
+#include "kernelctl.h"
 #include "kernel-ctl.h"
 
+/*
+ *  kernel_add_channel_context
+ *
+ *  Add context on a kernel channel.
+ */
+int kernel_add_channel_context(struct ltt_kernel_channel *chan,
+		struct lttng_kernel_context *ctx)
+{
+	int ret;
+
+	DBG("Adding context to channel %s", chan->channel->name);
+	ret = kernctl_add_context(chan->fd, ctx);
+	if (ret < 0) {
+		if (errno != EEXIST) {
+			perror("add context ioctl");
+		} else {
+			/* If EEXIST, we just ignore the error */
+			ret = 0;
+		}
+		goto error;
+	}
+
+	chan->ctx = malloc(sizeof(struct lttng_kernel_context));
+	if (chan->ctx == NULL) {
+		perror("malloc event context");
+		goto error;
+	}
+
+	memcpy(chan->ctx, ctx, sizeof(struct lttng_kernel_context));
+
+	return 0;
+
+error:
+	return ret;
+}
+
+/*
+ *  kernel_add_event_context
+ *
+ *  Add context on a kernel event.
+ */
+int kernel_add_event_context(struct ltt_kernel_event *event,
+		struct lttng_kernel_context *ctx)
+{
+	int ret;
+
+	DBG("Adding context to event %s", event->event->name);
+	ret = kernctl_add_context(event->fd, ctx);
+	if (ret < 0) {
+		perror("add context ioctl");
+		goto error;
+	}
+
+	event->ctx = malloc(sizeof(struct lttng_kernel_context));
+	if (event->ctx == NULL) {
+		perror("malloc event context");
+		goto error;
+	}
+
+	memcpy(event->ctx, ctx, sizeof(struct lttng_kernel_context));
+
+	return 0;
+
+error:
+	return ret;
+}
+
 /*
  *  kernel_create_session
  *
@@ -54,8 +121,14 @@ int kernel_create_session(struct ltt_session *session, int tracer_fd)
 	}
 
 	lks->fd = ret;
+	/* Prevent fd duplication after execlp() */
+	ret = fcntl(lks->fd, F_SETFD, FD_CLOEXEC);
+	if (ret < 0) {
+		perror("fcntl session fd");
+	}
+
+	lks->kconsumer_fds_sent = 0;
 	session->kernel_session = lks;
-	session->kern_session_count++;
 
 	DBG("Kernel session created (fd: %d)", lks->fd);
 
@@ -71,19 +144,19 @@ error:
  *  Create a kernel channel, register it to the kernel tracer and add it to the
  *  kernel session.
  */
-int kernel_create_channel(struct ltt_kernel_session *session)
+int kernel_create_channel(struct ltt_kernel_session *session, struct lttng_channel *chan, char *path)
 {
 	int ret;
 	struct ltt_kernel_channel *lkc;
 
 	/* Allocate kernel channel */
-	lkc = trace_create_kernel_channel();
+	lkc = trace_create_kernel_channel(chan, path);
 	if (lkc == NULL) {
 		goto error;
 	}
 
 	/* Kernel tracer channel creation */
-	ret = kernctl_create_channel(session->fd, lkc->channel);
+	ret = kernctl_create_channel(session->fd, &lkc->channel->attr);
 	if (ret < 0) {
 		perror("ioctl kernel create channel");
 		goto error;
@@ -91,11 +164,18 @@ int kernel_create_channel(struct ltt_kernel_session *session)
 
 	/* Setup the channel fd */
 	lkc->fd = ret;
+	/* Prevent fd duplication after execlp() */
+	ret = fcntl(lkc->fd, F_SETFD, FD_CLOEXEC);
+	if (ret < 0) {
+		perror("fcntl session fd");
+	}
+
 	/* Add channel to session */
 	cds_list_add(&lkc->list, &session->channel_list.head);
 	session->channel_count++;
 
-	DBG("Kernel channel created (fd: %d and path: %s)", lkc->fd, lkc->pathname);
+	DBG("Kernel channel %s created (fd: %d and path: %s)",
+			lkc->channel->name, lkc->fd, lkc->pathname);
 
 	return 0;
 
@@ -104,64 +184,179 @@ error:
 }
 
 /*
- *  kernel_enable_event
+ *  kernel_create_event
  *
  *  Create a kernel event, enable it to the kernel tracer and add it to the
  *  channel event list of the kernel session.
  */
-int kernel_enable_event(struct ltt_kernel_session *session, char *name)
+int kernel_create_event(struct lttng_event *ev, struct ltt_kernel_channel *channel)
 {
 	int ret;
-	struct ltt_kernel_channel *chan;
 	struct ltt_kernel_event *event;
 
-	event = trace_create_kernel_event(name, LTTNG_KERNEL_TRACEPOINTS);
+	event = trace_create_kernel_event(ev);
 	if (event == NULL) {
 		goto error;
 	}
 
-	cds_list_for_each_entry(chan, &session->channel_list.head, list) {
-		ret = kernctl_create_event(chan->fd, event->event);
-		if (ret < 0) {
-			goto error;
-		}
+	ret = kernctl_create_event(channel->fd, event->event);
+	if (ret < 0) {
+		perror("create event ioctl");
+		goto free_event;
+	}
 
-		event->fd = ret;
-		/* Add event to event list */
-		cds_list_add(&event->list, &chan->events_list.head);
-		DBG("Event %s enabled (fd: %d)", name, event->fd);
+	event->fd = ret;
+	/* Prevent fd duplication after execlp() */
+	ret = fcntl(event->fd, F_SETFD, FD_CLOEXEC);
+	if (ret < 0) {
+		perror("fcntl session fd");
 	}
 
+	/* Add event to event list */
+	cds_list_add(&event->list, &channel->events_list.head);
+	channel->event_count++;
+
+	DBG("Event %s created (fd: %d)", ev->name, event->fd);
+
 	return 0;
 
+free_event:
+	free(event);
 error:
 	return -1;
 }
 
+/*
+ *  kernel_disable_channel
+ *
+ *  Disable a kernel channel.
+ */
+int kernel_disable_channel(struct ltt_kernel_channel *chan)
+{
+	int ret;
+
+	ret = kernctl_disable(chan->fd);
+	if (ret < 0) {
+		perror("disable chan ioctl");
+		ret = errno;
+		goto error;
+	}
+
+	chan->enabled = 0;
+	DBG("Kernel channel %s disabled (fd: %d)", chan->channel->name, chan->fd);
+
+	return 0;
+
+error:
+	return ret;
+}
+
+/*
+ *  kernel_enable_channel
+ *
+ *  Enable a kernel channel.
+ */
+int kernel_enable_channel(struct ltt_kernel_channel *chan)
+{
+	int ret;
+
+	ret = kernctl_enable(chan->fd);
+	if (ret < 0) {
+		perror("enable chan ioctl");
+		ret = errno;
+		goto error;
+	}
+
+	chan->enabled = 1;
+	DBG("Kernel channel %s enabled (fd: %d)", chan->channel->name, chan->fd);
+
+	return 0;
+
+error:
+	return ret;
+}
+
+/*
+ *  kernel_enable_event
+ *
+ *  Enable a kernel event.
+ */
+int kernel_enable_event(struct ltt_kernel_event *event)
+{
+	int ret;
+
+	ret = kernctl_enable(event->fd);
+	if (ret < 0) {
+		perror("enable event ioctl");
+		if (errno == EEXIST) {
+			ret = -EEXIST;
+		}
+		goto error;
+	}
+
+	event->enabled = 1;
+	DBG("Kernel event %s enabled (fd: %d)", event->event->name, event->fd);
+
+	return 0;
+
+error:
+	return ret;
+}
+
+/*
+ *  kernel_disable_event
+ *
+ *  Disable a kernel event.
+ */
+int kernel_disable_event(struct ltt_kernel_event *event)
+{
+	int ret;
+
+	ret = kernctl_disable(event->fd);
+	if (ret < 0) {
+		perror("disable event ioctl");
+		goto error;
+	}
+
+	event->enabled = 0;
+	DBG("Kernel event %s disabled (fd: %d)", event->event->name, event->fd);
+
+	return 0;
+
+error:
+	return ret;
+}
+
 /*
  *  kernel_open_metadata
  *
  *  Create kernel metadata, open from the kernel tracer and add it to the
  *  kernel session.
  */
-int kernel_open_metadata(struct ltt_kernel_session *session)
+int kernel_open_metadata(struct ltt_kernel_session *session, char *path)
 {
 	int ret;
 	struct ltt_kernel_metadata *lkm;
 
 	/* Allocate kernel metadata */
-	lkm = trace_create_kernel_metadata();
+	lkm = trace_create_kernel_metadata(path);
 	if (lkm == NULL) {
 		goto error;
 	}
 
 	/* Kernel tracer metadata creation */
-	ret = kernctl_open_metadata(session->fd, lkm->conf);
+	ret = kernctl_open_metadata(session->fd, &lkm->conf->attr);
 	if (ret < 0) {
 		goto error;
 	}
 
 	lkm->fd = ret;
+	/* Prevent fd duplication after execlp() */
+	ret = fcntl(lkm->fd, F_SETFD, FD_CLOEXEC);
+	if (ret < 0) {
+		perror("fcntl session fd");
+	}
+
 	session->metadata = lkm;
 
 	DBG("Kernel metadata opened (fd: %d and path: %s)", lkm->fd, lkm->pathname);
@@ -183,6 +378,7 @@ int kernel_start_session(struct ltt_kernel_session *session)
 
 	ret = kernctl_start_session(session->fd);
 	if (ret < 0) {
+		perror("ioctl start session");
 		goto error;
 	}
 
@@ -194,6 +390,83 @@ error:
 	return ret;
 }
 
+/*
+ *  kernel_wait_quiescent
+ *
+ *  Make a kernel wait to make sure in-flight probe have completed.
+ */
+void kernel_wait_quiescent(int fd)
+{
+	int ret;
+
+	DBG("Kernel quiescent wait on %d", fd);
+
+	ret = kernctl_wait_quiescent(fd);
+	if (ret < 0) {
+		perror("wait quiescent ioctl");
+		ERR("Kernel quiescent wait failed");
+	}
+}
+
+/*
+ *  kernel_calibrate
+ */
+int kernel_calibrate(int fd, struct lttng_kernel_calibrate *calibrate)
+{
+	int ret;
+
+	ret = kernctl_calibrate(fd, calibrate);
+	if (ret < 0) {
+		perror("calibrate ioctl");
+		return -1;
+	}
+
+	return 0;
+}
+
+
+/*
+ *  kernel_metadata_flush_buffer
+ *
+ *  Force flush buffer of metadata.
+ */
+int kernel_metadata_flush_buffer(int fd)
+{
+	int ret;
+
+	ret = kernctl_buffer_flush(fd);
+	if (ret < 0) {
+		ERR("Fail to flush metadata buffers %d (ret: %d", fd, ret);
+	}
+
+	return 0;
+}
+
+/*
+ *  kernel_flush_buffer
+ *
+ *  Force flush buffer for channel.
+ */
+int kernel_flush_buffer(struct ltt_kernel_channel *channel)
+{
+	int ret;
+	struct ltt_kernel_stream *stream;
+
+	DBG("Flush buffer for channel %s", channel->channel->name);
+
+	cds_list_for_each_entry(stream, &channel->stream_list.head, list) {
+		DBG("Flushing channel stream %d", stream->fd);
+		ret = kernctl_buffer_flush(stream->fd);
+		if (ret < 0) {
+			perror("ioctl");
+			ERR("Fail to flush buffer for stream %d (ret: %d)",
+					stream->fd, ret);
+		}
+	}
+
+	return 0;
+}
+
 /*
  *  kernel_stop_session
  *
@@ -217,14 +490,14 @@ error:
 }
 
 /*
- *  kernel_create_channel_stream
+ *  kernel_open_channel_stream
  *
- *  Create a stream for a channel, register it to the kernel tracer and add it
+ *  Open stream of channel, register it to the kernel tracer and add it
  *  to the stream list of the channel.
  *
  *  Return the number of created stream. Else, a negative value.
  */
-int kernel_create_channel_stream(struct ltt_kernel_channel *channel)
+int kernel_open_channel_stream(struct ltt_kernel_channel *channel)
 {
 	int ret;
 	struct ltt_kernel_stream *lks;
@@ -237,8 +510,14 @@ int kernel_create_channel_stream(struct ltt_kernel_channel *channel)
 		}
 
 		lks->fd = ret;
-		ret = asprintf(&lks->pathname, "%s/trace_%d",
-				channel->pathname, channel->stream_count);
+		/* Prevent fd duplication after execlp() */
+		ret = fcntl(lks->fd, F_SETFD, FD_CLOEXEC);
+		if (ret < 0) {
+			perror("fcntl session fd");
+		}
+
+		ret = asprintf(&lks->pathname, "%s/%s_%d",
+				channel->pathname, channel->channel->name, channel->stream_count);
 		if (ret < 0) {
 			perror("asprintf kernel create stream");
 			goto error;
@@ -259,11 +538,11 @@ error:
 }
 
 /*
- *  kernel_create_metadata_stream
+ *  kernel_open_metadata_stream
  *
- *  Create the metadata stream and set it to the kernel session.
+ *  Open the metadata stream and set it to the kernel session.
  */
-int kernel_create_metadata_stream(struct ltt_kernel_session *session)
+int kernel_open_metadata_stream(struct ltt_kernel_session *session)
 {
 	int ret;
 
@@ -275,6 +554,11 @@ int kernel_create_metadata_stream(struct ltt_kernel_session *session)
 
 	DBG("Kernel metadata stream created (fd: %d)", ret);
 	session->metadata_stream_fd = ret;
+	/* Prevent fd duplication after execlp() */
+	ret = fcntl(session->metadata_stream_fd, F_SETFD, FD_CLOEXEC);
+	if (ret < 0) {
+		perror("fcntl session fd");
+	}
 
 	return 0;
 
@@ -283,18 +567,16 @@ error:
 }
 
 /*
- *  kernel_list_events
- *
- *  Get the event list from the kernel tracer and return that list in the CTF
- *  format.
+ * Get the event list from the kernel tracer and return the number of elements.
  */
-ssize_t kernel_list_events(int tracer_fd, char **list)
+ssize_t kernel_list_events(int tracer_fd, struct lttng_event **events)
 {
-	int fd;
-	char *buf, *line = NULL;
-	size_t nb, nbmem, total = 0;
+	int fd, pos;
+	char *event;
+	size_t nbmem, count = 0;
 	ssize_t size;
 	FILE *fp;
+	struct lttng_event *elist;
 
 	fd = kernctl_tracepoint_list(tracer_fd);
 	if (fd < 0) {
@@ -313,31 +595,31 @@ ssize_t kernel_list_events(int tracer_fd, char **list)
 	 * See kernel-ctl.h for explanation of this value
 	 */
 	nbmem = KERNEL_EVENT_LIST_SIZE;
-	buf = malloc(nbmem);
+	elist = malloc(sizeof(struct lttng_event) * nbmem);
 
-	while ((size = getline(&line, &nb, fp)) != -1) {
-		if (total + size > nbmem) {
-			DBG("Reallocating event list from %ld to %ld bytes", nbmem,
-					total + size + KERNEL_EVENT_LIST_SIZE);
+	while ((size = fscanf(fp, "event { name = %m[^;]; };%n\n", &event, &pos)) == 1) {
+		if (count > nbmem) {
+			DBG("Reallocating event list from %zu to %zu bytes", nbmem,
+					nbmem + KERNEL_EVENT_LIST_SIZE);
 			/* Adding the default size again */
-			nbmem = total + size + KERNEL_EVENT_LIST_SIZE;
-			buf = realloc(buf, nbmem);
-			if (buf == NULL) {
+			nbmem += KERNEL_EVENT_LIST_SIZE;
+			elist = realloc(elist, nbmem);
+			if (elist == NULL) {
 				perror("realloc list events");
 				goto error;
 			}
 		}
-		memcpy(buf + total, line, size);
-		total += size;
+		strncpy(elist[count].name, event, LTTNG_SYMBOL_NAME_LEN);
+		elist[count].name[LTTNG_SYMBOL_NAME_LEN - 1] = '\0';
+		count++;
 	}
 
-	*list = buf;
+	*events = elist;
 
-	DBG("Kernel list events done");
+	DBG("Kernel list events done (%zu events)", count);
 
-	return total;
+	return count;
 
 error:
 	return -1;
 }
-