struct rcu_head rcu_head;
};
-struct error_account_entry {
+struct ust_error_accounting_entry {
+ uid_t uid;
struct lttng_ht_node_u64 node;
struct rcu_head rcu_head;
struct ustctl_daemon_counter *daemon_counter;
int nr_counter_cpu_fds;
};
-struct kernel_error_account_entry {
+struct kernel_error_accounting_entry {
int kernel_event_notifier_error_counter_fd;
};
-static struct kernel_error_account_entry kernel_error_accountant;
-
-/* Hashtable mapping event notifier token to index_ht_entry. */
-static struct lttng_ht *error_counter_indexes_ht;
+static struct kernel_error_accounting_entry kernel_error_accountant;
/* Hashtable mapping uid to error_account_entry. */
static struct lttng_ht *error_counter_uid_ht;
-static uint64_t error_counter_size;
-static struct lttng_index_allocator *index_allocator;
+struct error_accounting_state {
+ struct lttng_index_allocator *index_allocator;
+ /* Hashtable mapping event notifier token to index_ht_entry. */
+ struct lttng_ht *indices_ht;
+ uint64_t number_indices;
+};
+
+static struct error_accounting_state ust_state;
+static struct error_accounting_state kernel_state;
static inline void get_trigger_info_for_log(const struct lttng_trigger *trigger,
const char **trigger_name,
}
}
+static
enum event_notifier_error_accounting_status
-event_notifier_error_accounting_init(uint64_t nb_bucket)
+init_error_accounting_state(struct error_accounting_state *state,
+ uint64_t index_count)
{
enum event_notifier_error_accounting_status status;
- index_allocator = lttng_index_allocator_create(nb_bucket);
- if (!index_allocator) {
- ERR("Failed to allocate event notifier error counter index");
+ assert(state);
+
+ state->number_indices = index_count;
+
+ state->index_allocator = lttng_index_allocator_create(index_count);
+ if (!state->index_allocator) {
+ ERR("Failed to allocate event notifier error counter index allocator");
status = EVENT_NOTIFIER_ERROR_ACCOUNTING_STATUS_NOMEM;
- goto error_index_allocator;
+ goto end;
}
- error_counter_indexes_ht = lttng_ht_new(
- ERROR_COUNTER_INDEX_HT_INITIAL_SIZE, LTTNG_HT_TYPE_U64);
- if (!error_counter_indexes_ht) {
+ state->indices_ht = lttng_ht_new(ERROR_COUNTER_INDEX_HT_INITIAL_SIZE,
+ LTTNG_HT_TYPE_U64);
+ if (!state->indices_ht) {
ERR("Failed to allocate error counter indices hash table");
status = EVENT_NOTIFIER_ERROR_ACCOUNTING_STATUS_NOMEM;
- goto error_index_allocator;
+ goto error_indices_ht;
+ }
+
+ status = EVENT_NOTIFIER_ERROR_ACCOUNTING_STATUS_OK;
+ goto end;
+
+error_indices_ht:
+ lttng_index_allocator_destroy(state->index_allocator);
+ state->index_allocator = NULL;
+end:
+ return status;
+}
+
+static
+void fini_error_accounting_state(struct error_accounting_state *state)
+{
+ assert(state);
+
+ /*
+ * Will assert if some error counter indices were not released (an
+ * internal error).
+ */
+ lttng_ht_destroy(state->indices_ht);
+ lttng_index_allocator_destroy(state->index_allocator);
+}
+
+enum event_notifier_error_accounting_status
+event_notifier_error_accounting_init(uint64_t buffer_size_kernel,
+ uint64_t buffer_size_ust)
+{
+ enum event_notifier_error_accounting_status status;
+
+ status = init_error_accounting_state(&kernel_state, buffer_size_kernel);
+ if (status != EVENT_NOTIFIER_ERROR_ACCOUNTING_STATUS_OK) {
+ ERR("Failed to initialize kernel event notifier accounting state: status = %s",
+ error_accounting_status_str(status));
+ goto end;
+ }
+
+ status = init_error_accounting_state(&ust_state, buffer_size_ust);
+ if (status != EVENT_NOTIFIER_ERROR_ACCOUNTING_STATUS_OK) {
+ ERR("Failed to initialize UST event notifier accounting state: status = %s",
+ error_accounting_status_str(status));
+ goto error_ust_state;
}
error_counter_uid_ht = lttng_ht_new(
if (!error_counter_uid_ht) {
ERR("Failed to allocate UID to error counter accountant hash table");
status = EVENT_NOTIFIER_ERROR_ACCOUNTING_STATUS_NOMEM;
- goto error_index_allocator;
+ goto error_uid_ht;
}
- error_counter_size = nb_bucket;
-
status = EVENT_NOTIFIER_ERROR_ACCOUNTING_STATUS_OK;
+ goto end;
-error_index_allocator:
+error_uid_ht:
+ fini_error_accounting_state(&ust_state);
+error_ust_state:
+ fini_error_accounting_state(&kernel_state);
+end:
return status;
}
static
enum event_notifier_error_accounting_status get_error_counter_index_for_token(
- uint64_t tracer_token, uint64_t *error_counter_index)
+ struct error_accounting_state *state, uint64_t tracer_token,
+ uint64_t *error_counter_index)
{
struct lttng_ht_node_u64 *node;
struct lttng_ht_iter iter;
enum event_notifier_error_accounting_status status;
rcu_read_lock();
- lttng_ht_lookup(error_counter_indexes_ht, &tracer_token, &iter);
+ lttng_ht_lookup(state->indices_ht, &tracer_token, &iter);
node = lttng_ht_iter_get_node_u64(&iter);
if (node) {
index_entry = caa_container_of(
#ifdef HAVE_LIBLTTNG_UST_CTL
static
-struct error_account_entry *get_uid_accounting_entry(const struct ust_app *app)
+struct ust_error_accounting_entry *get_uid_accounting_entry(const struct ust_app *app)
{
- struct error_account_entry *entry;
+ struct ust_error_accounting_entry *entry;
struct lttng_ht_node_u64 *node;
struct lttng_ht_iter iter;
uint64_t key = app->uid;
if(node == NULL) {
entry = NULL;
} else {
- entry = caa_container_of(node, struct error_account_entry, node);
+ entry = caa_container_of(node, struct ust_error_accounting_entry, node);
}
return entry;
}
static
-struct error_account_entry *create_uid_accounting_entry(
+struct ust_error_accounting_entry *create_uid_accounting_entry(
const struct ust_app *app)
{
int i, ret;
struct ustctl_daemon_counter *daemon_counter;
struct lttng_ust_abi_object_data *counter, **cpu_counters;
int *cpu_counter_fds = NULL;
- struct error_account_entry *entry = NULL;
+ struct ust_error_accounting_entry *entry = NULL;
const struct ustctl_counter_dimension dimension = {
- .size = error_counter_size,
+ .size = ust_state.number_indices,
.has_underflow = false,
.has_overflow = false,
};
- entry = zmalloc(sizeof(struct error_account_entry));
+ entry = zmalloc(sizeof(struct ust_error_accounting_entry));
if (!entry) {
PERROR("Failed to allocate event notifier error acounting entry")
goto error;
}
+ entry->uid = app->uid;
entry->nr_counter_cpu_fds = ustctl_get_nr_cpu_per_counter();
+
cpu_counter_fds = zmalloc(entry->nr_counter_cpu_fds * sizeof(*cpu_counter_fds));
if (!cpu_counter_fds) {
PERROR("Failed to allocate event notifier error counter file descriptors array: application uid = %d, application name = '%s', pid = %d, allocation size = %zu",
int ret;
uint64_t i;
struct lttng_ust_abi_object_data *new_counter;
- struct error_account_entry *entry;
+ struct ust_error_accounting_entry *entry;
enum event_notifier_error_accounting_status status;
struct lttng_ust_abi_object_data **cpu_counters;
event_notifier_error_accounting_unregister_app(struct ust_app *app)
{
enum event_notifier_error_accounting_status status;
- struct error_account_entry *entry;
+ struct ust_error_accounting_entry *entry;
int i;
rcu_read_lock();
const struct lttng_trigger *trigger, uint64_t *count)
{
struct lttng_ht_iter iter;
- struct error_account_entry *uid_entry;
+ struct ust_error_accounting_entry *uid_entry;
uint64_t error_counter_index, global_sum = 0;
enum event_notifier_error_accounting_status status;
size_t dimension_indexes[1];
const uint64_t tracer_token = lttng_trigger_get_tracer_token(trigger);
+ uid_t trigger_owner_uid;
+ const char *trigger_name;
- /*
- * Go over all error counters (ignoring uid) as a trigger (and trigger
- * errors) can be generated from any applications that this session
- * daemon is managing.
- */
rcu_read_lock();
+ get_trigger_info_for_log(trigger, &trigger_name, &trigger_owner_uid);
+
+ /*
+ * At the moment, the error counter index is domain wide. This means
+ * that if UID 1000 registers a event notifier and is allocated index 0
+ * in it's error counter, index zero will be unused in error counter of
+ * all other users.
+ */
status = get_error_counter_index_for_token(
+ &ust_state,
tracer_token,
&error_counter_index);
if (status != EVENT_NOTIFIER_ERROR_ACCOUNTING_STATUS_OK) {
- uid_t trigger_owner_uid;
- const char *trigger_name;
-
- get_trigger_info_for_log(trigger, &trigger_name,
- &trigger_owner_uid);
ERR("Failed to retrieve index for tracer token: token = %" PRIu64 ", trigger name = '%s', trigger owner uid = %d, status = %s",
tracer_token, trigger_name,
dimension_indexes[0] = error_counter_index;
+ /*
+ * Iterate over all the UID entries.
+ * We aggregate the value of all uid entries regardless of if the uid
+ * matches the trigger's uid because a user that is allowed to register
+ * a trigger to a given sessiond is also allowed to create an event
+ * notifier on all apps that this sessiond is aware of.
+ */
cds_lfht_for_each_entry(error_counter_uid_ht->ht, &iter.iter,
uid_entry, node.node) {
int ret;
dimension_indexes, &local_value, &overflow,
&underflow);
if (ret || local_value < 0) {
- uid_t trigger_owner_uid;
- const char *trigger_name;
-
- get_trigger_info_for_log(trigger, &trigger_name,
- &trigger_owner_uid);
-
if (ret) {
ERR("Failed to aggregate event notifier error counter values of trigger: trigger name = '%s', trigger owner uid = %d",
trigger_name,
/* Cast is safe as negative values are checked-for above. */
global_sum += (uint64_t) local_value;
-
}
*count = global_sum;
const struct lttng_trigger *trigger)
{
struct lttng_ht_iter iter;
- struct error_account_entry *uid_entry;
+ struct ust_error_accounting_entry *uid_entry;
uint64_t error_counter_index;
enum event_notifier_error_accounting_status status;
size_t dimension_index;
rcu_read_lock();
status = get_error_counter_index_for_token(
+ &ust_state,
tracer_token,
&error_counter_index);
if (status != EVENT_NOTIFIER_ERROR_ACCOUNTING_STATUS_OK) {
struct lttng_kernel_counter_clear counter_clear = {};
status = get_error_counter_index_for_token(
+ &kernel_state,
lttng_trigger_get_tracer_token(trigger),
&error_counter_index);
if (status != EVENT_NOTIFIER_ERROR_ACCOUNTING_STATUS_OK) {
LTTNG_KERNEL_COUNTER_BITNESS_64,
.global_sum_step = 0,
.number_dimensions = 1,
- .dimensions[0].size = error_counter_size,
+ .dimensions[0].size = kernel_state.number_indices,
.dimensions[0].has_underflow = false,
.dimensions[0].has_overflow = false,
};
static
enum event_notifier_error_accounting_status create_error_counter_index_for_token(
- uint64_t tracer_token, uint64_t *error_counter_index)
+ struct error_accounting_state *state, uint64_t tracer_token,
+ uint64_t *error_counter_index)
{
struct index_ht_entry *index_entry;
enum lttng_index_allocator_status index_alloc_status;
uint64_t local_error_counter_index;
enum event_notifier_error_accounting_status status;
+ assert(state);
+
/* Allocate a new index for that counter. */
- index_alloc_status = lttng_index_allocator_alloc(index_allocator,
+ index_alloc_status = lttng_index_allocator_alloc(state->index_allocator,
&local_error_counter_index);
switch (index_alloc_status) {
case LTTNG_INDEX_ALLOCATOR_STATUS_EMPTY:
DBG("No indices left in the configured event notifier error counter: "
"number-of-indices = %"PRIu64,
lttng_index_allocator_get_index_count(
- index_allocator));
+ state->index_allocator));
status = EVENT_NOTIFIER_ERROR_ACCOUNTING_STATUS_NO_INDEX_AVAILABLE;
goto end;
case LTTNG_INDEX_ALLOCATOR_STATUS_OK:
index_entry->error_counter_index = local_error_counter_index;
lttng_ht_node_init_u64(&index_entry->node, tracer_token);
- lttng_ht_add_unique_u64(error_counter_indexes_ht, &index_entry->node);
+ lttng_ht_add_unique_u64(state->indices_ht, &index_entry->node);
DBG("Allocated error counter index for tracer token: tracer token = %" PRIu64 ", index = %" PRIu64,
tracer_token, local_error_counter_index);
{
enum event_notifier_error_accounting_status status;
uint64_t local_error_counter_index;
+ struct error_accounting_state *state;
+
+ switch (lttng_trigger_get_underlying_domain_type_restriction(trigger)) {
+ case LTTNG_DOMAIN_KERNEL:
+ state = &kernel_state;
+ break;
+ case LTTNG_DOMAIN_UST:
+ state = &ust_state;
+ break;
+ default:
+ abort();
+ }
/*
* Check if this event notifier already has a error counter index
* assigned.
*/
- status = get_error_counter_index_for_token(
+ status = get_error_counter_index_for_token(state,
lttng_trigger_get_tracer_token(trigger),
&local_error_counter_index);
switch (status) {
trigger_name, trigger_owner_uid,
lttng_trigger_get_tracer_token(trigger));
- status = create_error_counter_index_for_token(
+ status = create_error_counter_index_for_token(state,
lttng_trigger_get_tracer_token(trigger),
&local_error_counter_index);
if (status != EVENT_NOTIFIER_ERROR_ACCOUNTING_STATUS_OK) {
int ret;
status = get_error_counter_index_for_token(
- lttng_trigger_get_tracer_token(trigger), &error_counter_index);
+ &kernel_state,
+ lttng_trigger_get_tracer_token(trigger),
+ &error_counter_index);
if (status != EVENT_NOTIFIER_ERROR_ACCOUNTING_STATUS_OK) {
ERR("Error getting index for token: status=%s",
error_accounting_status_str(status));
trigger, count);
case LTTNG_DOMAIN_UST:
#ifdef HAVE_LIBLTTNG_UST_CTL
- return event_notifier_error_accounting_ust_get_count(trigger, count);
+ return event_notifier_error_accounting_ust_get_count(trigger,
+ count);
#else
return EVENT_NOTIFIER_ERROR_ACCOUNTING_STATUS_OK;
#endif /* HAVE_LIBLTTNG_UST_CTL */
struct lttng_ht_node_u64 *node;
const uint64_t tracer_token = lttng_trigger_get_tracer_token(trigger);
enum event_notifier_error_accounting_status status;
+ struct error_accounting_state *state;
status = event_notifier_error_accounting_clear(trigger);
if (status != EVENT_NOTIFIER_ERROR_ACCOUNTING_STATUS_OK) {
error_accounting_status_str(status));
}
+ switch (lttng_trigger_get_underlying_domain_type_restriction(trigger)) {
+ case LTTNG_DOMAIN_KERNEL:
+ state = &kernel_state;
+ break;
+ case LTTNG_DOMAIN_UST:
+ state = &ust_state;
+ break;
+ default:
+ abort();
+ }
+
rcu_read_lock();
- lttng_ht_lookup(error_counter_indexes_ht, &tracer_token, &iter);
+ lttng_ht_lookup(state->indices_ht, &tracer_token, &iter);
node = lttng_ht_iter_get_node_u64(&iter);
if (node) {
int del_ret;
enum lttng_index_allocator_status index_alloc_status;
index_alloc_status = lttng_index_allocator_release(
- index_allocator,
+ state->index_allocator,
index_entry->error_counter_index);
if (index_alloc_status != LTTNG_INDEX_ALLOCATOR_STATUS_OK) {
uid_t trigger_owner_uid;
/* Don't exit, perform the rest of the clean-up. */
}
- del_ret = lttng_ht_del(error_counter_indexes_ht, &iter);
+ del_ret = lttng_ht_del(state->indices_ht, &iter);
assert(!del_ret);
call_rcu(&index_entry->rcu_head, free_index_ht_entry);
}
static void free_error_account_entry(struct rcu_head *head)
{
int i;
- struct error_account_entry *entry =
+ struct ust_error_accounting_entry *entry =
caa_container_of(head, typeof(*entry), rcu_head);
for (i = 0; i < entry->nr_counter_cpu_fds; i++) {
void event_notifier_error_accounting_fini(void)
{
struct lttng_ht_iter iter;
- struct error_account_entry *uid_entry;
-
- lttng_index_allocator_destroy(index_allocator);
+ struct ust_error_accounting_entry *uid_entry;
if (kernel_error_accountant.kernel_event_notifier_error_counter_fd) {
const int ret = close(kernel_error_accountant.kernel_event_notifier_error_counter_fd);
call_rcu(&uid_entry->rcu_head, free_error_account_entry);
}
rcu_read_unlock();
+
lttng_ht_destroy(error_counter_uid_ht);
- /*
- * Will assert if some error counter indices were not released (an
- * internal error).
- */
- lttng_ht_destroy(error_counter_indexes_ht);
+ fini_error_accounting_state(&kernel_state);
+ fini_error_accounting_state(&ust_state);
}
;
#define EVENT_NOTIFIER_ERROR_COUNTER_NUMBER_OF_BUCKET_MAX 65535
+#define EVENT_NOTIFIER_ERROR_BUFFER_SIZE_BASE_OPTION_STR \
+ "event-notifier-error-buffer-size"
+#define EVENT_NOTIFIER_ERROR_BUFFER_SIZE_KERNEL_OPTION_STR \
+ EVENT_NOTIFIER_ERROR_BUFFER_SIZE_BASE_OPTION_STR "-kernel"
+#define EVENT_NOTIFIER_ERROR_BUFFER_SIZE_USERSPACE_OPTION_STR \
+ EVENT_NOTIFIER_ERROR_BUFFER_SIZE_BASE_OPTION_STR "-userspace"
+
const char *progname;
static int lockfile_fd = -1;
{ "load", required_argument, 0, 'l' },
{ "kmod-probes", required_argument, 0, '\0' },
{ "extra-kmod-probes", required_argument, 0, '\0' },
- { "event-notifier-error-number-of-bucket", required_argument, 0, '\0' },
+ { EVENT_NOTIFIER_ERROR_BUFFER_SIZE_KERNEL_OPTION_STR, required_argument, 0, '\0' },
+ { EVENT_NOTIFIER_ERROR_BUFFER_SIZE_USERSPACE_OPTION_STR, required_argument, 0, '\0' },
{ NULL, 0, 0, 0 }
};
ret = -ENOMEM;
}
}
- } else if (string_match(optname, "event-notifier-error-number-of-bucket")) {
+ } else if (string_match(optname, EVENT_NOTIFIER_ERROR_BUFFER_SIZE_KERNEL_OPTION_STR)) {
unsigned long v;
errno = 0;
v = strtoul(arg, NULL, 0);
if (errno != 0 || !isdigit(arg[0])) {
- ERR("Wrong value in --event-notifier-error-number-of-bucket parameter: %s", arg);
+ ERR("Wrong value in --%s parameter: %s",
+ EVENT_NOTIFIER_ERROR_BUFFER_SIZE_KERNEL_OPTION_STR, arg);
return -1;
}
if (v == 0 || v >= EVENT_NOTIFIER_ERROR_COUNTER_NUMBER_OF_BUCKET_MAX) {
- ERR("Value out of range for --event-notifier-error-number-of-bucket parameter: %s", arg);
+ ERR("Value out of range for --%s parameter: %s",
+ EVENT_NOTIFIER_ERROR_BUFFER_SIZE_KERNEL_OPTION_STR, arg);
return -1;
}
- the_config.event_notifier_error_counter_bucket = (int) v;
- DBG3("Number of event notifier error counter set to non default: %i",
- the_config.event_notifier_error_counter_bucket);
+ the_config.event_notifier_buffer_size_kernel = (int) v;
+ DBG3("Number of event notifier error buffer kernel size to non default: %i",
+ the_config.event_notifier_buffer_size_kernel);
+ goto end;
+ } else if (string_match(optname, EVENT_NOTIFIER_ERROR_BUFFER_SIZE_USERSPACE_OPTION_STR)) {
+ unsigned long v;
+
+ errno = 0;
+ v = strtoul(arg, NULL, 0);
+ if (errno != 0 || !isdigit(arg[0])) {
+ ERR("Wrong value in --%s parameter: %s",
+ EVENT_NOTIFIER_ERROR_BUFFER_SIZE_USERSPACE_OPTION_STR, arg);
+ return -1;
+ }
+ if (v == 0 || v >= EVENT_NOTIFIER_ERROR_COUNTER_NUMBER_OF_BUCKET_MAX) {
+ ERR("Value out of range for --%s parameter: %s",
+ EVENT_NOTIFIER_ERROR_BUFFER_SIZE_USERSPACE_OPTION_STR, arg);
+ return -1;
+ }
+ the_config.event_notifier_buffer_size_userspace = (int) v;
+ DBG3("Number of event notifier error buffer userspace size to non default: %i",
+ the_config.event_notifier_buffer_size_userspace);
goto end;
} else if (string_match(optname, "config") || opt == 'f') {
/* This is handled in set_options() thus silent skip. */
struct lttng_thread *client_thread = NULL;
struct lttng_thread *notification_thread = NULL;
struct lttng_thread *register_apps_thread = NULL;
+ enum event_notifier_error_accounting_status event_notifier_error_accounting_status;
logger_set_thread_name("Main", false);
init_kernel_workarounds();
goto stop_threads;
}
- event_notifier_error_accounting_init(the_config.event_notifier_error_counter_bucket);
+ event_notifier_error_accounting_status = event_notifier_error_accounting_init(
+ the_config.event_notifier_buffer_size_kernel,
+ the_config.event_notifier_buffer_size_userspace);
+ if (event_notifier_error_accounting_status != EVENT_NOTIFIER_ERROR_ACCOUNTING_STATUS_OK) {
+ ERR("Failed to initialize event notifier error accounting system");
+ retval = -1;
+ goto stop_threads;
+ }
/*
* Initialize agent app hash table. We allocate the hash table here
projects / lttng-tools.git / commitdiff
