wine-commits July 2021

wine-commits@winehq.org

1 participants
728 discussions

Huw Davies : mountmgr.sys: Move dhcp lookup to a worker thread.
by Alexandre Julliard 06 Jul '21

06 Jul '21

Module: wine Branch: master Commit: 715edfb0b2c42ae79a60300b87eca000c6e59cd2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=715edfb0b2c42ae79a60300b… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jul 6 10:11:47 2021 +0100 mountmgr.sys: Move dhcp lookup to a worker thread. While this is a reasonable change per se, the motivation is to avoid a deadlock when mountmgr.sys calls into iphlpapi and further into nsiproxy.sys via the nsi device. nsiproxy.sys is hosted by the same process as mountmgr.sys so is unable to handle the request while it is also waiting for that same request to return. The correct long-term solution is for mountmgr.sys to call the netio.sys versions of the iphlpapi functions. These will call the kernel-side versions of the nsi functions without going through the nsi device. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/mountmgr.c | 46 +++++++++++++++++++++++++++++--------------- 1 file changed, 31 insertions(+), 15 deletions(-) diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index 61d51d8e61d..b94944a350c 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -286,32 +286,48 @@ static NTSTATUS define_unix_drive( const void *in_buff, SIZE_T insize ) } /* implementation of IOCTL_MOUNTMGR_QUERY_DHCP_REQUEST_PARAMS */ -static NTSTATUS query_dhcp_request_params( void *buff, SIZE_T insize, - SIZE_T outsize, IO_STATUS_BLOCK *iosb ) +static void WINAPI query_dhcp_request_params( TP_CALLBACK_INSTANCE *instance, void *context ) { - struct mountmgr_dhcp_request_params *query = buff; - ULONG i, offset; + IRP *irp = context; + struct mountmgr_dhcp_request_params *query = irp->AssociatedIrp.SystemBuffer; + IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); + SIZE_T insize = irpsp->Parameters.DeviceIoControl.InputBufferLength; + SIZE_T outsize = irpsp->Parameters.DeviceIoControl.OutputBufferLength; + ULONG i, offset = 0; /* sanity checks */ if (FIELD_OFFSET(struct mountmgr_dhcp_request_params, params[query->count]) > insize || - !memchrW( query->adapter, 0, ARRAY_SIZE(query->adapter) )) return STATUS_INVALID_PARAMETER; + !memchrW( query->adapter, 0, ARRAY_SIZE(query->adapter) )) + { + irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; + goto err; + } + for (i = 0; i < query->count; i++) - if (query->params[i].offset + query->params[i].size > insize) return STATUS_INVALID_PARAMETER; + if (query->params[i].offset + query->params[i].size > insize) + { + irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; + goto err; + } + offset = FIELD_OFFSET(struct mountmgr_dhcp_request_params, params[query->count]); for (i = 0; i < query->count; i++) { - offset += get_dhcp_request_param( query->adapter, &query->params[i], buff, offset, outsize - offset ); + offset += get_dhcp_request_param( query->adapter, &query->params[i], (char *)query, offset, outsize - offset ); if (offset > outsize) { if (offset >= sizeof(query->size)) query->size = offset; - iosb->Information = sizeof(query->size); - return STATUS_MORE_ENTRIES; + offset = sizeof(query->size); + irp->IoStatus.u.Status = STATUS_MORE_ENTRIES; + goto err; } } + irp->IoStatus.u.Status = STATUS_SUCCESS; - iosb->Information = offset; - return STATUS_SUCCESS; +err: + irp->IoStatus.Information = offset; + IoCompleteRequest( irp, IO_NO_INCREMENT ); } /* implementation of Wine extension to use host APIs to find symbol file by GUID */ @@ -929,10 +945,10 @@ static NTSTATUS WINAPI mountmgr_ioctl( DEVICE_OBJECT *device, IRP *irp ) status = STATUS_INVALID_PARAMETER; break; } - status = query_dhcp_request_params( irp->AssociatedIrp.SystemBuffer, - irpsp->Parameters.DeviceIoControl.InputBufferLength, - irpsp->Parameters.DeviceIoControl.OutputBufferLength, - &irp->IoStatus ); + + if (TrySubmitThreadpoolCallback( query_dhcp_request_params, irp, NULL )) + return (irp->IoStatus.u.Status = STATUS_PENDING); + status = STATUS_NO_MEMORY; break; #ifdef __APPLE__ case IOCTL_MOUNTMGR_QUERY_SYMBOL_FILE:

1 0

Zebediah Figura : wined3d: Set an array of samplers as a single CS operation.
by Alexandre Julliard 06 Jul '21

06 Jul '21

Module: wine Branch: master Commit: 34a9d3e40f71ddc2f03c976830bf8b9f6a35ea25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34a9d3e40f71ddc2f03c9768… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 5 21:40:54 2021 -0500 wined3d: Set an array of samplers as a single CS operation. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 168 +++++++++++++++-------------------------- dlls/wined3d/cs.c | 38 ++++++---- dlls/wined3d/device.c | 38 +++++----- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 4 +- include/wine/wined3d.h | 4 +- 6 files changed, 107 insertions(+), 147 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=34a9d3e40f71ddc2f03c…

1 0

Zebediah Figura : wined3d: Set an array of shader resource views as a single CS operation.
by Alexandre Julliard 06 Jul '21

06 Jul '21

Module: wine Branch: master Commit: 7698b9e25a1f039a0ad6c70cfe43c16aed51029e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7698b9e25a1f039a0ad6c70c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 5 21:40:53 2021 -0500 wined3d: Set an array of shader resource views as a single CS operation. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 169 +++++++++++++++-------------------------- dlls/wined3d/cs.c | 53 +++++++------ dlls/wined3d/device.c | 71 ++++++++++------- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 6 +- include/wine/wined3d.h | 5 +- 6 files changed, 141 insertions(+), 165 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7698b9e25a1f039a0ad6…

1 0

Zebediah Figura : wined3d: Set an array of constant buffers as a single CS operation.
by Alexandre Julliard 06 Jul '21

06 Jul '21

Module: wine Branch: master Commit: e6bbf6ee9151c632bfc9e73b785e51dcb001d0ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6bbf6ee9151c632bfc9e73b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 5 21:40:52 2021 -0500 wined3d: Set an array of constant buffers as a single CS operation. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 38 ++++++++++++++++++++++-------- dlls/wined3d/cs.c | 53 ++++++++++++++++++++++++------------------ dlls/wined3d/device.c | 37 ++++++++++++++++------------- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 5 ++-- include/wine/wined3d.h | 5 ++-- 6 files changed, 87 insertions(+), 53 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e6bbf6ee9151c632bfc9…

1 0

Zebediah Figura : wined3d: Pass a wined3d_cs pointer to wined3d_not_from_cs().
by Alexandre Julliard 06 Jul '21

06 Jul '21

Module: wine Branch: master Commit: a68cdf4a41a19fc52311250356c4e8db8cf87d1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a68cdf4a41a19fc523112503… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 5 19:32:13 2021 -0500 wined3d: Pass a wined3d_cs pointer to wined3d_not_from_cs(). This partially reverts 6a9752bf5e3cff3ceb4249d5a5e59b4d548008d1. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 4 ++-- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index d7e1d1383a8..b7c48d2d0a9 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2457,7 +2457,7 @@ HRESULT wined3d_device_context_emit_map(struct wined3d_device_context *context, /* Mapping resources from the worker thread isn't an issue by itself, but * increasing the map count would be visible to applications. */ - wined3d_not_from_cs(context->device); + wined3d_not_from_cs(context->device->cs); wined3d_resource_wait_idle(resource); @@ -2502,7 +2502,7 @@ HRESULT wined3d_device_context_emit_unmap(struct wined3d_device_context *context return WINED3D_OK; } - wined3d_not_from_cs(context->device); + wined3d_not_from_cs(context->device->cs); op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_MAP); op->opcode = WINED3D_CS_OP_UNMAP; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6e600a59b72..b97d565c42d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5536,7 +5536,7 @@ void device_resource_add(struct wined3d_device *device, struct wined3d_resource { TRACE("device %p, resource %p.\n", device, resource); - wined3d_not_from_cs(device); + wined3d_not_from_cs(device->cs); list_add_head(&device->resources, &resource->resource_list_entry); } @@ -5545,7 +5545,7 @@ static void device_resource_remove(struct wined3d_device *device, struct wined3d { TRACE("device %p, resource %p.\n", device, resource); - wined3d_not_from_cs(device); + wined3d_not_from_cs(device->cs); list_remove(&resource->resource_list_entry); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 935fdb5cb4e..5f0c2bb6732 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -6041,9 +6041,9 @@ static inline void wined3d_from_cs(const struct wined3d_cs *cs) assert(cs->thread_id == GetCurrentThreadId()); } -static inline void wined3d_not_from_cs(const struct wined3d_device *device) +static inline void wined3d_not_from_cs(const struct wined3d_cs *cs) { - assert(device->cs->thread_id != GetCurrentThreadId()); + assert(cs->thread_id != GetCurrentThreadId()); } static inline enum wined3d_material_color_source validate_material_colour_source(WORD use_map,

1 0

Zebediah Figura : wined3d: Factor out most of the execute_command_list callback to a common function.
by Alexandre Julliard 06 Jul '21

06 Jul '21

Module: wine Branch: master Commit: f2fe987907238ad563750db927f2434b0dacfe82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2fe987907238ad563750db9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 5 19:21:59 2021 -0500 wined3d: Factor out most of the execute_command_list callback to a common function. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 54 +++++++++++++++++++----------------------- dlls/wined3d/device.c | 2 +- dlls/wined3d/wined3d_private.h | 5 ++-- 3 files changed, 29 insertions(+), 32 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index ce0417c9f71..d7e1d1383a8 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2353,25 +2353,12 @@ static void wined3d_cs_issue_query(struct wined3d_device_context *context, query->state = QUERY_SIGNALLED; } -static void wined3d_cs_execute_command_list(struct wined3d_device_context *context, - struct wined3d_command_list *list, bool restore_state) +static void wined3d_cs_acquire_command_list(struct wined3d_device_context *context, struct wined3d_command_list *list) { - struct wined3d_cs_execute_command_list *op; SIZE_T i; - op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); - op->opcode = WINED3D_CS_OP_EXECUTE_COMMAND_LIST; - op->list = list; - for (i = 0; i < list->resource_count; ++i) wined3d_resource_acquire(list->resources[i]); - - wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); - - if (restore_state) - wined3d_device_context_set_state(context, context->state); - else - wined3d_device_context_reset_state(context); } static void wined3d_cs_exec_preload_resource(struct wined3d_cs *cs, const void *data) @@ -2962,6 +2949,25 @@ static void wined3d_cs_exec_execute_command_list(struct wined3d_cs *cs, const vo } } +void wined3d_device_context_emit_execute_command_list(struct wined3d_device_context *context, + struct wined3d_command_list *list, bool restore_state) +{ + struct wined3d_cs_execute_command_list *op; + + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op->opcode = WINED3D_CS_OP_EXECUTE_COMMAND_LIST; + op->list = list; + + context->ops->acquire_command_list(context, list); + + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); + + if (restore_state) + wined3d_device_context_set_state(context, context->state); + else + wined3d_device_context_reset_state(context); +} + static void *wined3d_cs_st_require_space(struct wined3d_device_context *context, size_t size, enum wined3d_cs_queue_id queue_id) { @@ -3042,7 +3048,7 @@ static const struct wined3d_device_context_ops wined3d_cs_st_ops = wined3d_cs_issue_query, wined3d_cs_flush, wined3d_cs_acquire_resource, - wined3d_cs_execute_command_list, + wined3d_cs_acquire_command_list, }; static BOOL wined3d_cs_queue_is_empty(const struct wined3d_cs *cs, const struct wined3d_cs_queue *queue) @@ -3169,7 +3175,7 @@ static const struct wined3d_device_context_ops wined3d_cs_mt_ops = wined3d_cs_issue_query, wined3d_cs_flush, wined3d_cs_acquire_resource, - wined3d_cs_execute_command_list, + wined3d_cs_acquire_command_list, }; static void poll_queries(struct wined3d_cs *cs) @@ -3562,20 +3568,10 @@ static void wined3d_deferred_context_acquire_resource(struct wined3d_device_cont wined3d_resource_incref(resource); } -static void wined3d_deferred_context_execute_command_list(struct wined3d_device_context *context, - struct wined3d_command_list *list, bool restore_state) +static void wined3d_deferred_context_acquire_command_list(struct wined3d_device_context *context, + struct wined3d_command_list *list) { struct wined3d_deferred_context *deferred = wined3d_deferred_context_from_context(context); - struct wined3d_cs_execute_command_list *op; - - op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); - op->opcode = WINED3D_CS_OP_EXECUTE_COMMAND_LIST; - op->list = list; - - if (restore_state) - wined3d_device_context_set_state(context, context->state); - else - wined3d_device_context_reset_state(context); /* Grab a reference to the command list. Note that this implicitly prevents * any dependent command lists or resources from being freed as well. */ @@ -3597,7 +3593,7 @@ static const struct wined3d_device_context_ops wined3d_deferred_context_ops = wined3d_deferred_context_issue_query, wined3d_deferred_context_flush, wined3d_deferred_context_acquire_resource, - wined3d_deferred_context_execute_command_list, + wined3d_deferred_context_acquire_command_list, }; HRESULT CDECL wined3d_deferred_context_create(struct wined3d_device *device, struct wined3d_device_context **context) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5a2a95ebe96..6e600a59b72 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4908,7 +4908,7 @@ void CDECL wined3d_device_context_execute_command_list(struct wined3d_device_con { TRACE("context %p, list %p, restore_state %d.\n", context, list, restore_state); - context->ops->execute_command_list(context, list, restore_state); + wined3d_device_context_emit_execute_command_list(context, list, restore_state); } struct wined3d_rendertarget_view * CDECL wined3d_device_context_get_rendertarget_view( diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 80e03ad9212..935fdb5cb4e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4717,8 +4717,7 @@ struct wined3d_device_context_ops void (*issue_query)(struct wined3d_device_context *context, struct wined3d_query *query, unsigned int flags); void (*flush)(struct wined3d_device_context *context); void (*acquire_resource)(struct wined3d_device_context *context, struct wined3d_resource *resource); - void (*execute_command_list)(struct wined3d_device_context *context, - struct wined3d_command_list *list, bool restore_state); + void (*acquire_command_list)(struct wined3d_device_context *context, struct wined3d_command_list *list); }; struct wined3d_device_context @@ -4798,6 +4797,8 @@ void wined3d_device_context_emit_draw(struct wined3d_device_context *context, enum wined3d_primitive_type primitive_type, unsigned int patch_vertex_count, int base_vertex_idx, unsigned int start_idx, unsigned int index_count, unsigned int start_instance, unsigned int instance_count, bool indexed) DECLSPEC_HIDDEN; +void wined3d_device_context_emit_execute_command_list(struct wined3d_device_context *context, + struct wined3d_command_list *list, bool restore_state) DECLSPEC_HIDDEN; void wined3d_device_context_emit_generate_mipmaps(struct wined3d_device_context *context, struct wined3d_shader_resource_view *view) DECLSPEC_HIDDEN; HRESULT wined3d_device_context_emit_map(struct wined3d_device_context *context,

1 0

Alexandre Julliard : winebuild: Save/restore the %fs register in the syscall dispatcher on Linux.
by Alexandre Julliard 06 Jul '21

06 Jul '21

Module: wine Branch: master Commit: 216d2411781f4bf12edf2083a7ac84d2885bd404 URL: https://source.winehq.org/git/wine.git/?a=commit;h=216d2411781f4bf12edf2083… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 6 12:50:56 2021 +0200 winebuild: Save/restore the %fs register in the syscall dispatcher on Linux. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 11 +++++++++-- tools/winebuild/import.c | 22 ++++++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index dab22c67021..93183794bf6 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -41,6 +41,9 @@ #ifdef HAVE_MACHINE_SYSARCH_H # include <machine/sysarch.h> #endif +#ifdef HAVE_SYS_AUXV_H +# include <sys/auxv.h> +#endif #ifdef HAVE_SYS_PARAM_H # include <sys/param.h> #endif @@ -276,8 +279,10 @@ C_ASSERT( sizeof(XSTATE) == 0x140 ); C_ASSERT( sizeof(struct stack_layout) == 0x590 ); /* Should match the size in call_user_exception_dispatcher(). */ /* flags to control the behavior of the syscall dispatcher */ -#define SYSCALL_HAVE_XSAVE 1 -#define SYSCALL_HAVE_XSAVEC 2 +#define SYSCALL_HAVE_XSAVE 1 +#define SYSCALL_HAVE_XSAVEC 2 +#define SYSCALL_HAVE_PTHREAD_TEB 4 +#define SYSCALL_HAVE_WRFSGSBASE 8 /* stack layout when calling an user apc function. * FIXME: match Windows ABI. */ @@ -2859,6 +2864,8 @@ void signal_init_process(void) if ((sel = alloc_fs_sel( -1, teb32 )) != -1) { fs32_sel = (sel << 3) | 3; + __wine_syscall_flags |= SYSCALL_HAVE_PTHREAD_TEB; + if (getauxval( AT_HWCAP2 ) & 2) __wine_syscall_flags |= SYSCALL_HAVE_WRFSGSBASE; } else ERR( "failed to allocate %%fs selector\n" ); } diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 6b03ff73f49..064ab1b4768 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1597,6 +1597,21 @@ static void output_syscall_dispatcher(void) output( "\tjmp 3f\n" ); output( "2:\tfxsave64 0xc0(%%rcx)\n" ); output( "3:\tleaq 0x98(%%rcx),%%rbp\n" ); + if (target_platform == PLATFORM_LINUX) + { + output( "\ttestl $12,%%r14d\n" ); /* SYSCALL_HAVE_PTHREAD_TEB | SYSCALL_HAVE_WRFSGSBASE */ + output( "\tjz 2f\n" ); + output( "\tmovq %%gs:0x330,%%rsi\n" ); /* amd64_thread_data()->pthread_teb */ + output( "\ttestl $8,%%r14d\n" ); /* SYSCALL_HAVE_WRFSGSBASE */ + output( "\tjz 1f\n" ); + output( "\twrfsbase %%rsi\n" ); + output( "\tjmp 2f\n" ); + output( "1:\tmov $0x1002,%%edi\n" ); /* ARCH_SET_FS */ + output( "\tmov $158,%%eax\n" ); /* SYS_arch_prctl */ + output( "\tsyscall\n" ); + output( "\tleaq -0x98(%%rbp),%%rcx\n" ); + output( "2:\n" ); + } output( "\tleaq 0x28(%%rsp),%%rsi\n" ); /* first argument */ output( "\tmovq %%rcx,%%rsp\n" ); output( "\tmovq 0x00(%%rcx),%%rax\n" ); @@ -1625,6 +1640,13 @@ static void output_syscall_dispatcher(void) output( "\tcallq *(%%r10,%%rax,8)\n" ); output( "\tleaq -0x98(%%rbp),%%rcx\n" ); output( "2:\tmovl 0x94(%%rcx),%%edx\n" ); /* frame->restore_flags */ + if (target_platform == PLATFORM_LINUX) + { + output( "\ttestl $12,%%r14d\n" ); /* SYSCALL_HAVE_PTHREAD_TEB | SYSCALL_HAVE_WRFSGSBASE */ + output( "\tjz 1f\n" ); + output( "\tmovw 0x7e(%%rcx),%%fs\n" ); + output( "1:\n" ); + } output( "\ttestl $0x48,%%edx\n" ); /* CONTEXT_FLOATING_POINT | CONTEXT_XSTATE */ output( "\tjz 4f\n" ); output( "\ttestl $3,%%r14d\n" ); /* SYSCALL_HAVE_XSAVE | SYSCALL_HAVE_XSAVEC */

1 0

Alexandre Julliard : winebuild: Add a specific platform id for Linux.
by Alexandre Julliard 06 Jul '21

06 Jul '21

Module: wine Branch: master Commit: 5e12256ec41189579cc3d2471d1ddf37ca9181ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e12256ec41189579cc3d247… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 6 12:50:30 2021 +0200 winebuild: Add a specific platform id for Linux. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 1 + tools/winebuild/main.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 84938aabf4f..1918932ad1f 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -152,6 +152,7 @@ enum target_platform { PLATFORM_UNSPECIFIED, PLATFORM_APPLE, + PLATFORM_LINUX, PLATFORM_FREEBSD, PLATFORM_MINGW, PLATFORM_SOLARIS, diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 72e13b7992b..8c0e77030b6 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -67,6 +67,8 @@ enum target_cpu target_cpu = CPU_ARM64; #ifdef __APPLE__ enum target_platform target_platform = PLATFORM_APPLE; +#elif defined(__linux__) +enum target_platform target_platform = PLATFORM_LINUX; #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) enum target_platform target_platform = PLATFORM_FREEBSD; #elif defined(__sun) @@ -132,6 +134,7 @@ static const struct { { "macos", PLATFORM_APPLE }, { "darwin", PLATFORM_APPLE }, + { "linux", PLATFORM_LINUX }, { "freebsd", PLATFORM_FREEBSD }, { "solaris", PLATFORM_SOLARIS }, { "mingw32", PLATFORM_MINGW },

1 0

Alexandre Julliard : ntdll: Switch back to the pthread %fs register in signal handlers.
by Alexandre Julliard 06 Jul '21

06 Jul '21

Module: wine Branch: master Commit: c42384b5a117ef818313cb023333c89f9810e124 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c42384b5a117ef818313cb02… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 6 12:41:27 2021 +0200 ntdll: Switch back to the pthread %fs register in signal handlers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index b94ad9c4d91..dab22c67021 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1520,6 +1520,28 @@ static inline void set_sigcontext( const CONTEXT *context, ucontext_t *sigcontex } +/*********************************************************************** + * init_handler + */ +static inline void init_handler( const ucontext_t *sigcontext ) +{ +#ifdef __linux__ + if (fs32_sel) arch_prctl( ARCH_SET_FS, amd64_thread_data()->pthread_teb ); +#endif +} + + +/*********************************************************************** + * leave_handler + */ +static inline void leave_handler( const ucontext_t *sigcontext ) +{ +#ifdef __linux__ + if (fs32_sel) __asm__ volatile( "movw %0,%%fs" :: "r" (fs32_sel) ); +#endif +} + + /*********************************************************************** * save_context * @@ -1529,6 +1551,8 @@ static void save_context( struct xcontext *xcontext, const ucontext_t *sigcontex { CONTEXT *context = &xcontext->c; + init_handler( sigcontext ); + context->ContextFlags = CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS | CONTEXT_DEBUG_REGISTERS; context->Rax = RAX_sig(sigcontext); context->Rcx = RCX_sig(sigcontext); @@ -1611,6 +1635,7 @@ static void restore_context( const struct xcontext *xcontext, ucontext_t *sigcon if (FPU_sig(sigcontext)) *FPU_sig(sigcontext) = context->u.FltSave; if ((cpu_info.ProcessorFeatureBits & CPU_FEATURE_AVX) && (xs = XState_sig(FPU_sig(sigcontext)))) xs->CompactionMask = xcontext->host_compaction_mask; + leave_handler( sigcontext ); } @@ -2139,6 +2164,7 @@ static void setup_raise_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec RSP_sig(sigcontext) = (ULONG_PTR)stack; /* clear single-step, direction, and align check flag */ EFL_sig(sigcontext) &= ~(0x100|0x400|0x40000); + leave_handler( sigcontext ); } @@ -2343,6 +2369,7 @@ static inline BOOL handle_interrupt( ucontext_t *sigcontext, EXCEPTION_RECORD *r case 4: /* BREAKPOINT_UNLOAD_SYMBOLS */ case 5: /* BREAKPOINT_COMMAND_STRING (>= Win2003) */ RIP_sig(sigcontext) += 3; + leave_handler( sigcontext ); return TRUE; } context->Rip += 3; @@ -2479,12 +2506,17 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec.ExceptionInformation[1] = (ULONG_PTR)siginfo->si_addr; rec.ExceptionCode = virtual_handle_fault( siginfo->si_addr, rec.ExceptionInformation[0], (void *)RSP_sig(ucontext) ); - if (!rec.ExceptionCode) return; + if (!rec.ExceptionCode) + { + leave_handler( sigcontext ); + return; + } break; case TRAP_x86_ALIGNFLT: /* Alignment check exception */ if (EFL_sig(ucontext) & 0x00040000) { EFL_sig(ucontext) &= ~0x00040000; /* reset AC flag */ + leave_handler( sigcontext ); return; } rec.ExceptionCode = EXCEPTION_DATATYPE_MISALIGNMENT; @@ -2627,6 +2659,7 @@ static void abrt_handler( int signal, siginfo_t *siginfo, void *sigcontext ) */ static void quit_handler( int signal, siginfo_t *siginfo, void *ucontext ) { + init_handler( ucontext ); abort_thread(0); }

1 0

Alexandre Julliard : ntdll: Allocate a 32-bit %fs selector on Linux in Wow64 mode.
by Alexandre Julliard 06 Jul '21

06 Jul '21

Module: wine Branch: master Commit: a7b6b4f0d06127526addc4dba7c0b6b09821542b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7b6b4f0d06127526addc4db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 6 12:38:07 2021 +0200 ntdll: Allocate a 32-bit %fs selector on Linux in Wow64 mode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 6175bb9b230..b94ad9c4d91 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -88,6 +88,30 @@ WINE_DEFAULT_DEBUG_CHANNEL(seh); #include <asm/prctl.h> static inline int arch_prctl( int func, void *ptr ) { return syscall( __NR_arch_prctl, func, ptr ); } +extern int CDECL alloc_fs_sel( int sel, void *base ); +__ASM_GLOBAL_FUNC( alloc_fs_sel, + /* switch to 32-bit stack */ + "pushq %rbx\n\t" + "pushq %rdi\n\t" + "movq %rsp,%rdi\n\t" + "movq %gs:0x8,%rsp\n\t" /* NtCurrentTeb()->Tib.StackBase */ + "subl $0x10,%esp\n\t" + /* setup modify_ldt struct on 32-bit stack */ + "movl %ecx,(%rsp)\n\t" /* entry_number */ + "movl %edx,4(%rsp)\n\t" /* base */ + "movl $~0,8(%rsp)\n\t" /* limit */ + "movl $0x41,12(%rsp)\n\t" /* seg_32bit | usable */ + /* invoke 32-bit syscall */ + "movl %esp,%ebx\n\t" + "movl $0xf3,%eax\n\t" /* SYS_set_thread_area */ + "int $0x80\n\t" + /* restore stack */ + "movl (%rsp),%eax\n\t" /* entry_number */ + "movq %rdi,%rsp\n\t" + "popq %rdi\n\t" + "popq %rbx\n\t" + "ret" ); + #ifndef FP_XSTATE_MAGIC1 #define FP_XSTATE_MAGIC1 0x46505853 #endif @@ -367,6 +391,7 @@ static inline void context_init_xstate( CONTEXT *context, void *xstate_buffer ) static USHORT cs32_sel; /* selector for %cs in 32-bit mode */ static USHORT cs64_sel; /* selector for %cs in 64-bit mode */ static USHORT ds64_sel; /* selector for %ds/%es/%ss in 64-bit mode */ +static USHORT fs32_sel; /* selector for %fs in 32-bit mode */ /*********************************************************************** * Definitions for Dwarf unwind tables @@ -1911,7 +1936,7 @@ NTSTATUS set_thread_wow64_context( HANDLE handle, const void *ctx, ULONG size ) { wow_frame->SegDs = ds64_sel; wow_frame->SegEs = ds64_sel; - wow_frame->SegFs = 0; /* FIXME */ + wow_frame->SegFs = fs32_sel; wow_frame->SegGs = ds64_sel; } if (flags & CONTEXT_I386_DEBUG_REGISTERS) @@ -2743,6 +2768,7 @@ void signal_init_thread( TEB *teb ) #if defined __linux__ arch_prctl( ARCH_SET_GS, teb ); arch_prctl( ARCH_GET_FS, &amd64_thread_data()->pthread_teb ); + if (fs32_sel) alloc_fs_sel( fs32_sel >> 3, (char *)teb + teb->WowTebOffset ); #elif defined (__FreeBSD__) || defined (__FreeBSD_kernel__) amd64_set_gsbase( teb ); #elif defined(__NetBSD__) @@ -2793,7 +2819,15 @@ void signal_init_process(void) #ifdef __linux__ if (NtCurrentTeb()->WowTebOffset) { + void *teb32 = (char *)NtCurrentTeb() + NtCurrentTeb()->WowTebOffset; + int sel; + cs32_sel = 0x23; + if ((sel = alloc_fs_sel( -1, teb32 )) != -1) + { + fs32_sel = (sel << 3) | 3; + } + else ERR( "failed to allocate %%fs selector\n" ); } #endif @@ -2842,6 +2876,7 @@ void DECLSPEC_HIDDEN call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, B context.SegCs = cs64_sel; context.SegDs = ds64_sel; context.SegEs = ds64_sel; + context.SegFs = fs32_sel; context.SegGs = ds64_sel; context.SegSs = ds64_sel; context.EFlags = 0x200;

1 0

← Newer
1
...
52
53
54
55
56
57
58
...
73
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2021