Ros-diffs August 2021

ros-diffs@reactos.org

16 participants
93 discussions

[reactos] 01/01: [IMM32] Rewrite ImmSetConversionStatus (#3879)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c0c9b1445dc7d1eea7ab2… commit c0c9b1445dc7d1eea7ab2f9f0b77ae38d3ff308f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Aug 6 07:15:19 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Aug 6 07:15:19 2021 +0900 [IMM32] Rewrite ImmSetConversionStatus (#3879) CORE-11700 --- dll/win32/imm32/imm.c | 62 +++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 45 insertions(+), 17 deletions(-) diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index 84ab597c381..c1f5db8b1c1 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -3678,33 +3678,61 @@ BOOL WINAPI ImmSetCompositionWindow( BOOL WINAPI ImmSetConversionStatus( HIMC hIMC, DWORD fdwConversion, DWORD fdwSentence) { - DWORD oldConversion, oldSentence; - InputContextData *data = get_imc_data(hIMC); + HKL hKL; + LPINPUTCONTEXT pIC; + DWORD dwImeThreadId, dwThreadId, dwOldConversion, dwOldSentence; + BOOL fConversionChange = FALSE, fSentenceChange = FALSE; + HWND hWnd; - TRACE("%p %d %d\n", hIMC, fdwConversion, fdwSentence); + TRACE("(%p, 0x%lX, 0x%lX)\n", hIMC, fdwConversion, fdwSentence); - if (!data) + hKL = GetKeyboardLayout(0); + if (!IS_IME_HKL(hKL)) { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; + if (g_psi && (g_psi->dwSRVIFlags & SRVINFO_CICERO_ENABLED)) + { + FIXME("Cicero\n"); + return FALSE; + } } - if (IMM_IsCrossThreadAccess(NULL, hIMC)) + dwImeThreadId = Imm32QueryInputContext(hIMC, 1); + dwThreadId = GetCurrentThreadId(); + if (dwImeThreadId != dwThreadId) + return FALSE; + + pIC = ImmLockIMC(hIMC); + if (pIC == NULL) return FALSE; - if ( fdwConversion != data->IMC.fdwConversion ) + if (pIC->fdwConversion != fdwConversion) + { + dwOldConversion = pIC->fdwConversion; + pIC->fdwConversion = fdwConversion; + fConversionChange = TRUE; + } + + if (pIC->fdwSentence != fdwSentence) { - oldConversion = data->IMC.fdwConversion; - data->IMC.fdwConversion = fdwConversion; - ImmNotifyIME(hIMC, NI_CONTEXTUPDATED, oldConversion, IMC_SETCONVERSIONMODE); - ImmInternalSendIMENotify(data, IMN_SETCONVERSIONMODE, 0); + dwOldSentence = pIC->fdwSentence; + pIC->fdwSentence = fdwSentence; + fSentenceChange = TRUE; } - if ( fdwSentence != data->IMC.fdwSentence ) + + hWnd = pIC->hWnd; + ImmUnlockIMC(hIMC); + + if (fConversionChange) + { + Imm32NotifyAction(hIMC, hWnd, NI_CONTEXTUPDATED, dwOldConversion, + IMC_SETCONVERSIONMODE, IMN_SETCONVERSIONMODE, 0); + Imm32NotifyIMEStatus(hWnd, hIMC, fdwConversion); + } + + if (fSentenceChange) { - oldSentence = data->IMC.fdwSentence; - data->IMC.fdwSentence = fdwSentence; - ImmNotifyIME(hIMC, NI_CONTEXTUPDATED, oldSentence, IMC_SETSENTENCEMODE); - ImmInternalSendIMENotify(data, IMN_SETSENTENCEMODE, 0); + Imm32NotifyAction(hIMC, hWnd, NI_CONTEXTUPDATED, dwOldSentence, + IMC_SETSENTENCEMODE, IMN_SETSENTENCEMODE, 0); } return TRUE;

3 years, 4 months

[reactos] 02/02: [SETUPAPI] Add stubs for SetupDiSetDriverInstallParamsA/W

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=528fede0341ad0d669003… commit 528fede0341ad0d6690031054f07b0c29afbb09d Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sun Jul 18 15:34:03 2021 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu Aug 5 23:45:23 2021 +0200 [SETUPAPI] Add stubs for SetupDiSetDriverInstallParamsA/W --- dll/win32/setupapi/setupapi.spec | 4 ++-- dll/win32/setupapi/stubs.c | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dll/win32/setupapi/setupapi.spec b/dll/win32/setupapi/setupapi.spec index 2af90d61106..1d96d8bcb16 100644 --- a/dll/win32/setupapi/setupapi.spec +++ b/dll/win32/setupapi/setupapi.spec @@ -382,8 +382,8 @@ @ stub SetupDiSetDeviceInterfaceDefault @ stdcall SetupDiSetDeviceRegistryPropertyA(ptr ptr long ptr long) @ stdcall SetupDiSetDeviceRegistryPropertyW(ptr ptr long ptr long) -@ stub SetupDiSetDriverInstallParamsA -@ stub SetupDiSetDriverInstallParamsW +@ stdcall SetupDiSetDriverInstallParamsA(ptr ptr ptr ptr) +@ stdcall SetupDiSetDriverInstallParamsW(ptr ptr ptr ptr) @ stdcall SetupDiSetSelectedDevice(ptr ptr) @ stdcall SetupDiSetSelectedDriverA(ptr ptr ptr) @ stdcall SetupDiSetSelectedDriverW(ptr ptr ptr) diff --git a/dll/win32/setupapi/stubs.c b/dll/win32/setupapi/stubs.c index f132a8a0fc4..17ded50eeb3 100644 --- a/dll/win32/setupapi/stubs.c +++ b/dll/win32/setupapi/stubs.c @@ -149,3 +149,26 @@ SetupVerifyInfFileW( return FALSE; } +BOOL WINAPI +SetupDiSetDriverInstallParamsA( + _In_ HDEVINFO DeviceInfoSet, + _In_opt_ PSP_DEVINFO_DATA DeviceInfoData, + _In_ PSP_DRVINFO_DATA_A DriverInfoData, + _In_ PSP_DRVINSTALL_PARAMS DriverInstallParams) +{ + FIXME("Stub %p %p %p %p\n", DeviceInfoSet, DeviceInfoData, DriverInfoData, DriverInstallParams); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +BOOL WINAPI +SetupDiSetDriverInstallParamsW( + _In_ HDEVINFO DeviceInfoSet, + _In_opt_ PSP_DEVINFO_DATA DeviceInfoData, + _In_ PSP_DRVINFO_DATA_W DriverInfoData, + _In_ PSP_DRVINSTALL_PARAMS DriverInstallParams) +{ + FIXME("Stub %p %p %p %p\n", DeviceInfoSet, DeviceInfoData, DriverInfoData, DriverInstallParams); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +}

3 years, 4 months

[reactos] 01/02: [PSDK] Add DRIVER_UNTRUSTED_RANK define

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e763bec6cdb0fa73fae2f… commit e763bec6cdb0fa73fae2f74d7e029a2cf73f6903 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sun Jul 18 15:36:30 2021 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu Aug 5 23:45:20 2021 +0200 [PSDK] Add DRIVER_UNTRUSTED_RANK define --- sdk/include/psdk/setupapi.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sdk/include/psdk/setupapi.h b/sdk/include/psdk/setupapi.h index d11e36a464a..efe15a7b0bf 100644 --- a/sdk/include/psdk/setupapi.h +++ b/sdk/include/psdk/setupapi.h @@ -272,6 +272,11 @@ extern "C" { #define DPROMPT_BUFFERTOOSMALL 3 #define DPROMPT_OUTOFMEMORY 4 #define DRIVER_HARDWAREID_RANK 0x00000FFF +#if (_SETUPAPI_VER >= 0x0600) +#define DRIVER_UNTRUSTED_RANK 0x80000000 +#else +#define DRIVER_UNTRUSTED_RANK 0x00008000 +#endif #define DYNAWIZ_FLAG_PAGESADDED 0x00000001 #define DYNAWIZ_FLAG_INSTALLDET_NEXT 0x00000002 #define DYNAWIZ_FLAG_INSTALLDET_PREV 0x00000004

3 years, 4 months

[reactos] 01/01: [CRT] Add one missing entry to _syserr_list array, fix _sys_nerr definition

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0782375f8b3f7d307185f… commit 0782375f8b3f7d307185f2845a36974a3e429cb9 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Thu Aug 5 15:33:43 2021 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Thu Aug 5 15:35:19 2021 +0200 [CRT] Add one missing entry to _syserr_list array, fix _sys_nerr definition Partial revert of 296e07b94d79b9e6fec3b05de26c4afad3b1f4e1 --- sdk/lib/crt/string/strerror.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sdk/lib/crt/string/strerror.c b/sdk/lib/crt/string/strerror.c index 10bda6c746f..bc9b5785d93 100644 --- a/sdk/lib/crt/string/strerror.c +++ b/sdk/lib/crt/string/strerror.c @@ -63,6 +63,7 @@ char __syserr39[] = "No locks available (ENOLCK)"; char __syserr40[] = "Function not implemented (ENOSYS)"; char __syserr41[] = "Directory not empty (ENOTEMPTY)"; char __syserr42[] = "Illegal byte sequence (EILSEQ)"; +char __syserr43[] = "Unknown/generic error"; char *_sys_errlist[] = { __syserr00, __syserr01, __syserr02, __syserr03, __syserr04, @@ -73,10 +74,10 @@ __syserr20, __syserr21, __syserr22, __syserr23, __syserr24, __syserr25, __syserr26, __syserr27, __syserr28, __syserr29, __syserr30, __syserr31, __syserr32, __syserr33, __syserr34, __syserr35, __syserr36, __syserr37, __syserr38, __syserr39, -__syserr40, __syserr41, __syserr42 +__syserr40, __syserr41, __syserr42, __syserr43 }; -int _sys_nerr = sizeof(_sys_errlist) / sizeof(_sys_errlist[0]); +int _sys_nerr = sizeof(_sys_errlist) / sizeof(_sys_errlist[0]) - 1; /********************************************************************* * strerror (MSVCRT.@)

3 years, 4 months

[reactos] 01/01: [IMM32] Implement ImmGetGuideLineA/W (#3877)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=29b09d8935580090065dd… commit 29b09d8935580090065dd7c84116c6c2e060a01f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Aug 5 21:43:21 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Aug 5 21:43:21 2021 +0900 [IMM32] Implement ImmGetGuideLineA/W (#3877) Implement ImmGetGuideLineA and ImmGetGuideLineW functions. CORE-11700 --- dll/win32/imm32/imm.c | 184 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 174 insertions(+), 10 deletions(-) diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index 67aab7c5a60..84ab597c381 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -2758,17 +2758,184 @@ UINT WINAPI ImmGetDescriptionW(HKL hKL, LPWSTR lpszDescription, UINT uBufLen) return (UINT)cch; } +static DWORD APIENTRY +ImmGetGuideLineAW(HIMC hIMC, DWORD dwIndex, LPVOID lpBuf, DWORD dwBufLen, BOOL bAnsi) +{ + PCLIENTIMC pClientImc; + LPINPUTCONTEXT pIC; + LPGUIDELINE pGuideLine; + DWORD cb, ret = 0; + LPVOID pvStr, pvPrivate; + BOOL bUsedDefault; + + pClientImc = ImmLockClientImc(hIMC); + if (!pClientImc) + return 0; + + pIC = ImmLockIMC(hIMC); + if (!pIC) + { + ImmUnlockClientImc(pClientImc); + return 0; + } + + pGuideLine = ImmLockIMCC(pIC->hGuideLine); + if (!pGuideLine) + { + ImmUnlockIMC(hIMC); + ImmUnlockClientImc(pClientImc); + return 0; + } + + if (dwIndex == GGL_LEVEL) + { + ret = pGuideLine->dwLevel; + goto Quit; + } + + if (dwIndex == GGL_INDEX) + { + ret = pGuideLine->dwIndex; + goto Quit; + } + + if (dwIndex == GGL_STRING) + { + pvStr = (LPBYTE)pGuideLine + pGuideLine->dwStrOffset; + + /* get size */ + if (bAnsi) + { + if (pClientImc->dwFlags & CLIENTIMC_WIDE) + { + cb = WideCharToMultiByte(CP_ACP, 0, pvStr, pGuideLine->dwStrLen, + NULL, 0, NULL, &bUsedDefault); + } + else + { + cb = pGuideLine->dwStrLen * sizeof(CHAR); + } + } + else + { + if (pClientImc->dwFlags & CLIENTIMC_WIDE) + { + cb = pGuideLine->dwStrLen * sizeof(WCHAR); + } + else + { + cb = MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, pvStr, pGuideLine->dwStrLen, + NULL, 0) * sizeof(WCHAR); + } + } + + if (dwBufLen == 0 || cb == 0 || lpBuf == NULL || dwBufLen < cb) + { + ret = cb; + goto Quit; + } + + /* store to buffer */ + if (bAnsi) + { + if (pClientImc->dwFlags & CLIENTIMC_WIDE) + { + ret = WideCharToMultiByte(CP_ACP, 0, pvStr, pGuideLine->dwStrLen, + lpBuf, dwBufLen, NULL, &bUsedDefault); + goto Quit; + } + } + else + { + if (!(pClientImc->dwFlags & CLIENTIMC_WIDE)) + { + ret = MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, pvStr, pGuideLine->dwStrLen, + lpBuf, dwBufLen) * sizeof(WCHAR); + goto Quit; + } + } + + RtlCopyMemory(lpBuf, pvStr, cb); + ret = cb; + goto Quit; + } + + if (dwIndex == GGL_PRIVATE) + { + pvPrivate = (LPBYTE)pGuideLine + pGuideLine->dwPrivateOffset; + + /* get size */ + if (bAnsi) + { + if ((pClientImc->dwFlags & CLIENTIMC_WIDE) && + pGuideLine->dwIndex == GL_ID_REVERSECONVERSION) + { + cb = CandidateListWideToAnsi(pvPrivate, NULL, 0, CP_ACP); + } + else + { + cb = pGuideLine->dwPrivateSize; + } + } + else + { + if (!(pClientImc->dwFlags & CLIENTIMC_WIDE) && + pGuideLine->dwIndex == GL_ID_REVERSECONVERSION) + { + cb = CandidateListAnsiToWide(pvPrivate, NULL, 0, CP_ACP); + } + else + { + cb = pGuideLine->dwPrivateSize; + } + } + + if (dwBufLen == 0 || cb == 0 || lpBuf == NULL || dwBufLen < cb) + { + ret = cb; + goto Quit; + } + + /* store to buffer */ + if (bAnsi) + { + if ((pClientImc->dwFlags & CLIENTIMC_WIDE) && + pGuideLine->dwIndex == GL_ID_REVERSECONVERSION) + { + ret = CandidateListWideToAnsi(pvPrivate, lpBuf, cb, CP_ACP); + goto Quit; + } + } + else + { + if (!(pClientImc->dwFlags & CLIENTIMC_WIDE) && + pGuideLine->dwIndex == GL_ID_REVERSECONVERSION) + { + ret = CandidateListAnsiToWide(pvPrivate, lpBuf, cb, CP_ACP); + goto Quit; + } + } + + RtlCopyMemory(lpBuf, pvPrivate, cb); + ret = cb; + goto Quit; + } + +Quit: + ImmUnlockIMCC(pIC->hGuideLine); + ImmUnlockIMC(hIMC); + ImmUnlockClientImc(pClientImc); + return ret; +} + /*********************************************************************** * ImmGetGuideLineA (IMM32.@) */ DWORD WINAPI ImmGetGuideLineA( HIMC hIMC, DWORD dwIndex, LPSTR lpBuf, DWORD dwBufLen) { - FIXME("(%p, %d, %s, %d): stub\n", - hIMC, dwIndex, debugstr_a(lpBuf), dwBufLen - ); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + TRACE("(%p, %lu, %p, %lu)\n", hIMC, dwIndex, lpBuf, dwBufLen); + return ImmGetGuideLineAW(hIMC, dwIndex, lpBuf, dwBufLen, TRUE); } /*********************************************************************** @@ -2776,11 +2943,8 @@ DWORD WINAPI ImmGetGuideLineA( */ DWORD WINAPI ImmGetGuideLineW(HIMC hIMC, DWORD dwIndex, LPWSTR lpBuf, DWORD dwBufLen) { - FIXME("(%p, %d, %s, %d): stub\n", - hIMC, dwIndex, debugstr_w(lpBuf), dwBufLen - ); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + TRACE("(%p, %lu, %p, %lu)\n", hIMC, dwIndex, lpBuf, dwBufLen); + return ImmGetGuideLineAW(hIMC, dwIndex, lpBuf, dwBufLen, FALSE); } /***********************************************************************

3 years, 4 months

[reactos] 01/01: [NTOS:MM] Fix the mess created by the "balancer thread"

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=acf28dbc1eec4748f8bc6… commit acf28dbc1eec4748f8bc6b01d8862783894d551b Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Wed Aug 4 20:35:14 2021 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Thu Aug 5 10:06:19 2021 +0200 [NTOS:MM] Fix the mess created by the "balancer thread" When processing: Make sure that the process is not terminating. Make sure that the process WorkingSet is still valid Protect accessing & writing to PTEs by acquiring the working set lock CORE-17595 CORE-17642 --- ntoskrnl/mm/balance.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/ntoskrnl/mm/balance.c b/ntoskrnl/mm/balance.c index 0eec51fbb88..4558deeff18 100644 --- a/ntoskrnl/mm/balance.c +++ b/ntoskrnl/mm/balance.c @@ -207,16 +207,24 @@ MmTrimUserMemory(ULONG Target, ULONG Priority, PULONG NrFreedPages) Process = Entry->Process; Address = Entry->Address; + ObReferenceObject(Process); + + if (!ExAcquireRundownProtection(&Process->RundownProtect)) + { + ObDereferenceObject(Process); + MiReleasePfnLock(OldIrql); + continue; + } + MiReleasePfnLock(OldIrql); KeStackAttachProcess(&Process->Pcb, &ApcState); - - MmLockAddressSpace(&Process->Vm); + MiLockProcessWorkingSet(Process, PsGetCurrentThread()); /* Be sure this is still valid. */ - PMMPTE Pte = MiAddressToPte(Address); - if (Pte->u.Hard.Valid) + if (MmIsAddressValid(Address)) { + PMMPTE Pte = MiAddressToPte(Address); Accessed = Accessed || Pte->u.Hard.Accessed; Pte->u.Hard.Accessed = 0; @@ -224,9 +232,11 @@ MmTrimUserMemory(ULONG Target, ULONG Priority, PULONG NrFreedPages) //KeInvalidateTlbEntry(Address); } - MmUnlockAddressSpace(&Process->Vm); + MiUnlockProcessWorkingSet(Process, PsGetCurrentThread()); KeUnstackDetachProcess(&ApcState); + ExReleaseRundownProtection(&Process->RundownProtect); + ObDereferenceObject(Process); } if (!Accessed)

3 years, 4 months

[reactos] 01/01: Revert "[NTOS:MM] Do proper checks & acquire proper locks when sweeping user pages"

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=676dc4b44131d67265fe8… commit 676dc4b44131d67265fe896dc2a70071db28f192 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Wed Aug 4 23:57:39 2021 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Aug 4 23:57:39 2021 +0200 Revert "[NTOS:MM] Do proper checks & acquire proper locks when sweeping user pages" This reverts commit 7c006df7e0ea1fe3215137199bca7f4a0215a351. Note to self: This is what happens when you have too many branch and push the wrong one. --- ntoskrnl/mm/balance.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/ntoskrnl/mm/balance.c b/ntoskrnl/mm/balance.c index fe882aff6c4..0eec51fbb88 100644 --- a/ntoskrnl/mm/balance.c +++ b/ntoskrnl/mm/balance.c @@ -213,22 +213,15 @@ MmTrimUserMemory(ULONG Target, ULONG Priority, PULONG NrFreedPages) MmLockAddressSpace(&Process->Vm); - if (!Process->VmDeleted) + /* Be sure this is still valid. */ + PMMPTE Pte = MiAddressToPte(Address); + if (Pte->u.Hard.Valid) { - MiLockProcessWorkingSetUnsafe(Process, PsGetCurrentThread()); + Accessed = Accessed || Pte->u.Hard.Accessed; + Pte->u.Hard.Accessed = 0; - /* Be sure this is still valid. */ - if (MmIsAddressValid(Address)) - { - PMMPTE Pte = MiAddressToPte(Address); - Accessed = Accessed || Pte->u.Hard.Accessed; - Pte->u.Hard.Accessed = 0; - - /* There is no need to invalidate, the balancer thread is never on a user process */ - //KeInvalidateTlbEntry(Address); - } - - MiUnlockProcessWorkingSet(Process, PsGetCurrentThread()); + /* There is no need to invalidate, the balancer thread is never on a user process */ + //KeInvalidateTlbEntry(Address); } MmUnlockAddressSpace(&Process->Vm);

3 years, 4 months

[reactos] 01/01: [NTOS:MM] Do proper checks & acquire proper locks when sweeping user pages

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7c006df7e0ea1fe321513… commit 7c006df7e0ea1fe3215137199bca7f4a0215a351 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Wed Aug 4 20:35:14 2021 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Aug 4 20:38:37 2021 +0200 [NTOS:MM] Do proper checks & acquire proper locks when sweeping user pages CORE-17595 --- ntoskrnl/mm/balance.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/ntoskrnl/mm/balance.c b/ntoskrnl/mm/balance.c index 0eec51fbb88..fe882aff6c4 100644 --- a/ntoskrnl/mm/balance.c +++ b/ntoskrnl/mm/balance.c @@ -213,15 +213,22 @@ MmTrimUserMemory(ULONG Target, ULONG Priority, PULONG NrFreedPages) MmLockAddressSpace(&Process->Vm); - /* Be sure this is still valid. */ - PMMPTE Pte = MiAddressToPte(Address); - if (Pte->u.Hard.Valid) + if (!Process->VmDeleted) { - Accessed = Accessed || Pte->u.Hard.Accessed; - Pte->u.Hard.Accessed = 0; + MiLockProcessWorkingSetUnsafe(Process, PsGetCurrentThread()); - /* There is no need to invalidate, the balancer thread is never on a user process */ - //KeInvalidateTlbEntry(Address); + /* Be sure this is still valid. */ + if (MmIsAddressValid(Address)) + { + PMMPTE Pte = MiAddressToPte(Address); + Accessed = Accessed || Pte->u.Hard.Accessed; + Pte->u.Hard.Accessed = 0; + + /* There is no need to invalidate, the balancer thread is never on a user process */ + //KeInvalidateTlbEntry(Address); + } + + MiUnlockProcessWorkingSet(Process, PsGetCurrentThread()); } MmUnlockAddressSpace(&Process->Vm);

3 years, 4 months

[reactos] 06/06: [NTOS:MM] When mapping pages for zeroing them, disable cache, enable write through

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=789d7a7741aeb95a2000f… commit 789d7a7741aeb95a2000fa4e5c5631503b1e29cf Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Aug 2 18:48:07 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Aug 4 17:48:39 2021 +0200 [NTOS:MM] When mapping pages for zeroing them, disable cache, enable write through Idea from Thomas Faber --- ntoskrnl/mm/ARM3/hypermap.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ntoskrnl/mm/ARM3/hypermap.c b/ntoskrnl/mm/ARM3/hypermap.c index 4113814e6a6..e72a6878cc7 100644 --- a/ntoskrnl/mm/ARM3/hypermap.c +++ b/ntoskrnl/mm/ARM3/hypermap.c @@ -150,6 +150,10 @@ MiMapPagesInZeroSpace(IN PMMPFN Pfn1, PointerPte += (Offset + 1); TempPte = ValidKernelPte; + /* Disable cache. Write through */ + MI_PAGE_DISABLE_CACHE(&TempPte); + MI_PAGE_WRITE_THROUGH(&TempPte); + /* Make sure the list isn't empty and loop it */ ASSERT(Pfn1 != (PVOID)LIST_HEAD); while (Pfn1 != (PVOID)LIST_HEAD)

3 years, 4 months

[reactos] 05/06: [NTOS:MM] In page zeroing thread, zero more than one page at a time.

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=98e62b9bcaf62883298a7… commit 98e62b9bcaf62883298a773e545859ec624dab20 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Aug 2 18:46:05 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Aug 4 17:48:39 2021 +0200 [NTOS:MM] In page zeroing thread, zero more than one page at a time. --- ntoskrnl/mm/ARM3/zeropage.c | 75 +++++++++++++++++++++++++++------------------ 1 file changed, 46 insertions(+), 29 deletions(-) diff --git a/ntoskrnl/mm/ARM3/zeropage.c b/ntoskrnl/mm/ARM3/zeropage.c index 5ad738b53d4..407fb03e27c 100644 --- a/ntoskrnl/mm/ARM3/zeropage.c +++ b/ntoskrnl/mm/ARM3/zeropage.c @@ -38,10 +38,6 @@ MmZeroPageThread(VOID) PKTHREAD Thread = KeGetCurrentThread(); PVOID StartAddress, EndAddress; PVOID WaitObjects[2]; - KIRQL OldIrql; - PVOID ZeroAddress; - PFN_NUMBER PageIndex, FreePage; - PMMPFN Pfn1; /* Get the discardable sections to free them */ MiFindInitializationCode(&StartAddress, &EndAddress); @@ -58,6 +54,8 @@ MmZeroPageThread(VOID) while (TRUE) { + KIRQL OldIrql; + KeWaitForMultipleObjects(1, // 2 WaitObjects, WaitAny, @@ -70,41 +68,60 @@ MmZeroPageThread(VOID) while (TRUE) { - if (!MmFreePageListHead.Total) + ULONG PageCount = 0; + PMMPFN Pfn1 = (PMMPFN)LIST_HEAD; + PVOID ZeroAddress; + PFN_NUMBER PageIndex, FreePage; + + while (PageCount < MI_ZERO_PTES) { - KeClearEvent(&MmZeroingPageEvent); - MiReleasePfnLock(OldIrql); - break; + PMMPFN Pfn2; + + if (!MmFreePageListHead.Total) + break; + + PageIndex = MmFreePageListHead.Flink; + ASSERT(PageIndex != LIST_HEAD); + MI_SET_USAGE(MI_USAGE_ZERO_LOOP); + MI_SET_PROCESS2("Kernel 0 Loop"); + FreePage = MiRemoveAnyPage(MI_GET_PAGE_COLOR(PageIndex)); + + /* The first global free page should also be the first on its own list */ + if (FreePage != PageIndex) + { + KeBugCheckEx(PFN_LIST_CORRUPT, + 0x8F, + FreePage, + PageIndex, + 0); + } + + Pfn2 = MiGetPfnEntry(PageIndex); + Pfn2->u1.Flink = (PFN_NUMBER)Pfn1; + Pfn1 = Pfn2; + PageCount++; } + MiReleasePfnLock(OldIrql); - PageIndex = MmFreePageListHead.Flink; - ASSERT(PageIndex != LIST_HEAD); - Pfn1 = MiGetPfnEntry(PageIndex); - MI_SET_USAGE(MI_USAGE_ZERO_LOOP); - MI_SET_PROCESS2("Kernel 0 Loop"); - FreePage = MiRemoveAnyPage(MI_GET_PAGE_COLOR(PageIndex)); - - /* The first global free page should also be the first on its own list */ - if (FreePage != PageIndex) + if (PageCount == 0) { - KeBugCheckEx(PFN_LIST_CORRUPT, - 0x8F, - FreePage, - PageIndex, - 0); + KeClearEvent(&MmZeroingPageEvent); + break; } - Pfn1->u1.Flink = LIST_HEAD; - MiReleasePfnLock(OldIrql); - - ZeroAddress = MiMapPagesInZeroSpace(Pfn1, 1); + ZeroAddress = MiMapPagesInZeroSpace(Pfn1, PageCount); ASSERT(ZeroAddress); - KeZeroPages(ZeroAddress, PAGE_SIZE); - MiUnmapPagesInZeroSpace(ZeroAddress, 1); + KeZeroPages(ZeroAddress, PageCount * PAGE_SIZE); + MiUnmapPagesInZeroSpace(ZeroAddress, PageCount); OldIrql = MiAcquirePfnLock(); - MiInsertPageInList(&MmZeroedPageListHead, PageIndex); + while (Pfn1 != (PMMPFN)LIST_HEAD) + { + PageIndex = MiGetPfnEntryIndex(Pfn1); + Pfn1 = (PMMPFN)Pfn1->u1.Flink; + MiInsertPageInList(&MmZeroedPageListHead, PageIndex); + } } } }

3 years, 4 months

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2021