Ros-diffs January 2018

ros-diffs@reactos.org

37 participants
372 discussions

01/01: [ROSLOAD]: Fix NX enabling
by Alex Ionescu 28 Jan '18

28 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=478348ead113ae5d5b5ea… commit 478348ead113ae5d5b5eaf579b540f65339bebbd Author: Alex Ionescu <aionescu(a)gmail.com> AuthorDate: Sun Jan 28 16:29:43 2018 +0100 Commit: Alex Ionescu <aionescu(a)gmail.com> CommitDate: Sun Jan 28 16:29:43 2018 +0100 [ROSLOAD]: Fix NX enabling [ROSLOAD]: The IA32_MISC_ENABLE MSR bit actually _disables_ NX, so diabling the bit _enables_ NX. [ROSLOAD]: The MSR_XD_ENABLE_MASK is for the _high_ DWORD of the MSR (bit 34), not the low. [ROSLOAD]: Fix printf. [ENVIRON/ROSLOAD]: Switch to CPU_INFO structure instead of blindly using INT[4]. Revealed a bug in the PAE detection which was reading out of bounds. --- boot/environ/app/rosload/rosload.c | 39 ++++++++++++++++++++------------------ boot/environ/include/bl.h | 2 +- boot/environ/lib/misc/util.c | 30 ++++++++++++++--------------- boot/environ/lib/mm/i386/mmx86.c | 6 +++--- 4 files changed, 40 insertions(+), 37 deletions(-) diff --git a/boot/environ/app/rosload/rosload.c b/boot/environ/app/rosload/rosload.c index 9120631a1f..3c51963251 100644 --- a/boot/environ/app/rosload/rosload.c +++ b/boot/environ/app/rosload/rosload.c @@ -9783,24 +9783,26 @@ OslpMain ( _Out_ PULONG ReturnFlags ) { - INT CpuInfo[4]; - BOOLEAN NxDisabled; + CPU_INFO CpuInfo; + BOOLEAN NxEnabled; NTSTATUS Status; BOOLEAN ExecuteJump; + LARGE_INTEGER miscMsr; /* Check if the CPU supports NX */ - BlArchCpuId(0x80000001, 0, CpuInfo); - if (!(CpuInfo[3] & 0x10000)) + BlArchCpuId(0x80000001, 0, &CpuInfo); + if (!(CpuInfo.Edx & 0x10000)) { /* It doesn't, check if this is Intel */ - EfiPrintf(L"NX disabled: %d\r\n"); + EfiPrintf(L"NX disabled: %lx\r\n", CpuInfo.Edx); if (BlArchGetCpuVendor() == CPU_INTEL) { - /* Then turn off the MSR feature for it */ - EfiPrintf(L"NX being turned off\r\n"); - __writemsr(MSR_IA32_MISC_ENABLE, - __readmsr(MSR_IA32_MISC_ENABLE) & MSR_XD_ENABLE_MASK); - NxDisabled = TRUE; + /* Then turn off the MSR disable feature for it, enabling NX */ + EfiPrintf(L"NX being turned on\r\n"); + miscMsr.QuadPart = __readmsr(MSR_IA32_MISC_ENABLE); + miscMsr.HighPart &= MSR_XD_ENABLE_MASK; + __writemsr(MSR_IA32_MISC_ENABLE, miscMsr.QuadPart); + NxEnabled = TRUE; } } @@ -9818,12 +9820,13 @@ OslpMain ( /* Retore NX support */ __writemsr(MSR_EFER, __readmsr(MSR_EFER) ^ MSR_NXE); - /* Did we disable NX? */ - if (NxDisabled) + /* Did we manually enable NX? */ + if (NxEnabled) { - /* Turn it back on */ - __writemsr(MSR_IA32_MISC_ENABLE, - __readmsr(MSR_IA32_MISC_ENABLE) | ~MSR_XD_ENABLE_MASK); + /* Turn it back off */ + miscMsr.QuadPart = __readmsr(MSR_IA32_MISC_ENABLE); + miscMsr.HighPart |= ~MSR_XD_ENABLE_MASK; + __writemsr(MSR_IA32_MISC_ENABLE, miscMsr.QuadPart); } /* Go back */ @@ -9853,7 +9856,7 @@ OslMain ( NTSTATUS Status; PBL_RETURN_ARGUMENTS ReturnArguments; PBL_APPLICATION_ENTRY AppEntry; - INT CpuInfo[4]; + CPU_INFO CpuInfo; ULONG Flags; #ifdef DRAW_LOGO EFI_GRAPHICS_OUTPUT_BLT_PIXEL* gopBlt; @@ -9887,10 +9890,10 @@ OslMain ( if (BlArchIsCpuIdFunctionSupported(1)) { /* Query CPU features */ - BlArchCpuId(1, 0, CpuInfo); + BlArchCpuId(1, 0, &CpuInfo); /* Check if PAE is supported */ - if (CpuInfo[4] & 0x40) + if (CpuInfo.Edx & 0x40) { EfiPrintf(L"PAE Supported, but won't be used\r\n"); } diff --git a/boot/environ/include/bl.h b/boot/environ/include/bl.h index 7fa6c9667e..023e676d75 100644 --- a/boot/environ/include/bl.h +++ b/boot/environ/include/bl.h @@ -1666,7 +1666,7 @@ VOID BlArchCpuId ( _In_ ULONG Function, _In_ ULONG SubFunction, - _Out_ INT* Result + _Out_ PCPU_INFO Result ); CPU_VENDORS diff --git a/boot/environ/lib/misc/util.c b/boot/environ/lib/misc/util.c index d6e5459882..18f21cc2e9 100644 --- a/boot/environ/lib/misc/util.c +++ b/boot/environ/lib/misc/util.c @@ -904,12 +904,12 @@ BlArchGetPerformanceCounter ( ) { #if defined(_M_IX86) || defined(_M_X64) - INT CpuInfo[4]; + CPU_INFO CpuInfo; /* Serialize with CPUID, if it exists */ if (Archx86IsCpuidSupported()) { - BlArchCpuId(0, 0, CpuInfo); + BlArchCpuId(0, 0, &CpuInfo); } /* Read the TSC */ @@ -924,12 +924,12 @@ VOID BlArchCpuId ( _In_ ULONG Function, _In_ ULONG SubFunction, - _Out_ INT* Result + _Out_ PCPU_INFO Result ) { #if defined(_M_IX86) || defined(_M_X64) /* Use the intrinsic */ - __cpuidex(Result, Function, SubFunction); + __cpuidex((INT*)Result->AsUINT32, Function, SubFunction); #endif } @@ -938,37 +938,37 @@ BlArchGetCpuVendor ( VOID ) { - INT CpuInfo[4]; + CPU_INFO CpuInfo; INT Temp; /* Get the CPU Vendor */ - BlArchCpuId(0, 0, CpuInfo); - Temp = CpuInfo[2]; - CpuInfo[2] = CpuInfo[3]; - CpuInfo[3] = Temp; + BlArchCpuId(0, 0, &CpuInfo); + Temp = CpuInfo.Ecx; + CpuInfo.Ecx = CpuInfo.Edx; + CpuInfo.Edx = Temp; /* Check against supported values */ - if (!strncmp((PCHAR)&CpuInfo[1], "GenuineIntel", 12)) + if (!strncmp((PCHAR)&CpuInfo.Ebx, "GenuineIntel", 12)) { return CPU_INTEL; } - if (!strncmp((PCHAR)&CpuInfo[1], "AuthenticAMD", 12)) + if (!strncmp((PCHAR)&CpuInfo.Ebx, "AuthenticAMD", 12)) { return CPU_AMD; } - if (!strncmp((PCHAR)&CpuInfo[1], "CentaurHauls", 12)) + if (!strncmp((PCHAR)&CpuInfo.Ebx, "CentaurHauls", 12)) { return CPU_VIA; } - if (!strncmp((PCHAR)&CpuInfo[1], "CyrixInstead", 12)) + if (!strncmp((PCHAR)&CpuInfo.Ebx, "CyrixInstead", 12)) { return CPU_CYRIX; } - if (!strncmp((PCHAR)&CpuInfo[1], "GenuineTMx86", 12)) + if (!strncmp((PCHAR)&CpuInfo.Ebx, "GenuineTMx86", 12)) { return CPU_TRANSMETA; } - if (!strncmp((PCHAR)&CpuInfo[1], "RiseRiseRise", 12)) + if (!strncmp((PCHAR)&CpuInfo.Ebx, "RiseRiseRise", 12)) { return CPU_RISE; } diff --git a/boot/environ/lib/mm/i386/mmx86.c b/boot/environ/lib/mm/i386/mmx86.c index 38e52df1fd..b72a8983ae 100644 --- a/boot/environ/lib/mm/i386/mmx86.c +++ b/boot/environ/lib/mm/i386/mmx86.c @@ -1101,7 +1101,7 @@ MmArchInitialize ( { NTSTATUS Status; ULONGLONG IncreaseUserVa, PerfCounter, CpuRandom; - INT CpuInfo[4]; + CPU_INFO CpuInfo; /* For phase 2, just map deferred regions */ if (Phase != 1) @@ -1157,10 +1157,10 @@ MmArchInitialize ( if (BlArchIsCpuIdFunctionSupported(1)) { /* Call it */ - BlArchCpuId(1, 0, CpuInfo); + BlArchCpuId(1, 0, &CpuInfo); /* Check if RDRAND is supported */ - if (CpuInfo[2] & 0x40000000) + if (CpuInfo.Ecx & 0x40000000) { EfiPrintf(L"Your CPU can do RDRAND! Good for you!\r\n"); CpuRandom = 0;

1 0

01/01: [ROSLOAD] Initial support for launching OS Loader Entrypoint and returning from it
by Alex Ionescu 28 Jan '18

28 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e836d0b56e9a83aececee… commit e836d0b56e9a83aececee51bfbc97fabc792d27d Author: Alex Ionescu <aionescu(a)gmail.com> AuthorDate: Sun Jan 28 13:24:20 2018 +0100 Commit: Alex Ionescu <aionescu(a)gmail.com> CommitDate: Sun Jan 28 13:24:20 2018 +0100 [ROSLOAD] Initial support for launching OS Loader Entrypoint and returning from it [ENVIRON]: Implement BlArchGetCpuVendor [ROSLOAD]: Stub OslPrepareTarget, OslExecuteTransition [ROSLOAD]: Implement OslpMain --- boot/environ/app/rosload/rosload.c | 169 +++++++++++++++++++++++++++++++------ boot/environ/include/bl.h | 5 ++ boot/environ/lib/misc/util.c | 44 ++++++++++ 3 files changed, 194 insertions(+), 24 deletions(-) diff --git a/boot/environ/app/rosload/rosload.c b/boot/environ/app/rosload/rosload.c index de97ecf115..9120631a1f 100644 --- a/boot/environ/app/rosload/rosload.c +++ b/boot/environ/app/rosload/rosload.c @@ -9761,6 +9761,75 @@ ConvertBmpToGopBlt ( return EFI_SUCCESS; } +NTSTATUS +OslPrepareTarget ( + _Out_ PULONG ReturnFlags, + _Out_ PBOOLEAN Jump + ) +{ + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +OslExecuteTransition ( + VOID + ) +{ + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +OslpMain ( + _Out_ PULONG ReturnFlags + ) +{ + INT CpuInfo[4]; + BOOLEAN NxDisabled; + NTSTATUS Status; + BOOLEAN ExecuteJump; + + /* Check if the CPU supports NX */ + BlArchCpuId(0x80000001, 0, CpuInfo); + if (!(CpuInfo[3] & 0x10000)) + { + /* It doesn't, check if this is Intel */ + EfiPrintf(L"NX disabled: %d\r\n"); + if (BlArchGetCpuVendor() == CPU_INTEL) + { + /* Then turn off the MSR feature for it */ + EfiPrintf(L"NX being turned off\r\n"); + __writemsr(MSR_IA32_MISC_ENABLE, + __readmsr(MSR_IA32_MISC_ENABLE) & MSR_XD_ENABLE_MASK); + NxDisabled = TRUE; + } + } + + /* Turn on NX support with the CPU-generic MSR */ + __writemsr(MSR_EFER, __readmsr(MSR_EFER) | MSR_NXE); + + /* Load the kernel */ + Status = OslPrepareTarget(ReturnFlags, &ExecuteJump); + if (NT_SUCCESS(Status) && (ExecuteJump)) + { + /* Jump to the kernel */ + Status = OslExecuteTransition(); + } + + /* Retore NX support */ + __writemsr(MSR_EFER, __readmsr(MSR_EFER) ^ MSR_NXE); + + /* Did we disable NX? */ + if (NxDisabled) + { + /* Turn it back on */ + __writemsr(MSR_IA32_MISC_ENABLE, + __readmsr(MSR_IA32_MISC_ENABLE) | ~MSR_XD_ENABLE_MASK); + } + + /* Go back */ + return Status; +} + /*++ * @name OslMain * @@ -9782,6 +9851,11 @@ OslMain ( { BL_LIBRARY_PARAMETERS LibraryParameters; NTSTATUS Status; + PBL_RETURN_ARGUMENTS ReturnArguments; + PBL_APPLICATION_ENTRY AppEntry; + INT CpuInfo[4]; + ULONG Flags; +#ifdef DRAW_LOGO EFI_GRAPHICS_OUTPUT_BLT_PIXEL* gopBlt; UINTN gopBltSize, bmpHeight, bmpWidth, CoordinateY, CoordinateX; PBL_GRAPHICS_CONSOLE GraphicsConsole; @@ -9790,6 +9864,37 @@ OslMain ( EFI_GRAPHICS_OUTPUT_PROTOCOL* GraphicsOutput; extern EFI_BOOT_SERVICES* EfiBS; extern EFI_SYSTEM_TABLE* EfiST; +#endif + + /* Get the return arguments structure, and set our version */ + ReturnArguments = (PBL_RETURN_ARGUMENTS)((ULONG_PTR)BootParameters + + BootParameters->ReturnArgumentsOffset); + ReturnArguments->Version = BL_RETURN_ARGUMENTS_VERSION; + + /* Get the application entry, and validate it */ + AppEntry = (PBL_APPLICATION_ENTRY)((ULONG_PTR)BootParameters + + BootParameters->AppEntryOffset); + if (!RtlEqualMemory(AppEntry->Signature, + BL_APP_ENTRY_SIGNATURE, + sizeof(AppEntry->Signature))) + { + /* Unrecognized, bail out */ + Status = STATUS_INVALID_PARAMETER_9; + goto Quickie; + } + + /* Check if CPUID 01h is supported */ + if (BlArchIsCpuIdFunctionSupported(1)) + { + /* Query CPU features */ + BlArchCpuId(1, 0, CpuInfo); + + /* Check if PAE is supported */ + if (CpuInfo[4] & 0x40) + { + EfiPrintf(L"PAE Supported, but won't be used\r\n"); + } + } /* Setup the boot library parameters for this application */ BlSetupDefaultParameters(&LibraryParameters); @@ -9801,34 +9906,50 @@ OslMain ( LibraryParameters.HeapAllocationAttributes = BlMemoryKernelRange; LibraryParameters.FontBaseDirectory = L"\\Reactos\\Boot\\Fonts"; LibraryParameters.DescriptorCount = 512; - Status = BlInitializeLibrary(BootParameters, &LibraryParameters); - Status = ConvertBmpToGopBlt(g_Logo, sizeof(g_Logo), (PVOID*)&gopBlt, &gopBltSize, &bmpHeight, &bmpWidth); - - GraphicsConsole = DspGraphicalConsole; - CoordinateX = (GraphicsConsole->DisplayMode.HRes / 2) - (bmpWidth / 2); - CoordinateY = (GraphicsConsole->DisplayMode.VRes / 2) - (bmpHeight / 2); + /* Initialize the boot library */ + Status = BlInitializeLibrary(BootParameters, &LibraryParameters); + if (NT_SUCCESS(Status)) + { +#ifdef DRAW_LOGO + /* Display ReactOS Logo */ + Status = ConvertBmpToGopBlt(g_Logo, sizeof(g_Logo), (PVOID*)&gopBlt, &gopBltSize, &bmpHeight, &bmpWidth); + GraphicsConsole = DspGraphicalConsole; + CoordinateX = (GraphicsConsole->DisplayMode.HRes / 2) - (bmpWidth / 2); + CoordinateY = (GraphicsConsole->DisplayMode.VRes / 2) - (bmpHeight / 2); + BlMmTranslateVirtualAddress(gopBlt, &gopBltPhys); + gopBlt = (PVOID)gopBltPhys.LowPart; + RtlFillMemory(GraphicsConsole->FrameBuffer, GraphicsConsole->FrameBufferSize, 0x00); + BlpArchSwitchContext(BlRealMode); + Status = EfiBS->HandleProtocol(EfiST->ConsoleOutHandle, &EfiGraphicsOutputProtocol, (VOID **)&GraphicsOutput); + GraphicsOutput->Blt(GraphicsOutput, + gopBlt, + EfiBltBufferToVideo, + 0, + 0, + CoordinateX, + CoordinateY, + bmpWidth, + bmpHeight, + bmpWidth * sizeof(EFI_GRAPHICS_OUTPUT_BLT_PIXEL)); + BlpArchSwitchContext(BlProtectedMode); - BlMmTranslateVirtualAddress(gopBlt, &gopBltPhys); - gopBlt = (PVOID)gopBltPhys.LowPart; - RtlFillMemory(GraphicsConsole->FrameBuffer, GraphicsConsole->FrameBufferSize, 0x00); + /* Display text below */ + EfiPrintf(L"\n\n\n\n\nReactOS UEFI OS Loader Initializing... %lx\r\n", Status); + EfiStall(1000000); + BlDisplayClearScreen(); +#endif + /* Call the main routine */ + Status = OslpMain(&Flags); - BlpArchSwitchContext(BlRealMode); - Status = EfiBS->HandleProtocol(EfiST->ConsoleOutHandle, &EfiGraphicsOutputProtocol, (VOID **) &GraphicsOutput); - GraphicsOutput->Blt(GraphicsOutput, - gopBlt, - EfiBltBufferToVideo, - 0, - 0, - CoordinateX, - CoordinateY, - bmpWidth, - bmpHeight, - bmpWidth * sizeof(EFI_GRAPHICS_OUTPUT_BLT_PIXEL)); - BlpArchSwitchContext(BlProtectedMode); + /* Return the flags, and destroy the boot library */ + ReturnArguments->Flags = Flags; + BlDestroyLibrary(); + } - EfiPrintf(L"\n\nReactOS UEFI OS Loader Initializing...\r\n"); - EfiStall(1000000); +Quickie: + /* Return back to boot manager */ + ReturnArguments->Status = Status; return Status; } diff --git a/boot/environ/include/bl.h b/boot/environ/include/bl.h index d41e706f9f..7fa6c9667e 100644 --- a/boot/environ/include/bl.h +++ b/boot/environ/include/bl.h @@ -1669,6 +1669,11 @@ BlArchCpuId ( _Out_ INT* Result ); +CPU_VENDORS +BlArchGetCpuVendor ( + VOID + ); + BOOLEAN BlArchIsCpuIdFunctionSupported ( _In_ ULONG Function diff --git a/boot/environ/lib/misc/util.c b/boot/environ/lib/misc/util.c index b3d1f4e6dd..d6e5459882 100644 --- a/boot/environ/lib/misc/util.c +++ b/boot/environ/lib/misc/util.c @@ -932,3 +932,47 @@ BlArchCpuId ( __cpuidex(Result, Function, SubFunction); #endif } + +CPU_VENDORS +BlArchGetCpuVendor ( + VOID + ) +{ + INT CpuInfo[4]; + INT Temp; + + /* Get the CPU Vendor */ + BlArchCpuId(0, 0, CpuInfo); + Temp = CpuInfo[2]; + CpuInfo[2] = CpuInfo[3]; + CpuInfo[3] = Temp; + + /* Check against supported values */ + if (!strncmp((PCHAR)&CpuInfo[1], "GenuineIntel", 12)) + { + return CPU_INTEL; + } + if (!strncmp((PCHAR)&CpuInfo[1], "AuthenticAMD", 12)) + { + return CPU_AMD; + } + if (!strncmp((PCHAR)&CpuInfo[1], "CentaurHauls", 12)) + { + return CPU_VIA; + } + if (!strncmp((PCHAR)&CpuInfo[1], "CyrixInstead", 12)) + { + return CPU_CYRIX; + } + if (!strncmp((PCHAR)&CpuInfo[1], "GenuineTMx86", 12)) + { + return CPU_TRANSMETA; + } + if (!strncmp((PCHAR)&CpuInfo[1], "RiseRiseRise", 12)) + { + return CPU_RISE; + } + + /* Other */ + return CPU_UNKNOWN; +}

1 0

01/01: [NTOSKRNL] Drop ROS_DEFERRED_WRITE_CONTEXT in favor of DEFERRED_WRITE that was introduced in d3e0eb2.
by Pierre Schweitzer 28 Jan '18

28 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b49a2d635663986915d16… commit b49a2d635663986915d16a92ca2092b4a98a2c9c Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Jan 28 11:55:40 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Jan 28 11:55:40 2018 +0100 [NTOSKRNL] Drop ROS_DEFERRED_WRITE_CONTEXT in favor of DEFERRED_WRITE that was introduced in d3e0eb2. CORE-14235 --- ntoskrnl/cc/copy.c | 12 +++++++----- ntoskrnl/cc/view.c | 9 +++++---- ntoskrnl/include/internal/cc.h | 13 ++----------- 3 files changed, 14 insertions(+), 20 deletions(-) diff --git a/ntoskrnl/cc/copy.c b/ntoskrnl/cc/copy.c index e194074d59..b9e8893b87 100644 --- a/ntoskrnl/cc/copy.c +++ b/ntoskrnl/cc/copy.c @@ -496,13 +496,13 @@ CcDeferWrite ( IN ULONG BytesToWrite, IN BOOLEAN Retrying) { - PROS_DEFERRED_WRITE_CONTEXT Context; + PDEFERRED_WRITE Context; CCTRACE(CC_API_DEBUG, "FileObject=%p PostRoutine=%p Context1=%p Context2=%p BytesToWrite=%lu Retrying=%d\n", FileObject, PostRoutine, Context1, Context2, BytesToWrite, Retrying); /* Try to allocate a context for queueing the write operation */ - Context = ExAllocatePoolWithTag(NonPagedPool, sizeof(ROS_DEFERRED_WRITE_CONTEXT), 'CcDw'); + Context = ExAllocatePoolWithTag(NonPagedPool, sizeof(DEFERRED_WRITE), 'CcDw'); /* If it failed, immediately execute the operation! */ if (Context == NULL) { @@ -511,26 +511,28 @@ CcDeferWrite ( } /* Otherwise, initialize the context */ + RtlZeroMemory(Context, sizeof(DEFERRED_WRITE)); + Context->NodeTypeCode = NODE_TYPE_DEFERRED_WRITE; + Context->NodeByteSize = sizeof(DEFERRED_WRITE); Context->FileObject = FileObject; Context->PostRoutine = PostRoutine; Context->Context1 = Context1; Context->Context2 = Context2; Context->BytesToWrite = BytesToWrite; - Context->Retrying = Retrying; /* And queue it */ if (Retrying) { /* To the top, if that's a retry */ ExInterlockedInsertHeadList(&CcDeferredWrites, - &Context->CcDeferredWritesEntry, + &Context->DeferredWriteLinks, &CcDeferredWriteSpinLock); } else { /* To the bottom, if that's a first time */ ExInterlockedInsertTailList(&CcDeferredWrites, - &Context->CcDeferredWritesEntry, + &Context->DeferredWriteLinks, &CcDeferredWriteSpinLock); } } diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index e846130c79..2520cab53d 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -362,13 +362,14 @@ CciLazyWriter(PVOID Unused) ListEntry = ExInterlockedRemoveHeadList(&CcDeferredWrites, &CcDeferredWriteSpinLock); if (ListEntry != NULL) { - PROS_DEFERRED_WRITE_CONTEXT Context; + PDEFERRED_WRITE Context; /* Extract the context */ - Context = CONTAINING_RECORD(ListEntry, ROS_DEFERRED_WRITE_CONTEXT, CcDeferredWritesEntry); + Context = CONTAINING_RECORD(ListEntry, DEFERRED_WRITE, DeferredWriteLinks); + ASSERT(Context->NodeTypeCode == NODE_TYPE_DEFERRED_WRITE); /* Can we write now? */ - if (CcCanIWrite(Context->FileObject, Context->BytesToWrite, FALSE, Context->Retrying)) + if (CcCanIWrite(Context->FileObject, Context->BytesToWrite, FALSE, TRUE)) { /* Yes! Do it, and destroy the associated context */ Context->PostRoutine(Context->Context1, Context->Context2); @@ -381,7 +382,7 @@ CciLazyWriter(PVOID Unused) * It's better than nothing! */ ExInterlockedInsertTailList(&CcDeferredWrites, - &Context->CcDeferredWritesEntry, + &Context->DeferredWriteLinks, &CcDeferredWriteSpinLock); } } diff --git a/ntoskrnl/include/internal/cc.h b/ntoskrnl/include/internal/cc.h index a85df9da61..949fe7d56b 100644 --- a/ntoskrnl/include/internal/cc.h +++ b/ntoskrnl/include/internal/cc.h @@ -200,17 +200,6 @@ typedef struct _ROS_VACB /* Pointer to the next VACB in a chain. */ } ROS_VACB, *PROS_VACB; -typedef struct _ROS_DEFERRED_WRITE_CONTEXT -{ - LIST_ENTRY CcDeferredWritesEntry; - PFILE_OBJECT FileObject; - PCC_POST_DEFERRED_WRITE PostRoutine; - PVOID Context1; - PVOID Context2; - ULONG BytesToWrite; - BOOLEAN Retrying; -} ROS_DEFERRED_WRITE_CONTEXT, *PROS_DEFERRED_WRITE_CONTEXT; - typedef struct _INTERNAL_BCB { /* Lock */ @@ -222,6 +211,8 @@ typedef struct _INTERNAL_BCB CSHORT RefCount; /* (At offset 0x34 on WinNT4) */ } INTERNAL_BCB, *PINTERNAL_BCB; +#define NODE_TYPE_DEFERRED_WRITE 0x02FC + VOID NTAPI CcPfInitializePrefetcher(

1 0

01/01: [NTOSKRNL] Misc fixes to Cc: - CcUnpinDataForThread() only release VACB when the last BCB reference is gone. This avoids having a valid BCB with an invalid VACB - CcRosMarkDirtyVacb() will only accept non-dirty VACB now. This avoids a major bug where a an already dirty VACB was over-dereferenced - Thanks to previous point, simplify CcRosUnmapVacb(), CcRosReleaseVacb() implementation - And only set VACB dirty once in CcSetDirtyPinnedData() - Add a few sanity checks
by Pierre Schweitzer 28 Jan '18

28 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=52287be9a9299ac065fdb… commit 52287be9a9299ac065fdb676abb99f94007aa5b9 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Jan 28 11:09:21 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Jan 28 11:14:15 2018 +0100 [NTOSKRNL] Misc fixes to Cc: - CcUnpinDataForThread() only release VACB when the last BCB reference is gone. This avoids having a valid BCB with an invalid VACB - CcRosMarkDirtyVacb() will only accept non-dirty VACB now. This avoids a major bug where a an already dirty VACB was over-dereferenced - Thanks to previous point, simplify CcRosUnmapVacb(), CcRosReleaseVacb() implementation - And only set VACB dirty once in CcSetDirtyPinnedData() - Add a few sanity checks With that I can again install ReactOS with 128MB RAM :-). CORE-14263 CORE-14268 --- ntoskrnl/cc/pin.c | 17 +++++++++------- ntoskrnl/cc/view.c | 57 ++++++++++++++---------------------------------------- 2 files changed, 25 insertions(+), 49 deletions(-) diff --git a/ntoskrnl/cc/pin.c b/ntoskrnl/cc/pin.c index 393b206a0f..955bbd0ca7 100644 --- a/ntoskrnl/cc/pin.c +++ b/ntoskrnl/cc/pin.c @@ -247,7 +247,10 @@ CcSetDirtyPinnedData ( Bcb, Lsn); iBcb->Dirty = TRUE; - CcRosMarkDirtyVacb(iBcb->Vacb); + if (!iBcb->Vacb->Dirty) + { + CcRosMarkDirtyVacb(iBcb->Vacb); + } } @@ -284,14 +287,14 @@ CcUnpinDataForThread ( iBcb->Vacb->PinCount--; } - CcRosReleaseVacb(iBcb->Vacb->SharedCacheMap, - iBcb->Vacb, - TRUE, - iBcb->Dirty, - FALSE); - if (--iBcb->RefCount == 0) { + CcRosReleaseVacb(iBcb->Vacb->SharedCacheMap, + iBcb->Vacb, + TRUE, + iBcb->Dirty, + FALSE); + ExDeleteResourceLite(&iBcb->Lock); ExFreeToNPagedLookasideList(&iBcbLookasideList, iBcb); } diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index 78167505fa..e846130c79 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -99,6 +99,7 @@ static void CcRosVacbIncRefCount_(PROS_VACB vacb, const char* file, int line) static void CcRosVacbDecRefCount_(PROS_VACB vacb, const char* file, int line) { --vacb->ReferenceCount; + ASSERT(!(vacb->ReferenceCount == 0 && vacb->Dirty)); if (vacb->SharedCacheMap->Trace) { DbgPrint("(%s:%i) VACB %p --RefCount=%lu, Dirty %u, PageOut %lu\n", @@ -518,8 +519,6 @@ CcRosReleaseVacb ( BOOLEAN Dirty, BOOLEAN Mapped) { - BOOLEAN WasDirty; - ASSERT(SharedCacheMap); DPRINT("CcRosReleaseVacb(SharedCacheMap 0x%p, Vacb 0x%p, Valid %u)\n", @@ -527,17 +526,9 @@ CcRosReleaseVacb ( Vacb->Valid = Valid; - WasDirty = FALSE; - if (Dirty) + if (Dirty && !Vacb->Dirty) { - if (!Vacb->Dirty) - { - CcRosMarkDirtyVacb(Vacb); - } - else - { - WasDirty = TRUE; - } + CcRosMarkDirtyVacb(Vacb); } if (Mapped) @@ -549,10 +540,6 @@ CcRosReleaseVacb ( { CcRosVacbIncRefCount(Vacb); } - if (!WasDirty && Vacb->Dirty) - { - CcRosVacbIncRefCount(Vacb); - } CcRosReleaseVacbLock(Vacb); @@ -618,16 +605,12 @@ CcRosMarkDirtyVacb ( KeAcquireGuardedMutex(&ViewLock); KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &oldIrql); - if (!Vacb->Dirty) - { - InsertTailList(&DirtyVacbListHead, &Vacb->DirtyVacbListEntry); - CcTotalDirtyPages += VACB_MAPPING_GRANULARITY / PAGE_SIZE; - Vacb->SharedCacheMap->DirtyPages += VACB_MAPPING_GRANULARITY / PAGE_SIZE; - } - else - { - CcRosVacbDecRefCount(Vacb); - } + ASSERT(!Vacb->Dirty); + + InsertTailList(&DirtyVacbListHead, &Vacb->DirtyVacbListEntry); + CcTotalDirtyPages += VACB_MAPPING_GRANULARITY / PAGE_SIZE; + Vacb->SharedCacheMap->DirtyPages += VACB_MAPPING_GRANULARITY / PAGE_SIZE; + CcRosVacbIncRefCount(Vacb); /* Move to the tail of the LRU list */ RemoveEntryList(&Vacb->VacbLruListEntry); @@ -658,7 +641,10 @@ CcRosMarkDirtyFile ( KeBugCheck(CACHE_MANAGER); } - CcRosMarkDirtyVacb(Vacb); + if (!Vacb->Dirty) + { + CcRosMarkDirtyVacb(Vacb); + } CcRosReleaseVacbLock(Vacb); @@ -673,7 +659,6 @@ CcRosUnmapVacb ( BOOLEAN NowDirty) { PROS_VACB Vacb; - BOOLEAN WasDirty; ASSERT(SharedCacheMap); @@ -686,26 +671,14 @@ CcRosUnmapVacb ( return STATUS_UNSUCCESSFUL; } - WasDirty = FALSE; - if (NowDirty) + if (NowDirty && !Vacb->Dirty) { - if (!Vacb->Dirty) - { - CcRosMarkDirtyVacb(Vacb); - } - else - { - WasDirty = TRUE; - } + CcRosMarkDirtyVacb(Vacb); } Vacb->MappedCount--; CcRosVacbDecRefCount(Vacb); - if (!WasDirty && NowDirty) - { - CcRosVacbIncRefCount(Vacb); - } if (Vacb->MappedCount == 0) { CcRosVacbDecRefCount(Vacb);

1 0

03/03: [NDK] Add DEFERRED_WRITE structure for Cc. CORE-14235
by Thomas Faber 28 Jan '18

28 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d3e0eb2026581d5c6cf15… commit d3e0eb2026581d5c6cf159a0a7a4fb708943fa5f Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Jan 28 10:34:21 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Jan 28 10:48:36 2018 +0100 [NDK] Add DEFERRED_WRITE structure for Cc. CORE-14235 Consistently use CSHORT for NodeTypeCode/NodeByteSize while we're at it. --- sdk/include/ndk/cctypes.h | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/sdk/include/ndk/cctypes.h b/sdk/include/ndk/cctypes.h index 22533cdaab..5dd55689f5 100644 --- a/sdk/include/ndk/cctypes.h +++ b/sdk/include/ndk/cctypes.h @@ -112,8 +112,8 @@ typedef struct _MBCB // typedef struct _SHARED_CACHE_MAP { - SHORT NodeTypeCode; - SHORT NodeByteSize; + CSHORT NodeTypeCode; + CSHORT NodeByteSize; ULONG OpenCount; LARGE_INTEGER FileSize; LIST_ENTRY BcbList; @@ -156,6 +156,24 @@ typedef struct _SHARED_CACHE_MAP } SHARED_CACHE_MAP, *PSHARED_CACHE_MAP; #endif /* _NTIFS_INCLUDED_ */ + +// +// Deferred Write list entry +// +typedef struct _DEFERRED_WRITE +{ + CSHORT NodeTypeCode; + CSHORT NodeByteSize; + PFILE_OBJECT FileObject; + ULONG BytesToWrite; + LIST_ENTRY DeferredWriteLinks; + PKEVENT Event; + PCC_POST_DEFERRED_WRITE PostRoutine; + PVOID Context1; + PVOID Context2; + BOOLEAN LimitModifiedPages; +} DEFERRED_WRITE, *PDEFERRED_WRITE; + #endif /* NTOS_MODE_USER */ #endif /* _CCTYPES_H */

1 0

02/03: [NTOS:MM] Assert MmLocateMemoryAreaByAddress return value to satisfy Coverity. CID 701289
by Thomas Faber 28 Jan '18

28 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d3a29816cee614fcd4266… commit d3a29816cee614fcd4266063da5a0001d2abf8da Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Fri Jan 26 13:56:06 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Jan 28 10:48:27 2018 +0100 [NTOS:MM] Assert MmLocateMemoryAreaByAddress return value to satisfy Coverity. CID 701289 --- ntoskrnl/mm/ARM3/virtual.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/mm/ARM3/virtual.c b/ntoskrnl/mm/ARM3/virtual.c index 97f017f326..f0ab5d08f7 100644 --- a/ntoskrnl/mm/ARM3/virtual.c +++ b/ntoskrnl/mm/ARM3/virtual.c @@ -4742,7 +4742,7 @@ NtAllocateVirtualMemory(IN HANDLE ProcessHandle, goto FailPath; } - if ((AllocationType & MEM_RESET) == MEM_RESET) + if ((AllocationType & MEM_RESET) == MEM_RESET) { /// @todo HACK: pretend success DPRINT("MEM_RESET not supported\n"); @@ -4778,6 +4778,7 @@ NtAllocateVirtualMemory(IN HANDLE ProcessHandle, // Make sure this is an ARM3 section // MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, (PVOID)PAGE_ROUND_DOWN(PBaseAddress)); + ASSERT(MemoryArea != NULL); if (MemoryArea->Type != MEMORY_AREA_OWNED_BY_ARM3) { DPRINT1("Illegal commit of non-ARM3 section!\n");

1 0

01/03: [NTOS:PS] Check for rundown success in PsReferenceProcessFilePointer. CID 514553
by Thomas Faber 28 Jan '18

28 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5c52ded05fceddb392ed3… commit 5c52ded05fceddb392ed33eecc8ad693a96332f9 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Fri Jan 26 13:45:53 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Jan 28 10:48:19 2018 +0100 [NTOS:PS] Check for rundown success in PsReferenceProcessFilePointer. CID 514553 --- ntoskrnl/ps/query.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/ps/query.c b/ntoskrnl/ps/query.c index 2c492b654a..ad281e63c0 100644 --- a/ntoskrnl/ps/query.c +++ b/ntoskrnl/ps/query.c @@ -28,7 +28,10 @@ PsReferenceProcessFilePointer(IN PEPROCESS Process, PAGED_CODE(); /* Lock the process */ - ExAcquireRundownProtection(&Process->RundownProtect); + if (!ExAcquireRundownProtection(&Process->RundownProtect)) + { + return STATUS_PROCESS_IS_TERMINATING; + } /* Get the section */ Section = Process->SectionObject;

1 0

01/01: [SERVICES] Do not delete running services.
by Eric Kohl 27 Jan '18

27 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2d69520595e001f039a43… commit 2d69520595e001f039a4322c06edcbda89e30ae0 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jan 28 00:57:58 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jan 28 00:57:58 2018 +0100 [SERVICES] Do not delete running services. CORE-14260 --- base/system/services/rpcserver.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/base/system/services/rpcserver.c b/base/system/services/rpcserver.c index d2f032cfe0..f1ce146a92 100644 --- a/base/system/services/rpcserver.c +++ b/base/system/services/rpcserver.c @@ -992,7 +992,8 @@ RCloseServiceHandle( if (lpService->dwRefCount == 0) { /* If this service has been marked for deletion */ - if (lpService->bDeleted) + if (lpService->bDeleted && + lpService->Status.dwCurrentState == SERVICE_STOPPED) { /* Open the Services Reg key */ dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE,

1 0

01/01: [NTOSKRNL] Fix MSVC build?
by Pierre Schweitzer 27 Jan '18

27 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f032b77c5103145cc6f52… commit f032b77c5103145cc6f523dd3d72b719a2692f37 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Jan 27 22:02:01 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Jan 27 22:02:01 2018 +0100 [NTOSKRNL] Fix MSVC build? --- ntoskrnl/cc/view.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index 7112e02373..78167505fa 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -71,7 +71,11 @@ ULONG CcTotalDirtyPages = 0; LIST_ENTRY CcDeferredWrites; KSPIN_LOCK CcDeferredWriteSpinLock; LIST_ENTRY CcCleanSharedCacheMapList; +#ifndef _MSC_VER LARGE_INTEGER CcIdleDelay = {.QuadPart = (LONGLONG)-1*1000*1000*10}; +#else +LARGE_INTEGER CcIdleDelay = {(LONGLONG)-1*1000*1000*10}; +#endif /* Internal vars (ROS): * - Event to notify lazy writer to shutdown

1 0

01/01: [NTOSKRNL] Hello CcIdleDelay :-) (Good link for the interested reader: https://msdn.microsoft.com/en-us/library/bb742613.aspx)
by Pierre Schweitzer 27 Jan '18

27 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2d4a54dcf26c0a3df89d2… commit 2d4a54dcf26c0a3df89d21c3247fc638413fa4dc Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Jan 27 21:51:33 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Jan 27 21:52:19 2018 +0100 [NTOSKRNL] Hello CcIdleDelay :-) (Good link for the interested reader: https://msdn.microsoft.com/en-us/library/bb742613.aspx) --- ntoskrnl/cc/view.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index 1268fb5203..7112e02373 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -64,12 +64,14 @@ ULONG CcLazyWriteIos = 0; * - List for deferred writes * - Spinlock when dealing with the deferred list * - List for "clean" shared cache maps + * - One second delay for lazy writer */ ULONG CcDirtyPageThreshold = 0; ULONG CcTotalDirtyPages = 0; LIST_ENTRY CcDeferredWrites; KSPIN_LOCK CcDeferredWriteSpinLock; LIST_ENTRY CcCleanSharedCacheMapList; +LARGE_INTEGER CcIdleDelay = {.QuadPart = (LONGLONG)-1*1000*1000*10}; /* Internal vars (ROS): * - Event to notify lazy writer to shutdown @@ -312,10 +314,6 @@ VOID NTAPI CciLazyWriter(PVOID Unused) { - LARGE_INTEGER OneSecond; - - OneSecond.QuadPart = (LONGLONG)-1*1000*1000*10; - while (TRUE) { NTSTATUS Status; @@ -327,7 +325,7 @@ CciLazyWriter(PVOID Unused) Executive, KernelMode, FALSE, - &OneSecond); + &CcIdleDelay); /* If we succeeed, we've to stop running! */ if (Status == STATUS_SUCCESS)

1 0

← Newer
1
2
3
4
5
6
7
8
...
38
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2018