struct lttng_krp {
struct kretprobe krp;
- struct lttng_kernel_event_recorder *event[2]; /* ENTRY and EXIT */
+ struct lttng_kernel_event_common *event[2]; /* ENTRY and EXIT */
struct kref kref_register;
struct kref kref_alloc;
};
{
struct lttng_krp *lttng_krp =
container_of(lttng_get_kretprobe(krpi), struct lttng_krp, krp);
- struct lttng_kernel_event_recorder *event_recorder =
- lttng_krp->event[type];
- struct lttng_probe_ctx lttng_probe_ctx = {
- .event = event_recorder,
+ struct lttng_kernel_event_common *event = lttng_krp->event[type];
+ struct lttng_kernel_probe_ctx lttng_probe_ctx = {
+ .event = event,
.interruptible = !lttng_regs_irqs_disabled(regs),
};
- struct lttng_channel *chan = event_recorder->chan;
- struct lib_ring_buffer_ctx ctx;
- int ret;
struct {
unsigned long ip;
unsigned long parent_ip;
} payload;
- if (unlikely(!LTTNG_READ_ONCE(chan->session->active)))
- return 0;
- if (unlikely(!LTTNG_READ_ONCE(chan->enabled)))
- return 0;
- if (unlikely(!LTTNG_READ_ONCE(event_recorder->parent.enabled)))
- return 0;
-
- payload.ip = (unsigned long) lttng_get_kretprobe(krpi)->kp.addr;
- payload.parent_ip = (unsigned long) krpi->ret_addr;
+ switch (event->type) {
+ case LTTNG_KERNEL_EVENT_TYPE_RECORDER:
+ {
+ struct lttng_kernel_event_recorder *event_recorder =
+ container_of(event, struct lttng_kernel_event_recorder, parent);
+ struct lttng_kernel_channel_buffer *chan = event_recorder->chan;
+
+ if (unlikely(!LTTNG_READ_ONCE(chan->parent.session->active)))
+ return 0;
+ if (unlikely(!LTTNG_READ_ONCE(chan->parent.enabled)))
+ return 0;
+ break;
+ }
+ case LTTNG_KERNEL_EVENT_TYPE_NOTIFIER: /* Fall-through. */
+ default:
+ WARN_ON_ONCE(1);
+ }
- lib_ring_buffer_ctx_init(&ctx, chan->chan, <tng_probe_ctx, sizeof(payload),
- lttng_alignof(payload), -1);
- ret = chan->ops->event_reserve(&ctx, event_recorder->priv->id);
- if (ret < 0)
+ if (unlikely(!LTTNG_READ_ONCE(event->enabled)))
return 0;
- lib_ring_buffer_align_ctx(&ctx, lttng_alignof(payload));
- chan->ops->event_write(&ctx, &payload, sizeof(payload));
- chan->ops->event_commit(&ctx);
+
+ switch (event->type) {
+ case LTTNG_KERNEL_EVENT_TYPE_RECORDER:
+ {
+ struct lttng_kernel_event_recorder *event_recorder =
+ container_of(event, struct lttng_kernel_event_recorder, parent);
+ struct lttng_kernel_channel_buffer *chan = event_recorder->chan;
+ struct lttng_kernel_ring_buffer_ctx ctx;
+ int ret;
+
+ payload.ip = (unsigned long) lttng_get_kretprobe(krpi)->kp.addr;
+ payload.parent_ip = (unsigned long) krpi->ret_addr;
+
+ lib_ring_buffer_ctx_init(&ctx, event_recorder, sizeof(payload),
+ lttng_alignof(payload), <tng_probe_ctx);
+ ret = chan->ops->event_reserve(&ctx);
+ if (ret < 0)
+ return 0;
+ chan->ops->event_write(&ctx, &payload, sizeof(payload), lttng_alignof(payload));
+ chan->ops->event_commit(&ctx);
+ break;
+ }
+ case LTTNG_KERNEL_EVENT_TYPE_NOTIFIER: /* Fall-through. */
+ default:
+ WARN_ON_ONCE(1);
+ }
return 0;
}
return _lttng_kretprobes_handler(krpi, regs, EVENT_EXIT);
}
-static const struct lttng_kernel_type_common *event_type =
- lttng_kernel_static_type_integer_from_type(unsigned long, __BYTE_ORDER, 16);
+static const struct lttng_kernel_event_field *event_fields[] = {
+ lttng_kernel_static_event_field("ip",
+ lttng_kernel_static_type_integer_from_type(unsigned long, __BYTE_ORDER, 16),
+ false, false, false),
+ lttng_kernel_static_event_field("parent_ip",
+ lttng_kernel_static_type_integer_from_type(unsigned long, __BYTE_ORDER, 16),
+ false, false, false),
+};
+
+static const struct lttng_kernel_tracepoint_class tp_class = {
+ .nr_fields = ARRAY_SIZE(event_fields),
+ .fields = event_fields,
+};
/*
* Create event description
int lttng_create_kprobe_event(const char *name, struct lttng_kernel_event_recorder *event_recorder,
enum lttng_kretprobe_type type)
{
- const struct lttng_kernel_event_field **fieldp_array;
- struct lttng_kernel_event_field *field;
struct lttng_kernel_event_desc *desc;
char *alloc_name;
size_t name_len;
strcpy(alloc_name, name);
strcat(alloc_name, suffix);
desc->event_name = alloc_name;
- desc->nr_fields = 2;
- fieldp_array = kzalloc(desc->nr_fields * sizeof(struct lttng_kernel_event_field *), GFP_KERNEL);
- if (!fieldp_array) {
- ret = -ENOMEM;
- goto error_fieldp_array;
- }
- desc->fields = fieldp_array;
-
- field = kzalloc(sizeof(struct lttng_kernel_event_field), GFP_KERNEL);
- if (!field) {
- ret = -ENOMEM;
- goto error_field0;
- }
- field->name = "ip";
- field->type = event_type;
- desc->fields[0] = field;
-
- field = kzalloc(sizeof(struct lttng_kernel_event_field), GFP_KERNEL);
- if (!field) {
- ret = -ENOMEM;
- goto error_field1;
- }
- field->name = "parent_ip";
- field->type = event_type;
- desc->fields[1] = field;
-
+ desc->tp_class = &tp_class;
desc->owner = THIS_MODULE;
event_recorder->priv->parent.desc = desc;
return 0;
-error_field1:
- kfree(desc->fields[0]);
-error_field0:
- kfree(fieldp_array);
-error_fieldp_array:
- kfree(desc->event_name);
error_str:
kfree(desc);
return ret;
lttng_krp->krp.kp.addr = (void *) (unsigned long) addr;
/* Allow probe handler to find event structures */
- lttng_krp->event[EVENT_ENTRY] = event_recorder_entry;
- lttng_krp->event[EVENT_EXIT] = event_recorder_exit;
+ lttng_krp->event[EVENT_ENTRY] = &event_recorder_entry->parent;
+ lttng_krp->event[EVENT_EXIT] = &event_recorder_exit->parent;
event_recorder_entry->priv->parent.u.kretprobe.lttng_krp = lttng_krp;
event_recorder_exit->priv->parent.u.kretprobe.lttng_krp = lttng_krp;
name_error:
kfree(lttng_krp);
krp_error:
- kfree(event_recorder_exit->priv->parent.desc->fields[0]);
- kfree(event_recorder_exit->priv->parent.desc->fields[1]);
- kfree(event_recorder_exit->priv->parent.desc->fields);
kfree(event_recorder_exit->priv->parent.desc->event_name);
kfree(event_recorder_exit->priv->parent.desc);
event_exit_error:
- kfree(event_recorder_entry->priv->parent.desc->fields[0]);
- kfree(event_recorder_entry->priv->parent.desc->fields[1]);
- kfree(event_recorder_entry->priv->parent.desc->fields);
kfree(event_recorder_entry->priv->parent.desc->event_name);
kfree(event_recorder_entry->priv->parent.desc);
error:
void lttng_kretprobes_destroy_private(struct lttng_kernel_event_recorder *event_recorder)
{
- kfree(event_recorder->priv->parent.desc->fields[0]);
- kfree(event_recorder->priv->parent.desc->fields[1]);
- kfree(event_recorder->priv->parent.desc->fields);
kfree(event_recorder->priv->parent.desc->event_name);
kfree(event_recorder->priv->parent.desc);
kref_put(&event_recorder->priv->parent.u.kretprobe.lttng_krp->kref_alloc,
}
EXPORT_SYMBOL_GPL(lttng_kretprobes_destroy_private);
-int lttng_kretprobes_event_enable_state(struct lttng_kernel_event_recorder *event_recorder,
+int lttng_kretprobes_event_enable_state(struct lttng_kernel_event_common *event,
int enable)
{
- struct lttng_kernel_event_recorder *event_recorder_exit;
+ struct lttng_kernel_event_common *event_exit;
struct lttng_krp *lttng_krp;
- if (event_recorder->priv->parent.instrumentation != LTTNG_KERNEL_ABI_KRETPROBE) {
+ if (event->priv->instrumentation != LTTNG_KERNEL_ABI_KRETPROBE) {
return -EINVAL;
}
- if (event_recorder->parent.enabled == enable) {
+ if (event->enabled == enable) {
return -EBUSY;
}
- lttng_krp = event_recorder->priv->parent.u.kretprobe.lttng_krp;
- event_recorder_exit = lttng_krp->event[EVENT_EXIT];
- WRITE_ONCE(event_recorder->parent.enabled, enable);
- WRITE_ONCE(event_recorder_exit->parent.enabled, enable);
+ lttng_krp = event->priv->u.kretprobe.lttng_krp;
+ event_exit = lttng_krp->event[EVENT_EXIT];
+ WRITE_ONCE(event->enabled, enable);
+ WRITE_ONCE(event_exit->enabled, enable);
return 0;
}
EXPORT_SYMBOL_GPL(lttng_kretprobes_event_enable_state);
projects / lttng-modules.git / blobdiff