From patchwork Fri Apr 14 19:36:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Bugaev X-Patchwork-Id: 1769174 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=cB45ttVp; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PymvF19gcz1yXv for ; Sat, 15 Apr 2023 05:38:01 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 26A753856DDC for ; Fri, 14 Apr 2023 19:37:59 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 26A753856DDC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1681501079; bh=ZQiug4O6eJ2LOdLA42VmmyOL3weX817+HPwOyS1N4ZI=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=cB45ttVpVQ3M+zsD/SkUp3q9gIf25YtPmPUVsJboZpUDVFt7zPSRoBQ9OBPL+bCo3 ec9GK+WG+t494xEbr0zr7Wn2I0BjQnBEdZppzxGBevRf0EzwBqthLgUkwBLJBEZx49 xg1YwMX1LVKXzAPygN0riQH7iiKdlkWIvKtKI4Gg= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-lj1-x234.google.com (mail-lj1-x234.google.com [IPv6:2a00:1450:4864:20::234]) by sourceware.org (Postfix) with ESMTPS id 62F743858C54 for ; Fri, 14 Apr 2023 19:37:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 62F743858C54 Received: by mail-lj1-x234.google.com with SMTP id l7so5828068ljq.11 for ; Fri, 14 Apr 2023 12:37:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681501058; x=1684093058; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZQiug4O6eJ2LOdLA42VmmyOL3weX817+HPwOyS1N4ZI=; b=MhoaeWj9FLcSptCfsu2w5wAECDA2Z6aqFMU+SCO0cs36T0kOg4T5uLZ/bN+6W3SbLf PQqIzbV+jmJs1R7HDX2DKai2ZuWgD7XsUEE0+QDU/R+TOfCSQKUwFlRVKp8Cf6XB9WbI SqycfQzaTIvKl/h+pcOLMl7E3G1p4Aaas1cB8S1ESemU8FNxChaLihdiHokVwB27vDW8 j6ioRGCYRiQy4NpmphKIlUDV4q4mALgDWxgTxJCpYtfkgXgqZTV4vy8UycU3KFUyFIYy c7M48egh+/SerDkxzNzBH6fJ9Q4yD8ziY5Ud/XWgAcn7phQMmao69j+WZ6Q1bGVUtVNU Z+Kw== X-Gm-Message-State: AAQBX9c6/gtokN7FjwHYjma6v9nV3zaam2uMHEjeB4BucTLv1hCPatw+ 6pGLf8h/ii8jAyx+96QUU9I5S9MaF2K/KQ== X-Google-Smtp-Source: AKy350Y1qITlbMWIuoiJaGfbDzVpKZPDddLXKiQ8SGAIurYLpd/Ay7EnOQcPq/Cvi+U7jqL8iWpVOg== X-Received: by 2002:a05:651c:226:b0:293:591d:d84f with SMTP id z6-20020a05651c022600b00293591dd84fmr2327882ljn.11.1681501058707; Fri, 14 Apr 2023 12:37:38 -0700 (PDT) Received: from localhost.localdomain ([2a02:2168:b344:a600:4435:f106:1598:d2b0]) by smtp.gmail.com with ESMTPSA id v8-20020a2e9608000000b002a8a5afb87csm735730ljh.20.2023.04.14.12.37.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Apr 2023 12:37:38 -0700 (PDT) To: libc-alpha@sourceware.org, bug-hurd@gnu.org Cc: Samuel Thibault , Sergey Bugaev Subject: [PATCH 3/5] hurd: Implement sigreturn for x86_64 Date: Fri, 14 Apr 2023 22:36:58 +0300 Message-Id: <20230414193700.542116-3-bugaevc@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230414193700.542116-1-bugaevc@gmail.com> References: <20230414193700.542116-1-bugaevc@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-10.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, KAM_NUMSUBJECT, 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 X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Sergey Bugaev via Libc-alpha From: Sergey Bugaev Reply-To: Sergey Bugaev Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org Sender: "Libc-alpha" Signed-off-by: Sergey Bugaev --- This supersedes the previous version of this patch, and contains the same improvements the last two patches made to the i386 version. sysdeps/mach/hurd/x86_64/sigreturn.c | 166 +++++++++++++++++++++++++++ 1 file changed, 166 insertions(+) create mode 100644 sysdeps/mach/hurd/x86_64/sigreturn.c diff --git a/sysdeps/mach/hurd/x86_64/sigreturn.c b/sysdeps/mach/hurd/x86_64/sigreturn.c new file mode 100644 index 00000000..cba2eb77 --- /dev/null +++ b/sysdeps/mach/hurd/x86_64/sigreturn.c @@ -0,0 +1,166 @@ +/* Copyright (C) 1991-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 + +/* This is run on the thread stack after restoring it, to be able to + unlock SS off sigstack. */ +void +__sigreturn2 (struct hurd_sigstate *ss, uintptr_t *usp, + struct sigcontext *scp) +{ + mach_port_t reply_port; + _hurd_sigstate_unlock (ss); + + /* Destroy the MiG reply port used by the signal handler, and restore the + reply port in use by the thread when interrupted. + + We cannot use the original reply port for our RPCs that we do here, since + we could unexpectedly receive/consume a reply message meant for the user + (in particular, msg_sig_post_reply), and also since we would deallocate + the port if *our* RPC fails, which we don't want to do since the user + still has the old name. And so, temporarily set MACH_PORT_DEAD as our + reply name, and make sure destroying the port is the very last RPC we + do. */ + reply_port = THREAD_GETMEM (THREAD_SELF, reply_port); + THREAD_SETMEM (THREAD_SELF, reply_port, MACH_PORT_DEAD); + if (__glibc_likely (MACH_PORT_VALID (reply_port))) + (void) __mach_port_mod_refs (__mach_task_self (), reply_port, + MACH_PORT_RIGHT_RECEIVE, -1); + THREAD_SETMEM (THREAD_SELF, reply_port, scp->sc_reply_port); + + asm volatile ( + /* Point the stack to the register dump. */ + "movq %0, %%rsp\n" + /* Pop off the registers. */ + "popq %%r8\n" + "popq %%r9\n" + "popq %%r10\n" + "popq %%r11\n" + "popq %%r12\n" + "popq %%r13\n" + "popq %%r14\n" + "popq %%r15\n" + "popq %%rdi\n" + "popq %%rsi\n" + "popq %%rbp\n" + "popq %%rbx\n" + "popq %%rdx\n" + "popq %%rcx\n" + "popq %%rax\n" + "popfq\n" + /* Restore %rip and %rsp with a single instruction. */ + "retq $128" : + : "rm" (usp)); + __builtin_unreachable (); +} + +int +__sigreturn (struct sigcontext *scp) +{ + struct hurd_sigstate *ss; + struct hurd_userlink *link = (void *) &scp[1]; + mach_port_t reply_port; + + if (__glibc_unlikely (scp == NULL || (scp->sc_mask & _SIG_CANT_MASK))) + { + errno = EINVAL; + return -1; + } + + /* We know the sigstate must be initialized, but the compiler does not. + Help it out a little bit by eliding the check that _hurd_self_sigstate + makes otherwise. */ + ss = THREAD_GETMEM (THREAD_SELF, _hurd_sigstate); + _hurd_sigstate_lock (ss); + + /* Remove the link on the `active resources' chain added by + _hurd_setup_sighandler. Its purpose was to make sure + that we got called; now we have, it is done. */ + _hurd_userlink_unlink (link); + + /* Restore the set of blocked signals, and the intr_port slot. */ + ss->blocked = scp->sc_mask; + ss->intr_port = scp->sc_intr_port; + + /* Check for pending signals that were blocked by the old set. */ + if (_hurd_sigstate_pending (ss) & ~ss->blocked) + { + /* There are pending signals that just became unblocked. Wake up the + signal thread to deliver them. But first, squirrel away SCP where + the signal thread will notice it if it runs another handler, and + arrange to have us called over again in the new reality. */ + ss->context = scp; + _hurd_sigstate_unlock (ss); + __msg_sig_post (_hurd_msgport, 0, 0, __mach_task_self ()); + /* If a pending signal was handled, sig_post never returned. + If it did return, the pending signal didn't run a handler; + proceed as usual. */ + _hurd_sigstate_lock (ss); + ss->context = NULL; + } + + if (scp->sc_onstack) + ss->sigaltstack.ss_flags &= ~SS_ONSTACK; + + if (scp->sc_fpused) + /* Restore the FPU state. Mach conveniently stores the state + in the format the i387 `frstor' instruction uses to restore it. */ + asm volatile ("frstor %0" : : "m" (scp->sc_fpsave)); + + { + /* There are convenient instructions to pop state off the stack, so we + copy the registers onto the user's stack, switch there, pop and + return. */ + + uintptr_t *usp = (uintptr_t *) scp->sc_ursp - 128; + + *--usp = scp->sc_rip; + *--usp = scp->sc_rfl; + *--usp = scp->sc_rax; + *--usp = scp->sc_rcx; + *--usp = scp->sc_rdx; + *--usp = scp->sc_rbx; + *--usp = scp->sc_rbp; + *--usp = scp->sc_rsi; + *--usp = scp->sc_rdi; + *--usp = scp->sc_r15; + *--usp = scp->sc_r14; + *--usp = scp->sc_r13; + *--usp = scp->sc_r12; + *--usp = scp->sc_r11; + *--usp = scp->sc_r10; + *--usp = scp->sc_r9; + *--usp = scp->sc_r8; + + /* Switch to the user's stack that we have just prepared, and call + __sigreturn2. Clobber "memory" to make sure GCC flushes the stack + setup to actual memory. We align the stack as per the ABI, but pass + the original usp to __sigreturn2 as an argument. */ + asm volatile ("movq %1, %%rsp\n" + "andq $-16, %%rsp\n" + "call __sigreturn2" : + : "D" (ss), "S" (usp), "d" (scp) + : "memory"); + __builtin_unreachable (); + } +} + +weak_alias (__sigreturn, sigreturn)