From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1792) id 2B9413856241; Wed, 17 May 2023 20:57:15 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2B9413856241 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1684357035; bh=1EyfYLTYU/GRSo+9Gwp3cddCPptpyGBfBi9VfGPJS5s=; h=From:To:Subject:Date:From; b=acpivIopc+5te8yrTBZkg1VxGawE5QRM0EubaBUFKZOigR8uTC5mfa4ucsprlkVaG dNHMHlmg9q2IAjAGrhSH4tnrotyQjHkBmZFM+vMD1MXsTvsC0RYYH1lUWZgDuWXL8W nCNeQ929D5M4noKmLLukyuT1upM2J9V2vEOAZbHA= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Samuel Thibault To: glibc-cvs@sourceware.org Subject: [glibc] hurd: Use __mach_setup_thread_call () X-Act-Checkin: glibc X-Git-Author: Sergey Bugaev X-Git-Refname: refs/heads/master X-Git-Oldrev: 01f317e98f7e36b597905a7ad267ce6b59d463ee X-Git-Newrev: aa19c68d2bdf3a831894f609b8ac5c8f123268b2 Message-Id: <20230517205715.2B9413856241@sourceware.org> Date: Wed, 17 May 2023 20:57:15 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=aa19c68d2bdf3a831894f609b8ac5c8f123268b2 commit aa19c68d2bdf3a831894f609b8ac5c8f123268b2 Author: Sergey Bugaev Date: Wed May 17 22:14:31 2023 +0300 hurd: Use __mach_setup_thread_call () ...instead of mach_setup_thread (), which is unsuitable for setting up function calls. Checked on x86_64-gnu: the signal thread no longer crashes upon trying to process a message. Signed-off-by: Sergey Bugaev Message-Id: <20230517191436.73636-6-bugaevc@gmail.com> Diff: --- hurd/hurdsig.c | 10 ++++++---- sysdeps/mach/hurd/profil.c | 5 +++-- sysdeps/mach/hurd/setitimer.c | 11 ++++++----- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/hurd/hurdsig.c b/hurd/hurdsig.c index 78ea59d97d..313e95aeec 100644 --- a/hurd/hurdsig.c +++ b/hurd/hurdsig.c @@ -22,6 +22,7 @@ #include /* For `struct mutex'. */ #include #include +#include #include #include #include @@ -1525,10 +1526,11 @@ _hurdsig_init (const int *intarray, size_t intarraysize) assert_perror (err); stacksize = __vm_page_size * 8; /* Small stack for signal thread. */ - err = __mach_setup_thread (__mach_task_self (), _hurd_msgport_thread, - _hurd_msgport_receive, - (vm_address_t *) &__hurd_sigthread_stack_base, - &stacksize); + err = __mach_setup_thread_call (__mach_task_self (), + _hurd_msgport_thread, + _hurd_msgport_receive, + (vm_address_t *) &__hurd_sigthread_stack_base, + &stacksize); assert_perror (err); err = __mach_setup_tls (_hurd_msgport_thread); assert_perror (err); diff --git a/sysdeps/mach/hurd/profil.c b/sysdeps/mach/hurd/profil.c index 64fe76f702..8092df0a92 100644 --- a/sysdeps/mach/hurd/profil.c +++ b/sysdeps/mach/hurd/profil.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -68,8 +69,8 @@ update_waiter (u_short *sample_buffer, size_t size, size_t offset, u_int scale) /* Set up the profiling collector thread. */ err = __thread_create (__mach_task_self (), &profile_thread); if (! err) - err = __mach_setup_thread (__mach_task_self (), profile_thread, - &profile_waiter, NULL, NULL); + err = __mach_setup_thread_call (__mach_task_self (), profile_thread, + &profile_waiter, NULL, NULL); if (! err) err = __mach_setup_tls(profile_thread); } diff --git a/sysdeps/mach/hurd/setitimer.c b/sysdeps/mach/hurd/setitimer.c index d09c59dc6a..03191b91fc 100644 --- a/sysdeps/mach/hurd/setitimer.c +++ b/sysdeps/mach/hurd/setitimer.c @@ -25,6 +25,7 @@ #include #include #include +#include /* XXX Temporary cheezoid implementation of ITIMER_REAL/SIGALRM. */ @@ -227,11 +228,11 @@ setitimer_locked (const struct itimerval *new, struct itimerval *old, goto out; _hurd_itimer_thread_stack_base = 0; /* Anywhere. */ _hurd_itimer_thread_stack_size = __vm_page_size; /* Small stack. */ - if ((err = __mach_setup_thread (__mach_task_self (), - _hurd_itimer_thread, - &timer_thread, - &_hurd_itimer_thread_stack_base, - &_hurd_itimer_thread_stack_size)) + if ((err = __mach_setup_thread_call (__mach_task_self (), + _hurd_itimer_thread, + &timer_thread, + &_hurd_itimer_thread_stack_base, + &_hurd_itimer_thread_stack_size)) || (err = __mach_setup_tls(_hurd_itimer_thread))) { __thread_terminate (_hurd_itimer_thread);