[NTOS:CC] Use CcpEnsureFileCacheResident where applicable

TAN-Gaming · Nov 21, 2024 · 7c0290a · 7c0290a
1 parent c693f8c
commit 7c0290a
Showing 1 changed file with 18 additions and 22 deletions.
diff --git a/ntoskrnl/cc/copy.c b/ntoskrnl/cc/copy.c
@@ -514,25 +514,25 @@ CcCopyRead (
     /* Documented to ASSERT, but KMTests test this case... */
     // ASSERT((FileOffset->QuadPart + Length) <= SharedCacheMap->FileSize.QuadPart);
 
+    if (!CcpEnsureFileCacheResident(SharedCacheMap, Wait, FALSE, FileOffset->QuadPart, Length))
+    {
+        ASSERT(!Wait);
+        return FALSE;
+    }
+
     CurrentOffset = FileOffset->QuadPart;
     while(CurrentOffset < ReadEnd)
     {
         Status = CcRosGetVacb(SharedCacheMap, CurrentOffset, &Vacb);
         if (!NT_SUCCESS(Status))
-        {
             ExRaiseStatus(Status);
-            return FALSE;
-        }
 
         _SEH2_TRY
         {
             ULONG VacbOffset = CurrentOffset % VACB_MAPPING_GRANULARITY;
             ULONG VacbLength = min(Length, VACB_MAPPING_GRANULARITY - VacbOffset);
             SIZE_T CopyLength = VacbLength;
 
-            if (!CcRosEnsureVacbResident(Vacb, Wait, FALSE, VacbOffset, VacbLength))
-                return FALSE;
-
             _SEH2_TRY
             {
                 RtlCopyMemory(Buffer, (PUCHAR)Vacb->BaseAddress + VacbOffset, CopyLength);
@@ -619,6 +619,12 @@ CcCopyWrite (
 
     ASSERT(WriteEnd <= SharedCacheMap->SectionSize.QuadPart);
 
+    if (!CcpEnsureFileCacheResident(SharedCacheMap, Wait, FALSE, FileOffset->QuadPart, Length))
+    {
+        ASSERT(!Wait);
+        return FALSE;
+    }
+
     CurrentOffset = FileOffset->QuadPart;
     while(CurrentOffset < WriteEnd)
     {
@@ -627,18 +633,10 @@ CcCopyWrite (
 
         Status = CcRosGetVacb(SharedCacheMap, CurrentOffset, &Vacb);
         if (!NT_SUCCESS(Status))
-        {
             ExRaiseStatus(Status);
-            return FALSE;
-        }
 
         _SEH2_TRY
         {
-            if (!CcRosEnsureVacbResident(Vacb, Wait, FALSE, VacbOffset, VacbLength))
-            {
-                return FALSE;
-            }
-
             _SEH2_TRY
             {
                 RtlCopyMemory((PVOID)((ULONG_PTR)Vacb->BaseAddress + VacbOffset), Buffer, VacbLength);
@@ -890,25 +888,23 @@ CcZeroData (
 
     ASSERT(EndOffset->QuadPart <= SharedCacheMap->SectionSize.QuadPart);
 
+    if (!CcpEnsureFileCacheResident(SharedCacheMap, Wait, FALSE, StartOffset->QuadPart, Length))
+    {
+        ASSERT(!Wait);
+        return FALSE;
+    }
+
     while(WriteOffset.QuadPart < EndOffset->QuadPart)
     {
         ULONG VacbOffset = WriteOffset.QuadPart % VACB_MAPPING_GRANULARITY;
         ULONG VacbLength = min(Length, VACB_MAPPING_GRANULARITY - VacbOffset);
 
         Status = CcRosGetVacb(SharedCacheMap, WriteOffset.QuadPart, &Vacb);
         if (!NT_SUCCESS(Status))
-        {
             ExRaiseStatus(Status);
-            return FALSE;
-        }
 
         _SEH2_TRY
         {
-            if (!CcRosEnsureVacbResident(Vacb, Wait, FALSE, VacbOffset, VacbLength))
-            {
-                return FALSE;
-            }
-
             RtlZeroMemory((PVOID)((ULONG_PTR)Vacb->BaseAddress + VacbOffset), VacbLength);
 
             WriteOffset.QuadPart += VacbLength;