X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-context.c;h=9f84172799c99f171f292ec00228a34393869fba;hb=345227390cf2884995aa36de35e3e4fc0178c601;hp=869496d8ce0f222925afd2b4535ba15b2168ec87;hpb=9f36eaed6f91d5897924b551b44d1edd8cee00e2;p=lttng-modules.git diff --git a/lttng-context.c b/lttng-context.c index 869496d8..9f841727 100644 --- a/lttng-context.c +++ b/lttng-context.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1) +/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only) * * lttng-context.c * @@ -11,7 +11,6 @@ #include #include #include -#include /* for wrapper_vmalloc_sync_all() */ #include #include @@ -82,12 +81,13 @@ struct lttng_ctx_field *lttng_append_context(struct lttng_ctx **ctx_p) struct lttng_ctx_field *new_fields; ctx->allocated_fields = max_t(size_t, 1, 2 * ctx->allocated_fields); - new_fields = lttng_kvzalloc(ctx->allocated_fields * sizeof(struct lttng_ctx_field), GFP_KERNEL); + new_fields = kvzalloc_node(ctx->allocated_fields * sizeof(struct lttng_ctx_field), + GFP_KERNEL, NUMA_NO_NODE); if (!new_fields) return NULL; if (ctx->fields) memcpy(new_fields, ctx->fields, sizeof(*ctx->fields) * ctx->nr_fields); - lttng_kvfree(ctx->fields); + kvfree(ctx->fields); ctx->fields = new_fields; } field = &ctx->fields[ctx->nr_fields]; @@ -112,95 +112,65 @@ void lttng_context_update(struct lttng_ctx *ctx) type = &ctx->fields[i].event_field.type; switch (type->atype) { case atype_integer: - field_align = type->u.basic.integer.alignment; + field_align = type->u.integer.alignment; break; - case atype_array: - case atype_array_bitfield: + case atype_array_nestable: { - struct lttng_basic_type *btype; + const struct lttng_type *nested_type; - btype = &type->u.array.elem_type; - switch (btype->atype) { + nested_type = type->u.array_nestable.elem_type; + switch (nested_type->atype) { case atype_integer: - field_align = btype->u.basic.integer.alignment; + field_align = nested_type->u.integer.alignment; break; case atype_string: break; - case atype_array: - case atype_sequence: - case atype_array_bitfield: - case atype_sequence_bitfield: - case atype_struct: - case atype_array_compound: - case atype_sequence_compound: - case atype_variant: + case atype_array_nestable: + case atype_sequence_nestable: + case atype_struct_nestable: + case atype_variant_nestable: default: WARN_ON_ONCE(1); break; } + field_align = max_t(size_t, field_align, + type->u.array_nestable.alignment); break; } - case atype_sequence: - case atype_sequence_bitfield: + case atype_sequence_nestable: { - struct lttng_basic_type *btype; + const struct lttng_type *nested_type; - btype = &type->u.sequence.length_type; - switch (btype->atype) { + nested_type = type->u.sequence_nestable.elem_type; + switch (nested_type->atype) { case atype_integer: - field_align = btype->u.basic.integer.alignment; + field_align = nested_type->u.integer.alignment; break; case atype_string: - case atype_array: - case atype_sequence: - case atype_array_bitfield: - case atype_sequence_bitfield: - case atype_struct: - case atype_array_compound: - case atype_sequence_compound: - case atype_variant: - default: - WARN_ON_ONCE(1); - break; - } - - btype = &type->u.sequence.elem_type; - switch (btype->atype) { - case atype_integer: - field_align = max_t(size_t, - field_align, - btype->u.basic.integer.alignment); break; - case atype_string: - break; - - case atype_array: - case atype_sequence: - case atype_array_bitfield: - case atype_sequence_bitfield: - case atype_struct: - case atype_array_compound: - case atype_sequence_compound: - case atype_variant: + case atype_array_nestable: + case atype_sequence_nestable: + case atype_struct_nestable: + case atype_variant_nestable: default: WARN_ON_ONCE(1); break; } + field_align = max_t(size_t, field_align, + type->u.sequence_nestable.alignment); break; } case atype_string: break; - case atype_struct: - case atype_array_compound: - case atype_sequence_compound: - case atype_variant: + case atype_struct_nestable: + case atype_variant_nestable: break; - case atype_enum: + case atype_enum_nestable: default: WARN_ON_ONCE(1); break; @@ -235,7 +205,7 @@ void lttng_destroy_context(struct lttng_ctx *ctx) if (ctx->fields[i].destroy) ctx->fields[i].destroy(&ctx->fields[i]); } - lttng_kvfree(ctx->fields); + kvfree(ctx->fields); kfree(ctx); } @@ -303,6 +273,34 @@ int lttng_context_init(void) if (ret && ret != -ENOSYS) { printk(KERN_WARNING "Cannot add context lttng_add_migratable_to_ctx"); } + ret = lttng_add_cgroup_ns_to_ctx(<tng_static_ctx); + if (ret && ret != -ENOSYS) { + printk(KERN_WARNING "Cannot add context lttng_add_cgroup_ns_to_ctx"); + } + ret = lttng_add_ipc_ns_to_ctx(<tng_static_ctx); + if (ret && ret != -ENOSYS) { + printk(KERN_WARNING "Cannot add context lttng_add_ipc_ns_to_ctx"); + } + ret = lttng_add_mnt_ns_to_ctx(<tng_static_ctx); + if (ret && ret != -ENOSYS) { + printk(KERN_WARNING "Cannot add context lttng_add_mnt_ns_to_ctx"); + } + ret = lttng_add_net_ns_to_ctx(<tng_static_ctx); + if (ret && ret != -ENOSYS) { + printk(KERN_WARNING "Cannot add context lttng_add_net_ns_to_ctx"); + } + ret = lttng_add_pid_ns_to_ctx(<tng_static_ctx); + if (ret && ret != -ENOSYS) { + printk(KERN_WARNING "Cannot add context lttng_add_pid_ns_to_ctx"); + } + ret = lttng_add_user_ns_to_ctx(<tng_static_ctx); + if (ret && ret != -ENOSYS) { + printk(KERN_WARNING "Cannot add context lttng_add_user_ns_to_ctx"); + } + ret = lttng_add_uts_ns_to_ctx(<tng_static_ctx); + if (ret && ret != -ENOSYS) { + printk(KERN_WARNING "Cannot add context lttng_add_uts_ns_to_ctx"); + } /* TODO: perf counters for filtering */ return 0; }