From: Jonathan Rajotte Date: Tue, 11 May 2021 23:52:37 +0000 (-0400) Subject: Introduce lttng_event_rule_kernel_tracepoint X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=af0818efba7511c6cd42806504102151d1a4c973;p=lttng-tools.git Introduce lttng_event_rule_kernel_tracepoint A following patch will remove lttng_event_rule_tracepoint. Signed-off-by: Jonathan Rajotte Signed-off-by: Jérémie Galarneau Change-Id: I614e45be3ef5e41fa081ad24dc1a9dcddb7eb2af --- diff --git a/include/Makefile.am b/include/Makefile.am index 6b0343a62..f9d481379 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -154,8 +154,9 @@ lttngeventruleinclude_HEADERS= \ lttng/event-rule/event-rule.h \ lttng/event-rule/kernel-kprobe.h \ lttng/event-rule/kernel-syscall.h \ - lttng/event-rule/kernel-uprobe.h \ - lttng/event-rule/tracepoint.h + lttng/event-rule/tracepoint.h \ + lttng/event-rule/kernel-tracepoint.h \ + lttng/event-rule/kernel-uprobe.h noinst_HEADERS = \ lttng/action/action-internal.h \ @@ -184,6 +185,7 @@ noinst_HEADERS = \ lttng/event-rule/kernel-kprobe-internal.h \ lttng/event-rule/kernel-syscall-internal.h \ lttng/event-rule/tracepoint-internal.h \ + lttng/event-rule/kernel-tracepoint-internal.h \ lttng/event-rule/kernel-uprobe-internal.h \ lttng/health-internal.h \ lttng/kernel-probe-internal.h \ diff --git a/include/lttng/event-rule/event-rule.h b/include/lttng/event-rule/event-rule.h index df2056b35..975f5063e 100644 --- a/include/lttng/event-rule/event-rule.h +++ b/include/lttng/event-rule/event-rule.h @@ -20,7 +20,8 @@ enum lttng_event_rule_type { LTTNG_EVENT_RULE_TYPE_KERNEL_SYSCALL = 1, LTTNG_EVENT_RULE_TYPE_KERNEL_KPROBE = 2, LTTNG_EVENT_RULE_TYPE_KERNEL_FUNCTION = 3, - LTTNG_EVENT_RULE_TYPE_KERNEL_UPROBE = 4, + LTTNG_EVENT_RULE_TYPE_KERNEL_TRACEPOINT = 4, + LTTNG_EVENT_RULE_TYPE_KERNEL_UPROBE = 5, }; enum lttng_event_rule_status { diff --git a/include/lttng/event-rule/kernel-tracepoint-internal.h b/include/lttng/event-rule/kernel-tracepoint-internal.h new file mode 100644 index 000000000..f7065f924 --- /dev/null +++ b/include/lttng/event-rule/kernel-tracepoint-internal.h @@ -0,0 +1,52 @@ +/* + * Copyright (C) 2019 Jonathan Rajotte + * + * SPDX-License-Identifier: LGPL-2.1-only + * + */ + +#ifndef LTTNG_EVENT_RULE_KERNEL_TRACEPOINT_INTERNAL_H +#define LTTNG_EVENT_RULE_KERNEL_TRACEPOINT_INTERNAL_H + +#include +#include +#include +#include +#include +#include + +struct lttng_event_rule_kernel_tracepoint { + struct lttng_event_rule parent; + + /* Name pattern. */ + char *pattern; + + /* Filter. */ + char *filter_expression; + + /* internal use only. */ + struct { + char *filter; + struct lttng_bytecode *bytecode; + } internal_filter; +}; + +struct lttng_event_rule_kernel_tracepoint_comm { + /* Includes terminator `\0`. */ + uint32_t pattern_len; + /* Includes terminator `\0`. */ + uint32_t filter_expression_len; + /* + * Payload is composed of, in that order: + * - pattern (null terminated), + * - filter expression (null terminated), + */ + char payload[]; +} LTTNG_PACKED; + +LTTNG_HIDDEN +ssize_t lttng_event_rule_kernel_tracepoint_create_from_payload( + struct lttng_payload_view *view, + struct lttng_event_rule **rule); + +#endif /* LTTNG_EVENT_RULE_KERNEL_TRACEPOINT_INTERNAL_H */ diff --git a/include/lttng/event-rule/kernel-tracepoint.h b/include/lttng/event-rule/kernel-tracepoint.h new file mode 100644 index 000000000..84aa011e0 --- /dev/null +++ b/include/lttng/event-rule/kernel-tracepoint.h @@ -0,0 +1,84 @@ +/* + * Copyright (C) 2019 Jonathan Rajotte + * + * SPDX-License-Identifier: LGPL-2.1-only + * + */ + +#ifndef LTTNG_EVENT_RULE_KERNEL_TRACEPOINT_H +#define LTTNG_EVENT_RULE_KERNEL_TRACEPOINT_H + +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif + +/* + * Create a newly allocated kernel tracepoint event rule. + * + * The default pattern is '*'. + * + * 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_kernel_tracepoint_create(void); + +/* + * Set the name pattern of a kernel tracepoint event rule. + * + * Pattern can contain wildcard '*'. See man lttng-enable-event. + * + * 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_kernel_tracepoint_set_name_pattern( + struct lttng_event_rule *rule, const char *pattern); + +/* + * Get the name pattern of a kernel tracepoint event rule. + * + * The caller does not assume the ownership of the returned pattern. The + * pattern shall only only be used for the duration of the event rule's + * lifetime, or before a different pattern is set. + * + * Returns LTTNG_EVENT_RULE_STATUS_OK and a pointer to the event rule's pattern + * on success, LTTNG_EVENT_RULE_STATUS_INVALID if an invalid + * parameter is passed, or LTTNG_EVENT_RULE_STATUS_UNSET if a pattern + * was not set prior to this call. + */ +extern enum lttng_event_rule_status lttng_event_rule_kernel_tracepoint_get_name_pattern( + const struct lttng_event_rule *rule, const char **pattern); + +/* + * Set the filter expression of a kernel tracepoint event rule. + * + * The expression 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_kernel_tracepoint_set_filter( + struct lttng_event_rule *rule, const char *expression); + +/* + * Get the filter expression of a kernel tracepoint event rule. + * + * The caller does not assume the ownership of the returned filter expression. + * The filter expression shall only only be used for the duration of the event + * rule's lifetime, or before a different filter expression is set. + * + * Returns LTTNG_EVENT_RULE_STATUS_OK and a pointer to the event rule's filter + * expression on success, LTTNG_EVENT_RULE_STATUS_INVALID if an invalid + * parameter is passed, or LTTNG_EVENT_RULE_STATUS_UNSET if a filter expression + * was not set prior to this call. + */ +extern enum lttng_event_rule_status lttng_event_rule_kernel_tracepoint_get_filter( + const struct lttng_event_rule *rule, const char **expression); + +#ifdef __cplusplus +} +#endif + +#endif /* LTTNG_EVENT_RULE_KERNEL_TRACEPOINT_H */ diff --git a/include/lttng/lttng.h b/include/lttng/lttng.h index dc09f2037..566995868 100644 --- a/include/lttng/lttng.h +++ b/include/lttng/lttng.h @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 12a6ba807..381cf0546 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -69,6 +69,7 @@ libcommon_la_SOURCES = \ event-rule/kernel-syscall.c \ event-rule/kernel-uprobe.c \ event-rule/tracepoint.c \ + event-rule/kernel-tracepoint.c \ filter.c filter.h \ fd-handle.c fd-handle.h \ fs-handle.c fs-handle.h fs-handle-internal.h \ diff --git a/src/common/event-rule/event-rule.c b/src/common/event-rule/event-rule.c index 33e91cdfb..c38d647a1 100644 --- a/src/common/event-rule/event-rule.c +++ b/src/common/event-rule/event-rule.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include @@ -44,6 +45,7 @@ enum lttng_domain_type lttng_event_rule_get_domain_type( case LTTNG_EVENT_RULE_TYPE_KERNEL_KPROBE: case LTTNG_EVENT_RULE_TYPE_KERNEL_FUNCTION: case LTTNG_EVENT_RULE_TYPE_KERNEL_UPROBE: + case LTTNG_EVENT_RULE_TYPE_KERNEL_TRACEPOINT: domain_type = LTTNG_DOMAIN_KERNEL; break; case LTTNG_EVENT_RULE_TYPE_UNKNOWN: @@ -185,6 +187,11 @@ ssize_t lttng_event_rule_create_from_payload( create_from_payload = lttng_event_rule_kernel_syscall_create_from_payload; break; + case LTTNG_EVENT_RULE_TYPE_KERNEL_TRACEPOINT: + create_from_payload = + lttng_event_rule_kernel_tracepoint_create_from_payload; + break; + default: ERR("Attempted to create event rule of unknown type (%i)", (int) event_rule_comm->event_rule_type); @@ -321,6 +328,8 @@ const char *lttng_event_rule_type_str(enum lttng_event_rule_type type) return "function"; case LTTNG_EVENT_RULE_TYPE_KERNEL_UPROBE: return "kernel uprobe"; + case LTTNG_EVENT_RULE_TYPE_KERNEL_TRACEPOINT: + return "kernel tracepoint"; default: abort(); } diff --git a/src/common/event-rule/kernel-tracepoint.c b/src/common/event-rule/kernel-tracepoint.c new file mode 100644 index 000000000..11b34045f --- /dev/null +++ b/src/common/event-rule/kernel-tracepoint.c @@ -0,0 +1,525 @@ +/* + * Copyright (C) 2019 Jonathan Rajotte + * + * SPDX-License-Identifier: LGPL-2.1-only + * + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define IS_KERNEL_TRACEPOINT_EVENT_RULE(rule) \ + (lttng_event_rule_get_type(rule) == LTTNG_EVENT_RULE_TYPE_KERNEL_TRACEPOINT) + +static void lttng_event_rule_kernel_tracepoint_destroy(struct lttng_event_rule *rule) +{ + struct lttng_event_rule_kernel_tracepoint *tracepoint; + + if (rule == NULL) { + return; + } + + tracepoint = container_of( + rule, struct lttng_event_rule_kernel_tracepoint, parent); + + free(tracepoint->pattern); + free(tracepoint->filter_expression); + free(tracepoint->internal_filter.filter); + free(tracepoint->internal_filter.bytecode); + free(tracepoint); +} + +static bool lttng_event_rule_kernel_tracepoint_validate( + const struct lttng_event_rule *rule) +{ + bool valid = false; + struct lttng_event_rule_kernel_tracepoint *tracepoint; + + if (!rule) { + goto end; + } + + tracepoint = container_of( + rule, struct lttng_event_rule_kernel_tracepoint, parent); + + /* Required field. */ + if (!tracepoint->pattern) { + ERR("Invalid kernel tracepoint event rule: a pattern must be set."); + goto end; + } + + valid = true; +end: + return valid; +} + +static int lttng_event_rule_kernel_tracepoint_serialize( + const struct lttng_event_rule *rule, + struct lttng_payload *payload) +{ + int ret; + size_t pattern_len, filter_expression_len; + struct lttng_event_rule_kernel_tracepoint *tracepoint; + struct lttng_event_rule_kernel_tracepoint_comm tracepoint_comm; + + if (!rule || !IS_KERNEL_TRACEPOINT_EVENT_RULE(rule)) { + ret = -1; + goto end; + } + + DBG("Serializing kernel tracepoint event rule."); + tracepoint = container_of( + rule, struct lttng_event_rule_kernel_tracepoint, parent); + + pattern_len = strlen(tracepoint->pattern) + 1; + + if (tracepoint->filter_expression != NULL) { + filter_expression_len = + strlen(tracepoint->filter_expression) + 1; + } else { + filter_expression_len = 0; + } + + tracepoint_comm.pattern_len = pattern_len; + tracepoint_comm.filter_expression_len = filter_expression_len; + + ret = lttng_dynamic_buffer_append(&payload->buffer, &tracepoint_comm, + sizeof(tracepoint_comm)); + if (ret) { + goto end; + } + + ret = lttng_dynamic_buffer_append( + &payload->buffer, tracepoint->pattern, pattern_len); + if (ret) { + goto end; + } + + ret = lttng_dynamic_buffer_append(&payload->buffer, tracepoint->filter_expression, + filter_expression_len); + if (ret) { + goto end; + } + +end: + return ret; +} + +static bool lttng_event_rule_kernel_tracepoint_is_equal( + const struct lttng_event_rule *_a, + const struct lttng_event_rule *_b) +{ + bool is_equal = false; + struct lttng_event_rule_kernel_tracepoint *a, *b; + + a = container_of(_a, struct lttng_event_rule_kernel_tracepoint, parent); + b = container_of(_b, struct lttng_event_rule_kernel_tracepoint, parent); + + if (!!a->filter_expression != !!b->filter_expression) { + goto end; + } + + /* Long check. */ + assert(a->pattern); + assert(b->pattern); + if (strcmp(a->pattern, b->pattern)) { + goto end; + } + + if (a->filter_expression && b->filter_expression) { + if (strcmp(a->filter_expression, b->filter_expression)) { + goto end; + } + } else if (!!a->filter_expression != !!b->filter_expression) { + /* One is set; not the other. */ + goto end; + } + + is_equal = true; +end: + return is_equal; +} + +static enum lttng_error_code +lttng_event_rule_kernel_tracepoint_generate_filter_bytecode( + struct lttng_event_rule *rule, + const struct lttng_credentials *creds) +{ + int ret; + enum lttng_error_code ret_code; + struct lttng_event_rule_kernel_tracepoint *tracepoint; + enum lttng_event_rule_status status; + const char *filter; + struct lttng_bytecode *bytecode = NULL; + + assert(rule); + + tracepoint = container_of( + rule, struct lttng_event_rule_kernel_tracepoint, parent); + + status = lttng_event_rule_kernel_tracepoint_get_filter(rule, &filter); + if (status == LTTNG_EVENT_RULE_STATUS_UNSET) { + filter = NULL; + } else if (status != LTTNG_EVENT_RULE_STATUS_OK) { + ret_code = LTTNG_ERR_FILTER_INVAL; + goto end; + } + + if (filter && filter[0] == '\0') { + ret_code = LTTNG_ERR_FILTER_INVAL; + goto error; + } + + if (filter) { + tracepoint->internal_filter.filter = strdup(filter); + if (tracepoint->internal_filter.filter == NULL) { + ret_code = LTTNG_ERR_NOMEM; + goto error; + } + } else { + tracepoint->internal_filter.filter = NULL; + } + + if (tracepoint->internal_filter.filter == NULL) { + ret_code = LTTNG_OK; + goto end; + } + + ret = run_as_generate_filter_bytecode( + tracepoint->internal_filter.filter, creds, + &bytecode); + if (ret) { + ret_code = LTTNG_ERR_FILTER_INVAL; + goto end; + } + + tracepoint->internal_filter.bytecode = bytecode; + bytecode = NULL; + ret_code = LTTNG_OK; + +error: +end: + free(bytecode); + return ret_code; +} + +static const char *lttng_event_rule_kernel_tracepoint_get_internal_filter( + const struct lttng_event_rule *rule) +{ + struct lttng_event_rule_kernel_tracepoint *tracepoint; + + assert(rule); + tracepoint = container_of( + rule, struct lttng_event_rule_kernel_tracepoint, parent); + return tracepoint->internal_filter.filter; +} + +static const struct lttng_bytecode * +lttng_event_rule_kernel_tracepoint_get_internal_filter_bytecode( + const struct lttng_event_rule *rule) +{ + struct lttng_event_rule_kernel_tracepoint *tracepoint; + + assert(rule); + tracepoint = container_of( + rule, struct lttng_event_rule_kernel_tracepoint, parent); + return tracepoint->internal_filter.bytecode; +} + +static enum lttng_event_rule_generate_exclusions_status +lttng_event_rule_kernel_tracepoint_generate_exclusions( + const struct lttng_event_rule *rule, + struct lttng_event_exclusion **_exclusions) +{ + /* Unsupported. */ + *_exclusions = NULL; + return LTTNG_EVENT_RULE_GENERATE_EXCLUSIONS_STATUS_NONE; +} + +static unsigned long lttng_event_rule_kernel_tracepoint_hash( + const struct lttng_event_rule *rule) +{ + unsigned long hash; + struct lttng_event_rule_kernel_tracepoint *tp_rule = + container_of(rule, typeof(*tp_rule), parent); + + hash = hash_key_ulong((void *) LTTNG_EVENT_RULE_TYPE_KERNEL_TRACEPOINT, + lttng_ht_seed); + hash ^= hash_key_str(tp_rule->pattern, lttng_ht_seed); + + if (tp_rule->filter_expression) { + hash ^= hash_key_str(tp_rule->filter_expression, lttng_ht_seed); + } + + return hash; +} + +struct lttng_event_rule *lttng_event_rule_kernel_tracepoint_create(void) +{ + struct lttng_event_rule *rule = NULL; + struct lttng_event_rule_kernel_tracepoint *tp_rule; + enum lttng_event_rule_status status; + + tp_rule = zmalloc(sizeof(struct lttng_event_rule_kernel_tracepoint)); + if (!tp_rule) { + goto end; + } + + rule = &tp_rule->parent; + lttng_event_rule_init(&tp_rule->parent, LTTNG_EVENT_RULE_TYPE_KERNEL_TRACEPOINT); + tp_rule->parent.validate = lttng_event_rule_kernel_tracepoint_validate; + tp_rule->parent.serialize = lttng_event_rule_kernel_tracepoint_serialize; + tp_rule->parent.equal = lttng_event_rule_kernel_tracepoint_is_equal; + tp_rule->parent.destroy = lttng_event_rule_kernel_tracepoint_destroy; + tp_rule->parent.generate_filter_bytecode = + lttng_event_rule_kernel_tracepoint_generate_filter_bytecode; + tp_rule->parent.get_filter = + lttng_event_rule_kernel_tracepoint_get_internal_filter; + tp_rule->parent.get_filter_bytecode = + lttng_event_rule_kernel_tracepoint_get_internal_filter_bytecode; + tp_rule->parent.generate_exclusions = + lttng_event_rule_kernel_tracepoint_generate_exclusions; + tp_rule->parent.hash = lttng_event_rule_kernel_tracepoint_hash; + + /* Not necessary for now. */ + tp_rule->parent.generate_lttng_event = NULL; + + /* Default pattern is '*'. */ + status = lttng_event_rule_kernel_tracepoint_set_name_pattern(rule, "*"); + if (status != LTTNG_EVENT_RULE_STATUS_OK) { + lttng_event_rule_destroy(rule); + rule = NULL; + } + +end: + return rule; +} + +LTTNG_HIDDEN +ssize_t lttng_event_rule_kernel_tracepoint_create_from_payload( + struct lttng_payload_view *view, + struct lttng_event_rule **_event_rule) +{ + ssize_t ret, offset = 0; + enum lttng_event_rule_status status; + const struct lttng_event_rule_kernel_tracepoint_comm *tracepoint_comm; + const char *pattern; + const char *filter_expression = NULL; + struct lttng_buffer_view current_buffer_view; + struct lttng_event_rule *rule = NULL; + + if (!_event_rule) { + ret = -1; + goto end; + } + + current_buffer_view = lttng_buffer_view_from_view( + &view->buffer, offset, sizeof(*tracepoint_comm)); + if (!lttng_buffer_view_is_valid(¤t_buffer_view)) { + ERR("Failed to initialize from malformed event rule kernel tracepoint: buffer too short to contain header."); + ret = -1; + goto end; + } + + tracepoint_comm = (typeof(tracepoint_comm)) current_buffer_view.data; + + /* Skip to payload. */ + offset += current_buffer_view.size; + + /* Map the pattern. */ + current_buffer_view = lttng_buffer_view_from_view( + &view->buffer, offset, tracepoint_comm->pattern_len); + + if (!lttng_buffer_view_is_valid(¤t_buffer_view)) { + ret = -1; + goto end; + } + + pattern = current_buffer_view.data; + if (!lttng_buffer_view_contains_string(¤t_buffer_view, pattern, + tracepoint_comm->pattern_len)) { + ret = -1; + goto end; + } + + /* Skip after the pattern. */ + offset += tracepoint_comm->pattern_len; + + if (!tracepoint_comm->filter_expression_len) { + goto skip_filter_expression; + } + + /* Map the filter_expression. */ + current_buffer_view = lttng_buffer_view_from_view(&view->buffer, offset, + tracepoint_comm->filter_expression_len); + if (!lttng_buffer_view_is_valid(¤t_buffer_view)) { + ret = -1; + goto end; + } + + filter_expression = current_buffer_view.data; + if (!lttng_buffer_view_contains_string(¤t_buffer_view, + filter_expression, + tracepoint_comm->filter_expression_len)) { + ret = -1; + goto end; + } + + /* Skip after the pattern. */ + offset += tracepoint_comm->filter_expression_len; + +skip_filter_expression: + + rule = lttng_event_rule_kernel_tracepoint_create(); + if (!rule) { + ERR("Failed to create event rule kernel tracepoint."); + ret = -1; + goto end; + } + + status = lttng_event_rule_kernel_tracepoint_set_name_pattern(rule, pattern); + if (status != LTTNG_EVENT_RULE_STATUS_OK) { + ERR("Failed to set event rule kernel tracepoint pattern."); + ret = -1; + goto end; + } + + if (filter_expression) { + status = lttng_event_rule_kernel_tracepoint_set_filter( + rule, filter_expression); + if (status != LTTNG_EVENT_RULE_STATUS_OK) { + ERR("Failed to set event rule kernel tracepoint pattern."); + ret = -1; + goto end; + } + } + + *_event_rule = rule; + rule = NULL; + ret = offset; +end: + lttng_event_rule_destroy(rule); + return ret; +} + +enum lttng_event_rule_status lttng_event_rule_kernel_tracepoint_set_name_pattern( + struct lttng_event_rule *rule, const char *pattern) +{ + char *pattern_copy = NULL; + struct lttng_event_rule_kernel_tracepoint *tracepoint; + enum lttng_event_rule_status status = LTTNG_EVENT_RULE_STATUS_OK; + + if (!rule || !IS_KERNEL_TRACEPOINT_EVENT_RULE(rule) || !pattern || + strlen(pattern) == 0) { + status = LTTNG_EVENT_RULE_STATUS_INVALID; + goto end; + } + + tracepoint = container_of( + rule, struct lttng_event_rule_kernel_tracepoint, parent); + pattern_copy = strdup(pattern); + if (!pattern_copy) { + status = LTTNG_EVENT_RULE_STATUS_ERROR; + goto end; + } + + /* Normalize the pattern. */ + strutils_normalize_star_glob_pattern(pattern_copy); + + free(tracepoint->pattern); + + tracepoint->pattern = pattern_copy; + pattern_copy = NULL; +end: + return status; +} + +enum lttng_event_rule_status lttng_event_rule_kernel_tracepoint_get_name_pattern( + const struct lttng_event_rule *rule, const char **pattern) +{ + struct lttng_event_rule_kernel_tracepoint *tracepoint; + enum lttng_event_rule_status status = LTTNG_EVENT_RULE_STATUS_OK; + + if (!rule || !IS_KERNEL_TRACEPOINT_EVENT_RULE(rule) || !pattern) { + status = LTTNG_EVENT_RULE_STATUS_INVALID; + goto end; + } + + tracepoint = container_of( + rule, struct lttng_event_rule_kernel_tracepoint, parent); + if (!tracepoint->pattern) { + status = LTTNG_EVENT_RULE_STATUS_UNSET; + goto end; + } + + *pattern = tracepoint->pattern; +end: + return status; +} + +enum lttng_event_rule_status lttng_event_rule_kernel_tracepoint_set_filter( + struct lttng_event_rule *rule, const char *expression) +{ + char *expression_copy = NULL; + struct lttng_event_rule_kernel_tracepoint *tracepoint; + enum lttng_event_rule_status status = LTTNG_EVENT_RULE_STATUS_OK; + + if (!rule || !IS_KERNEL_TRACEPOINT_EVENT_RULE(rule) || !expression || + strlen(expression) == 0) { + status = LTTNG_EVENT_RULE_STATUS_INVALID; + goto end; + } + + tracepoint = container_of( + rule, struct lttng_event_rule_kernel_tracepoint, parent); + expression_copy = strdup(expression); + if (!expression_copy) { + PERROR("Failed to copy filter expression"); + status = LTTNG_EVENT_RULE_STATUS_ERROR; + goto end; + } + + if (tracepoint->filter_expression) { + free(tracepoint->filter_expression); + } + + tracepoint->filter_expression = expression_copy; + expression_copy = NULL; +end: + return status; +} + +enum lttng_event_rule_status lttng_event_rule_kernel_tracepoint_get_filter( + const struct lttng_event_rule *rule, const char **expression) +{ + struct lttng_event_rule_kernel_tracepoint *tracepoint; + enum lttng_event_rule_status status = LTTNG_EVENT_RULE_STATUS_OK; + + if (!rule || !IS_KERNEL_TRACEPOINT_EVENT_RULE(rule) || !expression) { + status = LTTNG_EVENT_RULE_STATUS_INVALID; + goto end; + } + + tracepoint = container_of( + rule, struct lttng_event_rule_kernel_tracepoint, parent); + if (!tracepoint->filter_expression) { + status = LTTNG_EVENT_RULE_STATUS_UNSET; + goto end; + } + + *expression = tracepoint->filter_expression; +end: + return status; +} diff --git a/tests/unit/test_event_rule.c b/tests/unit/test_event_rule.c index 8d2ffe35f..869b27a50 100644 --- a/tests/unit/test_event_rule.c +++ b/tests/unit/test_event_rule.c @@ -24,6 +24,8 @@ #include #include #include +#include +#include #include #include #include @@ -38,7 +40,7 @@ int lttng_opt_quiet = 1; int lttng_opt_verbose; int lttng_opt_mi; -#define NUM_TESTS 246 +#define NUM_TESTS 254 struct tracepoint_test { enum lttng_domain_type type; @@ -170,6 +172,55 @@ void test_event_rule_tracepoint(void) } } +static +void test_event_rule_kernel_tracepoint(void) +{ + struct lttng_event_rule *tracepoint = NULL; + struct lttng_event_rule *tracepoint_from_buffer = NULL; + enum lttng_event_rule_status status; + const char *pattern="my_event_*"; + const char *filter="msg_id == 23 && size >= 2048"; + const char *tmp; + struct lttng_payload payload; + + diag("Testing lttng_event_rule_kernel_tracepoint."); + + lttng_payload_init(&payload); + + tracepoint = lttng_event_rule_kernel_tracepoint_create(); + ok(tracepoint, "tracepoint object."); + + status = lttng_event_rule_kernel_tracepoint_set_name_pattern(tracepoint, pattern); + ok(status == LTTNG_EVENT_RULE_STATUS_OK, "setting pattern."); + status = lttng_event_rule_kernel_tracepoint_get_name_pattern(tracepoint, &tmp); + ok(status == LTTNG_EVENT_RULE_STATUS_OK, "getting pattern."); + ok(!strncmp(pattern, tmp, strlen(pattern)), "pattern is equal."); + + status = lttng_event_rule_kernel_tracepoint_set_filter(tracepoint, filter); + ok(status == LTTNG_EVENT_RULE_STATUS_OK, "setting filter."); + status = lttng_event_rule_kernel_tracepoint_get_filter(tracepoint, &tmp); + ok(status == LTTNG_EVENT_RULE_STATUS_OK, "getting filter."); + ok(!strncmp(filter, tmp, strlen(filter)), "filter is equal."); + + ok(lttng_event_rule_serialize(tracepoint, &payload) == 0, "Serializing."); + + { + struct lttng_payload_view view = + lttng_payload_view_from_payload( + &payload, 0, -1); + + ok(lttng_event_rule_create_from_payload( + &view, &tracepoint_from_buffer) > 0, + "Deserializing."); + } + + ok(lttng_event_rule_is_equal(tracepoint, tracepoint_from_buffer), "serialized and from buffer are equal."); + + lttng_payload_reset(&payload); + lttng_event_rule_destroy(tracepoint); + lttng_event_rule_destroy(tracepoint_from_buffer); +} + static void test_event_rule_syscall(void) { struct lttng_event_rule *syscall = NULL; @@ -389,25 +440,6 @@ static void test_set_event_rule_log_level_rules( lttng_log_level_rule_destroy(log_level_rule); } -static void test_event_rule_log_level_kernel(void) -{ - struct lttng_event_rule *kernel_tracepoint_rule; - enum lttng_event_rule_status er_exactly_status, er_as_severe_status; - - diag("Test kernel event rule + log level rule"); - kernel_tracepoint_rule = - lttng_event_rule_tracepoint_create(LTTNG_DOMAIN_KERNEL); - assert(kernel_tracepoint_rule); - - test_set_event_rule_log_level_rules(kernel_tracepoint_rule, 0, &er_exactly_status, &er_as_severe_status); - ok(er_exactly_status == LTTNG_EVENT_RULE_STATUS_UNSUPPORTED, - "Log level rule \"exactly\" rejected by kernel tracepoint event rule (unsupported)"); - ok(er_as_severe_status == LTTNG_EVENT_RULE_STATUS_UNSUPPORTED, - "Log level rule \"at least as severe as\" rejected by kernel tracepoint event rule (unsupported)"); - - lttng_event_rule_destroy(kernel_tracepoint_rule); -} - static void test_event_rule_log_level_generic(const char *domain_name, enum lttng_domain_type domain, log_level_name_getter get_log_level_name, @@ -593,10 +625,10 @@ int main(int argc, const char *argv[]) { plan_tests(NUM_TESTS); test_event_rule_tracepoint(); + test_event_rule_kernel_tracepoint(); test_event_rule_syscall(); test_event_rule_userspace_probe(); test_event_rule_kernel_probe(); - test_event_rule_log_level_kernel(); test_event_rule_log_level_ust(); test_event_rule_log_level_jul(); test_event_rule_log_level_log4j();