X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-events.c;h=7eb78cddc81ec3347a269eb2a4e68725909e6f25;hb=refs%2Fheads%2Fstable-2.3;hp=27a8f8644477be0bcf41c3732622e0e8c0f9fa57;hpb=9de2c21569afcb6b983e81a2e9b1d0c2b83c98f0;p=lttng-modules.git diff --git a/lttng-events.c b/lttng-events.c index 27a8f864..7eb78cdd 100644 --- a/lttng-events.c +++ b/lttng-events.c @@ -27,10 +27,12 @@ #include #include #include +#include #include "wrapper/uuid.h" #include "wrapper/vmalloc.h" /* for wrapper_vmalloc_sync_all() */ #include "wrapper/random.h" #include "wrapper/tracepoint.h" +#include "lttng-kernel-version.h" #include "lttng-events.h" #include "lttng-tracer.h" #include "lttng-abi-old.h" @@ -60,9 +62,15 @@ void _lttng_metadata_channel_hangup(struct lttng_metadata_stream *stream); void synchronize_trace(void) { synchronize_sched(); +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) +#ifdef CONFIG_PREEMPT_RT_FULL + synchronize_rcu(); +#endif +#else /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) */ #ifdef CONFIG_PREEMPT_RT synchronize_rcu(); #endif +#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) */ } struct lttng_session *lttng_session_create(void) @@ -359,18 +367,25 @@ struct lttng_event *lttng_event_create(struct lttng_channel *chan, int ret; mutex_lock(&sessions_mutex); - if (chan->free_event_id == -1U) + if (chan->free_event_id == -1U) { + ret = -EMFILE; goto full; + } /* * This is O(n^2) (for each event, the loop is called at event * creation). Might require a hash if we have lots of events. */ - list_for_each_entry(event, &chan->session->events, list) - if (!strcmp(event->desc->name, event_param->name)) + list_for_each_entry(event, &chan->session->events, list) { + if (!strcmp(event->desc->name, event_param->name)) { + ret = -EEXIST; goto exist; + } + } event = kmem_cache_zalloc(event_cache, GFP_KERNEL); - if (!event) + if (!event) { + ret = -ENOMEM; goto cache_error; + } event->chan = chan; event->filter = filter; event->id = chan->free_event_id++; @@ -381,13 +396,17 @@ struct lttng_event *lttng_event_create(struct lttng_channel *chan, switch (event_param->instrumentation) { case LTTNG_KERNEL_TRACEPOINT: event->desc = lttng_event_get(event_param->name); - if (!event->desc) + if (!event->desc) { + ret = -ENOENT; goto register_error; - ret = kabi_2635_tracepoint_probe_register(event_param->name, + } + ret = kabi_2635_tracepoint_probe_register(event->desc->kname, event->desc->probe_callback, event); - if (ret) + if (ret) { + ret = -EINVAL; goto register_error; + } break; case LTTNG_KERNEL_KPROBE: ret = lttng_kprobes_register(event_param->name, @@ -395,8 +414,10 @@ struct lttng_event *lttng_event_create(struct lttng_channel *chan, event_param->u.kprobe.offset, event_param->u.kprobe.addr, event); - if (ret) + if (ret) { + ret = -EINVAL; goto register_error; + } ret = try_module_get(event->desc->owner); WARN_ON_ONCE(!ret); break; @@ -407,8 +428,10 @@ struct lttng_event *lttng_event_create(struct lttng_channel *chan, /* kretprobe defines 2 events */ event_return = kmem_cache_zalloc(event_cache, GFP_KERNEL); - if (!event_return) + if (!event_return) { + ret = -ENOMEM; goto register_error; + } event_return->chan = chan; event_return->filter = filter; event_return->id = chan->free_event_id++; @@ -425,6 +448,7 @@ struct lttng_event *lttng_event_create(struct lttng_channel *chan, event, event_return); if (ret) { kmem_cache_free(event_cache, event_return); + ret = -EINVAL; goto register_error; } /* Take 2 refs on the module: one per event. */ @@ -434,6 +458,7 @@ struct lttng_event *lttng_event_create(struct lttng_channel *chan, WARN_ON_ONCE(!ret); ret = _lttng_event_metadata_statedump(chan->session, chan, event_return); + WARN_ON_ONCE(ret > 0); if (ret) { kmem_cache_free(event_cache, event_return); module_put(event->desc->owner); @@ -447,22 +472,29 @@ struct lttng_event *lttng_event_create(struct lttng_channel *chan, ret = lttng_ftrace_register(event_param->name, event_param->u.ftrace.symbol_name, event); - if (ret) + if (ret) { goto register_error; + } ret = try_module_get(event->desc->owner); WARN_ON_ONCE(!ret); break; case LTTNG_KERNEL_NOOP: event->desc = internal_desc; - if (!event->desc) + if (!event->desc) { + ret = -EINVAL; goto register_error; + } break; default: WARN_ON_ONCE(1); + ret = -EINVAL; + goto register_error; } ret = _lttng_event_metadata_statedump(chan->session, chan, event); - if (ret) + WARN_ON_ONCE(ret > 0); + if (ret) { goto statedump_error; + } list_add(&event->list, &chan->session->events); mutex_unlock(&sessions_mutex); return event; @@ -475,7 +507,7 @@ cache_error: exist: full: mutex_unlock(&sessions_mutex); - return NULL; + return ERR_PTR(ret); } /* @@ -487,7 +519,7 @@ int _lttng_event_unregister(struct lttng_event *event) switch (event->instrumentation) { case LTTNG_KERNEL_TRACEPOINT: - ret = kabi_2635_tracepoint_probe_unregister(event->desc->name, + ret = kabi_2635_tracepoint_probe_unregister(event->desc->kname, event->desc->probe_callback, event); if (ret) @@ -554,35 +586,43 @@ void _lttng_event_destroy(struct lttng_event *event) * remaining space left in packet and write, since mutual exclusion * protects us from concurrent writes. */ -int lttng_metadata_output_channel(struct lttng_channel *chan, - struct lttng_metadata_stream *stream) +int lttng_metadata_output_channel(struct lttng_metadata_stream *stream, + struct channel *chan) { struct lib_ring_buffer_ctx ctx; int ret = 0; size_t len, reserve_len; + /* + * Ensure we support mutiple get_next / put sequences followed + * by put_next. + */ + WARN_ON(stream->metadata_in < stream->metadata_out); + if (stream->metadata_in != stream->metadata_out) + return 0; + len = stream->metadata_cache->metadata_written - - stream->metadata_cache_read; + stream->metadata_in; if (!len) return 0; reserve_len = min_t(size_t, - chan->ops->packet_avail_size(chan->chan), + stream->transport->ops.packet_avail_size(chan), len); - lib_ring_buffer_ctx_init(&ctx, chan->chan, NULL, reserve_len, + lib_ring_buffer_ctx_init(&ctx, chan, NULL, reserve_len, sizeof(char), -1); /* * If reservation failed, return an error to the caller. */ - ret = chan->ops->event_reserve(&ctx, 0); + ret = stream->transport->ops.event_reserve(&ctx, 0); if (ret != 0) { printk(KERN_WARNING "LTTng: Metadata event reservation failed\n"); goto end; } - chan->ops->event_write(&ctx, - stream->metadata_cache->data + stream->metadata_cache_read, + stream->transport->ops.event_write(&ctx, + stream->metadata_cache->data + stream->metadata_in, reserve_len); - chan->ops->event_commit(&ctx); - stream->metadata_cache_read += reserve_len; + stream->transport->ops.event_commit(&ctx); + stream->metadata_in += reserve_len; ret = reserve_len; end: @@ -817,7 +857,7 @@ int _lttng_event_metadata_statedump(struct lttng_session *session, ret = lttng_metadata_printf(session, "event {\n" - " name = %s;\n" + " name = \"%s\";\n" " id = %u;\n" " stream_id = %u;\n", event->desc->name,