mutex_lock(&sessions_mutex);
if (chan->free_event_id == -1U) {
- event = ERR_PTR(-EMFILE);
+ ret = -EMFILE;
goto full;
}
/*
*/
list_for_each_entry(event, &chan->session->events, list) {
if (!strcmp(event->desc->name, event_param->name)) {
- event = ERR_PTR(-EEXIST);
+ ret = -EEXIST;
goto exist;
}
}
event = kmem_cache_zalloc(event_cache, GFP_KERNEL);
if (!event) {
- event = ERR_PTR(-ENOMEM);
+ ret = -ENOMEM;
goto cache_error;
}
event->chan = chan;
case LTTNG_KERNEL_TRACEPOINT:
event->desc = lttng_event_get(event_param->name);
if (!event->desc) {
- event = ERR_PTR(-ENOENT);
+ 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) {
- event = ERR_PTR(-EINVAL);
+ ret = -EINVAL;
goto register_error;
}
break;
event_param->u.kprobe.addr,
event);
if (ret) {
- event = ERR_PTR(-EINVAL);
+ ret = -EINVAL;
goto register_error;
}
ret = try_module_get(event->desc->owner);
event_return =
kmem_cache_zalloc(event_cache, GFP_KERNEL);
if (!event_return) {
- event = ERR_PTR(-ENOMEM);
+ ret = -ENOMEM;
goto register_error;
}
event_return->chan = chan;
event, event_return);
if (ret) {
kmem_cache_free(event_cache, event_return);
- event = ERR_PTR(-EINVAL);
+ ret = -EINVAL;
goto register_error;
}
/* Take 2 refs on the module: one per event. */
kmem_cache_free(event_cache, event_return);
module_put(event->desc->owner);
module_put(event->desc->owner);
- event = ERR_PTR(ret);
goto statedump_error;
}
list_add(&event_return->list, &chan->session->events);
event_param->u.ftrace.symbol_name,
event);
if (ret) {
- event = ERR_PTR(ret);
goto register_error;
}
ret = try_module_get(event->desc->owner);
case LTTNG_KERNEL_NOOP:
event->desc = internal_desc;
if (!event->desc) {
- event = ERR_PTR(-EINVAL);
+ ret = -EINVAL;
goto register_error;
}
break;
default:
WARN_ON_ONCE(1);
- event = ERR_PTR(-EINVAL);
+ ret = -EINVAL;
goto register_error;
}
ret = _lttng_event_metadata_statedump(chan->session, chan, event);
WARN_ON_ONCE(ret > 0);
if (ret) {
- event = ERR_PTR(ret);
goto statedump_error;
}
list_add(&event->list, &chan->session->events);
exist:
full:
mutex_unlock(&sessions_mutex);
- return event;
+ return ERR_PTR(ret);
}
/*
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)
/*
* Ensure we support mutiple get_next / put sequences followed
- * by put_next.
+ * by put_next. The metadata stream lock internally protects
+ * reading the metadata cache. It can indeed be read
+ * concurrently by "get_next_subbuf" and "flush" operations on
+ * the buffer invoked by different processes.
*/
+ mutex_lock(&stream->lock);
WARN_ON(stream->metadata_in < stream->metadata_out);
if (stream->metadata_in != stream->metadata_out)
- return 0;
+ goto end;
len = stream->metadata_cache->metadata_written -
stream->metadata_in;
if (!len)
- return 0;
+ goto end;
reserve_len = min_t(size_t,
stream->transport->ops.packet_avail_size(chan),
len);
ret = reserve_len;
end:
+ mutex_unlock(&stream->lock);
return ret;
}
MODULE_DESCRIPTION("LTTng Events");
MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "."
__stringify(LTTNG_MODULES_MINOR_VERSION) "."
- __stringify(LTTNG_MODULES_PATCHLEVEL_VERSION));
+ __stringify(LTTNG_MODULES_PATCHLEVEL_VERSION)
+ LTTNG_MODULES_EXTRAVERSION);