X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fprobes%2Flttng-kprobes.c;h=12de611a8004e968c58724273992313ed9977f2c;hb=f5ffbd770ec2b9d1ac9b7059eb33a01432043bce;hp=5d22169d3ffa196396fdb5aded83241be6ef53f5;hpb=606828e401c405619a0c7249e8c7e3291cc1cb45;p=lttng-modules.git diff --git a/src/probes/lttng-kprobes.c b/src/probes/lttng-kprobes.c index 5d22169d..12de611a 100644 --- a/src/probes/lttng-kprobes.c +++ b/src/probes/lttng-kprobes.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -20,97 +21,107 @@ static int lttng_kprobes_event_handler_pre(struct kprobe *p, struct pt_regs *regs) { - struct lttng_event *event = - container_of(p, struct lttng_event, u.kprobe.kp); - struct lttng_probe_ctx lttng_probe_ctx = { + struct lttng_kernel_event_common_private *event_priv = + container_of(p, struct lttng_kernel_event_common_private, u.kprobe.kp); + 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->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; + 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(!LTTNG_READ_ONCE(event->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->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); + 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 -int lttng_kprobes_event_notifier_handler_pre(struct kprobe *p, struct pt_regs *regs) -{ - struct lttng_event_notifier *event_notifier = - container_of(p, struct lttng_event_notifier, u.kprobe.kp); - struct lttng_kernel_notifier_ctx notif_ctx; +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), +}; - if (unlikely(!READ_ONCE(event_notifier->enabled))) - return 0; - - notif_ctx.eval_capture = LTTNG_READ_ONCE(event_notifier->eval_capture); - event_notifier->send_notification(event_notifier, NULL, NULL, ¬if_ctx); - - 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_tracepoint_class tp_class = { + .nr_fields = ARRAY_SIZE(event_fields), + .fields = event_fields, +}; /* * Create event description */ static -int lttng_create_kprobe_event(const char *name, struct lttng_event *event) +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->desc = desc; + 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; @@ -120,7 +131,7 @@ error_str: * Create event_notifier description */ static -int lttng_create_kprobe_event_notifier(const char *name, struct lttng_event_notifier *event_notifier) +int lttng_create_kprobe_event_notifier(const char *name, struct lttng_kernel_event_notifier *event_notifier) { struct lttng_kernel_event_desc *desc; int ret; @@ -128,15 +139,14 @@ int lttng_create_kprobe_event_notifier(const char *name, struct lttng_event_noti 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->desc = desc; + event_notifier->priv->parent.desc = desc; return 0; @@ -200,25 +210,24 @@ int lttng_kprobes_register_event(const char *name, const char *symbol_name, uint64_t offset, uint64_t addr, - struct lttng_event *event) + struct lttng_kernel_event_recorder *event_recorder) { int ret; - ret = lttng_create_kprobe_event(name, event); + ret = lttng_create_kprobe_event(name, event_recorder); if (ret) goto error; ret = _lttng_kprobes_register(symbol_name, offset, addr, - &event->u.kprobe, lttng_kprobes_event_handler_pre); + &event_recorder->priv->parent.u.kprobe, lttng_kprobes_event_handler_pre); if (ret) goto register_error; return 0; register_error: - kfree(event->desc->fields); - kfree(event->desc->event_name); - kfree(event->desc); + kfree(event_recorder->priv->parent.desc->event_name); + kfree(event_recorder->priv->parent.desc); error: return ret; } @@ -227,7 +236,7 @@ EXPORT_SYMBOL_GPL(lttng_kprobes_register_event); int lttng_kprobes_register_event_notifier(const char *symbol_name, uint64_t offset, uint64_t addr, - struct lttng_event_notifier *event_notifier) + struct lttng_kernel_event_notifier *event_notifier) { int ret; ret = lttng_create_kprobe_event_notifier(symbol_name, event_notifier); @@ -235,47 +244,45 @@ int lttng_kprobes_register_event_notifier(const char *symbol_name, goto error; ret = _lttng_kprobes_register(symbol_name, offset, addr, - &event_notifier->u.kprobe, lttng_kprobes_event_notifier_handler_pre); + &event_notifier->priv->parent.u.kprobe, lttng_kprobes_event_handler_pre); if (ret) goto register_error; return 0; register_error: - kfree(event_notifier->desc->event_name); - kfree(event_notifier->desc); + kfree(event_notifier->priv->parent.desc->event_name); + kfree(event_notifier->priv->parent.desc); error: return ret; } EXPORT_SYMBOL_GPL(lttng_kprobes_register_event_notifier); -void lttng_kprobes_unregister_event(struct lttng_event *event) +void lttng_kprobes_unregister_event(struct lttng_kernel_event_recorder *event_recorder) { - unregister_kprobe(&event->u.kprobe.kp); + unregister_kprobe(&event_recorder->priv->parent.u.kprobe.kp); } EXPORT_SYMBOL_GPL(lttng_kprobes_unregister_event); -void lttng_kprobes_unregister_event_notifier(struct lttng_event_notifier *event_notifier) +void lttng_kprobes_unregister_event_notifier(struct lttng_kernel_event_notifier *event_notifier) { - unregister_kprobe(&event_notifier->u.kprobe.kp); + unregister_kprobe(&event_notifier->priv->parent.u.kprobe.kp); } EXPORT_SYMBOL_GPL(lttng_kprobes_unregister_event_notifier); -void lttng_kprobes_destroy_event_private(struct lttng_event *event) +void lttng_kprobes_destroy_event_private(struct lttng_kernel_event_recorder *event_recorder) { - kfree(event->u.kprobe.symbol_name); - kfree(event->desc->fields[0]); - kfree(event->desc->fields); - kfree(event->desc->event_name); - kfree(event->desc); + kfree(event_recorder->priv->parent.u.kprobe.symbol_name); + kfree(event_recorder->priv->parent.desc->event_name); + kfree(event_recorder->priv->parent.desc); } EXPORT_SYMBOL_GPL(lttng_kprobes_destroy_event_private); -void lttng_kprobes_destroy_event_notifier_private(struct lttng_event_notifier *event_notifier) +void lttng_kprobes_destroy_event_notifier_private(struct lttng_kernel_event_notifier *event_notifier) { - kfree(event_notifier->u.kprobe.symbol_name); - kfree(event_notifier->desc->event_name); - kfree(event_notifier->desc); + kfree(event_notifier->priv->parent.u.kprobe.symbol_name); + kfree(event_notifier->priv->parent.desc->event_name); + kfree(event_notifier->priv->parent.desc); } EXPORT_SYMBOL_GPL(lttng_kprobes_destroy_event_notifier_private);