From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from eggs.gnu.org (eggs.gnu.org [IPv6:2001:470:142:3::10]) by sourceware.org (Postfix) with ESMTPS id D8BE53858D1E for ; Wed, 17 May 2023 20:56:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D8BE53858D1E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gnu.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gnu.org Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pzOCO-0003Q5-HH; Wed, 17 May 2023 16:56:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=In-Reply-To:MIME-Version:References:Subject:To:From: Date; bh=csn2uw7bJ9SK7mt26AsFVIb7O4Dgu5wPgl127J2TXDg=; b=L9ErXeXZOuUDKWSDBUiA 2ZbnzPO5yTAePS8lXgyLaloXrUuSQ4dGKUDSTD5nrQravo5qotG5g0EYPEQsBYgiyhFc6JJStOB0E O2IpJc3y/Iv+PhVxIf3gqwVLF71kVdDLXWxUvfFStgouTqNw4fiQHLPMbi9dA8ZAMfxU0Mt1RY1vA uYTqUTyrytGtXAG0DRw7HwcQ1QsVAmNHcAd4T+hCtpsA3TEJpkXEAkFhJgUmV9WF46fMfis8kK41N 2NM5j1FtqVlas6FUd8wXEBJJbSOkw+FSCnX6DPh43m0LDFaagRn+oEVsI7FtEnYA+d7XNLhQqlRH4 ZI826qIzsWh8aQ==; Received: from 2a01cb008c251f00de41a9fffe47ec49.ipv6.abo.wanadoo.fr ([2a01:cb00:8c25:1f00:de41:a9ff:fe47:ec49] helo=begin.home) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pzOCO-0001I7-AQ; Wed, 17 May 2023 16:56:40 -0400 Received: from samy by begin.home with local (Exim 4.96) (envelope-from ) id 1pzOCN-006LIM-0P; Wed, 17 May 2023 22:56:39 +0200 Date: Wed, 17 May 2023 22:56:39 +0200 From: Samuel Thibault To: Sergey Bugaev Cc: libc-alpha@sourceware.org, bug-hurd@gnu.org Subject: Re: [PATCH 04/10] mach: Add __mach_setup_thread_call () Message-ID: <20230517205639.odwg6rwe6widwn7b@begin> Mail-Followup-To: Sergey Bugaev , libc-alpha@sourceware.org, bug-hurd@gnu.org References: <20230517191436.73636-1-bugaevc@gmail.com> <20230517191436.73636-5-bugaevc@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20230517191436.73636-5-bugaevc@gmail.com> Organization: I am not organized User-Agent: NeoMutt/20170609 (1.8.3) X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,SPF_HELO_PASS,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Applied, thanks! Sergey Bugaev via Libc-alpha, le mer. 17 mai 2023 22:14:30 +0300, a ecrit: > This is just like mach_setup_thread (), but it's suitable for making the > thread call a function correctly, as opposed to explicitly setting the > thread's stack and instruction pointers to the given values. Internally, > it uses MACHINE_THREAD_STATE_SETUP_CALL. > > Unlike mach_setup_thread (), which is exported via mach.h for the > benefit of the Hurd exec server, __mach_setup_thread_call () is private > to glibc for the time being. > > Signed-off-by: Sergey Bugaev > --- > mach/mach.h | 6 +++++- > mach/setup-thread.c | 52 ++++++++++++++++++++++++++++++++------------- > mach/setup-thread.h | 32 ++++++++++++++++++++++++++++ > 3 files changed, 74 insertions(+), 16 deletions(-) > create mode 100644 mach/setup-thread.h > > diff --git a/mach/mach.h b/mach/mach.h > index d115f5a1..348f0196 100644 > --- a/mach/mach.h > +++ b/mach/mach.h > @@ -88,7 +88,11 @@ extern FILE *mach_open_devstream (mach_port_t device_port, const char *mode); > If STACK_BASE is not null it is filled in with the chosen stack base. > If STACK_SIZE is not null it is filled in with the chosen stack size. > Regardless, an extra page of red zone is allocated off the end; this > - is not included in *STACK_SIZE. */ > + is not included in *STACK_SIZE. > + > + Mote: this function is unsuitable for setting up the thread to call a > + function at PC, since the architecture ABI may impose additional > + requirements beyond setting PC and stack. */ > kern_return_t __mach_setup_thread (task_t task, thread_t thread, void *pc, > vm_address_t *stack_base, > vm_size_t *stack_size); > diff --git a/mach/setup-thread.c b/mach/setup-thread.c > index ae24a149..0e149787 100644 > --- a/mach/setup-thread.c > +++ b/mach/setup-thread.c > @@ -16,6 +16,7 @@ > . */ > > #include > +#include > #include > #include > #include > @@ -24,17 +25,10 @@ > > #define STACK_SIZE (16 * 1024 * 1024) /* 16MB, arbitrary. */ > > -/* Give THREAD a stack and set it to run at PC when resumed. > - If *STACK_SIZE is nonzero, that size of stack is allocated. > - If *STACK_BASE is nonzero, that stack location is used. > - If STACK_BASE is not null it is filled in with the chosen stack base. > - If STACK_SIZE is not null it is filled in with the chosen stack size. > - Regardless, an extra page of red zone is allocated off the end; this > - is not included in *STACK_SIZE. */ > - > -kern_return_t > -__mach_setup_thread (task_t task, thread_t thread, void *pc, > - vm_address_t *stack_base, vm_size_t *stack_size) > +static kern_return_t > +mach_setup_thread_impl (task_t task, thread_t thread, int is_call, > + void *pc, vm_address_t *stack_base, > + vm_size_t *stack_size) > { > kern_return_t error; > struct machine_thread_state ts; > @@ -43,6 +37,8 @@ __mach_setup_thread (task_t task, thread_t thread, void *pc, > vm_size_t size; > int anywhere; > > + memset (&ts, 0, sizeof (ts)); > + > size = stack_size ? *stack_size ? : STACK_SIZE : STACK_SIZE; > stack = stack_base ? *stack_base ? : 0 : 0; > anywhere = !stack_base || !*stack_base; > @@ -54,21 +50,25 @@ __mach_setup_thread (task_t task, thread_t thread, void *pc, > if (stack_size) > *stack_size = size; > > - memset (&ts, 0, sizeof (ts)); > - MACHINE_THREAD_STATE_SET_PC (&ts, pc); > #ifdef STACK_GROWTH_DOWN > if (stack_base) > *stack_base = stack + __vm_page_size; > - ts.SP = stack + __vm_page_size + size; > #elif defined (STACK_GROWTH_UP) > if (stack_base) > *stack_base = stack; > - ts.SP = stack; > stack += size; > #else > #error stack direction unknown > #endif > > + if (is_call) > + MACHINE_THREAD_STATE_SETUP_CALL (&ts, *stack_base, size, pc); > + else > + { > + MACHINE_THREAD_STATE_SET_PC (&ts, pc); > + MACHINE_THREAD_STATE_SET_SP (&ts, *stack_base, size); > + } > + > /* Create the red zone. */ > if (error = __vm_protect (task, stack, __vm_page_size, 0, VM_PROT_NONE)) > return error; > @@ -77,8 +77,30 @@ __mach_setup_thread (task_t task, thread_t thread, void *pc, > (natural_t *) &ts, tssize); > } > > +/* Give THREAD a stack and set it to run at PC when resumed. > + If *STACK_SIZE is nonzero, that size of stack is allocated. > + If *STACK_BASE is nonzero, that stack location is used. > + If STACK_BASE is not null it is filled in with the chosen stack base. > + If STACK_SIZE is not null it is filled in with the chosen stack size. > + Regardless, an extra page of red zone is allocated off the end; this > + is not included in *STACK_SIZE. */ > + > +kern_return_t > +__mach_setup_thread (task_t task, thread_t thread, void *pc, > + vm_address_t *stack_base, vm_size_t *stack_size) > +{ > + return mach_setup_thread_impl (task, thread, 0, pc, stack_base, stack_size); > +} > + > weak_alias (__mach_setup_thread, mach_setup_thread) > > +kern_return_t > +__mach_setup_thread_call (task_t task, thread_t thread, void *pc, > + vm_address_t *stack_base, vm_size_t *stack_size) > +{ > + return mach_setup_thread_impl (task, thread, 1, pc, stack_base, stack_size); > +} > + > /* Give THREAD a TLS area. */ > kern_return_t > __mach_setup_tls (thread_t thread) > diff --git a/mach/setup-thread.h b/mach/setup-thread.h > new file mode 100644 > index 00000000..b4c94d1d > --- /dev/null > +++ b/mach/setup-thread.h > @@ -0,0 +1,32 @@ > +/* Setup a Mach thread. > + Copyright (C) 1993-2023 Free Software Foundation, Inc. > + This file is part of the GNU C Library. > + > + The GNU C Library is free software; you can redistribute it and/or > + modify it under the terms of the GNU Lesser General Public > + License as published by the Free Software Foundation; either > + version 2.1 of the License, or (at your option) any later version. > + > + The GNU C Library is distributed in the hope that it will be useful, > + but WITHOUT ANY WARRANTY; without even the implied warranty of > + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + Lesser General Public License for more details. > + > + You should have received a copy of the GNU Lesser General Public > + License along with the GNU C Library; if not, see > + . */ > + > +#ifndef _MACH_SETUP_THREAD_H > + > +#define _MACH_SETUP_THREAD_H 1 > + > +#include > + > +/* Like mach_setup_thread (), but suitable for setting up function > + calls. */ > +kern_return_t __mach_setup_thread_call (task_t task, thread_t thread, > + void *function, > + vm_address_t *stack_base, > + vm_size_t *stack_size); > + > +#endif /* mach/setup-thread.h */ > -- > 2.40.1 > -- Samuel --- Pour une évaluation indépendante, transparente et rigoureuse ! Je soutiens la Commission d'Évaluation de l'Inria.