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

block: directly do DMA into page cache

Browse Source
This commit is contained in:
Matheus
2024-09-18 21:43:11 -03:00
parent c76b37693b
commit 5dfd2c3d6f
1 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel-src/io/block/block.c
+7 -13
View File
@@ -79,6 +79,7 @@ static int rwblock(int minor, void *buffer, size_t size, uintmax_t offset, int f
if (desc == NULL) if (desc == NULL)
return ENODEV; return ENODEV;
__assert((size % desc->blocksize) == 0);
uintmax_t bytetop = desc->blockcapacity * desc->blocksize; uintmax_t bytetop = desc->blockcapacity * desc->blocksize;
// offset past end // offset past end
@@ -99,28 +100,21 @@ static int rwblock(int minor, void *buffer, size_t size, uintmax_t offset, int f
size_t lbaoffset, lbacount, startoffset; size_t lbaoffset, lbacount, startoffset;
bytestolba(desc, offset, size, &lbaoffset, &lbacount, &startoffset); bytestolba(desc, offset, size, &lbaoffset, &lbacount, &startoffset);
void *lbabuffer = vmm_map(NULL, lbacount * desc->blocksize, VMM_FLAGS_ALLOCATE, MAP_FLAGS, NULL); int error = 0;
if (lbabuffer == NULL)
return ENOMEM;
int error = DISK_READ(desc, lbabuffer, lbaoffset + desc->lbaoffset, lbacount);
if (error)
goto cleanup;
if (write) { if (write) {
memcpy((void *)((uintptr_t)lbabuffer + startoffset), buffer, size); error = DISK_WRITE(desc, buffer, lbaoffset + desc->lbaoffset, lbacount);
error = DISK_WRITE(desc, lbabuffer, lbaoffset + desc->lbaoffset, lbacount); if (error)
goto cleanup;
} else {
error = DISK_READ(desc, buffer, lbaoffset + desc->lbaoffset, lbacount);
if (error) if (error)
goto cleanup; goto cleanup;
} }
if (!write)
memcpy(buffer, (void *)((uintptr_t)lbabuffer + startoffset), size);
*done = size; *done = size;
cleanup: cleanup:
vmm_unmap(lbabuffer, lbacount * desc->blocksize, 0);
return error; return error;
} }