From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lj1-x22c.google.com (mail-lj1-x22c.google.com [IPv6:2a00:1450:4864:20::22c]) by sourceware.org (Postfix) with ESMTPS id E390F38560AA for ; Wed, 17 May 2023 19:14:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E390F38560AA Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-lj1-x22c.google.com with SMTP id 38308e7fff4ca-2af12685274so4483991fa.2 for ; Wed, 17 May 2023 12:14:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684350890; x=1686942890; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=cXT6TtIV88qIUohZRRm5TOpZwH3Jf3/4Fo9cDFNgLSg=; b=VJC2LYHTBeQFtBj7SXgcDPL6LyAsamT3M0cgp/IOSPmefsIHnCftDvSlqHFmoqaBbJ eNMh67r3uj5eqOeMKa4vFVH9Sr1aLDExXyiCT3wdA9Gz868nKDBTDUcbmx9PpwEaz75V /qplkfrVTMwDpxNMyQ4JaDp39sBA8HMEX7FRW37rk9tRfB6vfpoNz8EctdKzmGCLbkn3 l+ZwFLSy3I0076iuKDs7o6OW9JNc+ZH7IosNLyq5qflA8jY3TphuJT/Q3utktUg4vX9A RM3nBu11hLuvADR/+fpt2pCdRWZzkkYYVYDBMZjV8yqW1wjNHEcwKWnS6k9YGpYGyw+Z davA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684350890; x=1686942890; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cXT6TtIV88qIUohZRRm5TOpZwH3Jf3/4Fo9cDFNgLSg=; b=k4xERBaqTKDMM4YQM/O/7bb3JQIIRt3bcP0pa921trCnKf/Mjwa2tX/qMaDVp0aADJ ZAQUehkDjLKeqAXeWhRTOBHGZtSN294nZgXvEngMpUeqnHj9w/42/G7olbXg15IzY5HY kAvE+fcVW+X7QgkN3iPrJzyE1KfBpMiS/HEE2Gw+wpUb7QUMLhTXaX484AAoYnVX0DK8 AgYFCfb9eYWQiRGgxlVCBxf7bZROcoU9ZDIkeV/IZzF8toVlAjXBh8KIW+Gi5NuwPf3R ayDGPbpcNMQrf40wwcLEy5JK1w4PBejf0a9lwUmt1CkMBePMEnbtjsgccxmOfhbVWhbk 5Nbg== X-Gm-Message-State: AC+VfDxHaybOURtrLWkiRt0o5PRmh6Kf38pwBddIYhTNCWfAObp0bPzC e2Rar404dBfwBqSQOscwf6kIEnc4zyM= X-Google-Smtp-Source: ACHHUZ6/XKTzv4K9quZl2YUHZtX+divK7uBBR26hbzVCBfB5ROpoN7yUs25ExeyMldkpoavK9UbP+A== X-Received: by 2002:a2e:9c18:0:b0:2ad:bedc:995b with SMTP id s24-20020a2e9c18000000b002adbedc995bmr7839874lji.16.1684350889884; Wed, 17 May 2023 12:14:49 -0700 (PDT) Received: from surface-pro-6.. ([194.190.106.50]) by smtp.gmail.com with ESMTPSA id o18-20020ac24352000000b004eed8de597csm3415744lfl.32.2023.05.17.12.14.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 May 2023 12:14:48 -0700 (PDT) From: Sergey Bugaev To: libc-alpha@sourceware.org, bug-hurd@gnu.org Subject: [PATCH 08/10] hurd: Fix setting up pthreads Date: Wed, 17 May 2023 22:14:34 +0300 Message-Id: <20230517191436.73636-9-bugaevc@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230517191436.73636-1-bugaevc@gmail.com> References: <20230517191436.73636-1-bugaevc@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.2 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,KAM_SHORT,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,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: On x86_64, we have to pass function arguments in registers, not on the stack. We also have to align the stack pointer in a specific way. Since sharing the logic with i386 does not bring much benefit, split the file back into i386- and x86_64-specific versions, and fix the x86_64 version to set up the thread properly. Bonus: i386 keeps doing the extra RPC inside __thread_set_pcsptp to fetch the state of the thread before setting it; but x86_64 no lnoger does that. Checked on x86_64-gnu and i686-gnu. Fixes be6d002ca277ffc90058d382396150cb0e785b9c "hurd: Set up the basic tree for x86_64-gnu" Signed-off-by: Sergey Bugaev --- __thread_set_pcsptp is also used by pthread_cancel (), which suffers from the same issue. Eventually I'd like to remove __thread_set_pcsptp entirely. .../mach/hurd/{x86 => i386}/htl/pt-setup.c | 2 +- sysdeps/mach/hurd/x86_64/htl/pt-setup.c | 93 +++++++++++++++++++ 2 files changed, 94 insertions(+), 1 deletion(-) rename sysdeps/mach/hurd/{x86 => i386}/htl/pt-setup.c (98%) create mode 100644 sysdeps/mach/hurd/x86_64/htl/pt-setup.c diff --git a/sysdeps/mach/hurd/x86/htl/pt-setup.c b/sysdeps/mach/hurd/i386/htl/pt-setup.c similarity index 98% rename from sysdeps/mach/hurd/x86/htl/pt-setup.c rename to sysdeps/mach/hurd/i386/htl/pt-setup.c index 686124d7..ba108b96 100644 --- a/sysdeps/mach/hurd/x86/htl/pt-setup.c +++ b/sysdeps/mach/hurd/i386/htl/pt-setup.c @@ -1,4 +1,4 @@ -/* Setup thread stack. Hurd/x86 version. +/* Setup thread stack. Hurd/i386 version. Copyright (C) 2000-2023 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/sysdeps/mach/hurd/x86_64/htl/pt-setup.c b/sysdeps/mach/hurd/x86_64/htl/pt-setup.c new file mode 100644 index 00000000..7dc62912 --- /dev/null +++ b/sysdeps/mach/hurd/x86_64/htl/pt-setup.c @@ -0,0 +1,93 @@ +/* Setup thread stack. Hurd/x86_64 version. + Copyright (C) 2000-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 + . */ + +#include +#include +#include +#include + +#include +#include + +/* Set up the stack for THREAD. Return the stack pointer + for the new thread. */ +static void * +stack_setup (struct __pthread *thread) +{ + error_t err; + uintptr_t bottom, top; + + /* Calculate the top of the new stack. */ + bottom = (uintptr_t) thread->stackaddr; + top = bottom + thread->stacksize + round_page (thread->guardsize); + + if (thread->guardsize) + { + err = __vm_protect (__mach_task_self (), (vm_address_t) bottom, + thread->guardsize, 0, 0); + assert_perror (err); + } + + return (void *) PTR_ALIGN_DOWN_8_16 (top); +} + +int +__pthread_setup (struct __pthread *thread, + void (*entry_point) (struct __pthread *, void *(*)(void *), + void *), void *(*start_routine) (void *), + void *arg) +{ + error_t err; + struct i386_thread_state state; + struct i386_fsgs_base_state fsgs_state; + + if (thread->kernel_thread == hurd_thread_self ()) + /* Fix up the TCB for the main thread. The C library has already + installed a TCB, which we want to keep using. This TCB must not + be freed so don't register it in the thread structure. On the + other hand, it's not yet possible to reliably release a TCB. + Leave the unused one registered so that it doesn't leak. */ + return 0; + + + thread->mcontext.pc = entry_point; + thread->mcontext.sp = stack_setup (thread); + + /* Set up the state to call entry_point (thread, start_routine, arg) */ + memset (&state, 0, sizeof (state)); + state.ursp = (uintptr_t) thread->mcontext.sp; + state.rip = (uintptr_t) thread->mcontext.pc; + state.rdi = (uintptr_t) thread; + state.rsi = (uintptr_t) start_routine; + state.rdx = (uintptr_t) arg; + + err = __thread_set_state (thread->kernel_thread, i386_THREAD_STATE, + (thread_state_t) &state, + i386_THREAD_STATE_COUNT); + assert_perror (err); + + /* Set fs_base to the TCB pointer for the thread. */ + memset (&fsgs_state, 0, sizeof (fsgs_state)); + fsgs_state.fs_base = (uintptr_t) thread->tcb; + err = __thread_set_state (thread->kernel_thread, i386_FSGS_BASE_STATE, + (thread_state_t) &fsgs_state, + i386_FSGS_BASE_STATE_COUNT); + assert_perror (err); + + return 0; +} -- 2.40.1