From nobody Sat Oct 25 08:55:14 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 1520088208836443.0470140928288; Sat, 3 Mar 2018 06:43:28 -0800 (PST) Received: from localhost ([::1]:40515 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1es8Nj-0001YK-UJ for importer@patchew.org; Sat, 03 Mar 2018 09:43:27 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56876) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1es8J1-000691-B0 for qemu-devel@nongnu.org; Sat, 03 Mar 2018 09:38:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1es8J0-0003wo-8V for qemu-devel@nongnu.org; Sat, 03 Mar 2018 09:38:35 -0500 Received: from mail-wr0-x241.google.com ([2a00:1450:400c:c0c::241]:35392) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1es8J0-0003wR-03 for qemu-devel@nongnu.org; Sat, 03 Mar 2018 09:38:34 -0500 Received: by mail-wr0-x241.google.com with SMTP id l43so12899022wrc.2 for ; Sat, 03 Mar 2018 06:38:33 -0800 (PST) Received: from cloudburst.twiddle.net ([37.205.61.206]) by smtp.gmail.com with ESMTPSA id 4sm2732686wmz.31.2018.03.03.06.38.31 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 03 Mar 2018 06:38:31 -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=TzbfQHhRuCXJGiOFy0Tfsa3XjAPdBD+AVNn/qejvqyY=; b=hx6NL43fVhtQWG7PX5fjtXNseFHPToq0LApuS5efWPyMEQsUTX9oeMovpNrtx0HAdG nlJT/bOrlkTgKsax5mqQBtXPMQy5bsmiPGLajkKBFaUGDlQTLNrRYKTMCjeM4yBZP6m5 VgxHazsxc1OiwSQgm3VL3K8rPkdxkDKTQXqhg= 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=TzbfQHhRuCXJGiOFy0Tfsa3XjAPdBD+AVNn/qejvqyY=; b=CRcJ8vbF6W4zM6sB37pT2LEteRUU20fyZW/x5mHpbeMkiGf/Urg+MyI9py6qxcFpbW DY0JZC1URM/cUc7NLAbtQVG9MhMD+soOGGDcLTMw1Ha0LsVTiwY0Zlly9540lKU3Lfey F+EhjWMWyNy9vIyEBRBmnTtk7N0zc2YXrTvX4ratpCWax+DTSrIxJHS8cHGvXsGT/X11 +a4S4fpu+rprsqhwsv2lpU9Vszfh7Rw1r0B1QojyKGELmS//AHSkuwBbCP4xHrIcIeon ItC5uwnhUEv+nKQj2fFI1nV563ULR/6j3GEowmxN28Zai8IFbcKx0VtqJVJwrmXG5dzl z7jA== X-Gm-Message-State: APf1xPD0Id4zvS156BTkQx2pVFThAhfT53kbtyMo9aeO0Zg2DTXeJAFb xZQGVnX95ycLpYU1MQ0TWpHN/hoNphc= X-Google-Smtp-Source: AG47ELsAi1mP5StWQwItrJ8rtG7NrRFA8fGYWLxiJsCBfYRg0ZJLZXcrcXrsAMFO2lDKPdBx/Xon6A== X-Received: by 10.223.195.147 with SMTP id p19mr8203044wrf.224.1520087912713; Sat, 03 Mar 2018 06:38:32 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sat, 3 Mar 2018 14:38:22 +0000 Message-Id: <20180303143823.27055-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180303143823.27055-1-richard.henderson@linaro.org> References: <20180303143823.27055-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::241 Subject: [Qemu-devel] [PATCH v4 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: qemu-arm@nongnu.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 Reviewed-by: Alex Benn=C3=A9e --- linux-user/signal.c | 74 +++++++++++++++++++++++++++++++++++++++++++++----= ---- 1 file changed, 63 insertions(+), 11 deletions(-) diff --git a/linux-user/signal.c b/linux-user/signal.c index f9eef3d753..c31cf0601d 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,48 +1572,74 @@ 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; + bool err =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); switch (magic) { case 0: if (size !=3D 0) { - return 1; + err =3D true; + goto exit; + } + if (used_extra) { + ctx =3D NULL; + } else { + ctx =3D extra; + used_extra =3D true; } - ctx =3D NULL; continue; =20 case TARGET_FPSIMD_MAGIC: if (fpsimd || size !=3D sizeof(struct target_fpsimd_context)) { - return 1; + err =3D true; + goto exit; } fpsimd =3D (struct target_fpsimd_context *)ctx; break; =20 + case TARGET_EXTRA_MAGIC: + if (extra || size !=3D sizeof(struct target_extra_context)) { + err =3D true; + goto exit; + } + __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? */ - return 1; + err =3D true; + goto exit; } ctx =3D (void *)ctx + size; } =20 /* Require FPSIMD always. */ - if (!fpsimd) { - return 1; + if (fpsimd) { + target_restore_fpsimd_record(env, fpsimd); + } else { + err =3D true; } - target_restore_fpsimd_record(env, fpsimd); =20 - return 0; + exit: + unlock_user(extra, extra_datap, 0); + return err; } =20 static abi_ulong get_sigframe(struct target_sigaction *ka, CPUARMState *en= v) @@ -1621,7 +1665,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 +1686,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