Ros-diffs

ros-diffs@reactos.org

81390 discussions

01/01: [SERVICES] Update the service status after unloading a driver
by Eric Kohl 10 Feb '18

10 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=85b71880fa000b24f2b2b… commit 85b71880fa000b24f2b2bc88b15d36cb039f00db Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Feb 10 17:02:23 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Feb 10 17:02:23 2018 +0100 [SERVICES] Update the service status after unloading a driver Update the service status after unloading the driver and pass the new status to the caller. CORE-14269 --- base/system/services/driver.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/base/system/services/driver.c b/base/system/services/driver.c index 4248ac95c9..de8bfc1aa3 100644 --- a/base/system/services/driver.c +++ b/base/system/services/driver.c @@ -306,8 +306,16 @@ ScmControlDriver(PSERVICE lpService, dwError = ScmUnloadDriver(lpService); if (dwError == ERROR_SUCCESS) { - lpService->Status.dwControlsAccepted = 0; lpService->Status.dwCurrentState = SERVICE_STOPPED; + lpService->Status.dwControlsAccepted = 0; + lpService->Status.dwWin32ExitCode = ERROR_SUCCESS; + + if (lpServiceStatus != NULL) + { + RtlCopyMemory(lpServiceStatus, + &lpService->Status, + sizeof(SERVICE_STATUS)); + } } break;

1 0

01/01: [EXPLORER] Send balloon notifications to the callback message. TODO: Send NIN_BALLOONUSERCLICK when the user clicks on the balloon content (not the X button).
by David Quintana 10 Feb '18

10 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3003471e64d09e838f242… commit 3003471e64d09e838f24263e0d71e4ac4b2b391c Author: David Quintana <gigaherz(a)gmail.com> AuthorDate: Sat Feb 10 15:47:49 2018 +0100 Commit: David Quintana <gigaherz(a)gmail.com> CommitDate: Sat Feb 10 16:31:26 2018 +0100 [EXPLORER] Send balloon notifications to the callback message. TODO: Send NIN_BALLOONUSERCLICK when the user clicks on the balloon content (not the X button). --- base/shell/explorer/syspager.cpp | 97 +++++++++++++++++++++++----------------- 1 file changed, 56 insertions(+), 41 deletions(-) diff --git a/base/shell/explorer/syspager.cpp b/base/shell/explorer/syspager.cpp index 32d4b45c6c..0fa8eae4e3 100644 --- a/base/shell/explorer/syspager.cpp +++ b/base/shell/explorer/syspager.cpp @@ -78,6 +78,8 @@ private: static UINT WINAPI WatcherThread(_In_opt_ LPVOID lpParam); }; +class CNotifyToolbar; + class CBalloonQueue { public: @@ -114,7 +116,7 @@ private: CAtlList<Info> m_queue; - CToolbar<InternalIconData> * m_toolbar; + CNotifyToolbar * m_toolbar; InternalIconData * m_current; bool m_currentClosed; @@ -124,7 +126,7 @@ private: public: CBalloonQueue(); - void Init(HWND hwndParent, CToolbar<InternalIconData> * toolbar, CTooltips * balloons); + void Init(HWND hwndParent, CNotifyToolbar * toolbar, CTooltips * balloons); void Deinit(); bool OnTimer(int timerId); @@ -137,7 +139,7 @@ private: int IndexOf(InternalIconData * pdata); void SetTimer(int length); void Show(Info& info); - void Close(IN OUT InternalIconData * notifyItem); + void Close(IN OUT InternalIconData * notifyItem, IN UINT uReason); }; class CNotifyToolbar : @@ -160,6 +162,7 @@ public: BOOL UpdateButton(IN CONST NOTIFYICONDATA *iconData); BOOL RemoveButton(IN CONST NOTIFYICONDATA *iconData); VOID ResizeImagelist(); + bool SendNotifyCallback(InternalIconData* notifyItem, UINT uMsg); private: VOID SendMouseEvent(IN WORD wIndex, IN UINT uMsg, IN WPARAM wParam); @@ -495,7 +498,7 @@ CBalloonQueue::CBalloonQueue() : { } -void CBalloonQueue::Init(HWND hwndParent, CToolbar<InternalIconData> * toolbar, CTooltips * balloons) +void CBalloonQueue::Init(HWND hwndParent, CNotifyToolbar * toolbar, CTooltips * balloons) { m_hwndParent = hwndParent; m_toolbar = toolbar; @@ -520,7 +523,7 @@ bool CBalloonQueue::OnTimer(int timerId) if (m_current && !m_currentClosed) { - Close(m_current); + Close(m_current, NIN_BALLOONTIMEOUT); } else { @@ -556,13 +559,13 @@ void CBalloonQueue::UpdateInfo(InternalIconData * notifyItem) } else { - Close(notifyItem); + Close(notifyItem, NIN_BALLOONHIDE); } } void CBalloonQueue::RemoveInfo(InternalIconData * notifyItem) { - Close(notifyItem); + Close(notifyItem, NIN_BALLOONHIDE); POSITION position = m_queue.GetHeadPosition(); while(position != NULL) @@ -578,7 +581,9 @@ void CBalloonQueue::RemoveInfo(InternalIconData * notifyItem) void CBalloonQueue::CloseCurrent() { if (m_current != NULL) - Close(m_current); + { + Close(m_current, NIN_BALLOONTIMEOUT); + } } int CBalloonQueue::IndexOf(InternalIconData * pdata) @@ -621,14 +626,18 @@ void CBalloonQueue::Show(Info& info) if (timeout > MaxTimeout) timeout = MaxTimeout; SetTimer(timeout); + + m_toolbar->SendNotifyCallback(m_current, NIN_BALLOONSHOW); } -void CBalloonQueue::Close(IN OUT InternalIconData * notifyItem) +void CBalloonQueue::Close(IN OUT InternalIconData * notifyItem, IN UINT uReason) { TRACE("HideBalloonTip called\n"); if (m_current == notifyItem && !m_currentClosed) { + m_toolbar->SendNotifyCallback(m_current, uReason); + // Prevent Re-entry m_currentClosed = true; m_tooltips->TrackDeactivate(); @@ -695,7 +704,7 @@ int CNotifyToolbar::FindExistingSharedIcon(HICON handle) BOOL CNotifyToolbar::AddButton(_In_ CONST NOTIFYICONDATA *iconData) { - TBBUTTON tbBtn; + TBBUTTON tbBtn = { 0 }; InternalIconData * notifyItem; WCHAR text[] = L""; @@ -1006,27 +1015,8 @@ VOID CNotifyToolbar::ResizeImagelist() SetButtonSize(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON)); } -VOID CNotifyToolbar::SendMouseEvent(IN WORD wIndex, IN UINT uMsg, IN WPARAM wParam) +bool CNotifyToolbar::SendNotifyCallback(InternalIconData* notifyItem, UINT uMsg) { - static LPCWSTR eventNames [] = { - L"WM_MOUSEMOVE", - L"WM_LBUTTONDOWN", - L"WM_LBUTTONUP", - L"WM_LBUTTONDBLCLK", - L"WM_RBUTTONDOWN", - L"WM_RBUTTONUP", - L"WM_RBUTTONDBLCLK", - L"WM_MBUTTONDOWN", - L"WM_MBUTTONUP", - L"WM_MBUTTONDBLCLK", - L"WM_MOUSEWHEEL", - L"WM_XBUTTONDOWN", - L"WM_XBUTTONUP", - L"WM_XBUTTONDBLCLK" - }; - - InternalIconData * notifyItem = GetItemData(wIndex); - if (!::IsWindow(notifyItem->hWnd)) { // We detect and destroy icons with invalid handles only on mouse move over systray, same as MS does. @@ -1039,14 +1029,7 @@ VOID CNotifyToolbar::SendMouseEvent(IN WORD wIndex, IN UINT uMsg, IN WPARAM wPar NMHDR nmh = {GetParent(), 0, NTNWM_REALIGN}; GetParent().SendMessage(WM_NOTIFY, 0, (LPARAM) &nmh); - return; - } - - if (uMsg >= WM_MOUSEFIRST && uMsg <= WM_MOUSELAST) - { - TRACE("Sending message %S from button %d to %p (msg=%x, w=%x, l=%x)...\n", - eventNames[uMsg - WM_MOUSEFIRST], wIndex, - notifyItem->hWnd, notifyItem->uCallbackMessage, notifyItem->uID, uMsg); + return true; } DWORD pid; @@ -1056,9 +1039,9 @@ VOID CNotifyToolbar::SendMouseEvent(IN WORD wIndex, IN UINT uMsg, IN WPARAM wPar (uMsg >= WM_MOUSEFIRST && uMsg <= WM_MOUSELAST)) { ::PostMessage(notifyItem->hWnd, - notifyItem->uCallbackMessage, - notifyItem->uID, - uMsg); + notifyItem->uCallbackMessage, + notifyItem->uID, + uMsg); } else { @@ -1067,6 +1050,38 @@ VOID CNotifyToolbar::SendMouseEvent(IN WORD wIndex, IN UINT uMsg, IN WPARAM wPar notifyItem->uID, uMsg); } + return false; +} + +VOID CNotifyToolbar::SendMouseEvent(IN WORD wIndex, IN UINT uMsg, IN WPARAM wParam) +{ + static LPCWSTR eventNames [] = { + L"WM_MOUSEMOVE", + L"WM_LBUTTONDOWN", + L"WM_LBUTTONUP", + L"WM_LBUTTONDBLCLK", + L"WM_RBUTTONDOWN", + L"WM_RBUTTONUP", + L"WM_RBUTTONDBLCLK", + L"WM_MBUTTONDOWN", + L"WM_MBUTTONUP", + L"WM_MBUTTONDBLCLK", + L"WM_MOUSEWHEEL", + L"WM_XBUTTONDOWN", + L"WM_XBUTTONUP", + L"WM_XBUTTONDBLCLK" + }; + + InternalIconData * notifyItem = GetItemData(wIndex); + + if (uMsg >= WM_MOUSEFIRST && uMsg <= WM_MOUSELAST) + { + TRACE("Sending message %S from button %d to %p (msg=%x, w=%x, l=%x)...\n", + eventNames[uMsg - WM_MOUSEFIRST], wIndex, + notifyItem->hWnd, notifyItem->uCallbackMessage, notifyItem->uID, uMsg); + } + + SendNotifyCallback(notifyItem, uMsg); } LRESULT CNotifyToolbar::OnMouseEvent(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)

1 0

01/01: [PSDK] Add missing shell notification message flags.
by Hermès Bélusca-Maïto 10 Feb '18

10 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8b78b0ff984aff5de66c0… commit 8b78b0ff984aff5de66c0aebadc54a5b93c14f60 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Feb 10 15:41:21 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Feb 10 15:43:24 2018 +0100 [PSDK] Add missing shell notification message flags. --- sdk/include/psdk/shellapi.h | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/sdk/include/psdk/shellapi.h b/sdk/include/psdk/shellapi.h index ee35759c19..41623a08c8 100644 --- a/sdk/include/psdk/shellapi.h +++ b/sdk/include/psdk/shellapi.h @@ -70,13 +70,34 @@ extern "C" { #define ABN_POSCHANGED 1 #define ABN_FULLSCREENAPP 2 #define ABN_WINDOWARRANGE 3 + +#if (_WIN32_IE >= 0x0500) +#define NIN_SELECT (WM_USER + 0) +#define NINF_KEY 1 +#define NIN_KEYSELECT (NIN_SELECT | NINF_KEY) +#endif + +#if (_WIN32_IE >= 0x0501) +#define NIN_BALLOONSHOW (WM_USER + 2) +#define NIN_BALLOONHIDE (WM_USER + 3) +#define NIN_BALLOONTIMEOUT (WM_USER + 4) +#define NIN_BALLOONUSERCLICK (WM_USER + 5) +#endif +#if (NTDDI_VERSION >= NTDDI_VISTA) +#define NIN_POPUPOPEN (WM_USER + 6) +#define NIN_POPUPCLOSE (WM_USER + 7) +#endif + #define NIM_ADD 0 #define NIM_MODIFY 1 #define NIM_DELETE 2 #if _WIN32_IE >= 0x0500 -#define NOTIFYICON_VERSION 3 #define NIM_SETFOCUS 3 #define NIM_SETVERSION 4 +#define NOTIFYICON_VERSION 3 +#if (NTDDI_VERSION >= NTDDI_VISTA) +#define NOTIFYICON_VERSION_4 4 +#endif #endif #define NIF_MESSAGE 1 #define NIF_ICON 2 @@ -97,6 +118,7 @@ extern "C" { #define NIIF_NOSOUND 0x10 #endif /* _WIN32_IE >= 0x0600 */ #endif /* _WIN32_IE >= 0x0500 */ + #define SE_ERR_FNF 2 #define SE_ERR_PNF 3 #define SE_ERR_ACCESSDENIED 5

1 0

01/01: [SERVICES] Support the NoInteractiveServices registry value
by Eric Kohl 10 Feb '18

10 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=905d65b75b6f00be642ad… commit 905d65b75b6f00be642ada60af4a937071c817dc Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Feb 10 14:23:11 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Feb 10 14:23:11 2018 +0100 [SERVICES] Support the NoInteractiveServices registry value --- base/system/services/database.c | 44 +++++++++++++++++++++++++++++++++-------- boot/bootdata/hivesys.inf | 1 + 2 files changed, 37 insertions(+), 8 deletions(-) diff --git a/base/system/services/database.c b/base/system/services/database.c index 9822d6048e..19c4e05724 100644 --- a/base/system/services/database.c +++ b/base/system/services/database.c @@ -27,6 +27,7 @@ LIST_ENTRY ServiceListHead; static RTL_RESOURCE DatabaseLock; static DWORD ResumeCount = 1; +static DWORD NoInteractiveServices = 0; /* The critical section synchronizes service control requests */ static CRITICAL_SECTION ControlServiceCriticalSection; @@ -832,6 +833,33 @@ ScmDeleteMarkedServices(VOID) } +static +VOID +ScmGetNoInteractiveServicesValue(VOID) +{ + HKEY hKey; + DWORD dwKeySize; + LONG lError; + + lError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SYSTEM\\CurrentControlSet\\Control\\Windows", + 0, + KEY_READ, + &hKey); + if (lError == ERROR_SUCCESS) + { + dwKeySize = sizeof(NoInteractiveServices); + lError = RegQueryValueExW(hKey, + L"NoInteractiveServices", + 0, + NULL, + (LPBYTE)&NoInteractiveServices, + &dwKeySize); + RegCloseKey(hKey); + } +} + + DWORD ScmCreateServiceDatabase(VOID) { @@ -845,11 +873,15 @@ ScmCreateServiceDatabase(VOID) DPRINT("ScmCreateServiceDatabase() called\n"); + /* Retrieve the NoInteractiveServies value */ + ScmGetNoInteractiveServicesValue(); + + /* Create the service group list */ dwError = ScmCreateGroupList(); if (dwError != ERROR_SUCCESS) return dwError; - /* Initialize basic variables */ + /* Initialize image and service lists */ InitializeListHead(&ImageListHead); InitializeListHead(&ServiceListHead); @@ -1637,10 +1669,8 @@ ScmStartUserModeService(PSERVICE Service, ZeroMemory(&ProcessInformation, sizeof(ProcessInformation)); /* Use the interactive desktop if the service is interactive */ - // TODO: We should also check the value "NoInteractiveServices ": - // See https://msdn.microsoft.com/en-us/library/windows/desktop/ms683502(v=vs.85).… - // for more details. - if (Service->Status.dwServiceType & SERVICE_INTERACTIVE_PROCESS) + if ((NoInteractiveServices == 0) && + (Service->Status.dwServiceType & SERVICE_INTERACTIVE_PROCESS)) StartupInfo.lpDesktop = L"WinSta0\\Default"; if (Service->lpImage->hToken) @@ -1920,9 +1950,7 @@ ScmAutoStartServices(VOID) */ ASSERT(ScmInitialize); - /* - * Retrieve the SafeBoot parameter. - */ + /* Retrieve the SafeBoot parameter */ dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Control\\SafeBoot\\Option", 0, diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index 07e98be494..bb0b3b8257 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -1308,6 +1308,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\ReactOS\Settings\Version","ReportAsWorkst ; Some installers check for SP2 HKLM,"SYSTEM\CurrentControlSet\Control\Windows","CSDReleaseType",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Control\Windows","CSDVersion",0x00010001,0x00000200 +HKLM,"SYSTEM\CurrentControlSet\Control\Windows","NoInteractiveServices",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Control\SecurityProviders","SecurityProviders",2,"schannel.dll" HKLM,"SYSTEM\CurrentControlSet\Control\SecurityProviders\SaslProfiles",,0x00000012

1 0

01/01: [NTOSKRNL] Avoid private cache map allocation for the first handle Standard shared cache map provides space for a private cache map, do the same and make it available for the first handle. It avoids two allocations in a row.
by Pierre Schweitzer 09 Feb '18

09 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a6e080bd3db21d64f1b43… commit a6e080bd3db21d64f1b43222377bb9c70e805857 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Feb 9 21:52:41 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri Feb 9 21:52:41 2018 +0100 [NTOSKRNL] Avoid private cache map allocation for the first handle Standard shared cache map provides space for a private cache map, do the same and make it available for the first handle. It avoids two allocations in a row. --- ntoskrnl/cc/view.c | 19 +++++++++++++++++-- ntoskrnl/include/internal/cc.h | 1 + 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index d69b195c10..cf2d2c5cb7 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -1194,7 +1194,14 @@ CcRosReleaseFileCache ( KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, OldIrql); /* And free it. */ - ExFreePoolWithTag(PrivateMap, TAG_PRIVATE_CACHE_MAP); + if (PrivateMap != &SharedCacheMap->PrivateCacheMap) + { + ExFreePoolWithTag(PrivateMap, TAG_PRIVATE_CACHE_MAP); + } + else + { + PrivateMap->NodeTypeCode = 0; + } if (SharedCacheMap->OpenCount > 0) { @@ -1271,7 +1278,15 @@ CcRosInitializeFileCache ( PPRIVATE_CACHE_MAP PrivateMap; /* Allocate the private cache map for this handle */ - PrivateMap = ExAllocatePoolWithTag(NonPagedPool, sizeof(PRIVATE_CACHE_MAP), TAG_PRIVATE_CACHE_MAP); + if (SharedCacheMap->PrivateCacheMap.NodeTypeCode != 0) + { + PrivateMap = ExAllocatePoolWithTag(NonPagedPool, sizeof(PRIVATE_CACHE_MAP), TAG_PRIVATE_CACHE_MAP); + } + else + { + PrivateMap = &SharedCacheMap->PrivateCacheMap; + } + if (PrivateMap == NULL) { /* If we also allocated the shared cache map for this file, kill it */ diff --git a/ntoskrnl/include/internal/cc.h b/ntoskrnl/include/internal/cc.h index d34360a7e3..5751ab665e 100644 --- a/ntoskrnl/include/internal/cc.h +++ b/ntoskrnl/include/internal/cc.h @@ -169,6 +169,7 @@ typedef struct _ROS_SHARED_CACHE_MAP PVOID LazyWriteContext; LIST_ENTRY PrivateList; ULONG DirtyPageThreshold; + PRIVATE_CACHE_MAP PrivateCacheMap; /* ROS specific */ LIST_ENTRY CacheMapVacbListHead;

1 0

03/03: [NTOSKRNL] Modified CcCanIWrite to handle Mm throttling limits
by Pierre Schweitzer 09 Feb '18

09 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5d93941d31c714579ff3b… commit 5d93941d31c714579ff3b3bedb766c6448aeaccb Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Feb 9 14:22:00 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri Feb 9 14:22:00 2018 +0100 [NTOSKRNL] Modified CcCanIWrite to handle Mm throttling limits --- ntoskrnl/cc/copy.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/cc/copy.c b/ntoskrnl/cc/copy.c index 40897028fc..a3b1f887aa 100644 --- a/ntoskrnl/cc/copy.c +++ b/ntoskrnl/cc/copy.c @@ -697,10 +697,16 @@ CcCanIWrite ( /* So, now allow write if: * - Not the first try or we have no throttling yet * AND: - * - We don't execeed threshold! + * - We don't exceed threshold! + * - We don't exceed what Mm can allow us to use + * + If we're above top, that's fine + * + If we're above bottom with limited modified pages, that's fine + * + Otherwise, throttle! */ if ((TryContext != FirstTry || IsListEmpty(&CcDeferredWrites)) && CcTotalDirtyPages + Pages < CcDirtyPageThreshold && + (MmAvailablePages > MmThrottleTop || + (MmModifiedPageListHead.Total < 1000 && MmAvailablePages > MmThrottleBottom)) && !PerFileDefer) { return TRUE;

1 0

02/03: [NTOSKRNL] Define the throttling limits for Cc in Mm: MmThrottleTop, MmThrottleBottom. Modified !defwrites to reflect that change
by Pierre Schweitzer 09 Feb '18

09 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6b0cb54fe578e81205ffc… commit 6b0cb54fe578e81205ffc3be6e53b246ce040d01 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Feb 9 14:21:14 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri Feb 9 14:21:14 2018 +0100 [NTOSKRNL] Define the throttling limits for Cc in Mm: MmThrottleTop, MmThrottleBottom. Modified !defwrites to reflect that change --- ntoskrnl/cc/view.c | 6 ++++++ ntoskrnl/include/internal/mm.h | 2 ++ ntoskrnl/mm/ARM3/mminit.c | 24 ++++++++++++++++++++++++ 3 files changed, 32 insertions(+) diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index cf2645591c..d69b195c10 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -1437,6 +1437,12 @@ ExpKdbgExtDefWrites(ULONG Argc, PCHAR Argv[]) (CcDirtyPageThreshold * PAGE_SIZE) / 1024); KdbpPrint("MmAvailablePages:\t%lu (%lu Kb)\n", MmAvailablePages, (MmAvailablePages * PAGE_SIZE) / 1024); + KdbpPrint("MmThrottleTop:\t\t%lu (%lu Kb)\n", MmThrottleTop, + (MmThrottleTop * PAGE_SIZE) / 1024); + KdbpPrint("MmThrottleBottom:\t%lu (%lu Kb)\n", MmThrottleBottom, + (MmThrottleBottom * PAGE_SIZE) / 1024); + KdbpPrint("MmModifiedPageListHead.Total:\t%lu (%lu Kb)\n", MmModifiedPageListHead.Total, + (MmModifiedPageListHead.Total * PAGE_SIZE) / 1024); if (CcTotalDirtyPages >= CcDirtyPageThreshold) { diff --git a/ntoskrnl/include/internal/mm.h b/ntoskrnl/include/internal/mm.h index 4489530ee2..d5094e0915 100644 --- a/ntoskrnl/include/internal/mm.h +++ b/ntoskrnl/include/internal/mm.h @@ -15,6 +15,8 @@ extern PFN_NUMBER MmLowestPhysicalPage; extern PFN_NUMBER MmHighestPhysicalPage; extern PFN_NUMBER MmAvailablePages; extern PFN_NUMBER MmResidentAvailablePages; +extern ULONG MmThrottleTop; +extern ULONG MmThrottleBottom; extern LIST_ENTRY MmLoadedUserImageList; diff --git a/ntoskrnl/mm/ARM3/mminit.c b/ntoskrnl/mm/ARM3/mminit.c index eb625fcecb..9b57931cbc 100644 --- a/ntoskrnl/mm/ARM3/mminit.c +++ b/ntoskrnl/mm/ARM3/mminit.c @@ -387,6 +387,15 @@ PFN_NUMBER MiNumberOfFreePages = 0; ULONG MmCritsectTimeoutSeconds = 150; // NT value: 720 * 60 * 60; (30 days) LARGE_INTEGER MmCriticalSectionTimeout; +// +// Throttling limits for Cc (in pages) +// Above top, we don't throttle +// Above bottom, we throttle depending on the amount of modified pages +// Otherwise, we throttle! +// +ULONG MmThrottleTop; +ULONG MmThrottleBottom; + /* PRIVATE FUNCTIONS **********************************************************/ VOID @@ -2074,6 +2083,13 @@ MmArmInitSystem(IN ULONG Phase, MiLowNonPagedPoolEvent = &MiTempEvent; MiHighNonPagedPoolEvent = &MiTempEvent; + // + // Default throttling limits for Cc + // May be ajusted later on depending on system type + // + MmThrottleTop = 450; + MmThrottleBottom = 127; + // // Define the basic user vs. kernel address space separation // @@ -2461,6 +2477,10 @@ MmArmInitSystem(IN ULONG Phase, /* Set Windows NT Workstation product type */ SharedUserData->NtProductType = NtProductWinNt; MmProductType = 0; + + /* For this product, we wait till the last moment to throttle */ + MmThrottleTop = 250; + MmThrottleBottom = 30; } else { @@ -2479,6 +2499,10 @@ MmArmInitSystem(IN ULONG Phase, /* Set the product type, and make the system more aggressive with low memory */ MmProductType = 1; MmMinimumFreePages = 81; + + /* We will throttle earlier to preserve memory */ + MmThrottleTop = 450; + MmThrottleBottom = 80; } /* Update working set tuning parameters */

1 0

01/03: [NTOSKRNL] Rewrite CcCanIWrite() to make it more accurate and handle specific callers
by Pierre Schweitzer 09 Feb '18

09 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=945ff8ea2ee2abd48f5ec… commit 945ff8ea2ee2abd48f5ecbe707131446546e75a3 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Feb 9 13:56:16 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri Feb 9 13:56:16 2018 +0100 [NTOSKRNL] Rewrite CcCanIWrite() to make it more accurate and handle specific callers --- ntoskrnl/cc/copy.c | 99 ++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 66 insertions(+), 33 deletions(-) diff --git a/ntoskrnl/cc/copy.c b/ntoskrnl/cc/copy.c index 4992ade290..40897028fc 100644 --- a/ntoskrnl/cc/copy.c +++ b/ntoskrnl/cc/copy.c @@ -27,6 +27,14 @@ typedef enum _CC_COPY_OPERATION CcOperationZero } CC_COPY_OPERATION; +typedef enum _CC_CAN_WRITE_RETRY +{ + FirstTry = 0, + RetryAllowRemote = 253, + RetryForceCheckPerFile = 254, + RetryMasterLocked = 255, +} CC_CAN_WRITE_RETRY; + ULONG CcRosTraceLevel = 0; ULONG CcFastMdlReadWait; ULONG CcFastMdlReadNotPossible; @@ -414,7 +422,7 @@ CcPostDeferredWrites(VOID) } /* Check we can write */ - if (CcCanIWrite(DeferredWrite->FileObject, WrittenBytes, FALSE, TRUE)) + if (CcCanIWrite(DeferredWrite->FileObject, WrittenBytes, FALSE, RetryForceCheckPerFile)) { /* We can, so remove it from the list and stop looking for entry */ RemoveEntryList(&DeferredWrite->DeferredWriteLinks); @@ -614,9 +622,13 @@ CcCanIWrite ( IN BOOLEAN Wait, IN BOOLEAN Retrying) { + KIRQL OldIrql; KEVENT WaitEvent; + ULONG Length, Pages; + BOOLEAN PerFileDefer; DEFERRED_WRITE Context; PFSRTL_COMMON_FCB_HEADER Fcb; + CC_CAN_WRITE_RETRY TryContext; PROS_SHARED_CACHE_MAP SharedCacheMap; CCTRACE(CC_API_DEBUG, "FileObject=%p BytesToWrite=%lu Wait=%d Retrying=%d\n", @@ -628,53 +640,74 @@ CcCanIWrite ( return TRUE; } - /* We cannot write if dirty pages count is above threshold */ - if (CcTotalDirtyPages > CcDirtyPageThreshold) + TryContext = Retrying; + /* Allow remote file if not from posted */ + if (IoIsFileOriginRemote(FileObject) && TryContext < RetryAllowRemote) { - /* Can the caller wait till it's possible to write? */ - goto CanIWait; + return TRUE; } - /* We cannot write if dirty pages count will bring use above - * XXX: Might not be accurate - */ - if (CcTotalDirtyPages + (BytesToWrite / PAGE_SIZE) > CcDirtyPageThreshold) + /* Don't exceed max tolerated size */ + Length = MAX_ZERO_LENGTH; + if (BytesToWrite < MAX_ZERO_LENGTH) { - /* Can the caller wait till it's possible to write? */ - goto CanIWait; + Length = BytesToWrite; } - /* Is there a limit per file object? */ + /* Convert it to pages count */ + Pages = (Length + PAGE_SIZE - 1) >> PAGE_SHIFT; + + /* By default, assume limits per file won't be hit */ + PerFileDefer = FALSE; Fcb = FileObject->FsContext; - SharedCacheMap = FileObject->SectionObjectPointer->SharedCacheMap; - if (!BooleanFlagOn(Fcb->Flags, FSRTL_FLAG_LIMIT_MODIFIED_PAGES) || - SharedCacheMap->DirtyPageThreshold == 0) + /* Do we have to check for limits per file? */ + if (TryContext >= RetryForceCheckPerFile || + BooleanFlagOn(Fcb->Flags, FSRTL_FLAG_LIMIT_MODIFIED_PAGES)) { - /* Nope, so that's fine, allow write operation */ - return TRUE; - } + /* If master is not locked, lock it now */ + if (TryContext != RetryMasterLocked) + { + OldIrql = KeAcquireQueuedSpinLock(LockQueueMasterLock); + } - /* Is dirty page count above local threshold? */ - if (SharedCacheMap->DirtyPages > SharedCacheMap->DirtyPageThreshold) - { - /* Can the caller wait till it's possible to write? */ - goto CanIWait; + /* Let's not assume the file is cached... */ + if (FileObject->SectionObjectPointer != NULL && + FileObject->SectionObjectPointer->SharedCacheMap != NULL) + { + SharedCacheMap = FileObject->SectionObjectPointer->SharedCacheMap; + /* Do we have limits per file set? */ + if (SharedCacheMap->DirtyPageThreshold != 0 && + SharedCacheMap->DirtyPages != 0) + { + /* Yes, check whether they are blocking */ + if (Pages + SharedCacheMap->DirtyPages > SharedCacheMap->DirtyPageThreshold) + { + PerFileDefer = TRUE; + } + } + } + + /* And don't forget to release master */ + if (TryContext != RetryMasterLocked) + { + KeReleaseQueuedSpinLock(LockQueueMasterLock, OldIrql); + } } - /* We cannot write if dirty pages count will bring use above - * XXX: Might not be accurate + /* So, now allow write if: + * - Not the first try or we have no throttling yet + * AND: + * - We don't execeed threshold! */ - if (SharedCacheMap->DirtyPages + (BytesToWrite / PAGE_SIZE) > SharedCacheMap->DirtyPageThreshold) + if ((TryContext != FirstTry || IsListEmpty(&CcDeferredWrites)) && + CcTotalDirtyPages + Pages < CcDirtyPageThreshold && + !PerFileDefer) { - /* Can the caller wait till it's possible to write? */ - goto CanIWait; + return TRUE; } - return TRUE; - -CanIWait: - /* If we reached that point, it means caller cannot write - * If he cannot wait, then fail and deny write + /* If we can wait, we'll start the wait loop for waiting till we can + * write for real */ if (!Wait) {

1 0

01/01: [NTOSKRNL] Don't defer write through write operations
by Pierre Schweitzer 09 Feb '18

09 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f51b74ca6111a93ea0835… commit f51b74ca6111a93ea08356fec0cbbd4bb7542e5a Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Feb 9 12:25:58 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri Feb 9 12:25:58 2018 +0100 [NTOSKRNL] Don't defer write through write operations --- ntoskrnl/cc/copy.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ntoskrnl/cc/copy.c b/ntoskrnl/cc/copy.c index 63ad5aeb11..4992ade290 100644 --- a/ntoskrnl/cc/copy.c +++ b/ntoskrnl/cc/copy.c @@ -622,6 +622,12 @@ CcCanIWrite ( CCTRACE(CC_API_DEBUG, "FileObject=%p BytesToWrite=%lu Wait=%d Retrying=%d\n", FileObject, BytesToWrite, Wait, Retrying); + /* Write through is always OK */ + if (BooleanFlagOn(FileObject->Flags, FO_WRITE_THROUGH)) + { + return TRUE; + } + /* We cannot write if dirty pages count is above threshold */ if (CcTotalDirtyPages > CcDirtyPageThreshold) {

1 0

01/01: [NTOSKRNL] Quickly implement the !defwrites in KDBG
by Pierre Schweitzer 09 Feb '18

09 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d35243d4e0bffb0edc071… commit d35243d4e0bffb0edc07150c550ff903ba4427d8 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Feb 9 12:16:29 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri Feb 9 12:16:29 2018 +0100 [NTOSKRNL] Quickly implement the !defwrites in KDBG --- ntoskrnl/cc/view.c | 26 ++++++++++++++++++++++++++ ntoskrnl/kdbg/kdb_cli.c | 2 ++ 2 files changed, 28 insertions(+) diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index 23bc5076e1..cf2645591c 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -1427,6 +1427,32 @@ ExpKdbgExtFileCache(ULONG Argc, PCHAR Argv[]) return TRUE; } + +BOOLEAN +ExpKdbgExtDefWrites(ULONG Argc, PCHAR Argv[]) +{ + KdbpPrint("CcTotalDirtyPages:\t%lu (%lu Kb)\n", CcTotalDirtyPages, + (CcTotalDirtyPages * PAGE_SIZE) / 1024); + KdbpPrint("CcDirtyPageThreshold:\t%lu (%lu Kb)\n", CcDirtyPageThreshold, + (CcDirtyPageThreshold * PAGE_SIZE) / 1024); + KdbpPrint("MmAvailablePages:\t%lu (%lu Kb)\n", MmAvailablePages, + (MmAvailablePages * PAGE_SIZE) / 1024); + + if (CcTotalDirtyPages >= CcDirtyPageThreshold) + { + KdbpPrint("CcTotalDirtyPages above the threshold, writes should be throttled\n"); + } + else if (CcTotalDirtyPages + 64 >= CcDirtyPageThreshold) + { + KdbpPrint("CcTotalDirtyPages within 64 (max charge) pages of the threshold, writes may be throttled\n"); + } + else + { + KdbpPrint("CcTotalDirtyPages below the threshold, writes should not be throttled\n"); + } + + return TRUE; +} #endif /* EOF */ diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c index dfb01f4960..3fce1977d9 100644 --- a/ntoskrnl/kdbg/kdb_cli.c +++ b/ntoskrnl/kdbg/kdb_cli.c @@ -94,6 +94,7 @@ static BOOLEAN KdbpCmdDmesg(ULONG Argc, PCHAR Argv[]); BOOLEAN ExpKdbgExtPool(ULONG Argc, PCHAR Argv[]); BOOLEAN ExpKdbgExtPoolUsed(ULONG Argc, PCHAR Argv[]); BOOLEAN ExpKdbgExtFileCache(ULONG Argc, PCHAR Argv[]); +BOOLEAN ExpKdbgExtDefWrites(ULONG Argc, PCHAR Argv[]); #ifdef __ROS_DWARF__ static BOOLEAN KdbpCmdPrintStruct(ULONG Argc, PCHAR Argv[]); @@ -188,6 +189,7 @@ static const struct { "!pool", "!pool [Address [Flags]]", "Display information about pool allocations.", ExpKdbgExtPool }, { "!poolused", "!poolused [Flags [Tag]]", "Display pool usage.", ExpKdbgExtPoolUsed }, { "!filecache", "!filecache", "Display cache usage.", ExpKdbgExtFileCache }, + { "!defwrites", "!defwrites", "Display cache write values.", ExpKdbgExtDefWrites }, }; /* FUNCTIONS *****************************************************************/

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs