From: Samuel Thibault <samuel.thibault@gnu.org>
To: Sergey Bugaev <bugaevc@gmail.com>
Cc: libc-alpha@sourceware.org, bug-hurd@gnu.org
Subject: Re: [PATCH 05/10] hurd: Use __mach_setup_thread_call ()
Date: Wed, 17 May 2023 22:57:16 +0200 [thread overview]
Message-ID: <20230517205716.7qybavmagrengolr@begin> (raw)
In-Reply-To: <20230517191436.73636-6-bugaevc@gmail.com>
Applied, thanks!
Sergey Bugaev, le mer. 17 mai 2023 22:14:31 +0300, a ecrit:
> ...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 <bugaevc@gmail.com>
> ---
> 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 78ea59d9..313e95ae 100644
> --- a/hurd/hurdsig.c
> +++ b/hurd/hurdsig.c
> @@ -22,6 +22,7 @@
> #include <lock-intern.h> /* For `struct mutex'. */
> #include <pthreadP.h>
> #include <mach.h>
> +#include <mach/setup-thread.h>
> #include <mach/thread_switch.h>
> #include <mach/mig_support.h>
> #include <mach/vm_param.h>
> @@ -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 64fe76f7..8092df0a 100644
> --- a/sysdeps/mach/hurd/profil.c
> +++ b/sysdeps/mach/hurd/profil.c
> @@ -22,6 +22,7 @@
> #include <hurd.h>
> #include <mach/mach4.h>
> #include <mach/pc_sample.h>
> +#include <mach/setup-thread.h>
> #include <lock-intern.h>
> #include <assert.h>
> #include <libc-internal.h>
> @@ -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 d09c59dc..03191b91 100644
> --- a/sysdeps/mach/hurd/setitimer.c
> +++ b/sysdeps/mach/hurd/setitimer.c
> @@ -25,6 +25,7 @@
> #include <hurd/msg_request.h>
> #include <mach.h>
> #include <mach/message.h>
> +#include <mach/setup-thread.h>
>
> /* 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);
> --
> 2.40.1
>
>
--
Samuel
---
Pour une évaluation indépendante, transparente et rigoureuse !
Je soutiens la Commission d'Évaluation de l'Inria.
next prev parent reply other threads:[~2023-05-17 20:57 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-17 19:14 [PATCH 00/10] Stack setup & misc fixes for x86_64-gnu Sergey Bugaev
2023-05-17 19:14 ` [PATCH 01/10] Remove sysdeps/generic/thread_state.h Sergey Bugaev
2023-05-17 20:50 ` Samuel Thibault
2023-05-17 19:14 ` [PATCH 02/10] mach: Define MACHINE_THREAD_STATE_SETUP_CALL Sergey Bugaev
2023-05-17 20:52 ` Samuel Thibault
2023-05-17 19:14 ` [PATCH 03/10] hurd: Use MACHINE_THREAD_STATE_SETUP_CALL Sergey Bugaev
2023-05-17 20:52 ` [PATCH 03/10] hurd: Use MACHINE_THREAD_STATE_SETUP_CALLo Samuel Thibault
2023-05-17 19:14 ` [PATCH 04/10] mach: Add __mach_setup_thread_call () Sergey Bugaev
2023-05-17 20:56 ` Samuel Thibault
2023-05-17 19:14 ` [PATCH 05/10] hurd: Use " Sergey Bugaev
2023-05-17 20:57 ` Samuel Thibault [this message]
2023-05-17 19:14 ` [RFC PATCH 06/10] hurd: Make sure to not use tcb->self Sergey Bugaev
2023-05-17 20:59 ` Samuel Thibault
2023-05-18 18:55 ` Joseph Myers
2023-05-18 19:33 ` Sergey Bugaev
2023-05-18 20:16 ` Joseph Myers
2023-05-18 23:47 ` Samuel Thibault
2023-05-19 8:22 ` Sergey Bugaev
2023-05-19 9:39 ` Florian Weimer
2023-05-19 16:50 ` Joseph Myers
2023-05-19 14:47 ` [PATCH] hurd: Fix using interposable hurd_thread_self Sergey Bugaev
2023-05-19 18:57 ` Samuel Thibault
2023-05-17 19:14 ` [PATCH 07/10] hurd: Fix x86_64 _hurd_tls_fork Sergey Bugaev
2023-05-17 21:01 ` Samuel Thibault
2023-05-17 19:14 ` [PATCH 08/10] hurd: Fix setting up pthreads Sergey Bugaev
2023-05-17 21:02 ` Samuel Thibault
2023-05-17 19:14 ` [PATCH 09/10] hurd: Also make it possible to call strlen very early Sergey Bugaev
2023-05-17 21:04 ` Samuel Thibault
2023-05-17 19:14 ` [RFC PATCH 10/10] hurd: Regenerate errno.h Sergey Bugaev
2023-05-17 19:39 ` Joseph Myers
2023-05-17 21:04 ` Samuel Thibault
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230517205716.7qybavmagrengolr@begin \
--to=samuel.thibault@gnu.org \
--cc=bug-hurd@gnu.org \
--cc=bugaevc@gmail.com \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).