From nobody Tue Apr 15 19:52:15 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520618601167551.4584748672968; Fri, 9 Mar 2018 10:03:21 -0800 (PST) Received: from localhost ([::1]:47089 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1euMMG-0006JH-VY for importer@patchew.org; Fri, 09 Mar 2018 13:03:09 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59590) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1euLmt-0008Q0-Jx for qemu-devel@nongnu.org; Fri, 09 Mar 2018 12:26:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1euLms-00065R-59 for qemu-devel@nongnu.org; Fri, 09 Mar 2018 12:26:35 -0500 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:46998) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1euLmr-00063U-TB for qemu-devel@nongnu.org; Fri, 09 Mar 2018 12:26:34 -0500 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1euLmm-00075E-CJ for qemu-devel@nongnu.org; Fri, 09 Mar 2018 17:26:28 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Date: Fri, 9 Mar 2018 17:26:05 +0000 Message-Id: <20180309172622.4277-9-peter.maydell@linaro.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180309172622.4277-1-peter.maydell@linaro.org> References: <20180309172622.4277-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PULL 08/25] aarch64-linux-user: Remove struct target_aux_context X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 From: Richard Henderson This changes the qemu signal frame layout to be more like the kernel's, in that the various records are dynamically allocated rather than fixed in place by a structure. For now, all of the allocation is out of uc.tuc_mcontext.__reserved, so the allocation is actually trivial. That will change with SVE support. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-id: 20180303143823.27055-4-richard.henderson@linaro.org Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Peter Maydell --- linux-user/signal.c | 89 ++++++++++++++++++++++++++++++++++++-------------= ---- 1 file changed, 61 insertions(+), 28 deletions(-) diff --git a/linux-user/signal.c b/linux-user/signal.c index 761d6acbf3..0f2b155c33 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -1446,20 +1446,12 @@ struct target_fpsimd_context { uint64_t vregs[32 * 2]; /* really uint128_t vregs[32] */ }; =20 -/* - * Auxiliary context saved in the sigcontext.__reserved array. Not exporte= d to - * user space as it will change with the addition of new context. User spa= ce - * should check the magic/size information. - */ -struct target_aux_context { - struct target_fpsimd_context fpsimd; - /* additional context to be added before "end" */ - struct target_aarch64_ctx end; -}; - struct target_rt_sigframe { struct target_siginfo info; struct target_ucontext uc; +}; + +struct target_rt_frame_record { uint64_t fp; uint64_t lr; uint32_t tramp[2]; @@ -1565,20 +1557,47 @@ static void target_restore_fpsimd_record(CPUARMStat= e *env, static int target_restore_sigframe(CPUARMState *env, struct target_rt_sigframe *sf) { - struct target_aux_context *aux - =3D (struct target_aux_context *)sf->uc.tuc_mcontext.__reserved; - uint32_t magic, size; + struct target_aarch64_ctx *ctx; + struct target_fpsimd_context *fpsimd =3D NULL; =20 target_restore_general_frame(env, sf); =20 - __get_user(magic, &aux->fpsimd.head.magic); - __get_user(size, &aux->fpsimd.head.size); - if (magic =3D=3D TARGET_FPSIMD_MAGIC - && size =3D=3D sizeof(struct target_fpsimd_context)) { - target_restore_fpsimd_record(env, &aux->fpsimd); - } else { + ctx =3D (struct target_aarch64_ctx *)sf->uc.tuc_mcontext.__reserved; + while (ctx) { + uint32_t magic, size; + + __get_user(magic, &ctx->magic); + __get_user(size, &ctx->size); + switch (magic) { + case 0: + if (size !=3D 0) { + return 1; + } + ctx =3D NULL; + continue; + + case TARGET_FPSIMD_MAGIC: + if (fpsimd || size !=3D sizeof(struct target_fpsimd_context)) { + return 1; + } + fpsimd =3D (struct target_fpsimd_context *)ctx; + break; + + default: + /* Unknown record -- we certainly didn't generate it. + * Did we in fact get out of sync? + */ + return 1; + } + ctx =3D (void *)ctx + size; + } + + /* Require FPSIMD always. */ + if (!fpsimd) { return 1; } + target_restore_fpsimd_record(env, fpsimd); + return 0; } =20 @@ -1604,20 +1623,33 @@ static void target_setup_frame(int usig, struct tar= get_sigaction *ka, target_siginfo_t *info, target_sigset_t *se= t, CPUARMState *env) { + int size =3D offsetof(struct target_rt_sigframe, uc.tuc_mcontext.__res= erved); + int fpsimd_ofs, end1_ofs, fr_ofs; struct target_rt_sigframe *frame; - struct target_aux_context *aux; + struct target_rt_frame_record *fr; abi_ulong frame_addr, return_addr; =20 + fpsimd_ofs =3D size; + size +=3D sizeof(struct target_fpsimd_context); + end1_ofs =3D size; + size +=3D sizeof(struct target_aarch64_ctx); + fr_ofs =3D size; + size +=3D sizeof(struct target_rt_frame_record); + frame_addr =3D get_sigframe(ka, env); trace_user_setup_frame(env, frame_addr); if (!lock_user_struct(VERIFY_WRITE, frame, frame_addr, 0)) { goto give_sigsegv; } - aux =3D (struct target_aux_context *)frame->uc.tuc_mcontext.__reserved; =20 target_setup_general_frame(frame, env, set); - target_setup_fpsimd_record(&aux->fpsimd, env); - target_setup_end_record(&aux->end); + target_setup_fpsimd_record((void *)frame + fpsimd_ofs, env); + target_setup_end_record((void *)frame + end1_ofs); + + /* Set up the stack frame for unwinding. */ + fr =3D (void *)frame + fr_ofs; + __put_user(env->xregs[29], &fr->fp); + __put_user(env->xregs[30], &fr->lr); =20 if (ka->sa_flags & TARGET_SA_RESTORER) { return_addr =3D ka->sa_restorer; @@ -1627,13 +1659,14 @@ static void target_setup_frame(int usig, struct tar= get_sigaction *ka, * Since these are instructions they need to be put as little-endi= an * regardless of target default or current CPU endianness. */ - __put_user_e(0xd2801168, &frame->tramp[0], le); - __put_user_e(0xd4000001, &frame->tramp[1], le); - return_addr =3D frame_addr + offsetof(struct target_rt_sigframe, t= ramp); + __put_user_e(0xd2801168, &fr->tramp[0], le); + __put_user_e(0xd4000001, &fr->tramp[1], le); + return_addr =3D frame_addr + fr_ofs + + offsetof(struct target_rt_frame_record, tramp); } env->xregs[0] =3D usig; env->xregs[31] =3D frame_addr; - env->xregs[29] =3D env->xregs[31] + offsetof(struct target_rt_sigframe= , fp); + env->xregs[29] =3D frame_addr + fr_ofs; env->pc =3D ka->_sa_handler; env->xregs[30] =3D return_addr; if (info) { --=20 2.16.2