mirrors/Astral
1
0
Fork 0
mirror of https://github.com/Mathewnd/Astral.git synced 2026-10-27 12:48:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

ringbuffer: handle user addresses

Browse Source
This commit is contained in:
Matheus
2024-09-18 19:01:01 -03:00
parent a63f8c37cc
commit 7460e8b707
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel-src/include/ringbuffer.h
+3
View File
@@ -19,11 +19,13 @@ int ringbuffer_init(ringbuffer_t *ringbuffer, size_t size);
void ringbuffer_destroy(ringbuffer_t *ringbuffer);
// reads count bytes from ring buffer into buffer
// can accept a buffer in userspace
// returns -1 if it was unable to read (due to EFAULT when copying a user page)
// otherwise returns the number of bytes read
size_t ringbuffer_read(ringbuffer_t* ringbuffer, void *buffer, size_t count);
// writes count bytes from buffer into ring buffer
// can accept a buffer in userspace
// returns -1 if it was unable to write (due to EFAULT when copying a user page)
// otherwise returns the number of bytes read
size_t ringbuffer_write(ringbuffer_t* ringbuffer, void *buffer, size_t count);
@@ -33,6 +35,7 @@ size_t ringbuffer_write(ringbuffer_t* ringbuffer, void *buffer, size_t count);
size_t ringbuffer_truncate(ringbuffer_t *ringbuffer, size_t count);
// same as ringbuffer_read, but accepts an offset and does not update the read pointer
// can accept a buffer in userspace
// returns -1 if it was unable to read (due to EFAULT when copying a user page)
// otherwise returns the number of bytes read
size_t ringbuffer_peek(ringbuffer_t *ringbuffer, void *buffer, uintmax_t offset, size_t count);
kernel-src/lib/ringbuffer.c
+14 -7
View File
@@ -3,6 +3,7 @@
#include <util.h>
#include <errno.h>
#include <string.h>
#include <kernel/usercopy.h>
int ringbuffer_init(ringbuffer_t *ringbuffer, size_t size) {
ringbuffer->data = vmm_map(NULL, ROUND_UP(size, PAGE_SIZE), VMM_FLAGS_ALLOCATE, ARCH_MMU_FLAGS_WRITE | ARCH_MMU_FLAGS_READ | ARCH_MMU_FLAGS_NOEXEC, NULL);
@@ -32,12 +33,14 @@ size_t ringbuffer_read(ringbuffer_t *ringbuffer, void *buffer, size_t count) {
size_t firstpassremaining = ringbuffer->size - firstpassoffset;
size_t firstpasscount = min(count, firstpassremaining);
memcpy(buffer, (void *)((uintptr_t)ringbuffer->data + firstpassoffset), firstpasscount);
if (USERCOPY_POSSIBLY_FROM_USER(buffer, (void *)((uintptr_t)ringbuffer->data + firstpassoffset), firstpasscount))
return -1;
if (firstpasscount == count)
goto leave;
memcpy((void *)((uintptr_t)buffer + firstpasscount), ringbuffer->data, count - firstpasscount);
if (USERCOPY_POSSIBLY_FROM_USER((void *)((uintptr_t)buffer + firstpasscount), ringbuffer->data, count - firstpasscount))
return -1;
leave:
ringbuffer->read += count;
@@ -58,12 +61,14 @@ size_t ringbuffer_peek(ringbuffer_t *ringbuffer, void *buffer, uintmax_t offset,
size_t firstpassremaining = ringbuffer->size - firstpassoffset;
size_t firstpasscount = min(count, firstpassremaining);
memcpy(buffer, (void *)((uintptr_t)ringbuffer->data + firstpassoffset), firstpasscount);
if (USERCOPY_POSSIBLY_TO_USER(buffer, (void *)((uintptr_t)ringbuffer->data + firstpassoffset), firstpasscount))
return -1;
if (firstpasscount == count)
return count;
memcpy((void *)((uintptr_t)buffer + firstpasscount), ringbuffer->data, count - firstpasscount);
if (USERCOPY_POSSIBLY_TO_USER((void *)((uintptr_t)buffer + firstpasscount), ringbuffer->data, count - firstpasscount))
return -1;
return count;
}
@@ -75,12 +80,14 @@ size_t ringbuffer_write(ringbuffer_t *ringbuffer, void *buffer, size_t count) {
size_t firstpassremaining = ringbuffer->size - firstpassoffset;
size_t firstpasscount = min(count, firstpassremaining);
memcpy((void *)((uintptr_t)ringbuffer->data + firstpassoffset), buffer, firstpasscount);
if (USERCOPY_POSSIBLY_FROM_USER((void *)((uintptr_t)ringbuffer->data + firstpassoffset), buffer, firstpasscount))
return -1;
if (firstpasscount == count)
if (firstpasscount == count)
goto leave;
memcpy(ringbuffer->data, (void *)((uintptr_t)buffer + firstpasscount), count - firstpasscount);
if (USERCOPY_POSSIBLY_FROM_USER(ringbuffer->data, (void *)((uintptr_t)buffer + firstpasscount), count - firstpasscount))
return -1;
leave:
ringbuffer->write += count;