mirrors/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-01-23 01:32:14 -05:00
Code Issues Projects Releases Packages Wiki Activity

Selectively disable interrupts in MM.

Browse source 
Also added an ASSERT_INTERRUPTS_DISABLED() macro.
This commit is contained in:
Andreas Kling 2018-10-25 10:15:28 +02:00
parent 86a547dcac
commit 1c49b34b93
Notes: sideshowbarker 2024-07-19 18:39:14 +09:00 
Author: https://github.com/awesomekling
Commit: https://github.com/SerenityOS/serenity/commit/1c49b34b93b
2 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Kernel/MemoryManager.cpp
View file

@ -58,6 +58,7 @@ void MemoryManager::initializePaging()
auto MemoryManager::ensurePTE(LinearAddress linearAddress) -> PageTableEntry auto MemoryManager::ensurePTE(LinearAddress linearAddress) -> PageTableEntry
{ {
ASSERT_INTERRUPTS_DISABLED();
dword pageDirectoryIndex = (linearAddress.get() >> 22) & 0x3ff; dword pageDirectoryIndex = (linearAddress.get() >> 22) & 0x3ff;
dword pageTableIndex = (linearAddress.get() >> 12) & 0x3ff; dword pageTableIndex = (linearAddress.get() >> 12) & 0x3ff;
@ -84,6 +85,7 @@ auto MemoryManager::ensurePTE(LinearAddress linearAddress) -> PageTableEntry
void MemoryManager::protectMap(LinearAddress linearAddress, size_t length) void MemoryManager::protectMap(LinearAddress linearAddress, size_t length)
{ {
InterruptDisabler disabler;
// FIXME: ASSERT(linearAddress is 4KB aligned); // FIXME: ASSERT(linearAddress is 4KB aligned);
for (dword offset = 0; offset < length; offset += 4096) { for (dword offset = 0; offset < length; offset += 4096) {
auto pteAddress = linearAddress.offset(offset); auto pteAddress = linearAddress.offset(offset);
@ -98,6 +100,7 @@ void MemoryManager::protectMap(LinearAddress linearAddress, size_t length)
void MemoryManager::identityMap(LinearAddress linearAddress, size_t length) void MemoryManager::identityMap(LinearAddress linearAddress, size_t length)
{ {
InterruptDisabler disabler;
// FIXME: ASSERT(linearAddress is 4KB aligned); // FIXME: ASSERT(linearAddress is 4KB aligned);
for (dword offset = 0; offset < length; offset += 4096) { for (dword offset = 0; offset < length; offset += 4096) {
auto pteAddress = linearAddress.offset(offset); auto pteAddress = linearAddress.offset(offset);
@ -117,6 +120,7 @@ void MemoryManager::initialize()
PageFaultResponse MemoryManager::handlePageFault(const PageFault& fault) PageFaultResponse MemoryManager::handlePageFault(const PageFault& fault)
{ {
ASSERT_INTERRUPTS_DISABLED();
kprintf("MM: handlePageFault(%w) at laddr=%p\n", fault.code(), fault.address().get()); kprintf("MM: handlePageFault(%w) at laddr=%p\n", fault.code(), fault.address().get());
if (fault.isNotPresent()) { if (fault.isNotPresent()) {
kprintf(" >> NP fault!\n"); kprintf(" >> NP fault!\n");
@ -138,6 +142,7 @@ RetainPtr<Zone> MemoryManager::createZone(size_t size)
Vector<PhysicalAddress> MemoryManager::allocatePhysicalPages(size_t count) Vector<PhysicalAddress> MemoryManager::allocatePhysicalPages(size_t count)
{ {
InterruptDisabler disabler;
if (count > m_freePages.size()) if (count > m_freePages.size())
return { }; return { };
@ -150,6 +155,7 @@ Vector<PhysicalAddress> MemoryManager::allocatePhysicalPages(size_t count)
byte* MemoryManager::quickMapOnePage(PhysicalAddress physicalAddress) byte* MemoryManager::quickMapOnePage(PhysicalAddress physicalAddress)
{ {
ASSERT_INTERRUPTS_DISABLED();
auto pte = ensurePTE(LinearAddress(4 * MB)); auto pte = ensurePTE(LinearAddress(4 * MB));
kprintf("quickmap %x @ %x {pte @ %p}\n", physicalAddress.get(), 4*MB, pte.ptr()); kprintf("quickmap %x @ %x {pte @ %p}\n", physicalAddress.get(), 4*MB, pte.ptr());
pte.setPhysicalPageBase(physicalAddress.pageBase()); pte.setPhysicalPageBase(physicalAddress.pageBase());
@ -174,6 +180,7 @@ void MemoryManager::flushTLB(LinearAddress laddr)
bool MemoryManager::unmapRegion(Task& task, Task::Region& region) bool MemoryManager::unmapRegion(Task& task, Task::Region& region)
{ {
InterruptDisabler disabler;
auto& zone = *region.zone; auto& zone = *region.zone;
for (size_t i = 0; i < zone.m_pages.size(); ++i) { for (size_t i = 0; i < zone.m_pages.size(); ++i) {
auto laddr = region.linearAddress.offset(i * PAGE_SIZE); auto laddr = region.linearAddress.offset(i * PAGE_SIZE);
@ -190,6 +197,7 @@ bool MemoryManager::unmapRegion(Task& task, Task::Region& region)
bool MemoryManager::unmapRegionsForTask(Task& task) bool MemoryManager::unmapRegionsForTask(Task& task)
{ {
ASSERT_INTERRUPTS_DISABLED();
for (auto& region : task.m_regions) { for (auto& region : task.m_regions) {
if (!unmapRegion(task, *region)) if (!unmapRegion(task, *region))
return false; return false;
@ -199,6 +207,7 @@ bool MemoryManager::unmapRegionsForTask(Task& task)
bool MemoryManager::mapRegion(Task& task, Task::Region& region) bool MemoryManager::mapRegion(Task& task, Task::Region& region)
{ {
InterruptDisabler disabler;
auto& zone = *region.zone; auto& zone = *region.zone;
for (size_t i = 0; i < zone.m_pages.size(); ++i) { for (size_t i = 0; i < zone.m_pages.size(); ++i) {
auto laddr = region.linearAddress.offset(i * PAGE_SIZE); auto laddr = region.linearAddress.offset(i * PAGE_SIZE);
@ -215,6 +224,7 @@ bool MemoryManager::mapRegion(Task& task, Task::Region& region)
bool MemoryManager::mapRegionsForTask(Task& task) bool MemoryManager::mapRegionsForTask(Task& task)
{ {
ASSERT_INTERRUPTS_DISABLED();
for (auto& region : task.m_regions) { for (auto& region : task.m_regions) {
if (!mapRegion(task, *region)) if (!mapRegion(task, *region))
return false; return false;
@ -229,6 +239,7 @@ bool copyToZone(Zone& zone, const void* data, size_t size)
return false; return false;
} }
InterruptDisabler disabler;
auto* dataptr = (const byte*)data; auto* dataptr = (const byte*)data;
size_t remaining = size; size_t remaining = size;
for (size_t i = 0; i < zone.m_pages.size(); ++i) { for (size_t i = 0; i < zone.m_pages.size(); ++i) {

2
Kernel/kassert.h
View file

@ -1,8 +1,10 @@
#pragma once #pragma once
#include "kprintf.h" #include "kprintf.h"
#include "i386.h"
#define CRASH() do { asm volatile("ud2"); } while(0) #define CRASH() do { asm volatile("ud2"); } while(0)
#define ASSERT(x) do { if (!(x)) { asm volatile("cli"); kprintf("ASSERTION FAILED: " #x "\n%s:%u in %s\n", __FILE__, __LINE__, __PRETTY_FUNCTION__); CRASH(); } } while(0) #define ASSERT(x) do { if (!(x)) { asm volatile("cli"); kprintf("ASSERTION FAILED: " #x "\n%s:%u in %s\n", __FILE__, __LINE__, __PRETTY_FUNCTION__); CRASH(); } } while(0)
#define RELEASE_ASSERT(x) do { if (!(x)) CRASH(); } while(0) #define RELEASE_ASSERT(x) do { if (!(x)) CRASH(); } while(0)
#define ASSERT_NOT_REACHED() ASSERT(false) #define ASSERT_NOT_REACHED() ASSERT(false)
#define ASSERT_INTERRUPTS_DISABLED() ASSERT(!(cpuFlags() & 0x200))