X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt-events.c;h=c64c20368aa6ec07b4afa6a8b08e9a27ba5ad6af;hb=f7bdf4db0b992946342dc845c7369e9cdca46559;hp=3532dee5a1c8d46e246fa14c8e6c07a1257f26c7;hpb=a33c99273818348fe61ba5bbd08fa61382eab22b;p=lttng-modules.git

diff --git a/ltt-events.c b/ltt-events.c
index 3532dee5..c64c2036 100644
--- a/ltt-events.c
+++ b/ltt-events.c
@@ -66,6 +66,10 @@ void ltt_session_destroy(struct ltt_session *session)
 
 	mutex_lock(&sessions_mutex);
 	ACCESS_ONCE(session->active) = 0;
+	list_for_each_entry(chan, &session->chan, list) {
+		ret = lttng_syscalls_unregister(chan);
+		WARN_ON(ret);
+	}
 	list_for_each_entry(event, &session->events, list) {
 		ret = _ltt_event_unregister(event);
 		WARN_ON(ret);
@@ -262,7 +266,8 @@ void _ltt_channel_destroy(struct ltt_channel *chan)
  */
 struct ltt_event *ltt_event_create(struct ltt_channel *chan,
 				   struct lttng_kernel_event *event_param,
-				   void *filter)
+				   void *filter,
+				   const struct lttng_event_desc *internal_desc)
 {
 	struct ltt_event *event;
 	int ret;
@@ -309,6 +314,49 @@ struct ltt_event *ltt_event_create(struct ltt_channel *chan,
 		ret = try_module_get(event->desc->owner);
 		WARN_ON_ONCE(!ret);
 		break;
+	case LTTNG_KERNEL_KRETPROBE:
+	{
+		struct ltt_event *event_return;
+
+		/* kretprobe defines 2 events */
+		event_return =
+			kmem_cache_zalloc(event_cache, GFP_KERNEL);
+		if (!event_return)
+			goto register_error;
+		event_return->chan = chan;
+		event_return->filter = filter;
+		event_return->id = chan->free_event_id++;
+		event_return->enabled = 1;
+		event_return->instrumentation = event_param->instrumentation;
+		/*
+		 * Populate ltt_event structure before kretprobe registration.
+		 */
+		smp_wmb();
+		ret = lttng_kretprobes_register(event_param->name,
+				event_param->u.kretprobe.symbol_name,
+				event_param->u.kretprobe.offset,
+				event_param->u.kretprobe.addr,
+				event, event_return);
+		if (ret) {
+			kmem_cache_free(event_cache, event_return);
+			goto register_error;
+		}
+		/* Take 2 refs on the module: one per event. */
+		ret = try_module_get(event->desc->owner);
+		WARN_ON_ONCE(!ret);
+		ret = try_module_get(event->desc->owner);
+		WARN_ON_ONCE(!ret);
+		ret = _ltt_event_metadata_statedump(chan->session, chan,
+						    event_return);
+		if (ret) {
+			kmem_cache_free(event_cache, event_return);
+			module_put(event->desc->owner);
+			module_put(event->desc->owner);
+			goto statedump_error;
+		}
+		list_add(&event_return->list, &chan->session->events);
+		break;
+	}
 	case LTTNG_KERNEL_FUNCTION:
 		ret = lttng_ftrace_register(event_param->name,
 				event_param->u.ftrace.symbol_name,
@@ -318,6 +366,11 @@ struct ltt_event *ltt_event_create(struct ltt_channel *chan,
 		ret = try_module_get(event->desc->owner);
 		WARN_ON_ONCE(!ret);
 		break;
+	case LTTNG_KERNEL_NOOP:
+		event->desc = internal_desc;
+		if (!event->desc)
+			goto register_error;
+		break;
 	default:
 		WARN_ON_ONCE(1);
 	}
@@ -329,10 +382,7 @@ struct ltt_event *ltt_event_create(struct ltt_channel *chan,
 	return event;
 
 statedump_error:
-	WARN_ON_ONCE(tracepoint_probe_unregister(event_param->name,
-				event->desc->probe_callback,
-				event));
-	ltt_event_put(event->desc);
+	/* If a statedump error occurs, events will not be readable. */
 register_error:
 	kmem_cache_free(event_cache, event);
 cache_error:
@@ -361,10 +411,17 @@ int _ltt_event_unregister(struct ltt_event *event)
 		lttng_kprobes_unregister(event);
 		ret = 0;
 		break;
+	case LTTNG_KERNEL_KRETPROBE:
+		lttng_kretprobes_unregister(event);
+		ret = 0;
+		break;
 	case LTTNG_KERNEL_FUNCTION:
 		lttng_ftrace_unregister(event);
 		ret = 0;
 		break;
+	case LTTNG_KERNEL_NOOP:
+		ret = 0;
+		break;
 	default:
 		WARN_ON_ONCE(1);
 	}
@@ -385,10 +442,16 @@ void _ltt_event_destroy(struct ltt_event *event)
 		module_put(event->desc->owner);
 		lttng_kprobes_destroy_private(event);
 		break;
+	case LTTNG_KERNEL_KRETPROBE:
+		module_put(event->desc->owner);
+		lttng_kretprobes_destroy_private(event);
+		break;
 	case LTTNG_KERNEL_FUNCTION:
 		module_put(event->desc->owner);
 		lttng_ftrace_destroy_private(event);
 		break;
+	case LTTNG_KERNEL_NOOP:
+		break;
 	default:
 		WARN_ON_ONCE(1);
 	}
@@ -436,7 +499,7 @@ int lttng_metadata_printf(struct ltt_session *session,
 		 * we need to bail out after timeout or being
 		 * interrupted.
 		 */
-		waitret = wait_event_interruptible_timeout(*chan->ops->get_reader_wait_queue(chan->chan),
+		waitret = wait_event_interruptible_timeout(*chan->ops->get_writer_buf_wait_queue(chan->chan, -1),
 			({
 				ret = chan->ops->event_reserve(&ctx, 0);
 				ret != -ENOBUFS || !ret;