Redis/redis-For-Windows
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Qfork: RejoinCOWPages issue with swapping

Browse Source 
Fix for https://github.com/MSOpenTech/redis/issues/167

RejoinCOWPages used to call QueryWorkingSetEx to figure out
which pages had been dirtied since the memory map was protected
with PAGE_WRITECOPY. But dirty pages that had been swapped out to
the system page file would be reported as not valid
(VirtualAttributes.Valid == 0) and so we wouldn't restore them into
the file map.
QueryWorkingSetEx only gives information about pages that are in the
working set at the time it is called. Pages can be forced into the
working set using VirtualLock, but that seems like a potentially
risky / expensive solution.
I implemented a solution that uses VirtualQuery to find out which
regions have changed protection from PAGE_WRITECOPY.
This commit is contained in:
Alexis Campailla
2015-05-01 12:40:15 +02:00
parent 8c5b7fd244
commit 6076412a35
1 changed files with 21 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Win32_Interop/Win32_QFork.cpp
+21 -34
View File
@@ -638,8 +638,9 @@ LONG CALLBACK VectoredHeapMapper(PEXCEPTION_POINTERS info) {
}
else
{
DWORD err = GetLastError();
::redisLog(REDIS_WARNING, "\nF(0x%p)", startOfMapping);
::redisLog(REDIS_WARNING, "\t MapViewOfFileEx failed with error 0x%08X. \n", GetLastError());
::redisLog(REDIS_WARNING, "\t MapViewOfFileEx failed with error 0x%08X. \n", err);
::redisLog(REDIS_WARNING, "\t heapStart 0x%p\n", heapStart);
::redisLog(REDIS_WARNING, "\t heapEnd 0x%p\n", heapEnd);
::redisLog(REDIS_WARNING, "\t failing access location 0x%p\n", failingMemoryAddress);
@@ -1057,47 +1058,33 @@ void RejoinCOWPages(HANDLE mmHandle, byte* mmStart, size_t mmSize) {
0,
mmSize,
string("RejoinCOWPages: Could not map COW back-copy view."));
HANDLE hProcess = GetCurrentProcess();
int pages = (int)(mmSize / pageSize);
shared_ptr<PSAPI_WORKING_SET_EX_INFORMATION> pwsi(
new PSAPI_WORKING_SET_EX_INFORMATION[pages],
[](PSAPI_WORKING_SET_EX_INFORMATION *p) { delete[] p; });
if (pwsi == NULL) {
throw new system_error(
GetLastError(),
system_category(),
"pwsi == NULL");
}
memset(pwsi.get(), 0, sizeof(PSAPI_WORKING_SET_EX_INFORMATION)* pages);
int virtualLockFailures = 0;
for (int page = 0; page < pages; page++) {
pwsi.get()[page].VirtualAddress = mmStart + page * pageSize;
}
if (QueryWorkingSetEx(
hProcess,
pwsi.get(),
sizeof(PSAPI_WORKING_SET_EX_INFORMATION)* pages) == FALSE) {
throw system_error(
GetLastError(),
system_category(),
"RejoinCOWPages: QueryWorkingSet failure");
}
for (int page = 0; page < pages; page++) {
if (pwsi.get()[page].VirtualAttributes.Valid == 1) {
// A 0 share count indicates a COW page
if (pwsi.get()[page].VirtualAttributes.ShareCount == 0) {
memcpy(copyView + (page*pageSize), mmStart + (page*pageSize), pageSize);
}
for (byte* mmAddress = mmStart; mmAddress < mmStart + mmSize; ) {
MEMORY_BASIC_INFORMATION memInfo;
if (!VirtualQuery(
mmAddress,
&memInfo,
sizeof(memInfo))) {
throw system_error(
GetLastError(),
system_category(),
"RejoinCOWPages: VirtualQuery failure");
}
byte* regionEnd = (byte*)memInfo.BaseAddress + memInfo.RegionSize;
if (memInfo.Protect != PAGE_WRITECOPY) {
byte* srcEnd = min(regionEnd, mmStart + mmSize);
memcpy(copyView + (mmAddress - mmStart), mmAddress, srcEnd - mmAddress);
}
mmAddress = regionEnd;
}
// If the COWs are not discarded, then there is no way of propagating changes into subsequent fork operations.
if (IsWindowsVersionAtLeast(8, 0, 0)) {
// restores all page protections on the view and culls the COW pages.
DWORD oldProtect;
if (FALSE == VirtualProtect(mmStart, pages * pageSize, PAGE_READWRITE | PAGE_REVERT_TO_FILE_MAP, &oldProtect)) {
if (FALSE == VirtualProtect(mmStart, mmSize, PAGE_READWRITE | PAGE_REVERT_TO_FILE_MAP, &oldProtect)) {
throw std::system_error(GetLastError(), std::system_category(), "RejoinCOWPages: COW cull failed");
}
} else {