From nobody Fri Sep 5 09:04:42 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1632795719649552.4163917708332; Mon, 27 Sep 2021 19:21:59 -0700 (PDT) Received: from localhost ([::1]:58240 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mV2ko-0007vo-O9 for importer@patchew.org; Mon, 27 Sep 2021 22:21:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57558) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mV2QZ-0004hr-5n for qemu-devel@nongnu.org; Mon, 27 Sep 2021 22:01:03 -0400 Received: from mail-qk1-x735.google.com ([2607:f8b0:4864:20::735]:43899) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mV2QX-0005sH-8w for qemu-devel@nongnu.org; Mon, 27 Sep 2021 22:01:02 -0400 Received: by mail-qk1-x735.google.com with SMTP id 138so38755832qko.10 for ; Mon, 27 Sep 2021 19:01:00 -0700 (PDT) Received: from localhost.localdomain (cpe-24-31-215-130.sc.res.rr.com. [24.31.215.130]) by smtp.gmail.com with ESMTPSA id g12sm12530370qtm.59.2021.09.27.19.00.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Sep 2021 19:00:59 -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=z6sdM0HHcKJX3xm0cdq26GIq2QyBnBfucTBir90HJQ8=; b=iRfTaPUXsCrbUfTIL6jd+LT+MsWfqUnEA1M+hQY34NV7I10Ev0zpAMofjm4WHvtfld MpZgbnfuOgspvcWFjQEfH4P2/ryqsG5VthcNy147Nzp0YCtZ6pMDIWv29gSIGf0DXiIB 12Fp1dta7oaY26tfMYuOJ0Ju2SsjckLCq76fqWYx4hnIkHoTdPiXXGIOnMeAzxoSc2/g fGh2qUHvCIjs/hQJ1TaeiWz0YYIN+z8C1r6849e1+2WXTqJada55jwWwFpWmt3qotiEB esKzmhGJLcVG/X7zCRoTv0Z810kdsHnJYtK8fiyA7CQl1S4Gi9MpRq7mBTwl1cncfUno HvRg== 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=z6sdM0HHcKJX3xm0cdq26GIq2QyBnBfucTBir90HJQ8=; b=MoxCthE6SOdDKAy6vUAbmUJAJnC+6ZyreVn5wT4sctDcBJfpXmWMswpcCf0vhb8xcy barwNMaJU36V70KDYOnjnXE2DdBnTSXmqJA2J7H4uukGca0Kb0vPwbkYCscL9q+8JQKT RyzEZ7fGy8xvY/DYz8J0Ajvatotb12GPfpGVeUUfMauQ/pVBnUSShY4ZSI1lxT0r+Dcn spgibD+2cO9Qxfod68Jo0W1T/E+wskuyvzUOx/Xcp0O1YZdtvsHqSV48VQ0HR/wYhUJ/ r0cHt22QZPzhbDfS8d42M88bHoGi8hAUURAgafNzywRlPpdkP6vfEfKmav5e7ndensX+ njVQ== X-Gm-Message-State: AOAM533TaeJFPihaKKmgowXup+MuELkbm2Onx7TbK/hPe8yaZwIeiZOM OO8s9RyPNYrXsBc9qxsGuvQt1bS9gI1uMA== X-Google-Smtp-Source: ABdhPJyKOe0SE2smzRFuWb6zx5Z04ZJS0fvpM6iMrDpwzpJNr5MzBusj0V5iQ4ZRZvvXGqfPhRMNvw== X-Received: by 2002:a37:9cce:: with SMTP id f197mr3179320qke.1.1632794459853; Mon, 27 Sep 2021 19:00:59 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v4 21/25] linux-user/s390x: Implement setup_sigtramp Date: Mon, 27 Sep 2021 22:00:35 -0400 Message-Id: <20210928020039.184412-22-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210928020039.184412-1-richard.henderson@linaro.org> References: <20210928020039.184412-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::735; envelope-from=richard.henderson@linaro.org; helo=mail-qk1-x735.google.com X-Spam_score_int: -1 X-Spam_score: -0.2 X-Spam_bar: / X-Spam_report: (-0.2 / 5.0 requ) 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: peter.maydell@linaro.org, qemu-s390x@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , laurent@vivier.eu, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1632795720290100001 Create and record the two signal trampolines. Use them when the guest does not use SA_RESTORER. Cc: qemu-s390x@nongnu.org Tested-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson --- linux-user/s390x/target_signal.h | 2 ++ linux-user/s390x/signal.c | 24 ++++++++++++++++-------- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/linux-user/s390x/target_signal.h b/linux-user/s390x/target_sig= nal.h index bbfc464d44..64f5f42201 100644 --- a/linux-user/s390x/target_signal.h +++ b/linux-user/s390x/target_signal.h @@ -19,4 +19,6 @@ typedef struct target_sigaltstack { #include "../generic/signal.h" =20 #define TARGET_ARCH_HAS_SETUP_FRAME +#define TARGET_ARCH_HAS_SIGTRAMP_PAGE 1 + #endif /* S390X_TARGET_SIGNAL_H */ diff --git a/linux-user/s390x/signal.c b/linux-user/s390x/signal.c index 80f34086d7..676b948147 100644 --- a/linux-user/s390x/signal.c +++ b/linux-user/s390x/signal.c @@ -68,7 +68,6 @@ typedef struct { target_sigregs sregs; int signo; target_sigregs_ext sregs_ext; - uint16_t retcode; } sigframe; =20 #define TARGET_UC_VXRS 2 @@ -85,7 +84,6 @@ struct target_ucontext { =20 typedef struct { uint8_t callee_used_stack[__SIGNAL_FRAMESIZE]; - uint16_t retcode; struct target_siginfo info; struct target_ucontext uc; } rt_sigframe; @@ -209,9 +207,7 @@ void setup_frame(int sig, struct target_sigaction *ka, if (ka->sa_flags & TARGET_SA_RESTORER) { restorer =3D ka->sa_restorer; } else { - restorer =3D frame_addr + offsetof(sigframe, retcode); - __put_user(S390_SYSCALL_OPCODE | TARGET_NR_sigreturn, - &frame->retcode); + restorer =3D default_sigreturn; } =20 /* Set up registers for signal handler */ @@ -262,9 +258,7 @@ void setup_rt_frame(int sig, struct target_sigaction *k= a, if (ka->sa_flags & TARGET_SA_RESTORER) { restorer =3D ka->sa_restorer; } else { - restorer =3D frame_addr + offsetof(typeof(*frame), retcode); - __put_user(S390_SYSCALL_OPCODE | TARGET_NR_rt_sigreturn, - &frame->retcode); + restorer =3D default_rt_sigreturn; } =20 /* Create siginfo on the signal stack. */ @@ -405,3 +399,17 @@ long do_rt_sigreturn(CPUS390XState *env) unlock_user_struct(frame, frame_addr, 0); return -TARGET_QEMU_ESIGRETURN; } + +void setup_sigtramp(abi_ulong sigtramp_page) +{ + uint16_t *tramp =3D lock_user(VERIFY_WRITE, sigtramp_page, 2 + 2, 0); + assert(tramp !=3D NULL); + + default_sigreturn =3D sigtramp_page; + __put_user(S390_SYSCALL_OPCODE | TARGET_NR_sigreturn, &tramp[0]); + + default_rt_sigreturn =3D sigtramp_page + 2; + __put_user(S390_SYSCALL_OPCODE | TARGET_NR_rt_sigreturn, &tramp[1]); + + unlock_user(tramp, sigtramp_page, 2 + 2); +} --=20 2.25.1