From 46fd07accf36998fca3e43e54513755a98f68f48 Mon Sep 17 00:00:00 2001 From: Jonathan Rajotte Date: Tue, 18 May 2021 13:44:38 -0400 Subject: [PATCH] Rename lttng_event_rule_userspace_probe to lttng_event_rule_kernel_uprobe MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The `--type` option for add trigger now only support `kernel:uprobe`. Signed-off-by: Jonathan Rajotte Signed-off-by: Jérémie Galarneau Change-Id: I2c4de8e314d6fba735343d21c04fff366b92cca9 --- include/Makefile.am | 4 +- include/lttng/event-rule/event-rule.h | 2 +- ...be-internal.h => kernel-uprobe-internal.h} | 16 +-- .../{userspace-probe.h => kernel-uprobe.h} | 22 ++-- include/lttng/lttng.h | 2 +- src/bin/lttng-sessiond/kernel.c | 8 +- src/bin/lttng-sessiond/trace-kernel.c | 8 +- src/bin/lttng/commands/add_trigger.c | 15 ++- src/bin/lttng/commands/list_triggers.c | 10 +- src/common/Makefile.am | 2 +- src/common/event-rule/event-rule.c | 12 +- .../{userspace-probe.c => kernel-uprobe.c} | 110 +++++++++--------- .../tools/notification/notification.c | 4 +- .../tools/trigger/test_add_trigger_cli | 26 ++--- .../tools/trigger/test_list_triggers_cli | 8 +- tests/unit/test_event_rule.c | 12 +- 16 files changed, 128 insertions(+), 133 deletions(-) rename include/lttng/event-rule/{userspace-probe-internal.h => kernel-uprobe-internal.h} (65%) rename include/lttng/event-rule/{userspace-probe.h => kernel-uprobe.h} (72%) rename src/common/event-rule/{userspace-probe.c => kernel-uprobe.c} (67%) diff --git a/include/Makefile.am b/include/Makefile.am index 2f403fe0a..0ab2888b2 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -154,7 +154,7 @@ lttngeventruleinclude_HEADERS= \ lttng/event-rule/event-rule.h \ lttng/event-rule/kernel-probe.h \ lttng/event-rule/kernel-syscall.h \ - lttng/event-rule/userspace-probe.h \ + lttng/event-rule/kernel-uprobe.h \ lttng/event-rule/tracepoint.h noinst_HEADERS = \ @@ -184,7 +184,7 @@ noinst_HEADERS = \ lttng/event-rule/kernel-probe-internal.h \ lttng/event-rule/kernel-syscall-internal.h \ lttng/event-rule/tracepoint-internal.h \ - lttng/event-rule/userspace-probe-internal.h \ + lttng/event-rule/kernel-uprobe-internal.h \ lttng/health-internal.h \ lttng/kernel-probe-internal.h \ lttng/load-internal.h \ diff --git a/include/lttng/event-rule/event-rule.h b/include/lttng/event-rule/event-rule.h index aac9f5913..1fea37b47 100644 --- a/include/lttng/event-rule/event-rule.h +++ b/include/lttng/event-rule/event-rule.h @@ -20,7 +20,7 @@ enum lttng_event_rule_type { LTTNG_EVENT_RULE_TYPE_KERNEL_SYSCALL = 1, LTTNG_EVENT_RULE_TYPE_KERNEL_PROBE = 2, LTTNG_EVENT_RULE_TYPE_KERNEL_FUNCTION = 3, - LTTNG_EVENT_RULE_TYPE_USERSPACE_PROBE = 4, + LTTNG_EVENT_RULE_TYPE_KERNEL_UPROBE = 4, }; enum lttng_event_rule_status { diff --git a/include/lttng/event-rule/userspace-probe-internal.h b/include/lttng/event-rule/kernel-uprobe-internal.h similarity index 65% rename from include/lttng/event-rule/userspace-probe-internal.h rename to include/lttng/event-rule/kernel-uprobe-internal.h index 8ba5b2bf2..e14dc431a 100644 --- a/include/lttng/event-rule/userspace-probe-internal.h +++ b/include/lttng/event-rule/kernel-uprobe-internal.h @@ -5,21 +5,21 @@ * */ -#ifndef LTTNG_EVENT_RULE_USERSPACE_PROBE_INTERNAL_H -#define LTTNG_EVENT_RULE_USERSPACE_PROBE_INTERNAL_H +#ifndef LTTNG_EVENT_RULE_KERNEL_UPROBE_INTERNAL_H +#define LTTNG_EVENT_RULE_KERNEL_UPROBE_INTERNAL_H #include #include #include -#include +#include -struct lttng_event_rule_userspace_probe { +struct lttng_event_rule_kernel_uprobe { struct lttng_event_rule parent; char *name; struct lttng_userspace_probe_location *location; }; -struct lttng_event_rule_userspace_probe_comm { +struct lttng_event_rule_kernel_uprobe_comm { /* Includes terminator `\0`. */ uint32_t name_len; /* Includes terminator `\0`. */ @@ -33,13 +33,13 @@ struct lttng_event_rule_userspace_probe_comm { } LTTNG_PACKED; LTTNG_HIDDEN -ssize_t lttng_event_rule_userspace_probe_create_from_payload( +ssize_t lttng_event_rule_kernel_uprobe_create_from_payload( struct lttng_payload_view *view, struct lttng_event_rule **rule); LTTNG_HIDDEN struct lttng_userspace_probe_location * -lttng_event_rule_userspace_probe_get_location_mutable( +lttng_event_rule_kernel_uprobe_get_location_mutable( const struct lttng_event_rule *rule); -#endif /* LTTNG_EVENT_RULE_USERSPACE_PROBE_INTERNAL_H */ +#endif /* LTTNG_EVENT_RULE_KERNEL_UPROBE_INTERNAL_H */ diff --git a/include/lttng/event-rule/userspace-probe.h b/include/lttng/event-rule/kernel-uprobe.h similarity index 72% rename from include/lttng/event-rule/userspace-probe.h rename to include/lttng/event-rule/kernel-uprobe.h index 37b366b68..06712df32 100644 --- a/include/lttng/event-rule/userspace-probe.h +++ b/include/lttng/event-rule/kernel-uprobe.h @@ -5,8 +5,8 @@ * */ -#ifndef LTTNG_EVENT_RULE_USERSPACE_PROBE_H -#define LTTNG_EVENT_RULE_USERSPACE_PROBE_H +#ifndef LTTNG_EVENT_RULE_KERNEL_UPROBE_H +#define LTTNG_EVENT_RULE_KERNEL_UPROBE_H #include #include @@ -16,18 +16,18 @@ extern "C" { #endif /* - * Create a newly allocated user space probe event rule. + * Create a newly allocated kernel uprobe event rule. * * The location is copied internally. * * Returns a new event rule on success, NULL on failure. This event rule must be * destroyed using lttng_event_rule_destroy(). */ -extern struct lttng_event_rule *lttng_event_rule_userspace_probe_create( +extern struct lttng_event_rule *lttng_event_rule_kernel_uprobe_create( const struct lttng_userspace_probe_location *location); /* - * Get the location of a user space probe event rule. + * Get the location of a kernel uprobe event rule. * * The caller does not assume the ownership of the returned location. * The location shall only be used for the duration of the event @@ -38,23 +38,23 @@ extern struct lttng_event_rule *lttng_event_rule_userspace_probe_create( * passed, or LTTNG_EVENT_RULE_STATUS_UNSET if a location was not set prior to * this call. */ -extern enum lttng_event_rule_status lttng_event_rule_userspace_probe_get_location( +extern enum lttng_event_rule_status lttng_event_rule_kernel_uprobe_get_location( const struct lttng_event_rule *rule, const struct lttng_userspace_probe_location **location); /* - * Set the name of a user space probe event rule. + * Set the name of a kernel uprobe event rule. * * The name is copied internally. * * Return LTTNG_EVENT_RULE_STATUS_OK on success, LTTNG_EVENT_RULE_STATUS_INVALID * if invalid parameters are passed. */ -extern enum lttng_event_rule_status lttng_event_rule_userspace_probe_set_event_name( +extern enum lttng_event_rule_status lttng_event_rule_kernel_uprobe_set_event_name( struct lttng_event_rule *rule, const char *name); /* - * Get the name of a user space probe event rule. + * Get the name of a kernel uprobe event rule. * * The caller does not assume the ownership of the returned name. * The name shall only only be used for the duration of the event @@ -64,11 +64,11 @@ extern enum lttng_event_rule_status lttng_event_rule_userspace_probe_set_event_n * success, LTTNG_EVENT_RULE_STATUS_INVALID if an invalid parameter is passed, * or LTTNG_EVENT_RULE_STATUS_UNSET if a name was not set prior to this call. */ -extern enum lttng_event_rule_status lttng_event_rule_userspace_probe_get_event_name( +extern enum lttng_event_rule_status lttng_event_rule_kernel_uprobe_get_event_name( const struct lttng_event_rule *rule, const char **name); #ifdef __cplusplus } #endif -#endif /* LTTNG_EVENT_RULE_USERSPACE_PROBE_H */ +#endif /* LTTNG_EVENT_RULE_KERNEL_UPROBE_H */ diff --git a/include/lttng/lttng.h b/include/lttng/lttng.h index fc242c511..1fa904b4d 100644 --- a/include/lttng/lttng.h +++ b/include/lttng/lttng.h @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/bin/lttng-sessiond/kernel.c b/src/bin/lttng-sessiond/kernel.c index 5afd87734..34975a312 100644 --- a/src/bin/lttng-sessiond/kernel.c +++ b/src/bin/lttng-sessiond/kernel.c @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include "event-notifier-error-accounting.h" #include "lttng-sessiond.h" @@ -542,9 +542,9 @@ static int userspace_probe_event_rule_add_callsites( assert(creds); event_rule_type = lttng_event_rule_get_type(rule); - assert(event_rule_type == LTTNG_EVENT_RULE_TYPE_USERSPACE_PROBE); + assert(event_rule_type == LTTNG_EVENT_RULE_TYPE_KERNEL_UPROBE); - status = lttng_event_rule_userspace_probe_get_location(rule, &location); + status = lttng_event_rule_kernel_uprobe_get_location(rule, &location); if (status != LTTNG_EVENT_RULE_STATUS_OK || !location) { ret = -1; goto end; @@ -2394,7 +2394,7 @@ static enum lttng_error_code kernel_create_event_notifier_rule( } if (lttng_event_rule_get_type(event_rule) == - LTTNG_EVENT_RULE_TYPE_USERSPACE_PROBE) { + LTTNG_EVENT_RULE_TYPE_KERNEL_UPROBE) { ret = userspace_probe_event_rule_add_callsites( event_rule, creds, event_notifier_rule->fd); if (ret) { diff --git a/src/bin/lttng-sessiond/trace-kernel.c b/src/bin/lttng-sessiond/trace-kernel.c index 423bb0730..0ab1b6864 100644 --- a/src/bin/lttng-sessiond/trace-kernel.c +++ b/src/bin/lttng-sessiond/trace-kernel.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include @@ -608,13 +608,13 @@ enum lttng_error_code trace_kernel_init_event_notifier_from_event_rule( ret_code = LTTNG_OK; break; } - case LTTNG_EVENT_RULE_TYPE_USERSPACE_PROBE: + case LTTNG_EVENT_RULE_TYPE_KERNEL_UPROBE: { const struct lttng_userspace_probe_location* location = NULL; const struct lttng_userspace_probe_location_lookup_method *lookup = NULL; enum lttng_event_rule_status status; - status = lttng_event_rule_userspace_probe_get_location(rule, &location); + status = lttng_event_rule_kernel_uprobe_get_location(rule, &location); if (status != LTTNG_EVENT_RULE_STATUS_OK) { ret_code = LTTNG_ERR_PROBE_LOCATION_INVAL; goto error; @@ -649,7 +649,7 @@ enum lttng_error_code trace_kernel_init_event_notifier_from_event_rule( abort(); } - status = lttng_event_rule_userspace_probe_get_event_name( + status = lttng_event_rule_kernel_uprobe_get_event_name( rule, &name); assert(status == LTTNG_EVENT_RULE_STATUS_OK); ret_code = LTTNG_OK; diff --git a/src/bin/lttng/commands/add_trigger.c b/src/bin/lttng/commands/add_trigger.c index a1bfe240e..0f94ef155 100644 --- a/src/bin/lttng/commands/add_trigger.c +++ b/src/bin/lttng/commands/add_trigger.c @@ -130,9 +130,8 @@ bool assign_event_rule_type(enum lttng_event_rule_type *dest, const char *arg) } else if (strcmp(arg, "kprobe") == 0 || strcmp(arg, "kernel-probe") == 0) { *dest = LTTNG_EVENT_RULE_TYPE_KERNEL_PROBE; - } else if (strcmp(arg, "uprobe") == 0 || - strcmp(arg, "userspace-probe") == 0) { - *dest = LTTNG_EVENT_RULE_TYPE_USERSPACE_PROBE; + } else if (strcmp(arg, "kernel:uprobe") == 0) { + *dest = LTTNG_EVENT_RULE_TYPE_KERNEL_UPROBE; } else if (strcmp(arg, "function") == 0) { *dest = LTTNG_EVENT_RULE_TYPE_KERNEL_FUNCTION; } else if (strncmp(arg, "syscall", strlen("syscall")) == 0 || @@ -887,7 +886,7 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv) */ switch (event_rule_type) { case LTTNG_EVENT_RULE_TYPE_KERNEL_PROBE: - case LTTNG_EVENT_RULE_TYPE_USERSPACE_PROBE: + case LTTNG_EVENT_RULE_TYPE_KERNEL_UPROBE: case LTTNG_EVENT_RULE_TYPE_KERNEL_FUNCTION: if (!location) { ERR("Event rule of type %s requires a --location.", @@ -934,7 +933,7 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv) switch (event_rule_type) { case LTTNG_EVENT_RULE_TYPE_KERNEL_PROBE: case LTTNG_EVENT_RULE_TYPE_KERNEL_FUNCTION: - case LTTNG_EVENT_RULE_TYPE_USERSPACE_PROBE: + case LTTNG_EVENT_RULE_TYPE_KERNEL_UPROBE: case LTTNG_EVENT_RULE_TYPE_KERNEL_SYSCALL: if (domain_type != LTTNG_DOMAIN_KERNEL) { ERR("Event type not available for user-space tracing."); @@ -1120,7 +1119,7 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv) break; } - case LTTNG_EVENT_RULE_TYPE_USERSPACE_PROBE: + case LTTNG_EVENT_RULE_TYPE_KERNEL_UPROBE: { int ret; enum lttng_event_rule_status event_rule_status; @@ -1132,14 +1131,14 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv) goto error; } - res.er = lttng_event_rule_userspace_probe_create(userspace_probe_location); + res.er = lttng_event_rule_kernel_uprobe_create(userspace_probe_location); if (!res.er) { ERR("Failed to create userspace probe event rule."); goto error; } event_rule_status = - lttng_event_rule_userspace_probe_set_event_name( + lttng_event_rule_kernel_uprobe_set_event_name( res.er, event_name); if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) { ERR("Failed to set user space probe event rule's name to '%s'.", diff --git a/src/bin/lttng/commands/list_triggers.c b/src/bin/lttng/commands/list_triggers.c index 10f76e843..e10fc29f1 100644 --- a/src/bin/lttng/commands/list_triggers.c +++ b/src/bin/lttng/commands/list_triggers.c @@ -327,23 +327,23 @@ void print_event_rule_userspace_probe(const struct lttng_event_rule *event_rule) const struct lttng_userspace_probe_location *location; enum lttng_userspace_probe_location_type userspace_probe_location_type; - assert(lttng_event_rule_get_type(event_rule) == LTTNG_EVENT_RULE_TYPE_USERSPACE_PROBE); + assert(lttng_event_rule_get_type(event_rule) == LTTNG_EVENT_RULE_TYPE_KERNEL_UPROBE); - event_rule_status = lttng_event_rule_userspace_probe_get_event_name( + event_rule_status = lttng_event_rule_kernel_uprobe_get_event_name( event_rule, &name); if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) { ERR("Failed to get uprobe event rule's name."); goto end; } - event_rule_status = lttng_event_rule_userspace_probe_get_location( + event_rule_status = lttng_event_rule_kernel_uprobe_get_location( event_rule, &location); if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) { ERR("Failed to get uprobe event rule's location."); goto end; } - _MSG(" rule: %s (type: userspace probe, ", name); + _MSG(" rule: %s (type: kernel:uprobe, ", name); userspace_probe_location_type = lttng_userspace_probe_location_get_type(location); @@ -428,7 +428,7 @@ void print_event_rule(const struct lttng_event_rule *event_rule) case LTTNG_EVENT_RULE_TYPE_KERNEL_PROBE: print_event_rule_kernel_probe(event_rule); break; - case LTTNG_EVENT_RULE_TYPE_USERSPACE_PROBE: + case LTTNG_EVENT_RULE_TYPE_KERNEL_UPROBE: print_event_rule_userspace_probe(event_rule); break; case LTTNG_EVENT_RULE_TYPE_KERNEL_SYSCALL: diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 32e9c02ab..296d49551 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -67,7 +67,7 @@ libcommon_la_SOURCES = \ event-rule/event-rule.c \ event-rule/kernel-probe.c \ event-rule/kernel-syscall.c \ - event-rule/userspace-probe.c \ + event-rule/kernel-uprobe.c \ event-rule/tracepoint.c \ filter.c filter.h \ fd-handle.c fd-handle.h \ diff --git a/src/common/event-rule/event-rule.c b/src/common/event-rule/event-rule.c index 0443c75e9..291ef533c 100644 --- a/src/common/event-rule/event-rule.c +++ b/src/common/event-rule/event-rule.c @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include enum lttng_event_rule_type lttng_event_rule_get_type( @@ -43,7 +43,7 @@ enum lttng_domain_type lttng_event_rule_get_domain_type( case LTTNG_EVENT_RULE_TYPE_KERNEL_SYSCALL: case LTTNG_EVENT_RULE_TYPE_KERNEL_PROBE: case LTTNG_EVENT_RULE_TYPE_KERNEL_FUNCTION: - case LTTNG_EVENT_RULE_TYPE_USERSPACE_PROBE: + case LTTNG_EVENT_RULE_TYPE_KERNEL_UPROBE: domain_type = LTTNG_DOMAIN_KERNEL; break; case LTTNG_EVENT_RULE_TYPE_UNKNOWN: @@ -178,8 +178,8 @@ ssize_t lttng_event_rule_create_from_payload( case LTTNG_EVENT_RULE_TYPE_KERNEL_FUNCTION: /* TODO */ break; - case LTTNG_EVENT_RULE_TYPE_USERSPACE_PROBE: - create_from_payload = lttng_event_rule_userspace_probe_create_from_payload; + case LTTNG_EVENT_RULE_TYPE_KERNEL_UPROBE: + create_from_payload = lttng_event_rule_kernel_uprobe_create_from_payload; break; case LTTNG_EVENT_RULE_TYPE_KERNEL_SYSCALL: create_from_payload = @@ -319,8 +319,8 @@ const char *lttng_event_rule_type_str(enum lttng_event_rule_type type) return "probe"; case LTTNG_EVENT_RULE_TYPE_KERNEL_FUNCTION: return "function"; - case LTTNG_EVENT_RULE_TYPE_USERSPACE_PROBE: - return "userspace-probe"; + case LTTNG_EVENT_RULE_TYPE_KERNEL_UPROBE: + return "kernel uprobe"; default: abort(); } diff --git a/src/common/event-rule/userspace-probe.c b/src/common/event-rule/kernel-uprobe.c similarity index 67% rename from src/common/event-rule/userspace-probe.c rename to src/common/event-rule/kernel-uprobe.c index 52c7553e9..df5b896cf 100644 --- a/src/common/event-rule/userspace-probe.c +++ b/src/common/event-rule/kernel-uprobe.c @@ -15,34 +15,34 @@ #include #include #include -#include +#include #include #define IS_UPROBE_EVENT_RULE(rule) \ - (lttng_event_rule_get_type(rule) == LTTNG_EVENT_RULE_TYPE_USERSPACE_PROBE) + (lttng_event_rule_get_type(rule) == LTTNG_EVENT_RULE_TYPE_KERNEL_UPROBE) -static void lttng_event_rule_userspace_probe_destroy(struct lttng_event_rule *rule) +static void lttng_event_rule_kernel_uprobe_destroy(struct lttng_event_rule *rule) { - struct lttng_event_rule_userspace_probe *uprobe; + struct lttng_event_rule_kernel_uprobe *uprobe; - uprobe = container_of(rule, struct lttng_event_rule_userspace_probe, parent); + uprobe = container_of(rule, struct lttng_event_rule_kernel_uprobe, parent); lttng_userspace_probe_location_destroy(uprobe->location); free(uprobe->name); free(uprobe); } -static bool lttng_event_rule_userspace_probe_validate( +static bool lttng_event_rule_kernel_uprobe_validate( const struct lttng_event_rule *rule) { bool valid = false; - struct lttng_event_rule_userspace_probe *uprobe; + struct lttng_event_rule_kernel_uprobe *uprobe; if (!rule) { goto end; } - uprobe = container_of(rule, struct lttng_event_rule_userspace_probe, parent); + uprobe = container_of(rule, struct lttng_event_rule_kernel_uprobe, parent); /* Required field. */ if (!uprobe->name) { @@ -60,15 +60,15 @@ end: return valid; } -static int lttng_event_rule_userspace_probe_serialize( +static int lttng_event_rule_kernel_uprobe_serialize( const struct lttng_event_rule *rule, struct lttng_payload *payload) { int ret; size_t name_len, header_offset, size_before_probe; - struct lttng_event_rule_userspace_probe *uprobe; - struct lttng_event_rule_userspace_probe_comm uprobe_comm = {}; - struct lttng_event_rule_userspace_probe_comm *header; + struct lttng_event_rule_kernel_uprobe *uprobe; + struct lttng_event_rule_kernel_uprobe_comm uprobe_comm = {}; + struct lttng_event_rule_kernel_uprobe_comm *header; if (!rule || !IS_UPROBE_EVENT_RULE(rule)) { ret = -1; @@ -78,7 +78,7 @@ static int lttng_event_rule_userspace_probe_serialize( header_offset = payload->buffer.size; DBG("Serializing uprobe event rule."); - uprobe = container_of(rule, struct lttng_event_rule_userspace_probe, parent); + uprobe = container_of(rule, struct lttng_event_rule_kernel_uprobe, parent); name_len = strlen(uprobe->name) + 1; @@ -105,7 +105,7 @@ static int lttng_event_rule_userspace_probe_serialize( } /* Update the header regarding the probe size. */ - header = (struct lttng_event_rule_userspace_probe_comm + header = (struct lttng_event_rule_kernel_uprobe_comm *) ((char *) payload->buffer.data + header_offset); header->location_len = payload->buffer.size - size_before_probe; @@ -116,14 +116,14 @@ end: return ret; } -static bool lttng_event_rule_userspace_probe_is_equal(const struct lttng_event_rule *_a, +static bool lttng_event_rule_kernel_uprobe_is_equal(const struct lttng_event_rule *_a, const struct lttng_event_rule *_b) { bool is_equal = false; - struct lttng_event_rule_userspace_probe *a, *b; + struct lttng_event_rule_kernel_uprobe *a, *b; - a = container_of(_a, struct lttng_event_rule_userspace_probe, parent); - b = container_of(_b, struct lttng_event_rule_userspace_probe, parent); + a = container_of(_a, struct lttng_event_rule_kernel_uprobe, parent); + b = container_of(_b, struct lttng_event_rule_kernel_uprobe, parent); /* uprobe is invalid if this is not true. */ assert(a->name); @@ -140,7 +140,7 @@ end: return is_equal; } -static enum lttng_error_code lttng_event_rule_userspace_probe_generate_filter_bytecode( +static enum lttng_error_code lttng_event_rule_kernel_uprobe_generate_filter_bytecode( struct lttng_event_rule *rule, const struct lttng_credentials *creds) { @@ -148,7 +148,7 @@ static enum lttng_error_code lttng_event_rule_userspace_probe_generate_filter_by return LTTNG_OK; } -static const char *lttng_event_rule_userspace_probe_get_filter( +static const char *lttng_event_rule_kernel_uprobe_get_filter( const struct lttng_event_rule *rule) { /* Unsupported. */ @@ -156,14 +156,14 @@ static const char *lttng_event_rule_userspace_probe_get_filter( } static const struct lttng_bytecode * -lttng_event_rule_userspace_probe_get_filter_bytecode(const struct lttng_event_rule *rule) +lttng_event_rule_kernel_uprobe_get_filter_bytecode(const struct lttng_event_rule *rule) { /* Unsupported. */ return NULL; } static enum lttng_event_rule_generate_exclusions_status -lttng_event_rule_userspace_probe_generate_exclusions(const struct lttng_event_rule *rule, +lttng_event_rule_kernel_uprobe_generate_exclusions(const struct lttng_event_rule *rule, struct lttng_event_exclusion **exclusions) { /* Unsupported. */ @@ -172,14 +172,14 @@ lttng_event_rule_userspace_probe_generate_exclusions(const struct lttng_event_ru } static unsigned long -lttng_event_rule_userspace_probe_hash( +lttng_event_rule_kernel_uprobe_hash( const struct lttng_event_rule *rule) { unsigned long hash; - struct lttng_event_rule_userspace_probe *urule = + struct lttng_event_rule_kernel_uprobe *urule = container_of(rule, typeof(*urule), parent); - hash = hash_key_ulong((void *) LTTNG_EVENT_RULE_TYPE_USERSPACE_PROBE, + hash = hash_key_ulong((void *) LTTNG_EVENT_RULE_TYPE_KERNEL_UPROBE, lttng_ht_seed); hash ^= hash_key_str(urule->name, lttng_ht_seed); hash ^= lttng_userspace_probe_location_hash(urule->location); @@ -189,7 +189,7 @@ lttng_event_rule_userspace_probe_hash( static int userspace_probe_set_location( - struct lttng_event_rule_userspace_probe *uprobe, + struct lttng_event_rule_kernel_uprobe *uprobe, const struct lttng_userspace_probe_location *location) { int ret; @@ -214,31 +214,31 @@ end: return ret; } -struct lttng_event_rule *lttng_event_rule_userspace_probe_create( +struct lttng_event_rule *lttng_event_rule_kernel_uprobe_create( const struct lttng_userspace_probe_location *location) { struct lttng_event_rule *rule = NULL; - struct lttng_event_rule_userspace_probe *urule; + struct lttng_event_rule_kernel_uprobe *urule; - urule = zmalloc(sizeof(struct lttng_event_rule_userspace_probe)); + urule = zmalloc(sizeof(struct lttng_event_rule_kernel_uprobe)); if (!urule) { goto end; } rule = &urule->parent; - lttng_event_rule_init(&urule->parent, LTTNG_EVENT_RULE_TYPE_USERSPACE_PROBE); - urule->parent.validate = lttng_event_rule_userspace_probe_validate; - urule->parent.serialize = lttng_event_rule_userspace_probe_serialize; - urule->parent.equal = lttng_event_rule_userspace_probe_is_equal; - urule->parent.destroy = lttng_event_rule_userspace_probe_destroy; + lttng_event_rule_init(&urule->parent, LTTNG_EVENT_RULE_TYPE_KERNEL_UPROBE); + urule->parent.validate = lttng_event_rule_kernel_uprobe_validate; + urule->parent.serialize = lttng_event_rule_kernel_uprobe_serialize; + urule->parent.equal = lttng_event_rule_kernel_uprobe_is_equal; + urule->parent.destroy = lttng_event_rule_kernel_uprobe_destroy; urule->parent.generate_filter_bytecode = - lttng_event_rule_userspace_probe_generate_filter_bytecode; - urule->parent.get_filter = lttng_event_rule_userspace_probe_get_filter; + lttng_event_rule_kernel_uprobe_generate_filter_bytecode; + urule->parent.get_filter = lttng_event_rule_kernel_uprobe_get_filter; urule->parent.get_filter_bytecode = - lttng_event_rule_userspace_probe_get_filter_bytecode; + lttng_event_rule_kernel_uprobe_get_filter_bytecode; urule->parent.generate_exclusions = - lttng_event_rule_userspace_probe_generate_exclusions; - urule->parent.hash = lttng_event_rule_userspace_probe_hash; + lttng_event_rule_kernel_uprobe_generate_exclusions; + urule->parent.hash = lttng_event_rule_kernel_uprobe_hash; if (userspace_probe_set_location(urule, location)) { lttng_event_rule_destroy(rule); @@ -250,12 +250,12 @@ end: } LTTNG_HIDDEN -ssize_t lttng_event_rule_userspace_probe_create_from_payload( +ssize_t lttng_event_rule_kernel_uprobe_create_from_payload( struct lttng_payload_view *view, struct lttng_event_rule **_event_rule) { ssize_t ret, offset = 0; - const struct lttng_event_rule_userspace_probe_comm *uprobe_comm; + const struct lttng_event_rule_kernel_uprobe_comm *uprobe_comm; const char *name; struct lttng_buffer_view current_buffer_view; struct lttng_event_rule *rule = NULL; @@ -323,20 +323,20 @@ ssize_t lttng_event_rule_userspace_probe_create_from_payload( /* Skip after the location. */ offset += uprobe_comm->location_len; - rule = lttng_event_rule_userspace_probe_create(location); + rule = lttng_event_rule_kernel_uprobe_create(location); if (!rule) { ERR("Failed to create event rule uprobe."); ret = -1; goto end; } - status = lttng_event_rule_userspace_probe_set_event_name(rule, name); + status = lttng_event_rule_kernel_uprobe_set_event_name(rule, name); if (status != LTTNG_EVENT_RULE_STATUS_OK) { ret = -1; goto end; } - if (!lttng_event_rule_userspace_probe_validate(rule)) { + if (!lttng_event_rule_kernel_uprobe_validate(rule)) { ret = -1; goto end; } @@ -351,7 +351,7 @@ end: } -enum lttng_event_rule_status lttng_event_rule_userspace_probe_get_location( +enum lttng_event_rule_status lttng_event_rule_kernel_uprobe_get_location( const struct lttng_event_rule *rule, const struct lttng_userspace_probe_location **location) { @@ -362,7 +362,7 @@ enum lttng_event_rule_status lttng_event_rule_userspace_probe_get_location( goto end; } - *location = lttng_event_rule_userspace_probe_get_location_mutable(rule); + *location = lttng_event_rule_kernel_uprobe_get_location_mutable(rule); if (!*location) { status = LTTNG_EVENT_RULE_STATUS_UNSET; goto end; @@ -374,22 +374,22 @@ end: LTTNG_HIDDEN struct lttng_userspace_probe_location * -lttng_event_rule_userspace_probe_get_location_mutable( +lttng_event_rule_kernel_uprobe_get_location_mutable( const struct lttng_event_rule *rule) { - struct lttng_event_rule_userspace_probe *uprobe; + struct lttng_event_rule_kernel_uprobe *uprobe; assert(rule); - uprobe = container_of(rule, struct lttng_event_rule_userspace_probe, parent); + uprobe = container_of(rule, struct lttng_event_rule_kernel_uprobe, parent); return uprobe->location; } -enum lttng_event_rule_status lttng_event_rule_userspace_probe_set_event_name( +enum lttng_event_rule_status lttng_event_rule_kernel_uprobe_set_event_name( struct lttng_event_rule *rule, const char *name) { char *name_copy = NULL; - struct lttng_event_rule_userspace_probe *uprobe; + struct lttng_event_rule_kernel_uprobe *uprobe; enum lttng_event_rule_status status = LTTNG_EVENT_RULE_STATUS_OK; if (!rule || !IS_UPROBE_EVENT_RULE(rule) || !name || @@ -398,7 +398,7 @@ enum lttng_event_rule_status lttng_event_rule_userspace_probe_set_event_name( goto end; } - uprobe = container_of(rule, struct lttng_event_rule_userspace_probe, parent); + uprobe = container_of(rule, struct lttng_event_rule_kernel_uprobe, parent); name_copy = strdup(name); if (!name_copy) { status = LTTNG_EVENT_RULE_STATUS_ERROR; @@ -415,10 +415,10 @@ end: return status; } -enum lttng_event_rule_status lttng_event_rule_userspace_probe_get_event_name( +enum lttng_event_rule_status lttng_event_rule_kernel_uprobe_get_event_name( const struct lttng_event_rule *rule, const char **name) { - struct lttng_event_rule_userspace_probe *uprobe; + struct lttng_event_rule_kernel_uprobe *uprobe; enum lttng_event_rule_status status = LTTNG_EVENT_RULE_STATUS_OK; if (!rule || !IS_UPROBE_EVENT_RULE(rule) || !name) { @@ -426,7 +426,7 @@ enum lttng_event_rule_status lttng_event_rule_userspace_probe_get_event_name( goto end; } - uprobe = container_of(rule, struct lttng_event_rule_userspace_probe, parent); + uprobe = container_of(rule, struct lttng_event_rule_kernel_uprobe, parent); if (!uprobe->name) { status = LTTNG_EVENT_RULE_STATUS_UNSET; goto end; diff --git a/tests/regression/tools/notification/notification.c b/tests/regression/tools/notification/notification.c index e089d47c0..aa42d5ef2 100644 --- a/tests/regression/tools/notification/notification.c +++ b/tests/regression/tools/notification/notification.c @@ -1966,10 +1966,10 @@ static void test_uprobe_event_rule_notification( lttng_session_daemon_notification_endpoint); ok(notification_channel, "Notification channel object creation"); - event_rule = lttng_event_rule_userspace_probe_create(probe_location); + event_rule = lttng_event_rule_kernel_uprobe_create(probe_location); ok(event_rule, "kprobe event rule object creation"); - event_rule_status = lttng_event_rule_userspace_probe_set_event_name( + event_rule_status = lttng_event_rule_kernel_uprobe_set_event_name( event_rule, trigger_name); ok(event_rule_status == LTTNG_EVENT_RULE_STATUS_OK, "Setting uprobe event rule name: '%s'", trigger_name); diff --git a/tests/regression/tools/trigger/test_add_trigger_cli b/tests/regression/tools/trigger/test_add_trigger_cli index 029f17cef..bbb34b51f 100755 --- a/tests/regression/tools/trigger/test_add_trigger_cli +++ b/tests/regression/tools/trigger/test_add_trigger_cli @@ -23,7 +23,7 @@ TESTDIR="$CURDIR/../../.." # shellcheck source=../../../utils/utils.sh source "$TESTDIR/utils/utils.sh" -plan_tests 297 +plan_tests 288 FULL_LTTNG_BIN="${TESTDIR}/../src/bin/lttng/${LTTNG_BIN}" @@ -178,16 +178,14 @@ skip $ist_root "non-root user: skipping kprobe tests" 18 || { done } -skip $ist_root "non-root user: skipping uprobe tests" 12 || { - for type in uprobe userspace-probe; do - test_success "--condition event-rule-matches uprobe" \ - --condition event-rule-matches --domain=kernel --type=$type --location=${uprobe_elf_binary}:test_function --event-name=ma-probe \ - --action notify +skip $ist_root "non-root user: skipping uprobe tests" 6 || { + test_success "--condition event-rule-matches uprobe" \ + --condition event-rule-matches --domain=kernel --type=kernel:uprobe --location=${uprobe_elf_binary}:test_function --event-name=ma-probe \ + --action notify - test_success "--condition event-rule-matches uprobe with elf prefix" \ - --condition event-rule-matches --domain=kernel --type=$type --location=elf:${uprobe_elf_binary}:test_function --event-name=ma-probe-2 \ - --action notify - done + test_success "--condition event-rule-matches uprobe with elf prefix" \ + --condition event-rule-matches --domain=kernel --type=kernel:uprobe --location=elf:${uprobe_elf_binary}:test_function --event-name=ma-probe-2 \ + --action notify } skip $ist_root "non-root user: skipping syscall tests" 30 || { @@ -380,11 +378,9 @@ test_failure "--condition event-rule-matches: --event-name with tracepoint event "Error: Can't use --event-name with tracepoint event rules." \ --condition event-rule-matches --domain=user --event-name='hello' -for type in uprobe userspace-probe; do - test_failure "--condition event-rule-matches: extra argument with --type=$type" \ - "Error: Unexpected argument 'hello'" \ - --condition event-rule-matches --domain=kernel --type=$type --location=${uprobe_elf_binary}:test_failure hello -done +test_failure "--condition event-rule-matches: extra argument with --type=kernel:uprobe" \ + "Error: Unexpected argument 'hello'" \ + --condition event-rule-matches --domain=kernel --type=$type --location=${uprobe_elf_binary}:test_failure hello test_failure "--condition event-rule-matches: extra argument with --type=syscall" \ "Error: Unexpected argument 'open'" \ diff --git a/tests/regression/tools/trigger/test_list_triggers_cli b/tests/regression/tools/trigger/test_list_triggers_cli index cfeab29b7..a36393f13 100755 --- a/tests/regression/tools/trigger/test_list_triggers_cli +++ b/tests/regression/tools/trigger/test_list_triggers_cli @@ -261,13 +261,13 @@ test_event_rule_matches_userspace_probe_elf () diag "Listing event-rule-matches userspace-probe elf" - lttng_add_trigger_ok "T0" --condition event-rule-matches --domain=kernel --type=uprobe --location=${uprobe_elf_binary}:test_function --event-name=ma-probe-elf --action notify + lttng_add_trigger_ok "T0" --condition event-rule-matches --domain=kernel --type=kernel:uprobe --location=${uprobe_elf_binary}:test_function --event-name=ma-probe-elf --action notify cat > "${tmp_expected_stdout}" <<- EOF - name: T0 owner uid: ${uid} condition: event rule matches - rule: ma-probe-elf (type: userspace probe, location type: ELF, location: ${uprobe_elf_binary}:${elf_function_name}) + rule: ma-probe-elf (type: kernel:uprobe, location type: ELF, location: ${uprobe_elf_binary}:${elf_function_name}) actions: notify errors: none @@ -286,13 +286,13 @@ test_event_rule_matches_userspace_probe_sdt () diag "Listing event-rule-matches userspace-probe sdt" - lttng_add_trigger_ok "T0" --condition event-rule-matches --domain=kernel --type=uprobe --location=sdt:${uprobe_sdt_binary}:${sdt_provider_name}:${sdt_probe_name} --event-name=ma-probe-sdt --action notify + lttng_add_trigger_ok "T0" --condition event-rule-matches --domain=kernel --type=kernel:uprobe --location=sdt:${uprobe_sdt_binary}:${sdt_provider_name}:${sdt_probe_name} --event-name=ma-probe-sdt --action notify cat > "${tmp_expected_stdout}" <<- EOF - name: T0 owner uid: 0 condition: event rule matches - rule: ma-probe-sdt (type: userspace probe, location type: SDT, location: ${uprobe_sdt_binary}:${sdt_provider_name}:${sdt_probe_name}) + rule: ma-probe-sdt (type: kernel:uprobe, location type: SDT, location: ${uprobe_sdt_binary}:${sdt_provider_name}:${sdt_probe_name}) actions: notify errors: none diff --git a/tests/unit/test_event_rule.c b/tests/unit/test_event_rule.c index 6ec49fe66..091f53aba 100644 --- a/tests/unit/test_event_rule.c +++ b/tests/unit/test_event_rule.c @@ -24,8 +24,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include @@ -255,10 +255,10 @@ static void test_event_rule_userspace_probe(void) lttng_payload_init(&payload); - uprobe = lttng_event_rule_userspace_probe_create(probe_location); + uprobe = lttng_event_rule_kernel_uprobe_create(probe_location); ok(uprobe, "uprobe event rule object creation."); - status = lttng_event_rule_userspace_probe_get_location( + status = lttng_event_rule_kernel_uprobe_get_location( uprobe, &probe_location_tmp); ok(status == LTTNG_EVENT_RULE_STATUS_OK, "Getting uprobe event rule location."); @@ -266,10 +266,10 @@ static void test_event_rule_userspace_probe(void) probe_location, probe_location_tmp), "Location is equal."); - status = lttng_event_rule_userspace_probe_set_event_name(uprobe, probe_name); + status = lttng_event_rule_kernel_uprobe_set_event_name(uprobe, probe_name); ok(status == LTTNG_EVENT_RULE_STATUS_OK, "Setting uprobe event rule name: %s.", probe_name); - status = lttng_event_rule_userspace_probe_get_event_name(uprobe, &tmp); + status = lttng_event_rule_kernel_uprobe_get_event_name(uprobe, &tmp); ok(status == LTTNG_EVENT_RULE_STATUS_OK, "Getting uprobe name."); ok(!strcmp(probe_name, tmp), "Uprobe name are equal."); -- 2.34.1