From nobody Fri Oct 24 21:41:01 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; dkim=fail; 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1518818462728849.0370272390337; Fri, 16 Feb 2018 14:01:02 -0800 (PST) Received: from localhost ([::1]:37080 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emo3x-0002AN-VL for importer@patchew.org; Fri, 16 Feb 2018 17:01:01 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40723) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emnzQ-0006ln-RC for qemu-devel@nongnu.org; Fri, 16 Feb 2018 16:56:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1emnzP-0007QA-SJ for qemu-devel@nongnu.org; Fri, 16 Feb 2018 16:56:20 -0500 Received: from mail-pl0-x242.google.com ([2607:f8b0:400e:c01::242]:34081) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1emnzP-0007Pv-Jv for qemu-devel@nongnu.org; Fri, 16 Feb 2018 16:56:19 -0500 Received: by mail-pl0-x242.google.com with SMTP id bd10so2396504plb.1 for ; Fri, 16 Feb 2018 13:56:19 -0800 (PST) Received: from cloudburst.twiddle.net ([50.0.192.64]) by smtp.gmail.com with ESMTPSA id b88sm39230538pfd.108.2018.02.16.13.56.16 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 16 Feb 2018 13:56:17 -0800 (PST) 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; bh=pnJnOBb4bnqWYBFZVnu+EyVcw82Gc2SEw4s7fOWRy0A=; b=hEcP2Z0OmTnPITCTHhOrG4qZNMX2ku5vHoqTN+NJN5rDhfhv7UJA4m6JAVC8G53ocY QVomMhn0vqkK2EjkZYWhUzgOsE+M8AlI1yMmRu9OoV7OhbIzST8eKfs3vKjKzO7dvjH0 MxJb/EdC/dlD/WrUDIKhxGav6BwCdJMHF4rzg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=pnJnOBb4bnqWYBFZVnu+EyVcw82Gc2SEw4s7fOWRy0A=; b=loTILtl0CX5wwt2t49vghUp0QlueGPfI7VJH+QfzTMz0wFj5BujfoYOaB/sGsxQ51E OcxLgkLi9hi5bAJJaW2WKJIL1gBojknJpaN9AenzZNCq49AJtLOt508tl0qqK4sYnBKR XYY0wQ884EEvB3xSn8gbIRJ8NSQonyMEj//4eW/V1qbTopBNp8H2cujlzgkF23zTlNCT RGnH+SFl6DxqBngPskPoWlY1ydfwzurW2j5Cr5t17jndZN1nKPVqItpmhS4eaKcgon7b bOGLJycvckvobsoah8sX8jwp25XY3LK4tXMfS5UdHGapA8thZ3rcQ0S2G/noY9FhAA5E t3OQ== X-Gm-Message-State: APf1xPCYTX77AZSXi2zsw7bQcjSYMuGz7xo2IV9wGisU4pT0f3W7CTxi OD18qt0Du2ulaoU2i5Pkjmjuobx5WWQ= X-Google-Smtp-Source: AH8x2263fU/j7crXiCKGnXfQgIVSf1UEz4ProzI6b6sW5gZ1vdgl9kO+6BieR0M274TKo1Ct6z5gkA== X-Received: by 2002:a17:902:7841:: with SMTP id e1-v6mr7017559pln.130.1518818178260; Fri, 16 Feb 2018 13:56:18 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 16 Feb 2018 13:56:07 -0800 Message-Id: <20180216215608.13227-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180216215608.13227-1-richard.henderson@linaro.org> References: <20180216215608.13227-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c01::242 Subject: [Qemu-devel] [PATCH v3 4/5] aarch64-linux-user: Add support for EXTRA signal frame records 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: , Cc: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The EXTRA record allows for additional space to be allocated beyon what is currently reserved. Add code to emit and read this record type. Nothing uses extra space yet. Signed-off-by: Richard Henderson --- linux-user/signal.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++= ---- 1 file changed, 51 insertions(+), 4 deletions(-) diff --git a/linux-user/signal.c b/linux-user/signal.c index f9eef3d753..ca0ba28c98 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -1443,6 +1443,15 @@ struct target_fpsimd_context { uint64_t vregs[32 * 2]; /* really uint128_t vregs[32] */ }; =20 +#define TARGET_EXTRA_MAGIC 0x45585401 + +struct target_extra_context { + struct target_aarch64_ctx head; + uint64_t datap; /* 16-byte aligned pointer to extra space cast to __u6= 4 */ + uint32_t size; /* size in bytes of the extra space */ + uint32_t reserved[3]; +}; + struct target_rt_sigframe { struct target_siginfo info; struct target_ucontext uc; @@ -1502,6 +1511,15 @@ static void target_setup_fpsimd_record(struct target= _fpsimd_context *fpsimd, } } =20 +static void target_setup_extra_record(struct target_extra_context *extra, + uint64_t datap, uint32_t extra_size) +{ + __put_user(TARGET_EXTRA_MAGIC, &extra->head.magic); + __put_user(sizeof(struct target_extra_context), &extra->head.size); + __put_user(datap, &extra->datap); + __put_user(extra_size, &extra->size); +} + static void target_setup_end_record(struct target_aarch64_ctx *end) { __put_user(0, &end->magic); @@ -1554,14 +1572,16 @@ static void target_restore_fpsimd_record(CPUARMStat= e *env, static int target_restore_sigframe(CPUARMState *env, struct target_rt_sigframe *sf) { - struct target_aarch64_ctx *ctx; + struct target_aarch64_ctx *ctx, *extra =3D NULL; struct target_fpsimd_context *fpsimd =3D NULL; + uint64_t extra_datap =3D 0; + bool used_extra =3D false; =20 target_restore_general_frame(env, sf); =20 ctx =3D (struct target_aarch64_ctx *)sf->uc.tuc_mcontext.__reserved; while (ctx) { - uint32_t magic, size; + uint32_t magic, size, extra_size; =20 __get_user(magic, &ctx->magic); __get_user(size, &ctx->size); @@ -1570,7 +1590,12 @@ static int target_restore_sigframe(CPUARMState *env, if (size !=3D 0) { return 1; } - ctx =3D NULL; + if (used_extra) { + ctx =3D NULL; + } else { + ctx =3D extra; + used_extra =3D true; + } continue; =20 case TARGET_FPSIMD_MAGIC: @@ -1580,6 +1605,17 @@ static int target_restore_sigframe(CPUARMState *env, fpsimd =3D (struct target_fpsimd_context *)ctx; break; =20 + case TARGET_EXTRA_MAGIC: + if (extra || size !=3D sizeof(struct target_extra_context)) { + return 1; + } + __get_user(extra_datap, + &((struct target_extra_context *)ctx)->datap); + __get_user(extra_size, + &((struct target_extra_context *)ctx)->size); + extra =3D lock_user(VERIFY_READ, extra_datap, extra_size, 0); + break; + default: /* Unknown record -- we certainly didn't generate it. * Did we in fact get out of sync? @@ -1595,6 +1631,9 @@ static int target_restore_sigframe(CPUARMState *env, } target_restore_fpsimd_record(env, fpsimd); =20 + if (extra) { + unlock_user(extra, extra_datap, 0); + } return 0; } =20 @@ -1621,7 +1660,8 @@ static void target_setup_frame(int usig, struct targe= t_sigaction *ka, CPUARMState *env) { int size =3D offsetof(struct target_rt_sigframe, uc.tuc_mcontext.__res= erved); - int fpsimd_ofs, end1_ofs, fr_ofs; + int fpsimd_ofs, end1_ofs, fr_ofs, end2_ofs =3D 0; + int extra_ofs =3D 0, extra_base =3D 0, extra_size =3D 0; struct target_rt_sigframe *frame; struct target_rt_frame_record *fr; abi_ulong frame_addr, return_addr; @@ -1641,7 +1681,14 @@ static void target_setup_frame(int usig, struct targ= et_sigaction *ka, =20 target_setup_general_frame(frame, env, set); target_setup_fpsimd_record((void *)frame + fpsimd_ofs, env); + if (extra_ofs) { + target_setup_extra_record((void *)frame + extra_ofs, + frame_addr + extra_base, extra_size); + } target_setup_end_record((void *)frame + end1_ofs); + if (end2_ofs) { + target_setup_end_record((void *)frame + end2_ofs); + } =20 /* Set up the stack frame for unwinding. */ fr =3D (void *)frame + fr_ofs; --=20 2.14.3