#include <linux/uaccess.h>
/* Internal helpers */
-#include "../../wrapper/ringbuffer/backend_internal.h"
-#include "../../wrapper/ringbuffer/frontend_internal.h"
+#include <wrapper/ringbuffer/backend_internal.h>
+#include <wrapper/ringbuffer/frontend_internal.h>
/* Ring buffer backend API */
extern int lib_ring_buffer_read_cstr(struct lib_ring_buffer_backend *bufb,
size_t offset, void *dest, size_t len);
-extern struct page **
-lib_ring_buffer_read_get_page(struct lib_ring_buffer_backend *bufb, size_t offset,
+extern unsigned long *
+lib_ring_buffer_read_get_pfn(struct lib_ring_buffer_backend *bufb, size_t offset,
void ***virt);
/*
{
struct lib_ring_buffer_backend *bufb = &ctx->buf->backend;
struct channel_backend *chanb = &ctx->chan->backend;
- size_t sbidx, index;
+ size_t sbidx, index, pagecpy;
size_t offset = ctx->buf_offset;
- ssize_t pagecpy;
struct lib_ring_buffer_backend_pages *rpages;
unsigned long sb_bindex, id;
struct lib_ring_buffer_backend *bufb = &ctx->buf->backend;
struct channel_backend *chanb = &ctx->chan->backend;
- size_t sbidx, index;
+ size_t sbidx, index, pagecpy;
size_t offset = ctx->buf_offset;
- ssize_t pagecpy;
struct lib_ring_buffer_backend_pages *rpages;
unsigned long sb_bindex, id;
int ret;
char c;
- ret = __get_user(c, &src[count]);
+ ret = __copy_from_user_inatomic(&c, src + count, 1);
if (ret || !c)
break;
lib_ring_buffer_do_copy(config, &dest[count], &c, 1);
{
struct lib_ring_buffer_backend *bufb = &ctx->buf->backend;
struct channel_backend *chanb = &ctx->chan->backend;
- size_t sbidx, index;
+ size_t sbidx, index, pagecpy;
size_t offset = ctx->buf_offset;
- ssize_t pagecpy;
struct lib_ring_buffer_backend_pages *rpages;
unsigned long sb_bindex, id;
unsigned long ret;
rpages->p[index].virt + (offset & ~PAGE_MASK),
src, len);
if (unlikely(ret > 0)) {
- len -= (pagecpy - ret);
- offset += (pagecpy - ret);
+ /* Copy failed. */
goto fill_buffer;
}
} else {