X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftrace-kernel.c;h=b550ccab5e12ba8214aea4fe4182c8e5d5092d3e;hb=refs%2Fheads%2Fsow-2020-0002-rev2;hp=22c602ceec7f714ef83666c45b82169b927e7698;hpb=55c9e7cac24318259d4f2549c97f7577b7b52db4;p=lttng-tools.git diff --git a/src/bin/lttng-sessiond/trace-kernel.c b/src/bin/lttng-sessiond/trace-kernel.c index 22c602cee..b550ccab5 100644 --- a/src/bin/lttng-sessiond/trace-kernel.c +++ b/src/bin/lttng-sessiond/trace-kernel.c @@ -1,18 +1,8 @@ /* - * Copyright (C) 2011 - David Goulet + * Copyright (C) 2011 David Goulet * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2 only, - * as published by the Free Software Foundation. + * SPDX-License-Identifier: GPL-2.0-only * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #define _LGPL_SOURCE @@ -23,18 +13,50 @@ #include #include +#include +#include #include #include - +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include +#include #include "consumer.h" #include "trace-kernel.h" #include "lttng-sessiond.h" #include "notification-thread-commands.h" +/* Next available map key. Access under next_map_key_lock. */ +static uint64_t _next_map_key; +static pthread_mutex_t next_map_key_lock = PTHREAD_MUTEX_INITIALIZER; + +/* + * Return the incremented value of next_map_key. + */ +static uint64_t get_next_map_key(void) +{ + uint64_t ret; + + pthread_mutex_lock(&next_map_key_lock); + ret = ++_next_map_key; + pthread_mutex_unlock(&next_map_key_lock); + return ret; +} + /* * Find the channel name for the given kernel session. */ @@ -66,20 +88,52 @@ struct ltt_kernel_channel *trace_kernel_get_channel_by_name( } /* - * Find the event for the given channel. + * Find the map name for the given kernel session. + */ +struct ltt_kernel_map *trace_kernel_get_map_by_name( + const char *name, struct ltt_kernel_session *session) +{ + struct ltt_kernel_map *map; + + assert(session); + assert(name); + + DBG("Trying to find map %s", name); + + cds_list_for_each_entry(map, &session->map_list.head, list) { + enum lttng_map_status status; + const char *cur_map_name; + + status = lttng_map_get_name(map->map, &cur_map_name); + assert(status == LTTNG_MAP_STATUS_OK); + + if (strcmp(name, cur_map_name) == 0) { + DBG("Found map by name %s", name); + return map; + } + } + + return NULL; +} + +/* + * Find the event for the given channel or map. */ struct ltt_kernel_event *trace_kernel_find_event( - char *name, struct ltt_kernel_channel *channel, + struct ltt_kernel_event_list *events_list, + uint64_t tracer_token, char *name, enum lttng_event_type type, - struct lttng_filter_bytecode *filter) + struct lttng_bytecode *filter) { struct ltt_kernel_event *ev; int found = 0; assert(name); - assert(channel); - cds_list_for_each_entry(ev, &channel->events_list.head, list) { + cds_list_for_each_entry(ev, &events_list->head, list) { + if (ev->event->token != tracer_token) { + continue; + } if (type != LTTNG_EVENT_ALL && ev->type != type) { continue; } @@ -100,10 +154,10 @@ struct ltt_kernel_event *trace_kernel_find_event( break; } if (found) { - DBG("Found event %s for channel %s", name, - channel->channel->name); + DBG("Kernel event %s found", name); return ev; } else { + DBG("Kernel event %s not found", name); return NULL; } } @@ -160,32 +214,34 @@ struct ltt_kernel_session *trace_kernel_create_session(void) lks->fd = -1; lks->metadata_stream_fd = -1; lks->channel_count = 0; + lks->map_count = 0; lks->stream_count_global = 0; lks->metadata = NULL; CDS_INIT_LIST_HEAD(&lks->channel_list.head); + CDS_INIT_LIST_HEAD(&lks->map_list.head); - lks->tracker_list_pid = lttng_tracker_list_create(); - if (!lks->tracker_list_pid) { + lks->tracker_pid = process_attr_tracker_create(); + if (!lks->tracker_pid) { goto error; } - lks->tracker_list_vpid = lttng_tracker_list_create(); - if (!lks->tracker_list_vpid) { + lks->tracker_vpid = process_attr_tracker_create(); + if (!lks->tracker_vpid) { goto error; } - lks->tracker_list_uid = lttng_tracker_list_create(); - if (!lks->tracker_list_uid) { + lks->tracker_uid = process_attr_tracker_create(); + if (!lks->tracker_uid) { goto error; } - lks->tracker_list_vuid = lttng_tracker_list_create(); - if (!lks->tracker_list_vuid) { + lks->tracker_vuid = process_attr_tracker_create(); + if (!lks->tracker_vuid) { goto error; } - lks->tracker_list_gid = lttng_tracker_list_create(); - if (!lks->tracker_list_gid) { + lks->tracker_gid = process_attr_tracker_create(); + if (!lks->tracker_gid) { goto error; } - lks->tracker_list_vgid = lttng_tracker_list_create(); - if (!lks->tracker_list_vgid) { + lks->tracker_vgid = process_attr_tracker_create(); + if (!lks->tracker_vgid) { goto error; } lks->consumer = consumer_create_output(CONSUMER_DST_LOCAL); @@ -196,12 +252,12 @@ struct ltt_kernel_session *trace_kernel_create_session(void) return lks; error: - lttng_tracker_list_destroy(lks->tracker_list_pid); - lttng_tracker_list_destroy(lks->tracker_list_vpid); - lttng_tracker_list_destroy(lks->tracker_list_uid); - lttng_tracker_list_destroy(lks->tracker_list_vuid); - lttng_tracker_list_destroy(lks->tracker_list_gid); - lttng_tracker_list_destroy(lks->tracker_list_vgid); + process_attr_tracker_destroy(lks->tracker_pid); + process_attr_tracker_destroy(lks->tracker_vpid); + process_attr_tracker_destroy(lks->tracker_uid); + process_attr_tracker_destroy(lks->tracker_vuid); + process_attr_tracker_destroy(lks->tracker_gid); + process_attr_tracker_destroy(lks->tracker_vgid); free(lks); alloc_error: @@ -274,6 +330,68 @@ error: return NULL; } +struct ltt_kernel_map *trace_kernel_create_map( + const struct lttng_map *map) +{ + struct ltt_kernel_map *kernel_map = NULL; + unsigned int i, number_dimensions; + + kernel_map = zmalloc(sizeof(*kernel_map)); + if (!kernel_map) { + PERROR("ltt_kernel_map zmalloc"); + goto end; + } + + switch (lttng_map_get_boundary_policy(map)) { + case LTTNG_MAP_BOUNDARY_POLICY_OVERFLOW: + kernel_map->counter_conf.arithmetic = LTTNG_KERNEL_COUNTER_ARITHMETIC_MODULAR; + break; + default: + abort(); + } + + switch (lttng_map_get_bitness(map)) { + case LTTNG_MAP_BITNESS_32BITS: + kernel_map->counter_conf.bitness = LTTNG_KERNEL_COUNTER_BITNESS_32; + break; + case LTTNG_MAP_BITNESS_64BITS: + kernel_map->counter_conf.bitness = LTTNG_KERNEL_COUNTER_BITNESS_64; + break; + default: + abort(); + } + + kernel_map->counter_conf.coalesce_hits = lttng_map_get_coalesce_hits(map); + + number_dimensions = lttng_map_get_dimension_count(map); + assert(number_dimensions <= LTTNG_KERNEL_COUNTER_DIMENSION_MAX); + + kernel_map->counter_conf.number_dimensions = number_dimensions; + + for (i = 0; i < kernel_map->counter_conf.number_dimensions; i++) { + enum lttng_map_status map_status; + uint64_t dimension_length; + + map_status = lttng_map_get_dimension_length(map, i, + &dimension_length); + assert(map_status == LTTNG_MAP_STATUS_OK); + + kernel_map->counter_conf.dimensions[i].size = dimension_length; + + //FIXME: We need to turn on overflow and underflow + kernel_map->counter_conf.dimensions[i].has_overflow = false; + kernel_map->counter_conf.dimensions[i].has_underflow = false; + } + + kernel_map->fd = -1; + kernel_map->enabled = 1; + kernel_map->key = get_next_map_key(); + + kernel_map->event_counters_ht = lttng_ht_new(0, LTTNG_HT_TYPE_U64); +end: + return kernel_map; +} + /* * Allocate and init a kernel context object. * @@ -330,7 +448,7 @@ error: */ enum lttng_error_code trace_kernel_create_event( struct lttng_event *ev, char *filter_expression, - struct lttng_filter_bytecode *filter, + struct lttng_bytecode *filter, struct ltt_kernel_event **kernel_event) { enum lttng_error_code ret; @@ -378,9 +496,6 @@ enum lttng_error_code trace_kernel_create_event( */ attr->instrumentation = LTTNG_KERNEL_UPROBE; - /* - * Only the elf lookup method is supported at the moment. - */ lookup = lttng_userspace_probe_location_get_lookup_method( location); if (!lookup) { @@ -400,16 +515,10 @@ enum lttng_error_code trace_kernel_create_event( /* * Save a reference to the probe location used during - * the listing of events. Close its FD since it won't - * be needed for listing. + * the listing of events. */ userspace_probe_location = lttng_userspace_probe_location_copy(location); - ret = lttng_userspace_probe_location_function_set_binary_fd( - userspace_probe_location, -1); - if (ret) { - goto error; - } break; case LTTNG_USERSPACE_PROBE_LOCATION_LOOKUP_METHOD_TYPE_TRACEPOINT_SDT: /* Get the file descriptor on the target binary. */ @@ -418,15 +527,10 @@ enum lttng_error_code trace_kernel_create_event( /* * Save a reference to the probe location used during the listing of - * events. Close its FD since it won't be needed for listing. + * events. */ userspace_probe_location = lttng_userspace_probe_location_copy(location); - ret = lttng_userspace_probe_location_tracepoint_set_binary_fd( - userspace_probe_location, -1); - if (ret) { - goto error; - } break; default: DBG("Unsupported lookup method type"); @@ -454,6 +558,9 @@ enum lttng_error_code trace_kernel_create_event( break; case LTTNG_EVENT_SYSCALL: attr->instrumentation = LTTNG_KERNEL_SYSCALL; + attr->u.syscall.abi = LTTNG_KERNEL_SYSCALL_ABI_ALL; + attr->u.syscall.entryexit = LTTNG_KERNEL_SYSCALL_ENTRYEXIT; + attr->u.syscall.match = LTTNG_KERNEL_SYSCALL_MATCH_NAME; break; case LTTNG_EVENT_ALL: attr->instrumentation = LTTNG_KERNEL_ALL; @@ -488,6 +595,323 @@ error: return ret; } +/* + * Allocate and initialize a kernel token event rule. + * + * Return pointer to structure or NULL. + */ +enum lttng_error_code trace_kernel_create_event_notifier_rule( + struct lttng_trigger *trigger, + uint64_t token, + uint64_t error_counter_index, + struct ltt_kernel_event_notifier_rule **event_notifier_rule) +{ + enum lttng_error_code ret = LTTNG_OK; + enum lttng_condition_type condition_type; + enum lttng_event_rule_type event_rule_type; + enum lttng_condition_status condition_status; + struct ltt_kernel_event_notifier_rule *local_kernel_token_event_rule; + const struct lttng_condition *condition = NULL; + const struct lttng_event_rule *event_rule = NULL; + + assert(event_notifier_rule); + + condition = lttng_trigger_get_condition(trigger); + assert(condition); + + condition_type = lttng_condition_get_type(condition); + assert(condition_type == LTTNG_CONDITION_TYPE_ON_EVENT); + + condition_status = lttng_condition_on_event_get_rule( + condition, &event_rule); + assert(condition_status == LTTNG_CONDITION_STATUS_OK); + assert(event_rule); + + event_rule_type = lttng_event_rule_get_type(event_rule); + assert(event_rule_type != LTTNG_EVENT_RULE_TYPE_UNKNOWN); + + local_kernel_token_event_rule = + zmalloc(sizeof(struct ltt_kernel_event_notifier_rule)); + if (local_kernel_token_event_rule == NULL) { + PERROR("Failed to allocate ltt_kernel_token_event_rule structure"); + ret = LTTNG_ERR_NOMEM; + goto error; + } + + local_kernel_token_event_rule->fd = -1; + local_kernel_token_event_rule->enabled = 1; + local_kernel_token_event_rule->token = token; + local_kernel_token_event_rule->error_counter_index = error_counter_index; + + /* Get the reference of the event rule. */ + lttng_trigger_get(trigger); + + local_kernel_token_event_rule->trigger = trigger; + /* The event rule still owns the filter and bytecode. */ + local_kernel_token_event_rule->filter = + lttng_event_rule_get_filter_bytecode(event_rule); + + DBG3("Created kernel event notifier rule: token = %" PRIu64, + local_kernel_token_event_rule->token); +error: + *event_notifier_rule = local_kernel_token_event_rule; + return ret; +} + +enum trace_kernel_event_type { + TRACE_KERNEL_EVENT_TYPE_NOTIFIER, + TRACE_KERNEL_EVENT_TYPE_COUNTER, +}; + +/* + * Initialize a kernel event from an event rule. + */ +static +enum lttng_error_code trace_kernel_init_event_from_event_rule( + const struct lttng_event_rule *rule, + struct lttng_kernel_event *kernel_event, + enum trace_kernel_event_type event_type) +{ + enum lttng_error_code ret_code; + const char *name; + int strncpy_ret; + + switch (lttng_event_rule_get_type(rule)) { + case LTTNG_EVENT_RULE_TYPE_KERNEL_PROBE: + { + uint64_t address = 0, offset = 0; + const char *symbol_name = NULL; + const struct lttng_kernel_probe_location *location = NULL; + enum lttng_kernel_probe_location_status k_status; + enum lttng_event_rule_status status; + + status = lttng_event_rule_kernel_probe_get_location(rule, &location); + if (status != LTTNG_EVENT_RULE_STATUS_OK) { + ret_code = LTTNG_ERR_PROBE_LOCATION_INVAL; + goto error; + } + + switch (lttng_kernel_probe_location_get_type(location)) { + case LTTNG_KERNEL_PROBE_LOCATION_TYPE_ADDRESS: + { + k_status = lttng_kernel_probe_location_address_get_address( + location, &address); + assert(k_status == LTTNG_KERNEL_PROBE_LOCATION_STATUS_OK); + break; + } + case LTTNG_KERNEL_PROBE_LOCATION_TYPE_SYMBOL_OFFSET: + { + k_status = lttng_kernel_probe_location_symbol_get_offset( + location, &offset); + assert(k_status == LTTNG_KERNEL_PROBE_LOCATION_STATUS_OK); + symbol_name = lttng_kernel_probe_location_symbol_get_name( + location); + break; + } + default: + abort(); + } + + kernel_event->instrumentation = LTTNG_KERNEL_KPROBE; + kernel_event->u.kprobe.addr = address; + kernel_event->u.kprobe.offset = offset; + if (symbol_name) { + strncpy_ret = lttng_strncpy( + kernel_event->u.kprobe.symbol_name, + symbol_name, LTTNG_KERNEL_SYM_NAME_LEN); + + if (strncpy_ret) { + ret_code = LTTNG_ERR_INVALID; + goto error; + } + } + + kernel_event->u.kprobe.symbol_name[LTTNG_KERNEL_SYM_NAME_LEN - 1] = '\0'; + + status = lttng_event_rule_kernel_probe_get_event_name(rule, &name); + assert(status == LTTNG_EVENT_RULE_STATUS_OK); + ret_code = LTTNG_OK; + break; + } + case LTTNG_EVENT_RULE_TYPE_KERNEL_FUNCTION: + { + uint64_t address = 0, offset = 0; + const char *symbol_name = NULL; + const struct lttng_kernel_function_location *location = NULL; + enum lttng_kernel_function_location_status k_status; + enum lttng_event_rule_status status; + + status = lttng_event_rule_kernel_function_get_location(rule, &location); + if (status != LTTNG_EVENT_RULE_STATUS_OK) { + ret_code = LTTNG_ERR_PROBE_LOCATION_INVAL; + goto error; + } + + switch (lttng_kernel_function_location_get_type(location)) { + case LTTNG_KERNEL_FUNCTION_LOCATION_TYPE_ADDRESS: + { + k_status = lttng_kernel_function_location_address_get_address( + location, &address); + assert(k_status == LTTNG_KERNEL_FUNCTION_LOCATION_STATUS_OK); + break; + } + case LTTNG_KERNEL_FUNCTION_LOCATION_TYPE_SYMBOL_OFFSET: + { + k_status = lttng_kernel_function_location_symbol_get_offset( + location, &offset); + assert(k_status == LTTNG_KERNEL_FUNCTION_LOCATION_STATUS_OK); + symbol_name = lttng_kernel_function_location_symbol_get_name( + location); + break; + } + default: + abort(); + } + + kernel_event->instrumentation = LTTNG_KERNEL_KRETPROBE; + kernel_event->u.kretprobe.addr = address; + kernel_event->u.kretprobe.offset = offset; + if (symbol_name) { + strncpy_ret = lttng_strncpy( + kernel_event->u.kretprobe.symbol_name, + symbol_name, LTTNG_KERNEL_SYM_NAME_LEN); + + if (strncpy_ret) { + ret_code = LTTNG_ERR_INVALID; + goto error; + } + } + + kernel_event->u.kretprobe.symbol_name[LTTNG_KERNEL_SYM_NAME_LEN - 1] = '\0'; + + status = lttng_event_rule_kernel_function_get_event_name(rule, &name); + assert(status == LTTNG_EVENT_RULE_STATUS_OK); + ret_code = LTTNG_OK; + break; + } + case LTTNG_EVENT_RULE_TYPE_USERSPACE_PROBE: + { + 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); + if (status != LTTNG_EVENT_RULE_STATUS_OK) { + ret_code = LTTNG_ERR_PROBE_LOCATION_INVAL; + goto error; + } + + kernel_event->instrumentation = LTTNG_KERNEL_UPROBE; + + lookup = lttng_userspace_probe_location_get_lookup_method( + location); + if (!lookup) { + ret_code = LTTNG_ERR_PROBE_LOCATION_INVAL; + goto error; + } + + /* + * From the kernel tracer's perspective, all userspace probe + * event types are all the same: a file and an offset. + */ + switch (lttng_userspace_probe_location_lookup_method_get_type(lookup)) { + case LTTNG_USERSPACE_PROBE_LOCATION_LOOKUP_METHOD_TYPE_FUNCTION_ELF: + /* Get the file descriptor on the target binary. */ + kernel_event->u.uprobe.fd = + lttng_userspace_probe_location_function_get_binary_fd(location); + + break; + case LTTNG_USERSPACE_PROBE_LOCATION_LOOKUP_METHOD_TYPE_TRACEPOINT_SDT: + /* Get the file descriptor on the target binary. */ + kernel_event->u.uprobe.fd = + lttng_userspace_probe_location_tracepoint_get_binary_fd(location); + break; + default: + abort(); + } + + status = lttng_event_rule_userspace_probe_get_event_name(rule, &name); + assert(status == LTTNG_EVENT_RULE_STATUS_OK); + ret_code = LTTNG_OK; + break; + } + case LTTNG_EVENT_RULE_TYPE_TRACEPOINT: + { + const enum lttng_domain_type domain = + lttng_event_rule_get_domain_type(rule); + const enum lttng_event_rule_status status = + lttng_event_rule_tracepoint_get_pattern( + rule, &name); + + assert(domain == LTTNG_DOMAIN_KERNEL); + assert(status == LTTNG_EVENT_RULE_STATUS_OK); + kernel_event->instrumentation = + LTTNG_KERNEL_TRACEPOINT; + + ret_code = LTTNG_OK; + break; + } + case LTTNG_EVENT_RULE_TYPE_SYSCALL: + { + const enum lttng_event_rule_status status = + lttng_event_rule_syscall_get_pattern( + rule, &name); + + assert(status == LTTNG_EVENT_RULE_STATUS_OK); + + kernel_event->instrumentation = + LTTNG_KERNEL_SYSCALL; + kernel_event->u.syscall.abi = + LTTNG_KERNEL_SYSCALL_ABI_ALL; + kernel_event->u.syscall.match = + LTTNG_KERNEL_SYSCALL_MATCH_NAME; + switch (event_type) { + case TRACE_KERNEL_EVENT_TYPE_COUNTER: + kernel_event->u.syscall.entryexit = + LTTNG_KERNEL_SYSCALL_ENTRYEXIT; + break; + case TRACE_KERNEL_EVENT_TYPE_NOTIFIER: + kernel_event->u.syscall.entryexit = + LTTNG_KERNEL_SYSCALL_ENTRY; + break; + } + ret_code = LTTNG_OK; + break; + } + default: + abort(); + break; + } + + strncpy_ret = lttng_strncpy(kernel_event->name, name, + LTTNG_KERNEL_SYM_NAME_LEN); + if (strncpy_ret) { + ret_code = LTTNG_ERR_INVALID; + goto error; + } + +error: + return ret_code; +} + +enum lttng_error_code trace_kernel_init_event_notifier_from_event_rule( + const struct lttng_event_rule *rule, + struct lttng_kernel_event_notifier *kernel_event_notifier) +{ + return trace_kernel_init_event_from_event_rule(rule, + &kernel_event_notifier->event, + TRACE_KERNEL_EVENT_TYPE_NOTIFIER); +} + +enum lttng_error_code trace_kernel_init_event_counter_from_event_rule( + const struct lttng_event_rule *rule, + struct lttng_kernel_counter_event *kernel_counter_event) +{ + return trace_kernel_init_event_from_event_rule(rule, + &kernel_counter_event->event, + TRACE_KERNEL_EVENT_TYPE_COUNTER); +} + /* * Allocate and initialize a kernel metadata. * @@ -495,6 +919,7 @@ error: */ struct ltt_kernel_metadata *trace_kernel_create_metadata(void) { + int ret; struct ltt_kernel_metadata *lkm; struct lttng_channel *chan; @@ -505,13 +930,38 @@ struct ltt_kernel_metadata *trace_kernel_create_metadata(void) goto error; } + ret = lttng_strncpy( + chan->name, DEFAULT_METADATA_NAME, sizeof(chan->name)); + if (ret) { + ERR("Failed to initialize metadata channel name to `%s`", + DEFAULT_METADATA_NAME); + goto error; + } + /* Set default attributes */ - chan->attr.overwrite = DEFAULT_CHANNEL_OVERWRITE; + chan->attr.overwrite = DEFAULT_METADATA_OVERWRITE; chan->attr.subbuf_size = default_get_metadata_subbuf_size(); chan->attr.num_subbuf = DEFAULT_METADATA_SUBBUF_NUM; - chan->attr.switch_timer_interval = DEFAULT_KERNEL_CHANNEL_SWITCH_TIMER; - chan->attr.read_timer_interval = DEFAULT_KERNEL_CHANNEL_READ_TIMER; - chan->attr.output = DEFAULT_KERNEL_CHANNEL_OUTPUT; + chan->attr.switch_timer_interval = DEFAULT_METADATA_SWITCH_TIMER; + chan->attr.read_timer_interval = DEFAULT_METADATA_READ_TIMER;; + + + /* + * The metadata channel of kernel sessions must use the "mmap" + * back-end since the consumer daemon accumulates complete + * metadata units before sending them to the relay daemon in + * live mode. The consumer daemon also needs to extract the contents + * of the metadata cache when computing a rotation position. + * + * In both cases, it is not possible to rely on the splice + * back-end as the consumer daemon may need to accumulate more + * content than can be backed by the ring buffer's underlying + * pages. + */ + chan->attr.output = LTTNG_EVENT_MMAP; + chan->attr.tracefile_size = 0; + chan->attr.tracefile_count = 0; + chan->attr.live_timer_interval = 0; /* Init metadata */ lkm->fd = -1; @@ -604,7 +1054,7 @@ void trace_kernel_destroy_event(struct ltt_kernel_event *event) PERROR("close"); } } else { - DBG("[trace] Tearing down event (no associated fd)"); + DBG("[trace] Tearing down event (no associated file descriptor)"); } /* Remove from event list */ @@ -617,6 +1067,73 @@ void trace_kernel_destroy_event(struct ltt_kernel_event *event) free(event); } +/* + * Free kernel event counter structure from RCU context + */ +static void free_event_counter_rcu(struct rcu_head *rcu_node) +{ + struct ltt_kernel_event_counter *event_counter = caa_container_of(rcu_node, + struct ltt_kernel_event_counter, rcu_node); + + free(event_counter); +} +/* + * Cleanup kernel event counter structure. + */ +void trace_kernel_destroy_event_counter(struct ltt_kernel_event_counter *event_counter) +{ + assert(event_counter); + + if (event_counter->fd >= 0) { + int ret; + + DBG("[trace] Closing event counter fd %d", event_counter->fd); + /* Close kernel fd */ + ret = close(event_counter->fd); + if (ret) { + PERROR("close"); + } + } else { + DBG("[trace] Tearing down event counter (no associated file descriptor)"); + } + + lttng_map_key_put(event_counter->key); + call_rcu(&event_counter->rcu_node, free_event_counter_rcu); +} + + +/* + * Cleanup kernel event structure. + */ +static void free_token_event_rule_rcu(struct rcu_head *rcu_node) +{ + struct ltt_kernel_event_notifier_rule *rule = caa_container_of(rcu_node, + struct ltt_kernel_event_notifier_rule, rcu_node); + + free(rule); +} + +void trace_kernel_destroy_event_notifier_rule( + struct ltt_kernel_event_notifier_rule *event) +{ + assert(event); + + if (event->fd >= 0) { + const int ret = close(event->fd); + + DBG("Closing kernel event notifier rule file descriptor: fd = %d", + event->fd); + if (ret) { + PERROR("Failed to close kernel event notifier file descriptor: fd = %d", + event->fd); + } + } else { + DBG("Destroying kernel event notifier rule (no associated file descriptor)"); + } + + lttng_trigger_put(event->trigger); + call_rcu(&event->rcu_node, free_token_event_rule_rcu); +} /* * Cleanup kernel context structure. */ @@ -682,6 +1199,38 @@ void trace_kernel_destroy_channel(struct ltt_kernel_channel *channel) free(channel); } +/* + * Cleanup kernel map structure. + */ +void trace_kernel_destroy_map(struct ltt_kernel_map *map) +{ + int ret; + struct ltt_kernel_event_counter *event_counter; + struct lttng_ht_iter iter; + + assert(map); + + DBG("[trace] Closing map fd %d", map->fd); + /* Close kernel fd */ + if (map->fd >= 0) { + ret = close(map->fd); + if (ret) { + PERROR("close"); + } + } + + /* For each event counter in the map hashtable */ + cds_lfht_for_each_entry(map->event_counters_ht->ht, &iter.iter, + event_counter, ht_node.node) { + trace_kernel_destroy_event_counter(event_counter); + } + + /* Remove from map list */ + cds_list_del(&map->list); + + free(map); +} + /* * Cleanup kernel metadata structure. */ @@ -712,6 +1261,7 @@ void trace_kernel_destroy_metadata(struct ltt_kernel_metadata *metadata) void trace_kernel_destroy_session(struct ltt_kernel_session *session) { struct ltt_kernel_channel *channel, *ctmp; + struct ltt_kernel_map *map, *map_tmp; int ret; assert(session); @@ -740,6 +1290,10 @@ void trace_kernel_destroy_session(struct ltt_kernel_session *session) cds_list_for_each_entry_safe(channel, ctmp, &session->channel_list.head, list) { trace_kernel_destroy_channel(channel); } + + cds_list_for_each_entry_safe(map, map_tmp, &session->map_list.head, list) { + trace_kernel_destroy_map(map); + } } /* Free elements needed by destroy notifiers. */ @@ -748,12 +1302,12 @@ void trace_kernel_free_session(struct ltt_kernel_session *session) /* Wipe consumer output object */ consumer_output_put(session->consumer); - lttng_tracker_list_destroy(session->tracker_list_pid); - lttng_tracker_list_destroy(session->tracker_list_vpid); - lttng_tracker_list_destroy(session->tracker_list_uid); - lttng_tracker_list_destroy(session->tracker_list_vuid); - lttng_tracker_list_destroy(session->tracker_list_gid); - lttng_tracker_list_destroy(session->tracker_list_vgid); + process_attr_tracker_destroy(session->tracker_pid); + process_attr_tracker_destroy(session->tracker_vpid); + process_attr_tracker_destroy(session->tracker_uid); + process_attr_tracker_destroy(session->tracker_vuid); + process_attr_tracker_destroy(session->tracker_gid); + process_attr_tracker_destroy(session->tracker_vgid); free(session); }