From 4d698f45aa6543fda4dd0eb9a01eb6d26d9eb4c1 Mon Sep 17 00:00:00 2001
From: Art Yerkes <art.yerkes@gmail.com>
Date: Mon, 5 Mar 2012 02:20:22 +0000
Subject: [PATCH] [NEWCC] Fix paging out. - We know we're in a wait entry in
 the section.  What we really want to know is if it's safe to evict this
 address space when withdrawing the mappings. - We don't want to corrupt our
 wait entry in the section page table to keep accumulating dirty state into
 the page out process until it's time to finally evict.

svn path=/trunk/; revision=56024
---
 reactos/ntoskrnl/cache/section/swapout.c | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/reactos/ntoskrnl/cache/section/swapout.c b/reactos/ntoskrnl/cache/section/swapout.c
index dd1e86bb187..1c6e4d73652 100644
--- a/reactos/ntoskrnl/cache/section/swapout.c
+++ b/reactos/ntoskrnl/cache/section/swapout.c
@@ -184,7 +184,7 @@ MmPageOutCacheSection
 (PMMSUPPORT AddressSpace,
  MEMORY_AREA* MemoryArea,
  PVOID Address,
- BOOLEAN Dirty,
+ PBOOLEAN Dirty,
  PMM_REQUIRED_RESOURCES Required)
 {
 	ULONG Entry;
@@ -204,19 +204,16 @@ MmPageOutCacheSection
 
 	Entry = MmGetPageEntrySectionSegment(Segment, &TotalOffset);
 
-	if (MM_IS_WAIT_PTE(Entry))
+	if (MmIsPageSwapEntry(Process, PAddress))
 	{
+        SWAPENTRY SwapEntry;
+        MmGetPageFileMapping(Process, PAddress, &SwapEntry);
 		MmUnlockSectionSegment(Segment);
-		return STATUS_SUCCESS + 1;
+		return SwapEntry == MM_WAIT_ENTRY ? STATUS_SUCCESS + 1 : STATUS_UNSUCCESSFUL;
 	}
 
-	if (Dirty) {
-        DPRINT("Dirty page: %p:%p segment %p offset %08x%08x\n", Process, Address, Segment, TotalOffset.HighPart, TotalOffset.LowPart);
-		MmSetPageEntrySectionSegment(Segment, &TotalOffset, DIRTY_SSE(Entry));
-    }
-
     MmDeleteRmap(Required->Page[0], Process, Address);
-    MmDeleteVirtualMapping(Process, Address, FALSE, NULL, &OurPage);
+    MmDeleteVirtualMapping(Process, Address, FALSE, Dirty, &OurPage);
     ASSERT(OurPage == Required->Page[0]);
 
 	MmReleasePageMemoryConsumer(MC_CACHE, Required->Page[0]);
@@ -230,7 +227,7 @@ NTSTATUS
 NTAPI
 MmpPageOutPhysicalAddress(PFN_NUMBER Page)
 {
-   BOOLEAN ProcRef = FALSE;
+   BOOLEAN ProcRef = FALSE, PageDirty;
    PFN_NUMBER SectionPage = 0;
    PMM_RMAP_ENTRY entry;
    PMM_SECTION_SEGMENT Segment = NULL;
@@ -357,8 +354,10 @@ MmpPageOutPhysicalAddress(PFN_NUMBER Page)
 		   ASSERT(KeGetCurrentIrql() <= APC_LEVEL);
 
 		   DPRINT("%x:%x, page %x %x\n", Process, Address, Page, Resources.Page[0]);
+           PageDirty = FALSE;
 		   Status = MmPageOutCacheSection
-			   (AddressSpace, MemoryArea, Address, Dirty, &Resources);
+			   (AddressSpace, MemoryArea, Address, &PageDirty, &Resources);
+           Dirty |= PageDirty;
 		   DPRINT("%x\n", Status);
 		   
 		   ASSERT(KeGetCurrentIrql() <= APC_LEVEL);