/**
* lib_ring_buffer_get_cpu - Precedes ring buffer reserve/commit.
*
- * Grabs RCU read-side lock and keeps a ring buffer nesting count as
- * supplementary safety net to ensure tracer client code will never
- * trigger an endless recursion. Returns the processor ID on success,
- * -EPERM on failure (nesting count too high).
+ * Keeps a ring buffer nesting count as supplementary safety net to
+ * ensure tracer client code will never trigger an endless recursion.
+ * Returns the processor ID on success, -EPERM on failure (nesting count
+ * too high).
*
* asm volatile and "memory" clobber prevent the compiler from moving
* instructions out of the ring buffer nesting count. This is required to ensure
{
int cpu, nesting;
- rcu_read_lock();
cpu = lttng_ust_get_cpu();
- nesting = ++lib_ring_buffer_nesting; /* TLS */
+ nesting = ++URCU_TLS(lib_ring_buffer_nesting);
cmm_barrier();
if (caa_unlikely(nesting > 4)) {
WARN_ON_ONCE(1);
- lib_ring_buffer_nesting--; /* TLS */
- rcu_read_unlock();
+ URCU_TLS(lib_ring_buffer_nesting)--;
return -EPERM;
} else
return cpu;
void lib_ring_buffer_put_cpu(const struct lttng_ust_lib_ring_buffer_config *config)
{
cmm_barrier();
- lib_ring_buffer_nesting--; /* TLS */
- rcu_read_unlock();
+ URCU_TLS(lib_ring_buffer_nesting)--; /* TLS */
}
/*
commit_count = v_read(config, &shmp_index(handle, buf->commit_hot, endidx)->cc);
lib_ring_buffer_check_deliver(config, buf, chan, offset_end - 1,
- commit_count, endidx, handle);
+ commit_count, endidx, handle, ctx->tsc);
/*
* Update used size at each commit. It's needed only for extracting
* ring_buffer buffers from vmcore, after crash.
*/
lib_ring_buffer_write_commit_counter(config, buf, chan, endidx,
- ctx->buf_offset, commit_count,
- ctx->slot_size, handle);
+ offset_end, commit_count, handle);
}
/**