Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-25 20:01:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1841660 - Fix potential deadlock waiting for StartupCache ThreadedPrefetch, r=jesup

Browse Source 
In a previous change to this logic, we missed a hidden early return in
the `MMAP_FAULT_HANDLER_CATCH()` macro which can early return on both
Linux and Windows. If this is hit, we could end up blocking at various
points waiting for the StartupCache to be prefetched.

This patch changes the logic to notify to happen in a ScopeExit instead,
ensuring that it'll happen on all return paths.

In addition, there was another potential deadlock due to the
ThreadedPrefetch thread acquiring mTableLock. This was fixed by passing
in the pointers in the runnable instead. This should be OK as we are
making sure to block on ThreadedPrefetch before we clear the startup
data already.

Differential Revision: https://phabricator.services.mozilla.com/D182732
This commit is contained in:
Nika Layzell 2023-07-04 19:05:06 +00:00
parent 471d7fc4fc
commit f216180afc
2 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
startupcache/StartupCache.cpp
View File

@ -255,8 +255,9 @@ void StartupCache::StartPrefetchMemory() {
MonitorAutoLock lock(mPrefetchComplete);
mPrefetchInProgress = true;
}
NS_DispatchBackgroundTask(NewRunnableMethod(
"StartupCache::ThreadedPrefetch", this, &StartupCache::ThreadedPrefetch));
NS_DispatchBackgroundTask(NewRunnableMethod<uint8_t*, size_t>(
"StartupCache::ThreadedPrefetch", this, &StartupCache::ThreadedPrefetch,
mCacheData.get<uint8_t>().get(), mCacheData.size()));
}
/**
@ -706,22 +707,20 @@ void StartupCache::WaitOnPrefetch() {
}
}
void StartupCache::ThreadedPrefetch() {
uint8_t* buf;
size_t size;
{
MutexAutoLock lock(mTableLock);
buf = mCacheData.get<uint8_t>().get();
size = mCacheData.size();
}
void StartupCache::ThreadedPrefetch(uint8_t* aStart, size_t aSize) {
// Always notify of completion, even if MMAP_FAULT_HANDLER_CATCH()
// early-returns.
auto notifyPrefetchComplete = MakeScopeExit([&] {
MonitorAutoLock lock(mPrefetchComplete);
mPrefetchInProgress = false;
mPrefetchComplete.NotifyAll();
});
// PrefetchMemory does madvise/equivalent, but doesn't access the memory
// pointed to by buf
MMAP_FAULT_HANDLER_BEGIN_BUFFER(buf, size)
PrefetchMemory(buf, size);
// pointed to by aStart
MMAP_FAULT_HANDLER_BEGIN_BUFFER(aStart, aSize)
PrefetchMemory(aStart, aSize);
MMAP_FAULT_HANDLER_CATCH()
MonitorAutoLock lock(mPrefetchComplete);
mPrefetchInProgress = false;
mPrefetchComplete.NotifyAll();
}
// mTableLock must be held

4
startupcache/StartupCache.h
View File

@ -213,12 +213,12 @@ class StartupCache : public nsIMemoryReporter {
Result<Ok, nsresult> WriteToDisk() MOZ_REQUIRES(mTableLock);
void WaitOnPrefetch();
void StartPrefetchMemory();
void StartPrefetchMemory() MOZ_REQUIRES(mTableLock);
static nsresult InitSingleton();
static void WriteTimeout(nsITimer* aTimer, void* aClosure);
void MaybeWriteOffMainThread();
void ThreadedPrefetch();
void ThreadedPrefetch(uint8_t* aStart, size_t aSize);
Monitor mPrefetchComplete{"StartupCachePrefetch"};
bool mPrefetchInProgress MOZ_GUARDED_BY(mPrefetchComplete){false};