i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

arm64: Fix double locking when calling FreeTable

Browse Source 
Change-Id: I159ccd17ec6c06d759e856f5397bf00a7473d1e0
Reviewed-on: https://review.haiku-os.org/c/haiku/+/8436
Tested-by: Commit checker robot <[email protected]>
Haiku-Format: Haiku-format Bot <[email protected]>
Reviewed-by: waddlesplash <[email protected]>
This commit is contained in:
Owen Anderson
2024-10-08 11:42:49 +00:00
committed by waddlesplash
parent f597685760
commit 17c50417f8
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/arch/arm64/VMSAv8TranslationMap.cpp
+3 -7
View File
@@ -139,20 +139,17 @@ VMSAv8TranslationMap::~VMSAv8TranslationMap()
ASSERT(!fIsKernel); ASSERT(!fIsKernel);
ASSERT(fRefcount == 0); ASSERT(fRefcount == 0);
{
ThreadCPUPinner pinner(thread_get_current_thread());
FreeTable(fPageTable, 0, fInitialLevel);
}
{ ThreadCPUPinner pinner(thread_get_current_thread());
InterruptsSpinLocker locker(sAsidLock); InterruptsSpinLocker locker(sAsidLock);
FreeTable(fPageTable, 0, fInitialLevel);
if (fASID != -1) { if (fASID != -1) {
sAsidMapping[fASID] = NULL; sAsidMapping[fASID] = NULL;
free_asid(fASID); free_asid(fASID);
} }
} }
}
// Switch user map into TTBR0. // Switch user map into TTBR0.
@@ -280,7 +277,6 @@ void
VMSAv8TranslationMap::FreeTable(phys_addr_t ptPa, uint64_t va, int level) VMSAv8TranslationMap::FreeTable(phys_addr_t ptPa, uint64_t va, int level)
{ {
ASSERT(level < 4); ASSERT(level < 4);
InterruptsSpinLocker locker(sAsidLock);
int tableBits = fPageBits - 3; int tableBits = fPageBits - 3;
uint64_t tableSize = 1UL << tableBits; uint64_t tableSize = 1UL << tableBits;