X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=include%2Fringbuffer%2Fbackend.h;h=5ceb4f1a26181a5f8b582ac7c7a5e5028cbfee9a;hb=c7d9db61d9c4861b6f344af8f1471a42e00739a8;hp=67592546dec2d08cb757e33ce83af3190ec92833;hpb=585e5dcc4bf017c03b86dc84371f9c6170e12785;p=lttng-modules.git

diff --git a/include/ringbuffer/backend.h b/include/ringbuffer/backend.h
index 67592546..5ceb4f1a 100644
--- a/include/ringbuffer/backend.h
+++ b/include/ringbuffer/backend.h
@@ -75,10 +75,10 @@ void lib_ring_buffer_write(const struct lib_ring_buffer_config *config,
 			   struct lib_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))
@@ -95,7 +95,7 @@ void lib_ring_buffer_write(const struct lib_ring_buffer_config *config,
 					src, len);
 	else
 		_lib_ring_buffer_write(bufb, offset, src, len, 0);
-	ctx->buf_offset += len;
+	ctx->priv.buf_offset += len;
 }
 
 /**
@@ -116,10 +116,10 @@ void lib_ring_buffer_memset(const struct lib_ring_buffer_config *config,
 			    struct lib_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))
@@ -135,7 +135,7 @@ void lib_ring_buffer_memset(const struct lib_ring_buffer_config *config,
 					  c, len);
 	else
 		_lib_ring_buffer_memset(bufb, offset, c, len, 0);
-	ctx->buf_offset += len;
+	ctx->priv.buf_offset += len;
 }
 
 /*
@@ -213,10 +213,10 @@ void lib_ring_buffer_strcpy(const struct lib_ring_buffer_config *config,
 			   struct lib_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))
@@ -250,7 +250,7 @@ void lib_ring_buffer_strcpy(const struct lib_ring_buffer_config *config,
 	} else {
 		_lib_ring_buffer_strcpy(bufb, offset, src, len, 0, pad);
 	}
-	ctx->buf_offset += len;
+	ctx->priv.buf_offset += len;
 }
 
 /**
@@ -271,13 +271,12 @@ void lib_ring_buffer_copy_from_user_inatomic(const struct lib_ring_buffer_config
 				    struct lib_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;
@@ -287,7 +286,6 @@ void lib_ring_buffer_copy_from_user_inatomic(const struct lib_ring_buffer_config
 	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;
@@ -304,14 +302,12 @@ void lib_ring_buffer_copy_from_user_inatomic(const struct lib_ring_buffer_config
 		_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.
@@ -342,12 +338,11 @@ void lib_ring_buffer_strcpy_from_user_inatomic(const struct lib_ring_buffer_conf
 		struct lib_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;
@@ -357,7 +352,6 @@ void lib_ring_buffer_strcpy_from_user_inatomic(const struct lib_ring_buffer_conf
 	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;
@@ -388,14 +382,12 @@ void lib_ring_buffer_strcpy_from_user_inatomic(const struct lib_ring_buffer_conf
 					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.
@@ -447,16 +439,12 @@ unsigned long lib_ring_buffer_copy_from_user_check_nofault(void *dest,
 						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;
 }