From patchwork Wed Sep 29 13:05:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 514834 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:4087:0:0:0:0 with SMTP id m7csp14672jam; Wed, 29 Sep 2021 06:16:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxPRuzjniUBlZ5vhpX9mhCHSh+QpsySn3yyRFE2Mi/ktBhvkDx6LSh/9zBCcoJJl2ysN/Gr X-Received: by 2002:a50:d8c5:: with SMTP id y5mr14709889edj.370.1632921361819; Wed, 29 Sep 2021 06:16:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632921361; cv=none; d=google.com; s=arc-20160816; b=X03LFOFg9segEzyA4Ygmi+htCxTsblo/iUXsNPK6D/+qq22No6+Du/ZZH+GP6S0+Ns dXEwtUwr40Hok0MZ+p82u3U2JRbF/Yn+URnhTUeuyhNFqTL+vcGKhIx3xju+433tjsNY ZoVNrXRHpGbfsdMMy+ziSdQzvsY9SNtud8IJhyOWsWjya2gdTIsq3hFMxGkMa9kEiP4d gDn62JPYhZwGy5nxrhYDuP6VjwQq/U/aYESDr7sdQTANkXO00fX6qEVP9ei5dRhFwfxw XaY2MIpxfCSQ5hI/vXTCEMttqK6oTW4ypl/91zT3Q0zyOsjvpo9/SmDBdDDQbUFiB5ZE 3mxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=E9r1xAdALpfQj8Y2p7MHsD/Kt2/NgPJhspyOQqw2vSE=; b=RyanEA5uM69Lv92WXVGKUMnRYJvhZ2fazLBmcmZfMUxz5EWwLPGqwiScjzB6e53tve j2+SQC/0SgeR9GuBF/+yHWSZdGtk7nc5ejqWNFE7x+zNjSx13S8888sHPSnp+qkM8ubc rvNPHXA7p5NImPyTxMqRNbRdkVlAlacR6180BBUs6IJFbCs1Se2aY4TSs7R+58B59N0n ELdfglm46c+HiM/7OrPFyuiDgpOuExYHtNxTTrx8n0FAtggxKUHMH5MCjS+O1Ok1ut3t 5EPWnOlO4xn/OglJ5VCH8TQhcSWjpxTBWegkl1Jlpxmmp4rWNPzqFP281sUOF7z+ajyE qX+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=h+tH8fr3; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 13si2611740eje.666.2021.09.29.06.16.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 29 Sep 2021 06:16:01 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=h+tH8fr3; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:50960 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVZRI-0002wt-Q6 for patch@linaro.org; Wed, 29 Sep 2021 09:16:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39198) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVZHt-0006Px-4o for qemu-devel@nongnu.org; Wed, 29 Sep 2021 09:06:17 -0400 Received: from mail-oi1-x22f.google.com ([2607:f8b0:4864:20::22f]:36771) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVZHr-00067A-Bg for qemu-devel@nongnu.org; Wed, 29 Sep 2021 09:06:16 -0400 Received: by mail-oi1-x22f.google.com with SMTP id y201so2808223oie.3 for ; Wed, 29 Sep 2021 06:06:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=E9r1xAdALpfQj8Y2p7MHsD/Kt2/NgPJhspyOQqw2vSE=; b=h+tH8fr3/9ZC1OM8M7fvqox3Opcx7g+eogUAnhSv+qlFu8DPXMHrKZkmZ82vCDXQR4 p97vgyx8ju6Q2cTovTpaOej7s9v7mfhom1yzYnDn0SP/3bfiIpa4YIzLXpVnqxy4pxIQ CycDEbKcoVyYMCxPYY/FraR8GoY8P9UgYv3eE2mN0SchepynHy8pQAaJovqsXMYvuWpP gpuhQboCv+l69azMoTtVYWfkBPT6G21djy9BU4H9r1nW2D157Gepbi036Nohie7dJe+i m94cw4gBw8PCJWf6AnCL67g9QZpbQWCar8m8gZRbjKu2SeUrCk8y2cr1ztEFXLF26XrD Y5yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=E9r1xAdALpfQj8Y2p7MHsD/Kt2/NgPJhspyOQqw2vSE=; b=CQyETeIhere7r/OXvmCIJ1pwjw5PIgTGoUE1oFCwHXLYFiFJE/Rhr3i/Ed1HgWNvQD s67zdKsKXA5kuecWcWRUyq3j3zAFsIAipvsXvjK5nYXQe4d8bCEsFbNFh4XMkoopekj6 b4uZmUTYv5iwBVoJuTKaohTkz2PLPlPBYkpB8aI7DKFbUeTxBVAoG3mpUYBB7yqHQHIB r1IDc15eLM5QFH8D6Nx3rN+QTU7VHyvtZap5z6y9z+f7hBY9VWgyQDihrZ3iyY1zhn78 CfLb5KV2rISBTgzgzrGrg9AEfYAC/FI8U0icwXEBrIYtcliv2DnFz+ogSGvqtuN0IauD z8YQ== X-Gm-Message-State: AOAM531xR+vzrO4OnJp1PdYP1Qik3BEuMkrftM6G8g+QnIC8P9RX88xs hRkmETlhOmJrcSLrYs7bY+YxY2kCPoiE+w== X-Received: by 2002:aca:e004:: with SMTP id x4mr7692435oig.155.1632920772755; Wed, 29 Sep 2021 06:06:12 -0700 (PDT) Received: from localhost.localdomain ([172.58.171.248]) by smtp.gmail.com with ESMTPSA id w1sm442823ote.41.2021.09.29.06.06.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Sep 2021 06:06:12 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v5 06/26] linux-user/alpha: Implement setup_sigtramp Date: Wed, 29 Sep 2021 09:05:33 -0400 Message-Id: <20210929130553.121567-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210929130553.121567-1-richard.henderson@linaro.org> References: <20210929130553.121567-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::22f; envelope-from=richard.henderson@linaro.org; helo=mail-oi1-x22f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alex.bennee@linaro.org, laurent@vivier.eu, =?utf-8?q?Philippe_Mathieu-?= =?utf-8?b?RGF1ZMOp?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Create and record the two signal trampolines. Use them when the guest does not use ka_restorer. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- linux-user/alpha/target_signal.h | 1 + linux-user/alpha/signal.c | 34 +++++++++++++++++++------------- 2 files changed, 21 insertions(+), 14 deletions(-) -- 2.25.1 diff --git a/linux-user/alpha/target_signal.h b/linux-user/alpha/target_signal.h index 250642913e..0b6a39de65 100644 --- a/linux-user/alpha/target_signal.h +++ b/linux-user/alpha/target_signal.h @@ -93,6 +93,7 @@ typedef struct target_sigaltstack { #define TARGET_ARCH_HAS_SETUP_FRAME #define TARGET_ARCH_HAS_KA_RESTORER +#define TARGET_ARCH_HAS_SIGTRAMP_PAGE 1 /* bit-flags */ #define TARGET_SS_AUTODISARM (1U << 31) /* disable sas during sighandling */ diff --git a/linux-user/alpha/signal.c b/linux-user/alpha/signal.c index 3a820f616b..bbe3dd175a 100644 --- a/linux-user/alpha/signal.c +++ b/linux-user/alpha/signal.c @@ -55,13 +55,11 @@ struct target_ucontext { struct target_sigframe { struct target_sigcontext sc; - unsigned int retcode[3]; }; struct target_rt_sigframe { target_siginfo_t info; struct target_ucontext uc; - unsigned int retcode[3]; }; #define INSN_MOV_R30_R16 0x47fe0410 @@ -142,12 +140,7 @@ void setup_frame(int sig, struct target_sigaction *ka, if (ka->ka_restorer) { r26 = ka->ka_restorer; } else { - __put_user(INSN_MOV_R30_R16, &frame->retcode[0]); - __put_user(INSN_LDI_R0 + TARGET_NR_sigreturn, - &frame->retcode[1]); - __put_user(INSN_CALLSYS, &frame->retcode[2]); - /* imb() */ - r26 = frame_addr + offsetof(struct target_sigframe, retcode); + r26 = default_sigreturn; } unlock_user_struct(frame, frame_addr, 1); @@ -196,12 +189,7 @@ void setup_rt_frame(int sig, struct target_sigaction *ka, if (ka->ka_restorer) { r26 = ka->ka_restorer; } else { - __put_user(INSN_MOV_R30_R16, &frame->retcode[0]); - __put_user(INSN_LDI_R0 + TARGET_NR_rt_sigreturn, - &frame->retcode[1]); - __put_user(INSN_CALLSYS, &frame->retcode[2]); - /* imb(); */ - r26 = frame_addr + offsetof(struct target_rt_sigframe, retcode); + r26 = default_rt_sigreturn; } if (err) { @@ -269,3 +257,21 @@ badframe: force_sig(TARGET_SIGSEGV); return -TARGET_QEMU_ESIGRETURN; } + +void setup_sigtramp(abi_ulong sigtramp_page) +{ + uint32_t *tramp = lock_user(VERIFY_WRITE, sigtramp_page, 6 * 4, 0); + assert(tramp != NULL); + + default_sigreturn = sigtramp_page; + __put_user(INSN_MOV_R30_R16, &tramp[0]); + __put_user(INSN_LDI_R0 + TARGET_NR_sigreturn, &tramp[1]); + __put_user(INSN_CALLSYS, &tramp[2]); + + default_rt_sigreturn = sigtramp_page + 3 * 4; + __put_user(INSN_MOV_R30_R16, &tramp[3]); + __put_user(INSN_LDI_R0 + TARGET_NR_rt_sigreturn, &tramp[4]); + __put_user(INSN_CALLSYS, &tramp[5]); + + unlock_user(tramp, sigtramp_page, 6 * 4); +}