X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fprobes%2Flttng-kprobes.c;h=12de611a8004e968c58724273992313ed9977f2c;hb=f5ffbd770ec2b9d1ac9b7059eb33a01432043bce;hp=ecb08fc8fd65f9f9dcb474d4e959baadca50b7d2;hpb=a67ba386d82d85c6b6ca56c249a13ab5a1f34b08;p=lttng-modules.git diff --git a/src/probes/lttng-kprobes.c b/src/probes/lttng-kprobes.c index ecb08fc8..12de611a 100644 --- a/src/probes/lttng-kprobes.c +++ b/src/probes/lttng-kprobes.c @@ -23,59 +23,81 @@ int lttng_kprobes_event_handler_pre(struct kprobe *p, struct pt_regs *regs) { struct lttng_kernel_event_common_private *event_priv = container_of(p, struct lttng_kernel_event_common_private, u.kprobe.kp); - struct lttng_kernel_event_recorder_private *event_recorder_priv = - container_of(event_priv, struct lttng_kernel_event_recorder_private, parent); - struct lttng_kernel_event_recorder *event_recorder = - event_recorder_priv->pub; - struct lttng_probe_ctx lttng_probe_ctx = { - .event = event_recorder, + struct lttng_kernel_event_common *event = event_priv->pub; + 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; unsigned long data = (unsigned long) p->addr; - 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; - - lib_ring_buffer_ctx_init(&ctx, chan->chan, <tng_probe_ctx, sizeof(data), - lttng_alignof(data), -1); - ret = chan->ops->event_reserve(&ctx, event_recorder->priv->id); - if (ret < 0) - return 0; - lib_ring_buffer_align_ctx(&ctx, lttng_alignof(data)); - chan->ops->event_write(&ctx, &data, sizeof(data)); - chan->ops->event_commit(&ctx); - return 0; -} - -static -int lttng_kprobes_event_notifier_handler_pre(struct kprobe *p, struct pt_regs *regs) -{ - struct lttng_kernel_event_common_private *event_priv = - container_of(p, struct lttng_kernel_event_common_private, u.kprobe.kp); - struct lttng_kernel_event_notifier_private *event_notifier_priv = - container_of(event_priv, struct lttng_kernel_event_notifier_private, parent); - struct lttng_kernel_event_notifier *event_notifier = - event_notifier_priv->pub; - struct lttng_kernel_notification_ctx notif_ctx; + switch (event->type) { + case LTTNG_KERNEL_EVENT_TYPE_RECORDER: + { + struct lttng_kernel_event_recorder_private *event_recorder_priv = + container_of(event_priv, struct lttng_kernel_event_recorder_private, parent); + struct lttng_kernel_event_recorder *event_recorder = + event_recorder_priv->pub; + 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: + break; + default: + WARN_ON_ONCE(1); + } - if (unlikely(!READ_ONCE(event_notifier->parent.enabled))) + if (unlikely(!LTTNG_READ_ONCE(event->enabled))) return 0; - notif_ctx.eval_capture = LTTNG_READ_ONCE(event_notifier->eval_capture); - event_notifier->notification_send(event_notifier, NULL, NULL, ¬if_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; + + lib_ring_buffer_ctx_init(&ctx, event_recorder, sizeof(data), + lttng_alignof(data), <tng_probe_ctx); + ret = chan->ops->event_reserve(&ctx); + if (ret < 0) + return 0; + chan->ops->event_write(&ctx, &data, sizeof(data), lttng_alignof(data)); + chan->ops->event_commit(&ctx); + break; + } + case LTTNG_KERNEL_EVENT_TYPE_NOTIFIER: + { + struct lttng_kernel_event_notifier *event_notifier = + container_of(event, struct lttng_kernel_event_notifier, parent); + struct lttng_kernel_notification_ctx notif_ctx; + + notif_ctx.eval_capture = LTTNG_READ_ONCE(event_notifier->eval_capture); + event_notifier->notification_send(event_notifier, NULL, NULL, ¬if_ctx); + break; + } + default: + WARN_ON_ONCE(1); + } return 0; } -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), +}; + +static const struct lttng_kernel_tracepoint_class tp_class = { + .nr_fields = ARRAY_SIZE(event_fields), + .fields = event_fields, +}; /* * Create event description @@ -83,43 +105,23 @@ static const struct lttng_kernel_type_common *event_type = static int lttng_create_kprobe_event(const char *name, struct lttng_kernel_event_recorder *event_recorder) { - const struct lttng_kernel_event_field **fieldp_array; - struct lttng_kernel_event_field *field; struct lttng_kernel_event_desc *desc; int ret; desc = kzalloc(sizeof(*desc), GFP_KERNEL); if (!desc) return -ENOMEM; + desc->tp_class = &tp_class; desc->event_name = kstrdup(name, GFP_KERNEL); if (!desc->event_name) { ret = -ENOMEM; goto error_str; } - desc->nr_fields = 1; - fieldp_array = kzalloc(1 * sizeof(struct lttng_kernel_event_field *), GFP_KERNEL); - if (!fieldp_array) { - ret = -ENOMEM; - goto error_fieldp_array; - } - desc->fields = fieldp_array; - desc->fields[0] = field = - kzalloc(sizeof(struct lttng_kernel_event_field), GFP_KERNEL); - if (!field) { - ret = -ENOMEM; - goto error_field; - } - field->name = "ip"; - field->type = event_type; desc->owner = THIS_MODULE; event_recorder->priv->parent.desc = desc; return 0; -error_field: - kfree(fieldp_array); -error_fieldp_array: - kfree(desc->event_name); error_str: kfree(desc); return ret; @@ -137,13 +139,12 @@ int lttng_create_kprobe_event_notifier(const char *name, struct lttng_kernel_eve desc = kzalloc(sizeof(*desc), GFP_KERNEL); if (!desc) return -ENOMEM; + desc->tp_class = &tp_class; desc->event_name = kstrdup(name, GFP_KERNEL); if (!desc->event_name) { ret = -ENOMEM; goto error_str; } - desc->nr_fields = 0; - desc->owner = THIS_MODULE; event_notifier->priv->parent.desc = desc; @@ -225,7 +226,6 @@ int lttng_kprobes_register_event(const char *name, return 0; register_error: - kfree(event_recorder->priv->parent.desc->fields); kfree(event_recorder->priv->parent.desc->event_name); kfree(event_recorder->priv->parent.desc); error: @@ -244,7 +244,7 @@ int lttng_kprobes_register_event_notifier(const char *symbol_name, goto error; ret = _lttng_kprobes_register(symbol_name, offset, addr, - &event_notifier->priv->parent.u.kprobe, lttng_kprobes_event_notifier_handler_pre); + &event_notifier->priv->parent.u.kprobe, lttng_kprobes_event_handler_pre); if (ret) goto register_error; @@ -273,8 +273,6 @@ EXPORT_SYMBOL_GPL(lttng_kprobes_unregister_event_notifier); void lttng_kprobes_destroy_event_private(struct lttng_kernel_event_recorder *event_recorder) { kfree(event_recorder->priv->parent.u.kprobe.symbol_name); - kfree(event_recorder->priv->parent.desc->fields[0]); - kfree(event_recorder->priv->parent.desc->fields); kfree(event_recorder->priv->parent.desc->event_name); kfree(event_recorder->priv->parent.desc); }