projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: Remove 'type' argument from access_ok() function (v5.0)
[lttng-modules.git]
/
lib
/
ringbuffer
/
backend.h
diff --git
a/lib/ringbuffer/backend.h
b/lib/ringbuffer/backend.h
index 449d663555dc37ecf11e7165fa564a6a45f94f57..3f8c108141521073c930661244ed376769cf137f 100644
(file)
--- a/
lib/ringbuffer/backend.h
+++ b/
lib/ringbuffer/backend.h
@@
-34,7
+34,7
@@
#include <linux/list.h>
#include <linux/fs.h>
#include <linux/mm.h>
#include <linux/list.h>
#include <linux/fs.h>
#include <linux/mm.h>
-#include <
linux
/uaccess.h>
+#include <
wrapper
/uaccess.h>
/* Internal helpers */
#include <wrapper/ringbuffer/backend_internal.h>
/* Internal helpers */
#include <wrapper/ringbuffer/backend_internal.h>
@@
-90,26
+90,20
@@
void lib_ring_buffer_write(const struct lib_ring_buffer_config *config,
{
struct lib_ring_buffer_backend *bufb = &ctx->buf->backend;
struct channel_backend *chanb = &ctx->chan->backend;
{
struct lib_ring_buffer_backend *bufb = &ctx->buf->backend;
struct channel_backend *chanb = &ctx->chan->backend;
- size_t
sbidx,
index, pagecpy;
+ size_t index, pagecpy;
size_t offset = ctx->buf_offset;
size_t offset = ctx->buf_offset;
- struct lib_ring_buffer_backend_pages *rpages;
- unsigned long sb_bindex, id;
+ struct lib_ring_buffer_backend_pages *backend_pages;
if (unlikely(!len))
return;
if (unlikely(!len))
return;
+ backend_pages =
+ lib_ring_buffer_get_backend_pages_from_ctx(config, ctx);
offset &= chanb->buf_size - 1;
offset &= chanb->buf_size - 1;
- sbidx = offset >> chanb->subbuf_size_order;
index = (offset & (chanb->subbuf_size - 1)) >> PAGE_SHIFT;
pagecpy = min_t(size_t, len, (-offset) & ~PAGE_MASK);
index = (offset & (chanb->subbuf_size - 1)) >> PAGE_SHIFT;
pagecpy = min_t(size_t, len, (-offset) & ~PAGE_MASK);
- id = bufb->buf_wsb[sbidx].id;
- sb_bindex = subbuffer_id_get_index(config, id);
- rpages = bufb->array[sb_bindex];
- CHAN_WARN_ON(ctx->chan,
- config->mode == RING_BUFFER_OVERWRITE
- && subbuffer_id_is_noref(config, id));
if (likely(pagecpy == len))
lib_ring_buffer_do_copy(config,
if (likely(pagecpy == len))
lib_ring_buffer_do_copy(config,
-
r
pages->p[index].virt
+
backend_
pages->p[index].virt
+ (offset & ~PAGE_MASK),
src, len);
else
+ (offset & ~PAGE_MASK),
src, len);
else
@@
-137,25
+131,19
@@
void lib_ring_buffer_memset(const struct lib_ring_buffer_config *config,
struct lib_ring_buffer_backend *bufb = &ctx->buf->backend;
struct channel_backend *chanb = &ctx->chan->backend;
struct lib_ring_buffer_backend *bufb = &ctx->buf->backend;
struct channel_backend *chanb = &ctx->chan->backend;
- size_t
sbidx,
index, pagecpy;
+ size_t index, pagecpy;
size_t offset = ctx->buf_offset;
size_t offset = ctx->buf_offset;
- struct lib_ring_buffer_backend_pages *rpages;
- unsigned long sb_bindex, id;
+ struct lib_ring_buffer_backend_pages *backend_pages;
if (unlikely(!len))
return;
if (unlikely(!len))
return;
+ backend_pages =
+ lib_ring_buffer_get_backend_pages_from_ctx(config, ctx);
offset &= chanb->buf_size - 1;
offset &= chanb->buf_size - 1;
- sbidx = offset >> chanb->subbuf_size_order;
index = (offset & (chanb->subbuf_size - 1)) >> PAGE_SHIFT;
pagecpy = min_t(size_t, len, (-offset) & ~PAGE_MASK);
index = (offset & (chanb->subbuf_size - 1)) >> PAGE_SHIFT;
pagecpy = min_t(size_t, len, (-offset) & ~PAGE_MASK);
- id = bufb->buf_wsb[sbidx].id;
- sb_bindex = subbuffer_id_get_index(config, id);
- rpages = bufb->array[sb_bindex];
- CHAN_WARN_ON(ctx->chan,
- config->mode == RING_BUFFER_OVERWRITE
- && subbuffer_id_is_noref(config, id));
if (likely(pagecpy == len))
if (likely(pagecpy == len))
- lib_ring_buffer_do_memset(
r
pages->p[index].virt
+ lib_ring_buffer_do_memset(
backend_
pages->p[index].virt
+ (offset & ~PAGE_MASK),
c, len);
else
+ (offset & ~PAGE_MASK),
c, len);
else
@@
-168,7
+156,7
@@
void lib_ring_buffer_memset(const struct lib_ring_buffer_config *config,
* terminating character is found in @src. Returns the number of bytes
* copied. Does *not* terminate @dest with NULL terminating character.
*/
* terminating character is found in @src. Returns the number of bytes
* copied. Does *not* terminate @dest with NULL terminating character.
*/
-static inline
+static inline
__attribute__((always_inline))
size_t lib_ring_buffer_do_strcpy(const struct lib_ring_buffer_config *config,
char *dest, const char *src, size_t len)
{
size_t lib_ring_buffer_do_strcpy(const struct lib_ring_buffer_config *config,
char *dest, const char *src, size_t len)
{
@@
-181,7
+169,7
@@
size_t lib_ring_buffer_do_strcpy(const struct lib_ring_buffer_config *config,
* Only read source character once, in case it is
* modified concurrently.
*/
* Only read source character once, in case it is
* modified concurrently.
*/
- c =
ACCESS
_ONCE(src[count]);
+ c =
READ
_ONCE(src[count]);
if (!c)
break;
lib_ring_buffer_do_copy(config, &dest[count], &c, 1);
if (!c)
break;
lib_ring_buffer_do_copy(config, &dest[count], &c, 1);
@@
-199,7
+187,7
@@
size_t lib_ring_buffer_do_strcpy(const struct lib_ring_buffer_config *config,
* directly without having the src pointer checked with access_ok()
* previously.
*/
* directly without having the src pointer checked with access_ok()
* previously.
*/
-static inline
+static inline
__attribute__((always_inline))
size_t lib_ring_buffer_do_strcpy_from_user_inatomic(const struct lib_ring_buffer_config *config,
char *dest, const char __user *src, size_t len)
{
size_t lib_ring_buffer_do_strcpy_from_user_inatomic(const struct lib_ring_buffer_config *config,
char *dest, const char __user *src, size_t len)
{
@@
-240,28
+228,22
@@
void lib_ring_buffer_strcpy(const struct lib_ring_buffer_config *config,
{
struct lib_ring_buffer_backend *bufb = &ctx->buf->backend;
struct channel_backend *chanb = &ctx->chan->backend;
{
struct lib_ring_buffer_backend *bufb = &ctx->buf->backend;
struct channel_backend *chanb = &ctx->chan->backend;
- size_t
sbidx,
index, pagecpy;
+ size_t index, pagecpy;
size_t offset = ctx->buf_offset;
size_t offset = ctx->buf_offset;
- struct lib_ring_buffer_backend_pages *rpages;
- unsigned long sb_bindex, id;
+ struct lib_ring_buffer_backend_pages *backend_pages;
if (unlikely(!len))
return;
if (unlikely(!len))
return;
+ backend_pages =
+ lib_ring_buffer_get_backend_pages_from_ctx(config, ctx);
offset &= chanb->buf_size - 1;
offset &= chanb->buf_size - 1;
- sbidx = offset >> chanb->subbuf_size_order;
index = (offset & (chanb->subbuf_size - 1)) >> PAGE_SHIFT;
pagecpy = min_t(size_t, len, (-offset) & ~PAGE_MASK);
index = (offset & (chanb->subbuf_size - 1)) >> PAGE_SHIFT;
pagecpy = min_t(size_t, len, (-offset) & ~PAGE_MASK);
- id = bufb->buf_wsb[sbidx].id;
- sb_bindex = subbuffer_id_get_index(config, id);
- rpages = bufb->array[sb_bindex];
- CHAN_WARN_ON(ctx->chan,
- config->mode == RING_BUFFER_OVERWRITE
- && subbuffer_id_is_noref(config, id));
if (likely(pagecpy == len)) {
size_t count;
count = lib_ring_buffer_do_strcpy(config,
if (likely(pagecpy == len)) {
size_t count;
count = lib_ring_buffer_do_strcpy(config,
-
r
pages->p[index].virt
+
backend_
pages->p[index].virt
+ (offset & ~PAGE_MASK),
src, len - 1);
offset += count;
+ (offset & ~PAGE_MASK),
src, len - 1);
offset += count;
@@
-269,13
+251,13
@@
void lib_ring_buffer_strcpy(const struct lib_ring_buffer_config *config,
if (unlikely(count < len - 1)) {
size_t pad_len = len - 1 - count;
if (unlikely(count < len - 1)) {
size_t pad_len = len - 1 - count;
- lib_ring_buffer_do_memset(
r
pages->p[index].virt
+ lib_ring_buffer_do_memset(
backend_
pages->p[index].virt
+ (offset & ~PAGE_MASK),
pad, pad_len);
offset += pad_len;
}
/* Ending '\0' */
+ (offset & ~PAGE_MASK),
pad, pad_len);
offset += pad_len;
}
/* Ending '\0' */
- lib_ring_buffer_do_memset(
r
pages->p[index].virt
+ lib_ring_buffer_do_memset(
backend_
pages->p[index].virt
+ (offset & ~PAGE_MASK),
'\0', 1);
} else {
+ (offset & ~PAGE_MASK),
'\0', 1);
} else {
@@
-297,41
+279,35
@@
void lib_ring_buffer_strcpy(const struct lib_ring_buffer_config *config,
* (_ring_buffer_write_from_user_inatomic) if copy is crossing a page boundary.
* Disable the page fault handler to ensure we never try to take the mmap_sem.
*/
* (_ring_buffer_write_from_user_inatomic) if copy is crossing a page boundary.
* Disable the page fault handler to ensure we never try to take the mmap_sem.
*/
-static inline
+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,
const void __user *src, size_t len)
{
struct lib_ring_buffer_backend *bufb = &ctx->buf->backend;
struct channel_backend *chanb = &ctx->chan->backend;
void lib_ring_buffer_copy_from_user_inatomic(const struct lib_ring_buffer_config *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;
- size_t
sbidx,
index, pagecpy;
+ size_t index, pagecpy;
size_t offset = ctx->buf_offset;
size_t offset = ctx->buf_offset;
- struct lib_ring_buffer_backend_pages *rpages;
- unsigned long sb_bindex, id;
+ struct lib_ring_buffer_backend_pages *backend_pages;
unsigned long ret;
mm_segment_t old_fs = get_fs();
if (unlikely(!len))
return;
unsigned long ret;
mm_segment_t old_fs = get_fs();
if (unlikely(!len))
return;
+ backend_pages =
+ lib_ring_buffer_get_backend_pages_from_ctx(config, ctx);
offset &= chanb->buf_size - 1;
offset &= chanb->buf_size - 1;
- sbidx = offset >> chanb->subbuf_size_order;
index = (offset & (chanb->subbuf_size - 1)) >> PAGE_SHIFT;
pagecpy = min_t(size_t, len, (-offset) & ~PAGE_MASK);
index = (offset & (chanb->subbuf_size - 1)) >> PAGE_SHIFT;
pagecpy = min_t(size_t, len, (-offset) & ~PAGE_MASK);
- id = bufb->buf_wsb[sbidx].id;
- sb_bindex = subbuffer_id_get_index(config, id);
- rpages = bufb->array[sb_bindex];
- CHAN_WARN_ON(ctx->chan,
- config->mode == RING_BUFFER_OVERWRITE
- && subbuffer_id_is_noref(config, id));
set_fs(KERNEL_DS);
pagefault_disable();
set_fs(KERNEL_DS);
pagefault_disable();
- if (unlikely(!access_ok(VERIFY_READ, src, len)))
+ if (unlikely(!
lttng_
access_ok(VERIFY_READ, src, len)))
goto fill_buffer;
if (likely(pagecpy == len)) {
ret = lib_ring_buffer_do_copy_from_user_inatomic(
goto fill_buffer;
if (likely(pagecpy == len)) {
ret = lib_ring_buffer_do_copy_from_user_inatomic(
-
r
pages->p[index].virt + (offset & ~PAGE_MASK),
+
backend_
pages->p[index].virt + (offset & ~PAGE_MASK),
src, len);
if (unlikely(ret > 0)) {
/* Copy failed. */
src, len);
if (unlikely(ret > 0)) {
/* Copy failed. */
@@
-381,35
+357,29
@@
void lib_ring_buffer_strcpy_from_user_inatomic(const struct lib_ring_buffer_conf
{
struct lib_ring_buffer_backend *bufb = &ctx->buf->backend;
struct channel_backend *chanb = &ctx->chan->backend;
{
struct lib_ring_buffer_backend *bufb = &ctx->buf->backend;
struct channel_backend *chanb = &ctx->chan->backend;
- size_t
sbidx,
index, pagecpy;
+ size_t index, pagecpy;
size_t offset = ctx->buf_offset;
size_t offset = ctx->buf_offset;
- struct lib_ring_buffer_backend_pages *rpages;
- unsigned long sb_bindex, id;
+ struct lib_ring_buffer_backend_pages *backend_pages;
mm_segment_t old_fs = get_fs();
if (unlikely(!len))
return;
mm_segment_t old_fs = get_fs();
if (unlikely(!len))
return;
+ backend_pages =
+ lib_ring_buffer_get_backend_pages_from_ctx(config, ctx);
offset &= chanb->buf_size - 1;
offset &= chanb->buf_size - 1;
- sbidx = offset >> chanb->subbuf_size_order;
index = (offset & (chanb->subbuf_size - 1)) >> PAGE_SHIFT;
pagecpy = min_t(size_t, len, (-offset) & ~PAGE_MASK);
index = (offset & (chanb->subbuf_size - 1)) >> PAGE_SHIFT;
pagecpy = min_t(size_t, len, (-offset) & ~PAGE_MASK);
- id = bufb->buf_wsb[sbidx].id;
- sb_bindex = subbuffer_id_get_index(config, id);
- rpages = bufb->array[sb_bindex];
- CHAN_WARN_ON(ctx->chan,
- config->mode == RING_BUFFER_OVERWRITE
- && subbuffer_id_is_noref(config, id));
set_fs(KERNEL_DS);
pagefault_disable();
set_fs(KERNEL_DS);
pagefault_disable();
- if (unlikely(!access_ok(VERIFY_READ, src, len)))
+ if (unlikely(!
lttng_
access_ok(VERIFY_READ, src, len)))
goto fill_buffer;
if (likely(pagecpy == len)) {
size_t count;
count = lib_ring_buffer_do_strcpy_from_user_inatomic(config,
goto fill_buffer;
if (likely(pagecpy == len)) {
size_t count;
count = lib_ring_buffer_do_strcpy_from_user_inatomic(config,
-
r
pages->p[index].virt
+
backend_
pages->p[index].virt
+ (offset & ~PAGE_MASK),
src, len - 1);
offset += count;
+ (offset & ~PAGE_MASK),
src, len - 1);
offset += count;
@@
-417,13
+387,13
@@
void lib_ring_buffer_strcpy_from_user_inatomic(const struct lib_ring_buffer_conf
if (unlikely(count < len - 1)) {
size_t pad_len = len - 1 - count;
if (unlikely(count < len - 1)) {
size_t pad_len = len - 1 - count;
- lib_ring_buffer_do_memset(
r
pages->p[index].virt
+ lib_ring_buffer_do_memset(
backend_
pages->p[index].virt
+ (offset & ~PAGE_MASK),
pad, pad_len);
offset += pad_len;
}
/* Ending '\0' */
+ (offset & ~PAGE_MASK),
pad, pad_len);
offset += pad_len;
}
/* Ending '\0' */
- lib_ring_buffer_do_memset(
r
pages->p[index].virt
+ lib_ring_buffer_do_memset(
backend_
pages->p[index].virt
+ (offset & ~PAGE_MASK),
'\0', 1);
} else {
+ (offset & ~PAGE_MASK),
'\0', 1);
} else {
@@
-492,7
+462,7
@@
unsigned long lib_ring_buffer_copy_from_user_check_nofault(void *dest,
unsigned long ret;
mm_segment_t old_fs;
unsigned long ret;
mm_segment_t old_fs;
- if (!access_ok(VERIFY_READ, src, len))
+ if (!
lttng_
access_ok(VERIFY_READ, src, len))
return 1;
old_fs = get_fs();
set_fs(KERNEL_DS);
return 1;
old_fs = get_fs();
set_fs(KERNEL_DS);
This page took
0.029146 seconds
and
4
git commands to generate.