Ros-diffs November 2020

ros-diffs@reactos.org

18 participants
162 discussions

[reactos] 03/03: [CRT] Remove duplicated atexit/onexit code
by Timo Kreuzer 01 Nov '20

01 Nov '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2c791cdde79d8d7bc7709… commit 2c791cdde79d8d7bc770980e98d502144be316ac Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Oct 22 17:11:02 2020 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Nov 1 09:33:14 2020 +0100 [CRT] Remove duplicated atexit/onexit code This removes the broken wine version of atexit and onexit. It keeps only dllonexit, which is implemented properly. The previous __call_atexit is moved to where the mingw onexit/atexit code is and adjusts it to work with the existing code. A call to __call_atexit is added in __tmainCRTStartup after the main function was called. --- sdk/lib/crt/crt.cmake | 2 +- sdk/lib/crt/startup/atonexit.c | 36 +++++++++++++++++++++--- sdk/lib/crt/startup/crtexe.c | 3 ++ sdk/lib/crt/stdlib/atexit.c | 63 ------------------------------------------ 4 files changed, 36 insertions(+), 68 deletions(-) diff --git a/sdk/lib/crt/crt.cmake b/sdk/lib/crt/crt.cmake index 1148d12d289..3997ea778a9 100644 --- a/sdk/lib/crt/crt.cmake +++ b/sdk/lib/crt/crt.cmake @@ -197,7 +197,7 @@ list(APPEND CRT_SOURCE startup/natstart.c startup/charmax.c #startup/merr.c - #startup/atonexit.c + startup/atonexit.c #startup/txtmode.c startup/pesect.c startup/tlsmcrt.c diff --git a/sdk/lib/crt/startup/atonexit.c b/sdk/lib/crt/startup/atonexit.c index e5fb98a2d63..1774e90f1b3 100644 --- a/sdk/lib/crt/startup/atonexit.c +++ b/sdk/lib/crt/startup/atonexit.c @@ -24,13 +24,31 @@ _PVFV *__onexitbegin; _PVFV *__onexitend; -extern _CRTIMP _onexit_t __cdecl __dllonexit (_onexit_t, _PVFV**, _PVFV**); +extern _onexit_t __cdecl __dllonexit (_onexit_t, _PVFV**, _PVFV**); extern _onexit_t (__cdecl * __MINGW_IMP_SYMBOL(_onexit)) (_onexit_t func); +/* INTERNAL: call atexit functions */ +void __call_atexit(void) +{ + /* Note: should only be called with the exit lock held */ + _PVFV *first, *last; + + first = (_PVFV *)_decode_pointer(__onexitbegin); + last = (_PVFV *)_decode_pointer(__onexitend);; + + if (!first) return; + + while (--last >= first) + if (*last) + (**last)(); + + free(first); +} + /* Choose a different name to prevent name conflicts. The CRT one works fine. */ -_onexit_t __cdecl mingw_onexit(_onexit_t func); +_onexit_t __cdecl _onexit(_onexit_t func); -_onexit_t __cdecl mingw_onexit(_onexit_t func) +_onexit_t __cdecl _onexit(_onexit_t func) { _PVFV *onexitbegin; _PVFV *onexitend; @@ -39,7 +57,17 @@ _onexit_t __cdecl mingw_onexit(_onexit_t func) onexitbegin = (_PVFV *) _decode_pointer (__onexitbegin); if (onexitbegin == (_PVFV *) -1) +#ifdef __REACTOS__ + { + onexitbegin = (_PVFV *)calloc(32, sizeof(_onexit_t)); + if (onexitbegin == NULL) + return NULL; + __onexitbegin = _encode_pointer(onexitbegin); + __onexitend = _encode_pointer(onexitbegin + 32); + } +#else return (* __MINGW_IMP_SYMBOL(_onexit)) (func); +#endif _lock (_EXIT_LOCK1); onexitbegin = (_PVFV *) _decode_pointer (__onexitbegin); onexitend = (_PVFV *) _decode_pointer (__onexitend); @@ -55,5 +83,5 @@ _onexit_t __cdecl mingw_onexit(_onexit_t func) int __cdecl atexit (_PVFV func) { - return (mingw_onexit((_onexit_t)func) == NULL) ? -1 : 0; + return (_onexit((_onexit_t)func) == NULL) ? -1 : 0; } diff --git a/sdk/lib/crt/startup/crtexe.c b/sdk/lib/crt/startup/crtexe.c index d66db0bf2e7..efc29191191 100644 --- a/sdk/lib/crt/startup/crtexe.c +++ b/sdk/lib/crt/startup/crtexe.c @@ -211,6 +211,8 @@ int __cdecl mainCRTStartup (void) return ret; } +void __call_atexit(); + static __declspec(noinline) int __cdecl @@ -324,6 +326,7 @@ __tmainCRTStartup (void) #endif mainret = main (argc, argv, envp); #endif + __call_atexit(); if (!managedapp) exit (mainret); diff --git a/sdk/lib/crt/stdlib/atexit.c b/sdk/lib/crt/stdlib/atexit.c index 32c5f7effaf..88fa1ff0f95 100644 --- a/sdk/lib/crt/stdlib/atexit.c +++ b/sdk/lib/crt/stdlib/atexit.c @@ -1,26 +1,6 @@ /* taken from wine exit.c */ #include <precomp.h> -_onexit_t *atexit_table = NULL; -int atexit_table_size = 0; -int atexit_registered = 0; /* Points to free slot */ - -/* INTERNAL: call atexit functions */ -void __call_atexit(void) -{ - /* Note: should only be called with the exit lock held */ - TRACE("%d atext functions to call\n", atexit_registered); - /* Last registered gets executed first */ - while (atexit_registered > 0) - { - atexit_registered--; - TRACE("next is %p\n",atexit_table[atexit_registered]); - if (atexit_table[atexit_registered]) - (*atexit_table[atexit_registered])(); - TRACE("returned\n"); - } -} - /********************************************************************* * __dllonexit (MSVCRT.@) */ @@ -53,46 +33,3 @@ _onexit_t CDECL __dllonexit(_onexit_t func, _onexit_t **start, _onexit_t **end) TRACE("new table start %p-%p, %d entries\n", *start, *end, len); return func; } - -/********************************************************************* - * _onexit (MSVCRT.@) - */ -_onexit_t CDECL _onexit(_onexit_t func) -{ - TRACE("(%p)\n",func); - - if (!func) - return NULL; - - LOCK_EXIT; - if (atexit_registered > atexit_table_size - 1) - { - _onexit_t *newtable; - TRACE("expanding table\n"); - newtable = calloc(atexit_table_size + 32, sizeof(_onexit_t)); - if (!newtable) - { - TRACE("failed!\n"); - UNLOCK_EXIT; - return NULL; - } - memcpy (newtable, atexit_table, atexit_table_size*sizeof(_onexit_t)); - atexit_table_size += 32; - free (atexit_table); - atexit_table = newtable; - } - atexit_table[atexit_registered] = func; - atexit_registered++; - UNLOCK_EXIT; - return func; -} - -/********************************************************************* - * atexit (MSVCRT.@) - */ -int CDECL atexit(void (*func)(void)) -{ - TRACE("(%p)\n", func); - return _onexit((_onexit_t)func) == (_onexit_t)func ? 0 : -1; -} -

1 0

[reactos] 02/03: [CMAKE] Rename def files for import libraries on MSVC builds to *_implib.de like on GCC
by Timo Kreuzer 01 Nov '20

01 Nov '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d685dcee9bf4c607db376… commit d685dcee9bf4c607db3760d3a4630b50aa260ba0 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Oct 22 16:25:46 2020 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Nov 1 09:33:14 2020 +0100 [CMAKE] Rename def files for import libraries on MSVC builds to *_implib.de like on GCC --- sdk/cmake/msvc.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index 8af5b6094c1..d4aed60c361 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -291,7 +291,7 @@ endfunction() function(generate_import_lib _libname _dllname _spec_file) - set(_def_file ${CMAKE_CURRENT_BINARY_DIR}/${_libname}_exp.def) + set(_def_file ${CMAKE_CURRENT_BINARY_DIR}/${_libname}_implib.def) set(_asm_stubs_file ${CMAKE_CURRENT_BINARY_DIR}/${_libname}_stubs.asm) # Generate the asm stub file and the def file for import library

1 0

[reactos] 01/03: [CRT_APITEST] Add test for atexit
by Timo Kreuzer 01 Nov '20

01 Nov '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=935280bf14643b2f8d807… commit 935280bf14643b2f8d80737efec29b148144131b Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Oct 22 15:13:56 2020 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Nov 1 09:33:14 2020 +0100 [CRT_APITEST] Add test for atexit --- modules/rostests/apitests/crt/atexit.c | 93 ++++++++++++++++++++++ .../rostests/apitests/crt/msvcrt_crt_apitest.cmake | 2 +- modules/rostests/apitests/crt/testlist.c | 2 + 3 files changed, 96 insertions(+), 1 deletion(-) diff --git a/modules/rostests/apitests/crt/atexit.c b/modules/rostests/apitests/crt/atexit.c new file mode 100644 index 00000000000..4a976fb4405 --- /dev/null +++ b/modules/rostests/apitests/crt/atexit.c @@ -0,0 +1,93 @@ +/* +* PROJECT: ReactOS API tests +* LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory +* PURPOSE: Test for atexit +* PROGRAMMER: Timo Kreuzer <timo.kreuzer(a)reactos.org> +*/ + +#include <apitest.h> + +#include <stdlib.h> +#include <stdio.h> +#include <ntndk.h> + +int g_sequence = 0; +HANDLE g_hSemaphore; + +void exitfunc1(void) +{ + ok_int(g_sequence, 1); + g_sequence++; + ReleaseSemaphore(g_hSemaphore, 1, NULL); +} + +void exitfunc2(void) +{ + ok_int(g_sequence, 2); + g_sequence++; + ReleaseSemaphore(g_hSemaphore, 1, NULL); +} + +void exitfunc3(void) +{ + ok_int(g_sequence, 0); + g_sequence++; + ReleaseSemaphore(g_hSemaphore, 1, NULL); + printf("exitfunc3\n"); +} + +typedef int (__cdecl *PFN_atexit)(void (__cdecl*)(void)); + +void Test_atexit() +{ + HMODULE hmod; + PFN_atexit patexit; + + /* Open the named sempahore to count atexit callbacks */ + g_hSemaphore = OpenSemaphoreA(SEMAPHORE_ALL_ACCESS, FALSE, "atext_apitest_sempahore"); + ok(g_hSemaphore != NULL, "couldn't open semaphore.\n"); + + /* Load atexit from msvcrt.dll */ + hmod = GetModuleHandleA("msvcrt.dll"); + patexit = (PFN_atexit)GetProcAddress(hmod, "atexit"); + ok(patexit != NULL, "failed to get atexit from msvcrt.dll\n"); + + /* Register 3 exit functions, the second one in msvcrt. */ + ok_int(atexit(exitfunc1), 0); + if (patexit != NULL) + { + ok_int(patexit(exitfunc2), 0); + } + ok_int(atexit(exitfunc3), 0); +} + +START_TEST(atexit) +{ + CHAR Buffer[MAX_PATH]; + PSTR CommandLine; + int result; + HANDLE hSemaphore; + SEMAPHORE_BASIC_INFORMATION SemInfo; + NTSTATUS Status; + + /* Check recursive call */ + CommandLine = GetCommandLineA(); + if (strstr(CommandLine, "-run") != NULL) + { + Test_atexit(); + return; + } + + /* Create a named semaphore to count atexit callbacks in remote process */ + hSemaphore = CreateSemaphoreA(NULL, 1, 20, "atext_apitest_sempahore"); + + /* Run the actual test in a new process */ + sprintf(Buffer, "%s -run", CommandLine); + result = system(Buffer); + ok_int(result, 0); + + /* Check the new semaphore state */ + Status = NtQuerySemaphore(hSemaphore, SemaphoreBasicInformation, &SemInfo, sizeof(SemInfo), NULL); + ok(NT_SUCCESS(Status), "NtQuerySemaphore failed: 0x%lx\n", Status); + ok_int(SemInfo.CurrentCount, 4); +} diff --git a/modules/rostests/apitests/crt/msvcrt_crt_apitest.cmake b/modules/rostests/apitests/crt/msvcrt_crt_apitest.cmake index e53d3b4f6fc..9e76ba0202c 100644 --- a/modules/rostests/apitests/crt/msvcrt_crt_apitest.cmake +++ b/modules/rostests/apitests/crt/msvcrt_crt_apitest.cmake @@ -1014,7 +1014,7 @@ list(APPEND SOURCE_MSVCRT # asin.c # atan.c # atan2.c -# atexit # <-- keep this as an extern, thank you + atexit.c # atof.c # atoi.c # atol.c diff --git a/modules/rostests/apitests/crt/testlist.c b/modules/rostests/apitests/crt/testlist.c index 20587372301..9516d540be0 100644 --- a/modules/rostests/apitests/crt/testlist.c +++ b/modules/rostests/apitests/crt/testlist.c @@ -6,6 +6,7 @@ #if defined(TEST_MSVCRT) extern void func__vscprintf(void); extern void func__vscwprintf(void); +extern void func_atexit(void); #endif #if defined(TEST_NTDLL) extern void func__vscwprintf(void); @@ -55,6 +56,7 @@ const struct test winetest_testlist[] = #endif #if defined(TEST_STATIC_CRT) #elif defined(TEST_MSVCRT) + { "atexit", func_atexit }, #if defined(_M_IX86) { "__getmainargs", func___getmainargs }, #endif

1 0

[reactos] 09/09: [NTOS:MM:X64] Fix MM_WAIT_ENTRY on x64
by Timo Kreuzer 01 Nov '20

01 Nov '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=17fa04f10b024cc34ca07… commit 17fa04f10b024cc34ca07ce0cf36d0a017df8ea1 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Jul 28 14:27:51 2019 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Nov 1 09:32:27 2020 +0100 [NTOS:MM:X64] Fix MM_WAIT_ENTRY on x64 --- ntoskrnl/include/internal/mm.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ntoskrnl/include/internal/mm.h b/ntoskrnl/include/internal/mm.h index 32fd7b1146d..fb70f3b460b 100644 --- a/ntoskrnl/include/internal/mm.h +++ b/ntoskrnl/include/internal/mm.h @@ -149,7 +149,13 @@ typedef ULONG_PTR SWAPENTRY; // // Wait entry for marking pages that are being serviced // +#ifdef _M_IX86 #define MM_WAIT_ENTRY 0x7ffffc00 +#elif defined(_M_AMD64) +#define MM_WAIT_ENTRY 0x7FFFFFFFFFFFFC00ULL +#else +#error Unsupported architecture! +#endif #define InterlockedCompareExchangePte(PointerPte, Exchange, Comperand) \ InterlockedCompareExchange((PLONG)(PointerPte), Exchange, Comperand)

1 0

[reactos] 08/09: [NTOS:MM] Make sure PXEs/PPEs and PDEs are always MM_EXECUTE_READWRITE
by Timo Kreuzer 01 Nov '20

01 Nov '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d4b4cf744887cbed6863f… commit d4b4cf744887cbed6863f44360a25f7f17b34319 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed Mar 21 21:22:03 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Nov 1 09:32:27 2020 +0100 [NTOS:MM] Make sure PXEs/PPEs and PDEs are always MM_EXECUTE_READWRITE This is required since the NX protection proagates from the highest level, enforcing NX on the entire range, independent of whether lower level P*Es have the bit set or not. It might be useful to add a platform specific constant to allow making page tables NX on architectures that have a different behavior. --- ntoskrnl/mm/ARM3/miarm.h | 10 ++++++++++ ntoskrnl/mm/ARM3/pagfault.c | 10 +++++----- ntoskrnl/mm/amd64/init.c | 12 ++++++------ 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/ntoskrnl/mm/ARM3/miarm.h b/ntoskrnl/mm/ARM3/miarm.h index 9d85c42afff..8b6cc19b45e 100644 --- a/ntoskrnl/mm/ARM3/miarm.h +++ b/ntoskrnl/mm/ARM3/miarm.h @@ -945,6 +945,10 @@ MI_WRITE_VALID_PTE(IN PMMPTE PointerPte, /* Write the valid PTE */ ASSERT(PointerPte->u.Hard.Valid == 0); ASSERT(TempPte.u.Hard.Valid == 1); +#if _M_AMD64 + ASSERT(!MI_IS_PAGE_TABLE_ADDRESS(MiPteToAddress(PointerPte)) || + (TempPte.u.Hard.NoExecute == 0)); +#endif *PointerPte = TempPte; } @@ -999,6 +1003,9 @@ MI_WRITE_VALID_PDE(IN PMMPDE PointerPde, { /* Write the valid PDE */ ASSERT(PointerPde->u.Hard.Valid == 0); +#ifdef _M_AMD64 + ASSERT(PointerPde->u.Hard.NoExecute == 0); +#endif ASSERT(TempPde.u.Hard.Valid == 1); *PointerPde = TempPde; } @@ -1014,6 +1021,9 @@ MI_WRITE_INVALID_PDE(IN PMMPDE PointerPde, /* Write the invalid PDE */ ASSERT(InvalidPde.u.Hard.Valid == 0); ASSERT(InvalidPde.u.Long != 0); +#ifdef _M_AMD64 + ASSERT(InvalidPde.u.Soft.Protection == MM_EXECUTE_READWRITE); +#endif *PointerPde = InvalidPde; } diff --git a/ntoskrnl/mm/ARM3/pagfault.c b/ntoskrnl/mm/ARM3/pagfault.c index 1ab109e9f65..eefee2b340b 100644 --- a/ntoskrnl/mm/ARM3/pagfault.c +++ b/ntoskrnl/mm/ARM3/pagfault.c @@ -319,7 +319,7 @@ MiCheckVirtualAddress(IN PVOID VirtualAddress, } /* Return full access rights */ - *ProtectCode = MM_READWRITE; + *ProtectCode = MM_EXECUTE_READWRITE; return NULL; } else if (MI_IS_SESSION_ADDRESS(VirtualAddress)) @@ -2099,7 +2099,7 @@ UserFault: /* Resolve a demand zero fault */ MiResolveDemandZeroFault(PointerPpe, PointerPxe, - MM_READWRITE, + MM_EXECUTE_READWRITE, CurrentProcess, MM_NOIRQL); @@ -2133,7 +2133,7 @@ UserFault: /* Resolve a demand zero fault */ MiResolveDemandZeroFault(PointerPde, PointerPpe, - MM_READWRITE, + MM_EXECUTE_READWRITE, CurrentProcess, MM_NOIRQL); @@ -2175,7 +2175,7 @@ UserFault: /* Resolve a demand zero fault */ MiResolveDemandZeroFault(PointerPte, PointerPde, - MM_READWRITE, + MM_EXECUTE_READWRITE, CurrentProcess, MM_NOIRQL); #if MI_TRACE_PFNS @@ -2338,7 +2338,7 @@ UserFault: _WARN("This is probably completely broken!"); MI_WRITE_INVALID_PDE((PMMPDE)PointerPte, DemandZeroPde); #else - MI_WRITE_INVALID_PTE(PointerPte, DemandZeroPde); + MI_WRITE_INVALID_PDE(PointerPte, DemandZeroPde); #endif } else diff --git a/ntoskrnl/mm/amd64/init.c b/ntoskrnl/mm/amd64/init.c index 89aace7dc15..9eae6c9b0da 100644 --- a/ntoskrnl/mm/amd64/init.c +++ b/ntoskrnl/mm/amd64/init.c @@ -25,19 +25,19 @@ extern PMMPTE MmDebugPte; /* GLOBALS *****************************************************************/ /* Template PTE and PDE for a kernel page */ -MMPTE ValidKernelPde = {{PTE_VALID|PTE_READWRITE|PTE_DIRTY|PTE_ACCESSED}}; -MMPTE ValidKernelPte = {{PTE_VALID|PTE_READWRITE|PTE_DIRTY|PTE_ACCESSED}}; +MMPTE ValidKernelPde = {{PTE_VALID|PTE_EXECUTE_READWRITE|PTE_DIRTY|PTE_ACCESSED}}; +MMPTE ValidKernelPte = {{PTE_VALID|PTE_EXECUTE_READWRITE|PTE_DIRTY|PTE_ACCESSED}}; /* The same, but for local pages */ -MMPTE ValidKernelPdeLocal = {{PTE_VALID|PTE_READWRITE|PTE_DIRTY|PTE_ACCESSED}}; -MMPTE ValidKernelPteLocal = {{PTE_VALID|PTE_READWRITE|PTE_DIRTY|PTE_ACCESSED}}; +MMPTE ValidKernelPdeLocal = {{PTE_VALID|PTE_EXECUTE_READWRITE|PTE_DIRTY|PTE_ACCESSED}}; +MMPTE ValidKernelPteLocal = {{PTE_VALID|PTE_EXECUTE_READWRITE|PTE_DIRTY|PTE_ACCESSED}}; /* Template PDE for a demand-zero page */ -MMPDE DemandZeroPde = {{MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS}}; +MMPDE DemandZeroPde = {{MM_EXECUTE_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS}}; MMPTE DemandZeroPte = {{MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS}}; /* Template PTE for prototype page */ -MMPTE PrototypePte = {{(MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS) | +MMPTE PrototypePte = {{(MM_EXECUTE_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS) | PTE_PROTOTYPE | (MI_PTE_LOOKUP_NEEDED << 32)}}; /* Template PTE for decommited page */

1 0

[reactos] 07/09: [NTOS:MM:X64] Fix session space initialization on x64
by Timo Kreuzer 01 Nov '20

01 Nov '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d55811f160a3b6e8e8867… commit d55811f160a3b6e8e8867d1149c10799b513a637 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Feb 4 19:19:03 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Nov 1 09:32:27 2020 +0100 [NTOS:MM:X64] Fix session space initialization on x64 --- ntoskrnl/include/internal/amd64/mm.h | 21 +++++++++-------- ntoskrnl/mm/ARM3/session.c | 13 +++++++++-- ntoskrnl/mm/amd64/init.c | 44 ++++++++++++++++++++++++------------ 3 files changed, 51 insertions(+), 27 deletions(-) diff --git a/ntoskrnl/include/internal/amd64/mm.h b/ntoskrnl/include/internal/amd64/mm.h index bfc4a4b68d1..f6c96bdc7e9 100644 --- a/ntoskrnl/include/internal/amd64/mm.h +++ b/ntoskrnl/include/internal/amd64/mm.h @@ -21,8 +21,8 @@ #define MI_PAGED_POOL_START (PVOID)0xFFFFF8A000000000ULL // 128 GB paged pool [MiVaPagedPool] //#define MI_PAGED_POOL_END 0xFFFFF8BFFFFFFFFFULL //#define MI_SESSION_SPACE_START 0xFFFFF90000000000ULL // 512 GB session space [MiVaSessionSpace] -#define MI_SESSION_VIEW_END 0xFFFFF97FFF000000ULL -#define MI_SESSION_SPACE_END 0xFFFFF97FFFFFFFFFULL +//#define MI_SESSION_VIEW_END 0xFFFFF97FFF000000ULL +#define MI_SESSION_SPACE_END 0xFFFFF98000000000ULL #define MI_SYSTEM_CACHE_START 0xFFFFF98000000000ULL // 1 TB system cache (on Vista+ this is dynamic VA space) [MiVaSystemCache,MiVaSpecialPoolPaged,MiVaSpecialPoolNonPaged] #define MI_SYSTEM_CACHE_END 0xFFFFFA7FFFFFFFFFULL #define MI_PFN_DATABASE 0xFFFFFA8000000000ULL // up to 5.5 TB PFN database followed by non paged pool [MiVaPfnDatabase/MiVaNonPagedPool] @@ -58,11 +58,11 @@ #define MI_MIN_INIT_PAGED_POOLSIZE (32 * _1MB) #define MI_MAX_INIT_NONPAGED_POOL_SIZE (128ULL * 1024 * 1024 * 1024) #define MI_MAX_NONPAGED_POOL_SIZE (128ULL * 1024 * 1024 * 1024) -#define MI_SYSTEM_VIEW_SIZE (16 * _1MB) -#define MI_SESSION_VIEW_SIZE (20 * _1MB) -#define MI_SESSION_POOL_SIZE (16 * _1MB) -#define MI_SESSION_IMAGE_SIZE (8 * _1MB) -#define MI_SESSION_WORKING_SET_SIZE (4 * _1MB) +#define MI_SYSTEM_VIEW_SIZE (104 * _1MB) +#define MI_SESSION_VIEW_SIZE (104 * _1MB) +#define MI_SESSION_POOL_SIZE (64 * _1MB) +#define MI_SESSION_IMAGE_SIZE (16 * _1MB) +#define MI_SESSION_WORKING_SET_SIZE (16 * _1MB) #define MI_SESSION_SIZE (MI_SESSION_VIEW_SIZE + \ MI_SESSION_POOL_SIZE + \ MI_SESSION_IMAGE_SIZE + \ @@ -289,9 +289,10 @@ FORCEINLINE BOOLEAN MI_IS_MAPPED_PTE(PMMPTE PointerPte) { - /// FIXME - __debugbreak(); - return ((PointerPte->u.Long & 0xFFFFFC01) != 0); + return ((PointerPte->u.Hard.Valid != 0) || + (PointerPte->u.Proto.Prototype != 0) || + (PointerPte->u.Trans.Transition != 0) || + (PointerPte->u.Hard.PageFrameNumber != 0)); } INIT_FUNCTION diff --git a/ntoskrnl/mm/ARM3/session.c b/ntoskrnl/mm/ARM3/session.c index 87606239685..898dbbbaebc 100644 --- a/ntoskrnl/mm/ARM3/session.c +++ b/ntoskrnl/mm/ARM3/session.c @@ -603,10 +603,14 @@ NTAPI MiSessionCreateInternal(OUT PULONG SessionId) { PEPROCESS Process = PsGetCurrentProcess(); - ULONG NewFlags, Flags, Size, i, Color; + ULONG NewFlags, Flags, i, Color; +#if (_MI_PAGING_LEVELS < 3) + ULONG Size; +#endif // (_MI_PAGING_LEVELS < 3) + PMMPDE PageTables = NULL; KIRQL OldIrql; PMMPTE PointerPte, SessionPte; - PMMPDE PointerPde, PageTables; + PMMPDE PointerPde; PMM_SESSION_SPACE SessionGlobal; MMPTE TempPte; MMPDE TempPde; @@ -644,6 +648,7 @@ MiSessionCreateInternal(OUT PULONG SessionId) /* Now we should own the flag */ ASSERT(Process->Flags & PSF_SESSION_CREATION_UNDERWAY_BIT); +#if (_MI_PAGING_LEVELS < 3) /* * Session space covers everything from 0xA0000000 to 0xC0000000. * Allocate enough page tables to describe the entire region @@ -652,6 +657,7 @@ MiSessionCreateInternal(OUT PULONG SessionId) PageTables = ExAllocatePoolWithTag(NonPagedPool, Size, 'tHmM'); ASSERT(PageTables != NULL); RtlZeroMemory(PageTables, Size); +#endif // (_MI_PAGING_LEVELS < 3) /* Lock the session ID creation mutex */ KeAcquireGuardedMutex(&MiSessionIdMutex); @@ -662,7 +668,9 @@ MiSessionCreateInternal(OUT PULONG SessionId) { /* We ran out of session IDs, we should expand */ DPRINT1("Too many sessions created. Expansion not yet supported\n"); +#if (_MI_PAGING_LEVELS < 3) ExFreePoolWithTag(PageTables, 'tHmM'); +#endif // (_MI_PAGING_LEVELS < 3) return STATUS_NO_MEMORY; } @@ -786,6 +794,7 @@ MiSessionCreateInternal(OUT PULONG SessionId) MmSessionSpace->PageTables[PointerPde - MiAddressToPde(MmSessionBase)] = *PointerPde; #endif InitializeListHead(&MmSessionSpace->ImageList); + DPRINT1("Session %lu is ready to go: 0x%p 0x%p, %lx 0x%p\n", *SessionId, MmSessionSpace, SessionGlobal, SessionPageDirIndex, PageTables); diff --git a/ntoskrnl/mm/amd64/init.c b/ntoskrnl/mm/amd64/init.c index f56816c76e4..89aace7dc15 100644 --- a/ntoskrnl/mm/amd64/init.c +++ b/ntoskrnl/mm/amd64/init.c @@ -15,11 +15,11 @@ #include <debug.h> #include <mm/ARM3/miarm.h> +#include <fltkernel.h> extern PMMPTE MmDebugPte; /* Helper macros */ -#define IS_ALIGNED(addr, align) (((ULONG64)(addr) & (align - 1)) == 0) #define IS_PAGE_ALIGNED(addr) IS_ALIGNED(addr, PAGE_SIZE) /* GLOBALS *****************************************************************/ @@ -62,28 +62,31 @@ VOID NTAPI MiInitializeSessionSpaceLayout(VOID) { + /* This is the entire size */ MmSessionSize = MI_SESSION_SIZE; - MmSessionViewSize = MI_SESSION_VIEW_SIZE; - MmSessionPoolSize = MI_SESSION_POOL_SIZE; - MmSessionImageSize = MI_SESSION_IMAGE_SIZE; - MmSystemViewSize = MI_SYSTEM_VIEW_SIZE; - /* Set up session space */ + /* Start with session space end */ MiSessionSpaceEnd = (PVOID)MI_SESSION_SPACE_END; - /* This is where we will load Win32k.sys and the video driver */ + /* The highest range is the session image range */ + MmSessionImageSize = MI_SESSION_IMAGE_SIZE; MiSessionImageEnd = MiSessionSpaceEnd; - MiSessionImageStart = (PCHAR)MiSessionImageEnd - MmSessionImageSize; + MiSessionImageStart = (PUCHAR)MiSessionImageEnd - MmSessionImageSize; + ASSERT(IS_PAGE_ALIGNED(MiSessionImageStart)); + + /* Session working set is below the session image range */ + MiSessionSpaceWs = (PUCHAR)MiSessionImageStart - MI_SESSION_WORKING_SET_SIZE; - /* The view starts right below the session working set (itself below - * the image area) */ - MiSessionViewEnd = (PVOID)MI_SESSION_VIEW_END; - MiSessionViewStart = (PCHAR)MiSessionViewEnd - MmSessionViewSize; + /* Session view is below the session working set */ + MmSessionViewSize = MI_SESSION_VIEW_SIZE; + MiSessionViewEnd = MiSessionSpaceWs; + MiSessionViewStart = (PUCHAR)MiSessionViewEnd - MmSessionViewSize; ASSERT(IS_PAGE_ALIGNED(MiSessionViewStart)); - /* Session pool follows */ + /* Session pool is below session view */ + MmSessionPoolSize = MI_SESSION_POOL_SIZE; MiSessionPoolEnd = MiSessionViewStart; - MiSessionPoolStart = (PCHAR)MiSessionPoolEnd - MmSessionPoolSize; + MiSessionPoolStart = (PUCHAR)MiSessionPoolEnd - MmSessionPoolSize; ASSERT(IS_PAGE_ALIGNED(MiSessionPoolStart)); /* And it all begins here */ @@ -91,12 +94,23 @@ MiInitializeSessionSpaceLayout(VOID) /* System view space ends at session space, so now that we know where * this is, we can compute the base address of system view space itself. */ - MiSystemViewStart = (PCHAR)MmSessionBase - MmSystemViewSize; + MmSystemViewSize = MI_SYSTEM_VIEW_SIZE; + MiSystemViewStart = (PUCHAR)MmSessionBase - MmSystemViewSize; ASSERT(IS_PAGE_ALIGNED(MiSystemViewStart)); /* Sanity checks */ + ASSERT(Add2Ptr(MmSessionBase, MmSessionSize) == MiSessionSpaceEnd); ASSERT(MiSessionViewEnd <= MiSessionImageStart); ASSERT(MmSessionBase <= MiSessionPoolStart); + + /* Compute the PTE addresses for all the addresses we carved out */ + MiSessionImagePteStart = MiAddressToPte(MiSessionImageStart); + MiSessionImagePteEnd = MiAddressToPte(MiSessionImageEnd); + MiSessionBasePte = MiAddressToPte(MmSessionBase); + MiSessionLastPte = MiAddressToPte(MiSessionSpaceEnd); + + /* Initialize the pointer to the session space structure */ + MmSessionSpace = (PMM_SESSION_SPACE)Add2Ptr(MiSessionImageStart, 0x10000); } VOID

1 0

[reactos] 06/09: [NTOS:MM:X64] Implement MmCreatePageFileMapping and MmDeletePageFileMapping
by Timo Kreuzer 01 Nov '20

01 Nov '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9095dbf5a5e877fae5a62… commit 9095dbf5a5e877fae5a62554d6a774adf35cb672 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Feb 10 22:45:45 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Nov 1 09:32:27 2020 +0100 [NTOS:MM:X64] Implement MmCreatePageFileMapping and MmDeletePageFileMapping --- ntoskrnl/mm/amd64/page.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 47 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/mm/amd64/page.c b/ntoskrnl/mm/amd64/page.c index 0559de76b88..6b311fb34da 100644 --- a/ntoskrnl/mm/amd64/page.c +++ b/ntoskrnl/mm/amd64/page.c @@ -462,7 +462,23 @@ NTAPI MmDeletePageFileMapping(PEPROCESS Process, PVOID Address, SWAPENTRY* SwapEntry) { - UNIMPLEMENTED; + PMMPTE Pte; + + Pte = MiGetPteForProcess(Process, Address, FALSE); + if (Pte == NULL) + { + *SwapEntry = 0; + return; + } + + if (Pte->u.Trans.Valid || !Pte->u.Trans.Transition) + { + DPRINT1("Pte %x (want not 1 and 0x800)\n", Pte); + KeBugCheck(MEMORY_MANAGEMENT); + } + + *SwapEntry = Pte->u.Long >> 1; + MI_ERASE_PTE(Pte); } NTSTATUS @@ -471,7 +487,36 @@ MmCreatePageFileMapping(PEPROCESS Process, PVOID Address, SWAPENTRY SwapEntry) { - UNIMPLEMENTED; + PMMPTE Pte; + MMPTE PteValue; + + if (Process == NULL && Address < MmSystemRangeStart) + { + DPRINT1("No process\n"); + KeBugCheck(MEMORY_MANAGEMENT); + } + if (Process != NULL && Address >= MmSystemRangeStart) + { + DPRINT1("Setting kernel address with process context\n"); + KeBugCheck(MEMORY_MANAGEMENT); + } + + if (SwapEntry & (1ull << 63)) + { + KeBugCheck(MEMORY_MANAGEMENT); + } + + /* Allocate a PTE */ + Pte = MiGetPteForProcess(Process, Address, TRUE); + if (Pte == NULL) + { + return STATUS_UNSUCCESSFUL; + } + + NT_ASSERT(Pte->u.Long == 0); + PteValue.u.Long = SwapEntry << 1; + MI_WRITE_INVALID_PTE(Pte, PteValue); + return STATUS_UNSUCCESSFUL; }

1 0

[reactos] 05/09: [NTOS:MM:X64] Simplify and fix x64 mapping code
by Timo Kreuzer 01 Nov '20

01 Nov '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8980850d565c226ec064e… commit 8980850d565c226ec064e6ee0613ebeace8c6b51 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Feb 4 13:33:14 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Nov 1 09:32:27 2020 +0100 [NTOS:MM:X64] Simplify and fix x64 mapping code - Use demand-zero-ptes in MiGetPteForProcess - Handle NoExecute in MiSetPteProtection - Fix MmIsPageSwapEntry - Fix MmGetPageFileMapping - remove obsolete functions. --- ntoskrnl/mm/amd64/page.c | 121 +++++++++++++++++------------------------------ 1 file changed, 44 insertions(+), 77 deletions(-) diff --git a/ntoskrnl/mm/amd64/page.c b/ntoskrnl/mm/amd64/page.c index afae9827191..0559de76b88 100644 --- a/ntoskrnl/mm/amd64/page.c +++ b/ntoskrnl/mm/amd64/page.c @@ -144,75 +144,65 @@ MiGetPteForProcess( PVOID Address, BOOLEAN Create) { - MMPTE TmplPte, *Pte; + PMMPTE Pte; + PMMPDE Pde; + PMMPPE Ppe; + PMMPXE Pxe; - /* Check if we need hypersapce mapping */ - if (Address < MmSystemRangeStart && - Process && Process != PsGetCurrentProcess()) + /* Make sure the process is correct */ + if (Address < MmSystemRangeStart) { - UNIMPLEMENTED; - __debugbreak(); - return NULL; + ASSERT(Process == PsGetCurrentProcess()); } - else if (Create) + else { - KIRQL OldIrql; - TmplPte.u.Long = 0; - TmplPte.u.Flush.Valid = 1; - TmplPte.u.Flush.Write = 1; - - /* All page table levels of user pages are user owned */ - TmplPte.u.Flush.Owner = (Address < MmHighestUserAddress) ? 1 : 0; + ASSERT((Process == NULL) || (Process == PsGetCurrentProcess())); + } - /* Lock the PFN database */ - OldIrql = MiAcquirePfnLock(); + Pxe = MiAddressToPxe(Address); + Ppe = MiAddressToPpe(Address); + Pde = MiAddressToPde(Address); + Pte = MiAddressToPte(Address); - /* Get the PXE */ - Pte = MiAddressToPxe(Address); - if (!Pte->u.Hard.Valid) + if (Create) + { + /* Check the PXE */ + if (Pxe->u.Long == 0) { - TmplPte.u.Hard.PageFrameNumber = MiRemoveZeroPage(0); - MI_WRITE_VALID_PTE(Pte, TmplPte); + /* Make it demand zero */ + MI_WRITE_INVALID_PDE(Pxe, DemandZeroPde); } - /* Get the PPE */ - Pte = MiAddressToPpe(Address); - if (!Pte->u.Hard.Valid) + /* Check the PPE */ + if (Ppe->u.Long == 0) { - TmplPte.u.Hard.PageFrameNumber = MiRemoveZeroPage(1); - MI_WRITE_VALID_PTE(Pte, TmplPte); + /* Make it demand zero */ + MI_WRITE_INVALID_PDE(Ppe, DemandZeroPde); } - /* Get the PDE */ - Pte = MiAddressToPde(Address); - if (!Pte->u.Hard.Valid) + /* Check the PDE */ + if (Pde->u.Long == 0) { - TmplPte.u.Hard.PageFrameNumber = MiRemoveZeroPage(2); - MI_WRITE_VALID_PTE(Pte, TmplPte); + /* Make it demand zero */ + MI_WRITE_INVALID_PDE(Pde, DemandZeroPde); } - - /* Unlock PFN database */ - MiReleasePfnLock(OldIrql); } else { - /* Get the PXE */ - Pte = MiAddressToPxe(Address); - if (!Pte->u.Hard.Valid) + /* Check the PXE */ + if (!Pxe->u.Hard.Valid) return NULL; - /* Get the PPE */ - Pte = MiAddressToPpe(Address); - if (!Pte->u.Hard.Valid) + /* Check the PPE */ + if (!Ppe->u.Hard.Valid) return NULL; - /* Get the PDE */ - Pte = MiAddressToPde(Address); - if (!Pte->u.Hard.Valid) + /* Check the PDE */ + if (!Pde->u.Hard.Valid) return NULL; } - return MiAddressToPte(Address); + return Pte; } static @@ -272,8 +262,8 @@ MiGetPteProtection(MMPTE Pte) return Protect; } +static VOID -NTAPI MiSetPteProtection(PMMPTE Pte, ULONG Protection) { Pte->u.Flush.CopyOnWrite = (Protection & PAGE_WRITECOPY_ANY) ? 1 : 0; @@ -282,7 +272,7 @@ MiSetPteProtection(PMMPTE Pte, ULONG Protection) Pte->u.Flush.WriteThrough = (Protection & PAGE_WRITETHROUGH) ? 1 : 0; // FIXME: This doesn't work. Why? -// Pte->u.Flush.NoExecute = (Protection & PAGE_EXECUTE_ANY) ? 0 : 1; + Pte->u.Flush.NoExecute = (Protection & PAGE_EXECUTE_ANY) ? 0 : 1; } /* FUNCTIONS ***************************************************************/ @@ -324,34 +314,7 @@ MmIsPageSwapEntry(PEPROCESS Process, PVOID Address) { MMPTE Pte; Pte.u.Long = MiGetPteValueForProcess(Process, Address); - return Pte.u.Hard.Valid && Pte.u.Soft.Transition; -} - -static PMMPTE -MmGetPageTableForProcess(PEPROCESS Process, PVOID Address, BOOLEAN Create) -{ - __debugbreak(); - return 0; -} - -BOOLEAN MmUnmapPageTable(PMMPTE Pt) -{ - ASSERT(FALSE); - return 0; -} - -static ULONG64 MmGetPageEntryForProcess(PEPROCESS Process, PVOID Address) -{ - MMPTE Pte, *PointerPte; - - PointerPte = MmGetPageTableForProcess(Process, Address, FALSE); - if (PointerPte) - { - Pte = *PointerPte; - MmUnmapPageTable(PointerPte); - return Pte.u.Long; - } - return 0; + return !Pte.u.Hard.Valid && Pte.u.Soft.Transition; } VOID @@ -361,8 +324,12 @@ MmGetPageFileMapping( PVOID Address, SWAPENTRY* SwapEntry) { - ULONG64 Entry = MmGetPageEntryForProcess(Process, Address); - *SwapEntry = Entry >> 1; + PMMPTE PointerPte; + + ASSERT(Process == PsGetCurrentProcess()); + + PointerPte = MiAddressToPte(Address); + *SwapEntry = PointerPte->u.Long >> 1; } BOOLEAN

1 0

[reactos] 04/09: [NTOS:MM:X64] Handle PPEs and PXEs as well in MmInitializeProcessAddressSpace()
by Timo Kreuzer 01 Nov '20

01 Nov '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0726cfce1022af4dcfbed… commit 0726cfce1022af4dcfbedb210642fd74dc54e6d1 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Oct 26 11:12:04 2020 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Nov 1 09:32:27 2020 +0100 [NTOS:MM:X64] Handle PPEs and PXEs as well in MmInitializeProcessAddressSpace() But don't set up the PFNs for the initial process on x64, as these have already been set up. --- ntoskrnl/mm/ARM3/procsup.c | 36 ++++++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/ntoskrnl/mm/ARM3/procsup.c b/ntoskrnl/mm/ARM3/procsup.c index 809f36e824d..e3aa8336bbd 100644 --- a/ntoskrnl/mm/ARM3/procsup.c +++ b/ntoskrnl/mm/ARM3/procsup.c @@ -951,6 +951,12 @@ MmInitializeProcessAddressSpace(IN PEPROCESS Process, PCHAR Destination; USHORT Length = 0; MMPTE TempPte; +#if (_MI_PAGING_LEVELS >= 3) + PMMPPE PointerPpe; +#endif +#if (_MI_PAGING_LEVELS == 4) + PMMPXE PointerPxe; +#endif /* We should have a PDE */ ASSERT(Process->Pcb.DirectoryTableBase[0] != 0); @@ -971,12 +977,19 @@ MmInitializeProcessAddressSpace(IN PEPROCESS Process, ASSERT(Process->VadRoot.NumberGenericTableElements == 0); Process->VadRoot.BalancedRoot.u1.Parent = &Process->VadRoot.BalancedRoot; +#ifdef _M_AMD64 + /* On x64 the PFNs for the initial process are already set up */ + if (Process != &KiInitialProcess) { +#endif + /* Lock PFN database */ OldIrql = MiAcquirePfnLock(); /* Setup the PFN for the PDE base of this process */ -#ifdef _M_AMD64 +#if (_MI_PAGING_LEVELS == 4) PointerPte = MiAddressToPte(PXE_BASE); +#elif (_MI_PAGING_LEVELS == 3) + PointerPte = MiAddressToPte(PPE_BASE); #else PointerPte = MiAddressToPte(PDE_BASE); #endif @@ -985,15 +998,22 @@ MmInitializeProcessAddressSpace(IN PEPROCESS Process, MiInitializePfn(PageFrameNumber, PointerPte, TRUE); /* Do the same for hyperspace */ -#ifdef _M_AMD64 - PointerPde = MiAddressToPxe((PVOID)HYPER_SPACE); -#else - PointerPde = MiAddressToPde(HYPER_SPACE); -#endif + PointerPde = MiAddressToPde((PVOID)HYPER_SPACE); PageFrameNumber = PFN_FROM_PTE(PointerPde); //ASSERT(Process->Pcb.DirectoryTableBase[0] == PageFrameNumber * PAGE_SIZE); // we're not lucky MiInitializePfn(PageFrameNumber, (PMMPTE)PointerPde, TRUE); +#if (_MI_PAGING_LEVELS >= 3) + PointerPpe = MiAddressToPpe((PVOID)HYPER_SPACE); + PageFrameNumber = PFN_FROM_PTE(PointerPpe); + MiInitializePfn(PageFrameNumber, PointerPpe, TRUE); +#endif +#if (_MI_PAGING_LEVELS == 4) + PointerPxe = MiAddressToPxe((PVOID)HYPER_SPACE); + PageFrameNumber = PFN_FROM_PTE(PointerPxe); + MiInitializePfn(PageFrameNumber, PointerPxe, TRUE); +#endif + /* Setup the PFN for the PTE for the working set */ PointerPte = MiAddressToPte(MI_WORKING_SET_LIST); MI_MAKE_HARDWARE_PTE(&TempPte, PointerPte, MM_READWRITE, 0); @@ -1013,6 +1033,10 @@ MmInitializeProcessAddressSpace(IN PEPROCESS Process, /* Release PFN lock */ MiReleasePfnLock(OldIrql); +#ifdef _M_AMD64 + } /* On x64 the PFNs for the initial process are already set up */ +#endif + #ifdef _M_AMD64 /* On x64 we need a VAD for the shared user page */ Status = MiInsertSharedUserPageVad();

1 0

[reactos] 03/09: [NTOS:MM:X64] On x64 allocate a VAD for the shared user page
by Timo Kreuzer 01 Nov '20

01 Nov '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=48d1bd2c883fc3ebf143a… commit 48d1bd2c883fc3ebf143ae905eeab07c259889b5 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Mar 7 19:35:15 2020 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Nov 1 09:32:27 2020 +0100 [NTOS:MM:X64] On x64 allocate a VAD for the shared user page --- ntoskrnl/mm/ARM3/procsup.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/ntoskrnl/mm/ARM3/procsup.c b/ntoskrnl/mm/ARM3/procsup.c index 6407b7896d0..809f36e824d 100644 --- a/ntoskrnl/mm/ARM3/procsup.c +++ b/ntoskrnl/mm/ARM3/procsup.c @@ -840,6 +840,62 @@ MmCreateTeb(IN PEPROCESS Process, return Status; } +#ifdef _M_AMD64 +static +NTSTATUS +MiInsertSharedUserPageVad(VOID) +{ + PMMVAD_LONG Vad; + ULONG_PTR BaseAddress; + NTSTATUS Status; + + /* Allocate a VAD */ + Vad = ExAllocatePoolWithTag(NonPagedPool, sizeof(MMVAD_LONG), 'ldaV'); + if (Vad == NULL) + { + DPRINT1("Failed to allocate VAD for shared user page\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Setup the primary flags with the size, and make it private, RO */ + Vad->u.LongFlags = 0; + Vad->u.VadFlags.CommitCharge = 0; + Vad->u.VadFlags.NoChange = TRUE; + Vad->u.VadFlags.VadType = VadNone; + Vad->u.VadFlags.MemCommit = FALSE; + Vad->u.VadFlags.Protection = MM_READONLY; + Vad->u.VadFlags.PrivateMemory = TRUE; + Vad->u1.Parent = NULL; + + /* Setup the secondary flags to make it a secured, readonly, long VAD */ + Vad->u2.LongFlags2 = 0; + Vad->u2.VadFlags2.OneSecured = TRUE; + Vad->u2.VadFlags2.LongVad = TRUE; + Vad->u2.VadFlags2.ReadOnly = FALSE; + + Vad->ControlArea = NULL; // For Memory-Area hack + Vad->FirstPrototypePte = NULL; + + /* Insert it into the process VAD table */ + BaseAddress = MM_SHARED_USER_DATA_VA; + Status = MiInsertVadEx((PMMVAD)Vad, + &BaseAddress, + PAGE_SIZE, + (ULONG_PTR)MM_HIGHEST_VAD_ADDRESS, + PAGE_SIZE, + MEM_TOP_DOWN); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to insert shared user VAD\n"); + ExFreePoolWithTag(Vad, 'ldaV'); + return Status; + } + + /* Success */ + return STATUS_SUCCESS; +} +#endif + VOID NTAPI MiInitializeWorkingSetList(IN PEPROCESS CurrentProcess) @@ -957,6 +1013,16 @@ MmInitializeProcessAddressSpace(IN PEPROCESS Process, /* Release PFN lock */ MiReleasePfnLock(OldIrql); +#ifdef _M_AMD64 + /* On x64 we need a VAD for the shared user page */ + Status = MiInsertSharedUserPageVad(); + if (!NT_SUCCESS(Status)) + { + DPRINT1("MiCreateSharedUserPageVad() failed: 0x%lx\n", Status); + return Status; + } +#endif + /* Check if there's a Section Object */ if (SectionObject) {

1 0

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 November 2020