Sinipelto
/
banan-os
forked from Bananymous/banan-os
1
0
Fork 0
Code Pull Requests Activity

Kernel: DiskCache uses are now done without interrupts 

This allows disk cache to not be invalid state after partial read/write
This commit is contained in:
Bananymous 2023-07-27 18:35:08 +03:00
parent 0f23e1f0f4
commit e4509d9482
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
kernel/kernel/Storage/DiskCache.cpp
View File

@ -1,3 +1,4 @@
#include <kernel/CriticalScope.h>
#include <kernel/LockGuard.h> #include <kernel/LockGuard.h>
#include <kernel/Memory/Heap.h> #include <kernel/Memory/Heap.h>
#include <kernel/Memory/PageTable.h> #include <kernel/Memory/PageTable.h>
@ -184,13 +185,13 @@ namespace Kernel
if (!(this->dirty_mask & (1 << i))) if (!(this->dirty_mask & (1 << i)))
continue; continue;
MUST(device.write_sectors_impl(this->first_sector + i, 1, (const uint8_t*)(i * device.sector_size()))); MUST(device.write_sectors_impl(this->first_sector + i, 1, (const uint8_t*)(i * device.sector_size())));
// FIXME: race condition between here :)
this->dirty_mask &= ~(1 << i);
} }
page_table.unmap_page(0); page_table.unmap_page(0);
page_table.unlock(); page_table.unlock();
this->dirty_mask = 0;
} }
BAN::ErrorOr<void> DiskCache::PageCache::read_sector(StorageDevice& device, uint64_t sector, uint8_t* buffer) BAN::ErrorOr<void> DiskCache::PageCache::read_sector(StorageDevice& device, uint64_t sector, uint8_t* buffer)
@ -212,11 +213,17 @@ namespace Kernel
// Sector not yet cached // Sector not yet cached
if (!(this->sector_mask & (1 << sector_offset))) if (!(this->sector_mask & (1 << sector_offset)))
{ {
TRY(device.read_sectors_impl(sector, 1, (uint8_t*)(sector_offset * device.sector_size()))); TRY(device.read_sectors_impl(sector, 1, buffer));
CriticalScope _;
memcpy((void*)(sector_offset * device.sector_size()), buffer, device.sector_size());
this->sector_mask |= 1 << sector_offset; this->sector_mask |= 1 << sector_offset;
} }
else
memcpy(buffer, (const void*)(sector_offset * device.sector_size()), device.sector_size()); {
CriticalScope _;
memcpy(buffer, (const void*)(sector_offset * device.sector_size()), device.sector_size());
}
page_table.unmap_page(0); page_table.unmap_page(0);
@ -241,9 +248,12 @@ namespace Kernel
page_table.map_page_at(this->paddr, 0, PageTable::Flags::ReadWrite | PageTable::Flags::Present); page_table.map_page_at(this->paddr, 0, PageTable::Flags::ReadWrite | PageTable::Flags::Present);
memcpy((void*)(sector_offset * device.sector_size()), buffer, device.sector_size()); {
this->sector_mask |= 1 << sector_offset; CriticalScope _;
this->dirty_mask |= 1 << sector_offset; memcpy((void*)(sector_offset * device.sector_size()), buffer, device.sector_size());
this->sector_mask |= 1 << sector_offset;
this->dirty_mask |= 1 << sector_offset;
}
page_table.unmap_page(0); page_table.unmap_page(0);