ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ntdll: Handle pages faults without fetching the view pointer when possible. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2017-09-22 12:15:27 +02:00
parent 1049acc28f
commit 8bc95aa74b
1 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
dlls/ntdll/virtual.c
View File

@ -415,6 +415,16 @@ static inline UINT_PTR get_mask( ULONG zero_bits )
}
/***********************************************************************
* is_write_watch_range
*/
static inline BOOL is_write_watch_range( const void *addr, size_t size )
{
struct file_view *view = VIRTUAL_FindView( addr, size );
return view && (view->protect & VPROT_WRITEWATCH);
}
/***********************************************************************
* find_view_range
*
@ -1758,16 +1768,20 @@ void virtual_clear_thread_stack(void)
*/
NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err, BOOL on_signal_stack )
{
struct file_view *view;
NTSTATUS ret = STATUS_ACCESS_VIOLATION;
void *page = ROUND_ADDR( addr, page_mask );
sigset_t sigset;
BYTE vprot;
server_enter_uninterrupted_section( &csVirtual, &sigset );
if ((view = VIRTUAL_FindView( addr, 0 )))
vprot = get_page_vprot( page );
if (!on_signal_stack && (vprot & VPROT_GUARD))
{
void *page = ROUND_ADDR( addr, page_mask );
BYTE vprot = get_page_vprot( page );
if ((err & EXCEPTION_WRITE_FAULT) && (view->protect & VPROT_WRITEWATCH))
set_page_vprot_bits( page, page_size, 0, VPROT_GUARD );
mprotect_range( page, page_size, 0, 0 );
ret = STATUS_GUARD_PAGE_VIOLATION;
}
else if (err & EXCEPTION_WRITE_FAULT)
{
if (vprot & VPROT_WRITEWATCH)
{
@ -1775,13 +1789,10 @@ NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err, BOOL on_signal_stack )
mprotect_range( page, page_size, 0, 0 );
}
/* ignore fault if page is writable now */
if (VIRTUAL_GetUnixProt( get_page_vprot( page )) & PROT_WRITE) ret = STATUS_SUCCESS;
}
if (!on_signal_stack && (vprot & VPROT_GUARD))
if (VIRTUAL_GetUnixProt( get_page_vprot( page )) & PROT_WRITE)
{
set_page_vprot_bits( page, page_size, 0, VPROT_GUARD );
mprotect_range( page, page_size, 0, 0 );
ret = STATUS_GUARD_PAGE_VIOLATION;
if ((vprot & VPROT_WRITEWATCH) || is_write_watch_range( page, page_size ))
ret = STATUS_SUCCESS;
}
}
server_leave_uninterrupted_section( &csVirtual, &sigset );
@ -3061,7 +3072,6 @@ NTSTATUS WINAPI NtFlushVirtualMemory( HANDLE process, LPCVOID *addr_ptr,
NTSTATUS WINAPI NtGetWriteWatch( HANDLE process, ULONG flags, PVOID base, SIZE_T size, PVOID *addresses,
ULONG_PTR *count, ULONG *granularity )
{
struct file_view *view;
NTSTATUS status = STATUS_SUCCESS;
sigset_t sigset;
@ -3079,7 +3089,7 @@ NTSTATUS WINAPI NtGetWriteWatch( HANDLE process, ULONG flags, PVOID base, SIZE_T
server_enter_uninterrupted_section( &csVirtual, &sigset );
if ((view = VIRTUAL_FindView( base, size )) && (view->protect & VPROT_WRITEWATCH))
if (is_write_watch_range( base, size ))
{
ULONG_PTR pos = 0;
char *addr = base;
@ -3107,7 +3117,6 @@ NTSTATUS WINAPI NtGetWriteWatch( HANDLE process, ULONG flags, PVOID base, SIZE_T
*/
NTSTATUS WINAPI NtResetWriteWatch( HANDLE process, PVOID base, SIZE_T size )
{
struct file_view *view;
NTSTATUS status = STATUS_SUCCESS;
sigset_t sigset;
@ -3120,7 +3129,7 @@ NTSTATUS WINAPI NtResetWriteWatch( HANDLE process, PVOID base, SIZE_T size )
server_enter_uninterrupted_section( &csVirtual, &sigset );
if ((view = VIRTUAL_FindView( base, size )) && (view->protect & VPROT_WRITEWATCH))
if (is_write_watch_range( base, size ))
reset_write_watches( base, size );
else
status = STATUS_INVALID_PARAMETER;