X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Flttng-context-callstack-stackwalk-impl.h;h=5075e9850d6742f320a89e2aa412807c256fdfd0;hb=92e2c5feecb39cdd4796da89f2b684e395403040;hp=2452804dfe019d274d9a6c140f9070cf870ce32d;hpb=f7d06400be7d046205c20277a03f3f31bf5b1703;p=lttng-modules.git

diff --git a/src/lttng-context-callstack-stackwalk-impl.h b/src/lttng-context-callstack-stackwalk-impl.h
index 2452804d..5075e985 100644
--- a/src/lttng-context-callstack-stackwalk-impl.h
+++ b/src/lttng-context-callstack-stackwalk-impl.h
@@ -152,6 +152,7 @@ size_t lttng_callstack_sequence_get_size(void *priv, struct lttng_kernel_probe_c
 	struct field_data *fdata = (struct field_data *) priv;
 	size_t orig_offset = offset;
 	int cpu = smp_processor_id();
+	struct irq_ibt_state irq_ibt_state;
 
 	/* do not write data if no space is available */
 	trace = stack_trace_context(fdata, cpu);
@@ -166,14 +167,18 @@ size_t lttng_callstack_sequence_get_size(void *priv, struct lttng_kernel_probe_c
 	switch (fdata->mode) {
 	case CALLSTACK_KERNEL:
 		/* do the real work and reserve space */
+		irq_ibt_state = wrapper_irq_ibt_save();
 		trace->nr_entries = save_func_kernel(trace->entries,
 						MAX_ENTRIES, 0);
+		wrapper_irq_ibt_restore(irq_ibt_state);
 		break;
 	case CALLSTACK_USER:
 		++per_cpu(callstack_user_nesting, cpu);
 		/* do the real work and reserve space */
+		irq_ibt_state = wrapper_irq_ibt_save();
 		trace->nr_entries = save_func_user(trace->entries,
 						MAX_ENTRIES);
+		wrapper_irq_ibt_restore(irq_ibt_state);
 		per_cpu(callstack_user_nesting, cpu)--;
 		break;
 	default:
@@ -202,7 +207,6 @@ void lttng_callstack_length_record(void *priv, struct lttng_kernel_probe_ctx *pr
 	struct lttng_stack_trace *trace = stack_trace_context(fdata, cpu);
 	unsigned int nr_seq_entries;
 
-	lib_ring_buffer_align_ctx(ctx, lttng_alignof(unsigned int));
 	if (unlikely(!trace)) {
 		nr_seq_entries = 0;
 	} else {
@@ -210,7 +214,7 @@ void lttng_callstack_length_record(void *priv, struct lttng_kernel_probe_ctx *pr
 		if (trace->nr_entries == MAX_ENTRIES)
 			nr_seq_entries++;
 	}
-	chan->ops->event_write(ctx, &nr_seq_entries, sizeof(unsigned int));
+	chan->ops->event_write(ctx, &nr_seq_entries, sizeof(unsigned int), lttng_alignof(unsigned int));
 }
 
 static
@@ -223,19 +227,20 @@ void lttng_callstack_sequence_record(void *priv, struct lttng_kernel_probe_ctx *
 	struct lttng_stack_trace *trace = stack_trace_context(fdata, cpu);
 	unsigned int nr_seq_entries;
 
-	lib_ring_buffer_align_ctx(ctx, lttng_alignof(unsigned long));
 	if (unlikely(!trace)) {
+		/* We need to align even if there are 0 elements. */
+		lib_ring_buffer_align_ctx(ctx, lttng_alignof(unsigned long));
 		return;
 	}
 	nr_seq_entries = trace->nr_entries;
 	if (trace->nr_entries == MAX_ENTRIES)
 		nr_seq_entries++;
 	chan->ops->event_write(ctx, trace->entries,
-			sizeof(unsigned long) * trace->nr_entries);
+			sizeof(unsigned long) * trace->nr_entries, lttng_alignof(unsigned long));
 	/* Add our own ULONG_MAX delimiter to show incomplete stack. */
 	if (trace->nr_entries == MAX_ENTRIES) {
 		unsigned long delim = ULONG_MAX;
 
-		chan->ops->event_write(ctx, &delim, sizeof(unsigned long));
+		chan->ops->event_write(ctx, &delim, sizeof(unsigned long), 1);
 	}
 }