*/
static inline __attribute__((always_inline))
void lib_ring_buffer_write(const struct lib_ring_buffer_config *config,
- struct lib_ring_buffer_ctx *ctx,
+ struct lttng_kernel_ring_buffer_ctx *ctx,
const void *src, size_t len)
{
- struct lib_ring_buffer_backend *bufb = &ctx->buf->backend;
- struct channel_backend *chanb = &ctx->chan->backend;
+ struct lib_ring_buffer_backend *bufb = &ctx->priv.buf->backend;
+ struct channel_backend *chanb = &ctx->priv.chan->backend;
size_t index, pagecpy;
- size_t offset = ctx->buf_offset;
+ size_t offset = ctx->priv.buf_offset;
struct lib_ring_buffer_backend_pages *backend_pages;
if (unlikely(!len))
src, len);
else
_lib_ring_buffer_write(bufb, offset, src, len, 0);
- ctx->buf_offset += len;
+ ctx->priv.buf_offset += len;
}
/**
*/
static inline
void lib_ring_buffer_memset(const struct lib_ring_buffer_config *config,
- struct lib_ring_buffer_ctx *ctx, int c, size_t len)
+ struct lttng_kernel_ring_buffer_ctx *ctx, int c, size_t len)
{
- struct lib_ring_buffer_backend *bufb = &ctx->buf->backend;
- struct channel_backend *chanb = &ctx->chan->backend;
+ struct lib_ring_buffer_backend *bufb = &ctx->priv.buf->backend;
+ struct channel_backend *chanb = &ctx->priv.chan->backend;
size_t index, pagecpy;
- size_t offset = ctx->buf_offset;
+ size_t offset = ctx->priv.buf_offset;
struct lib_ring_buffer_backend_pages *backend_pages;
if (unlikely(!len))
c, len);
else
_lib_ring_buffer_memset(bufb, offset, c, len, 0);
- ctx->buf_offset += len;
+ ctx->priv.buf_offset += len;
}
/*
* Only read source character once, in case it is
* modified concurrently.
*/
- c = READ_ONCE(src[count]);
+ c = LTTNG_READ_ONCE(src[count]);
if (!c)
break;
lib_ring_buffer_do_copy(config, &dest[count], &c, 1);
*/
static inline
void lib_ring_buffer_strcpy(const struct lib_ring_buffer_config *config,
- struct lib_ring_buffer_ctx *ctx,
+ struct lttng_kernel_ring_buffer_ctx *ctx,
const char *src, size_t len, int pad)
{
- struct lib_ring_buffer_backend *bufb = &ctx->buf->backend;
- struct channel_backend *chanb = &ctx->chan->backend;
+ struct lib_ring_buffer_backend *bufb = &ctx->priv.buf->backend;
+ struct channel_backend *chanb = &ctx->priv.chan->backend;
size_t index, pagecpy;
- size_t offset = ctx->buf_offset;
+ size_t offset = ctx->priv.buf_offset;
struct lib_ring_buffer_backend_pages *backend_pages;
if (unlikely(!len))
} else {
_lib_ring_buffer_strcpy(bufb, offset, src, len, 0, pad);
}
- ctx->buf_offset += len;
+ ctx->priv.buf_offset += len;
}
/**
*/
static inline __attribute__((always_inline))
void lib_ring_buffer_copy_from_user_inatomic(const struct lib_ring_buffer_config *config,
- struct lib_ring_buffer_ctx *ctx,
+ struct lttng_kernel_ring_buffer_ctx *ctx,
const void __user *src, size_t len)
{
- struct lib_ring_buffer_backend *bufb = &ctx->buf->backend;
- struct channel_backend *chanb = &ctx->chan->backend;
+ struct lib_ring_buffer_backend *bufb = &ctx->priv.buf->backend;
+ struct channel_backend *chanb = &ctx->priv.chan->backend;
size_t index, pagecpy;
- size_t offset = ctx->buf_offset;
+ size_t offset = ctx->priv.buf_offset;
struct lib_ring_buffer_backend_pages *backend_pages;
unsigned long ret;
- mm_segment_t old_fs = get_fs();
if (unlikely(!len))
return;
index = (offset & (chanb->subbuf_size - 1)) >> PAGE_SHIFT;
pagecpy = min_t(size_t, len, (-offset) & ~PAGE_MASK);
- set_fs(KERNEL_DS);
pagefault_disable();
if (unlikely(!lttng_access_ok(VERIFY_READ, src, len)))
goto fill_buffer;
_lib_ring_buffer_copy_from_user_inatomic(bufb, offset, src, len, 0);
}
pagefault_enable();
- set_fs(old_fs);
- ctx->buf_offset += len;
+ ctx->priv.buf_offset += len;
return;
fill_buffer:
pagefault_enable();
- set_fs(old_fs);
/*
* In the error path we call the slow path version to avoid
* the pollution of static inline code.
*/
static inline
void lib_ring_buffer_strcpy_from_user_inatomic(const struct lib_ring_buffer_config *config,
- struct lib_ring_buffer_ctx *ctx,
+ struct lttng_kernel_ring_buffer_ctx *ctx,
const void __user *src, size_t len, int pad)
{
- struct lib_ring_buffer_backend *bufb = &ctx->buf->backend;
- struct channel_backend *chanb = &ctx->chan->backend;
+ struct lib_ring_buffer_backend *bufb = &ctx->priv.buf->backend;
+ struct channel_backend *chanb = &ctx->priv.chan->backend;
size_t index, pagecpy;
- size_t offset = ctx->buf_offset;
+ size_t offset = ctx->priv.buf_offset;
struct lib_ring_buffer_backend_pages *backend_pages;
- mm_segment_t old_fs = get_fs();
if (unlikely(!len))
return;
index = (offset & (chanb->subbuf_size - 1)) >> PAGE_SHIFT;
pagecpy = min_t(size_t, len, (-offset) & ~PAGE_MASK);
- set_fs(KERNEL_DS);
pagefault_disable();
if (unlikely(!lttng_access_ok(VERIFY_READ, src, len)))
goto fill_buffer;
len, 0, pad);
}
pagefault_enable();
- set_fs(old_fs);
- ctx->buf_offset += len;
+ ctx->priv.buf_offset += len;
return;
fill_buffer:
pagefault_enable();
- set_fs(old_fs);
/*
* In the error path we call the slow path version to avoid
* the pollution of static inline code.
unsigned long len)
{
unsigned long ret;
- mm_segment_t old_fs;
if (!lttng_access_ok(VERIFY_READ, src, len))
return 1;
- old_fs = get_fs();
- set_fs(KERNEL_DS);
pagefault_disable();
ret = __copy_from_user_inatomic(dest, src, len);
pagefault_enable();
- set_fs(old_fs);
return ret;
}