#include <linux/kprobes.h>
#include <linux/slab.h>
#include <lttng/events.h>
+#include <lttng/events-internal.h>
#include <ringbuffer/frontend_types.h>
#include <wrapper/vmalloc.h>
#include <wrapper/irqflags.h>
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_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,
+ .event = event_recorder,
.interruptible = !lttng_regs_irqs_disabled(regs),
};
- struct lttng_channel *chan = event->chan;
+ struct lttng_channel *chan = event_recorder->chan;
struct lib_ring_buffer_ctx ctx;
int ret;
unsigned long data = (unsigned long) p->addr;
return 0;
if (unlikely(!LTTNG_READ_ONCE(chan->enabled)))
return 0;
- if (unlikely(!LTTNG_READ_ONCE(event->enabled)))
+ 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->id);
+ ret = chan->ops->event_reserve(&ctx, event_recorder->priv->id);
if (ret < 0)
return 0;
lib_ring_buffer_align_ctx(&ctx, lttng_alignof(data));
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;
-
- if (unlikely(!READ_ONCE(event_notifier->enabled)))
+ 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;
+
+ if (unlikely(!READ_ONCE(event_notifier->parent.enabled)))
return 0;
notif_ctx.eval_capture = LTTNG_READ_ONCE(event_notifier->eval_capture);
- event_notifier->send_notification(event_notifier, NULL, NULL, ¬if_ctx);
+ event_notifier->notification_send(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);
+
/*
* 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)
{
- struct lttng_event_field *field;
- struct lttng_event_desc *desc;
+ 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(*event->desc), GFP_KERNEL);
+ desc = kzalloc(sizeof(*desc), GFP_KERNEL);
if (!desc)
return -ENOMEM;
- desc->name = kstrdup(name, GFP_KERNEL);
- if (!desc->name) {
+ desc->event_name = kstrdup(name, GFP_KERNEL);
+ if (!desc->event_name) {
ret = -ENOMEM;
goto error_str;
}
desc->nr_fields = 1;
- desc->fields = field =
- kzalloc(1 * sizeof(struct lttng_event_field), GFP_KERNEL);
+ 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.type = lttng_kernel_type_integer;
- field->type.u.integer.size = sizeof(unsigned long) * CHAR_BIT;
- field->type.u.integer.alignment = lttng_alignof(unsigned long) * CHAR_BIT;
- field->type.u.integer.signedness = lttng_is_signed_type(unsigned long);
- field->type.u.integer.reverse_byte_order = 0;
- field->type.u.integer.base = 16;
- field->type.u.integer.encoding = lttng_encode_none;
+ field->type = event_type;
desc->owner = THIS_MODULE;
- event->desc = desc;
+ event_recorder->priv->parent.desc = desc;
return 0;
error_field:
- kfree(desc->name);
+ kfree(fieldp_array);
+error_fieldp_array:
+ kfree(desc->event_name);
error_str:
kfree(desc);
return ret;
* 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_event_desc *desc;
+ struct lttng_kernel_event_desc *desc;
int ret;
- desc = kzalloc(sizeof(*event_notifier->desc), GFP_KERNEL);
+ desc = kzalloc(sizeof(*desc), GFP_KERNEL);
if (!desc)
return -ENOMEM;
- desc->name = kstrdup(name, GFP_KERNEL);
- if (!desc->name) {
+ 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;
if (symbol_name) {
lttng_kp->symbol_name =
- kzalloc(LTTNG_KERNEL_SYM_NAME_LEN * sizeof(char),
+ kzalloc(LTTNG_KERNEL_ABI_SYM_NAME_LEN * sizeof(char),
GFP_KERNEL);
if (!lttng_kp->symbol_name) {
ret = -ENOMEM;
goto name_error;
}
memcpy(lttng_kp->symbol_name, symbol_name,
- LTTNG_KERNEL_SYM_NAME_LEN * sizeof(char));
+ LTTNG_KERNEL_ABI_SYM_NAME_LEN * sizeof(char));
lttng_kp->kp.symbol_name = lttng_kp->symbol_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->name);
- kfree(event->desc);
+ kfree(event_recorder->priv->parent.desc->fields);
+ kfree(event_recorder->priv->parent.desc->event_name);
+ kfree(event_recorder->priv->parent.desc);
error:
return ret;
}
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);
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_notifier_handler_pre);
if (ret)
goto register_error;
return 0;
register_error:
- kfree(event_notifier->desc->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);
- kfree(event->desc->name);
- kfree(event->desc);
+ 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);
}
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->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);
projects / lttng-modules.git / blobdiff