[MERGE #5345 @atulkatti] MSFT:17960528 In case we back-off from IdleDecommit we may still have pages in BG zero page queue.

atulkatti · atulkatti · commit 9e876e00804a · 2018-06-21T15:46:05.000-07:00
Merge pull request #5345 from atulkatti:FixIdleDecommitCheckAssert.1
diff --git a/lib/Common/Memory/PageAllocator.cpp b/lib/Common/Memory/PageAllocator.cpp
@@ -2519,7 +2519,8 @@ PageAllocatorBase<TVirtualAlloc, TSegment, TPageSegment>::Check()
 #if ENABLE_BACKGROUND_PAGE_ZEROING
     if (CONFIG_FLAG(EnableBGFreeZero))
     {
-        Assert(!this->HasZeroQueuedPages());
+        // We may have backed-off from the idle decommit on the background thread.
+        Assert(!this->HasZeroQueuedPages() || this->waitingToEnterIdleDecommit);
     }
 #endif
     size_t currentFreePageCount = 0;

Original file line number	Diff line number	Diff line change
`@@ -2519,7 +2519,8 @@ PageAllocatorBase<TVirtualAlloc, TSegment, TPageSegment>::Check()`
`2519`	`2519`	`#if ENABLE_BACKGROUND_PAGE_ZEROING`
`2520`	`2520`	`if (CONFIG_FLAG(EnableBGFreeZero))`
`2521`	`2521`	`{`
`2522`		`- Assert(!this->HasZeroQueuedPages());`
	`2522`	`+ // We may have backed-off from the idle decommit on the background thread.`
	`2523`	`+ Assert(!this->HasZeroQueuedPages() \|\| this->waitingToEnterIdleDecommit);`
`2523`	`2524`	`}`
`2524`	`2525`	`#endif`
`2525`	`2526`	`size_t currentFreePageCount = 0;`