From patchwork Tue Aug 22 17:02:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 1824287 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=XMnQBulD; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RVbJl4tjMz1ybW for ; Wed, 23 Aug 2023 03:03:19 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qYUlp-0008QK-AK; Tue, 22 Aug 2023 13:02:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qYUlm-0008Mg-9v for qemu-devel@nongnu.org; Tue, 22 Aug 2023 13:02:18 -0400 Received: from mail-pj1-x102d.google.com ([2607:f8b0:4864:20::102d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qYUli-0002KC-7B for qemu-devel@nongnu.org; Tue, 22 Aug 2023 13:02:18 -0400 Received: by mail-pj1-x102d.google.com with SMTP id 98e67ed59e1d1-26b41112708so3226227a91.3 for ; Tue, 22 Aug 2023 10:02:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1692723732; x=1693328532; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=jVHhYuUKW52ubI148rbZcLTzbA6J0OmH3AziT1EPcOU=; b=XMnQBulDR4Ustiqol4myQIFiIOepUtO3YNk1jNTdWULlrrRjHTDaoMH7qyfedBcokR w2JDYrivaWMb8XVbjX+VHbd6za7n6bldANm8SngfSG+FYqmPRm14+wqT8LHIWe8D2wEC EHBjuprO4G36Wg8TR46ThSjxqENMPNEkQxG0JzcQAN6DFGc3bjaPLvC7fWyCqV4vQiD1 llBbJO5nMRWleoMU3QIlmdS0pYrv2p5HQB7iOUufZgvSj6BgyW77GvLFI06YAmpAPhkK h1dfTQ5Mc/t7CWkwUtfQmPo8jSvdBSbpBawYmUISUFfQPo4yI9PhHSvnItdrnrSZXphO vMLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692723732; x=1693328532; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jVHhYuUKW52ubI148rbZcLTzbA6J0OmH3AziT1EPcOU=; b=GWUr7rDkIREEeyd8UMGQU01ZdnV+Xo8biQpdI9Z2Y/3DZ6RpzEh7ygwdpP4QHUPgVW 8A5HtNyYyWWvSN2u5jf1EJvcj2Q8GUcNFuaJlsAEfmh5sCXxzlqi/BoOKPjbkZDEs4h+ cMlolvJMb5JffSL8HH1+UFofEmbVYqfoEAr6zFRlzFNpAqt+bEKtOx/8talF5xm9DUOv u12FFb9PAaImHjwcTbvFKn34IBKnOs8iZGIF3aTOQ4hNQpsUBJssRUK6UbbV8rgPVbkO r0oB417Fv5KKo+pabXSiKEMyqOnA7+WbcXLPlpUdF7Bx48YlbRc3MV+tfkraoi9/MkVN WqQQ== X-Gm-Message-State: AOJu0YzqwYTSfmUGK/irTYTr4XQo7VDEvRKZeq5nvmVbNBosIXyjrhJQ JTKxWtR1uguvmdRnPx1Kyr0Sjjp40YmqJINqyK0= X-Google-Smtp-Source: AGHT+IH5vZ+iq9e2/moJ+aEuvtAOTe1Pqjenyu54E5IPgy17Vm3wobdEog31vjhtqTIpDstQHYazjw== X-Received: by 2002:a17:90a:e7cd:b0:26b:5758:8a04 with SMTP id kb13-20020a17090ae7cd00b0026b57588a04mr8860306pjb.29.1692723731936; Tue, 22 Aug 2023 10:02:11 -0700 (PDT) Received: from stoup.. ([2602:47:d483:7301:4e3c:f4a4:b92a:b5ab]) by smtp.gmail.com with ESMTPSA id 27-20020a17090a031b00b00264040322desm8761121pje.40.2023.08.22.10.02.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Aug 2023 10:02:11 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH 1/3] linux-user/aarch64: Add ESR signal frame for SIGSEGV, SIGBUS Date: Tue, 22 Aug 2023 10:02:07 -0700 Message-Id: <20230822170209.1130173-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230822170209.1130173-1-richard.henderson@linaro.org> References: <20230822170209.1130173-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102d; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102d.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org These are all synchronous exceptions for which the kernel passes on ESR to the user signal handler. Signed-off-by: Richard Henderson --- linux-user/aarch64/signal.c | 48 ++++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/linux-user/aarch64/signal.c b/linux-user/aarch64/signal.c index b265cfd470..b2280fa9e3 100644 --- a/linux-user/aarch64/signal.c +++ b/linux-user/aarch64/signal.c @@ -21,6 +21,7 @@ #include "user-internals.h" #include "signal-common.h" #include "linux-user/trace.h" +#include "target/arm/syndrome.h" struct target_sigcontext { uint64_t fault_address; @@ -64,6 +65,13 @@ struct target_fpsimd_context { uint64_t vregs[32 * 2]; /* really uint128_t vregs[32] */ }; +#define TARGET_ESR_MAGIC 0x45535201 + +struct target_esr_context { + struct target_aarch64_ctx head; + uint64_t esr; +}; + #define TARGET_EXTRA_MAGIC 0x45585401 struct target_extra_context { @@ -191,6 +199,14 @@ static void target_setup_end_record(struct target_aarch64_ctx *end) __put_user(0, &end->size); } +static void target_setup_esr_record(struct target_esr_context *esr, + CPUARMState *env) +{ + __put_user(TARGET_ESR_MAGIC, &esr->head.magic); + __put_user(sizeof(struct target_esr_context), &esr->head.size); + __put_user(env->exception.syndrome, &esr->esr); +} + static void target_setup_sve_record(struct target_sve_context *sve, CPUARMState *env, int size) { @@ -443,6 +459,10 @@ static int target_restore_sigframe(CPUARMState *env, fpsimd = (struct target_fpsimd_context *)ctx; break; + case TARGET_ESR_MAGIC: + /* ignore */ + break; + case TARGET_SVE_MAGIC: if (sve || size < sizeof(struct target_sve_context)) { goto err; @@ -558,6 +578,23 @@ static int alloc_sigframe_space(int this_size, target_sigframe_layout *l) return this_loc; } +static bool need_save_esr(target_siginfo_t *info, CPUARMState *env) +{ + int sig = info->si_signo; + int type = info->si_code >> 16; + + if (type != QEMU_SI_FAULT) { + return false; + } + + /* See arch/arm64/mm/fault.c, set_thread_esr. */ + if (sig == TARGET_SIGSEGV || sig == TARGET_SIGBUS) { + return true; + } + + return false; +} + static void target_setup_frame(int usig, struct target_sigaction *ka, target_siginfo_t *info, target_sigset_t *set, CPUARMState *env) @@ -567,7 +604,7 @@ static void target_setup_frame(int usig, struct target_sigaction *ka, .total_size = offsetof(struct target_rt_sigframe, uc.tuc_mcontext.__reserved), }; - int fpsimd_ofs, fr_ofs, sve_ofs = 0, za_ofs = 0; + int fpsimd_ofs, fr_ofs, esr_ofs = 0, sve_ofs = 0, za_ofs = 0; int sve_size = 0, za_size = 0; struct target_rt_sigframe *frame; struct target_rt_frame_record *fr; @@ -577,6 +614,12 @@ static void target_setup_frame(int usig, struct target_sigaction *ka, fpsimd_ofs = alloc_sigframe_space(sizeof(struct target_fpsimd_context), &layout); + /* ESR state needs saving only for certain signals. */ + if (need_save_esr(info, env)) { + esr_ofs = alloc_sigframe_space(sizeof(struct target_esr_context), + &layout); + } + /* SVE state needs saving only if it exists. */ if (cpu_isar_feature(aa64_sve, env_archcpu(env)) || cpu_isar_feature(aa64_sme, env_archcpu(env))) { @@ -637,6 +680,9 @@ static void target_setup_frame(int usig, struct target_sigaction *ka, layout.extra_size); target_setup_end_record((void *)frame + layout.extra_end_ofs); } + if (esr_ofs) { + target_setup_esr_record((void *)frame + esr_ofs, env); + } if (sve_ofs) { target_setup_sve_record((void *)frame + sve_ofs, env, sve_size); } From patchwork Tue Aug 22 17:02:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 1824286 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=dit81IQt; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RVbJh4kWLz1ybW for ; Wed, 23 Aug 2023 03:03:16 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qYUlp-0008Qj-MR; Tue, 22 Aug 2023 13:02:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qYUlm-0008Mf-9e for qemu-devel@nongnu.org; Tue, 22 Aug 2023 13:02:18 -0400 Received: from mail-pg1-x531.google.com ([2607:f8b0:4864:20::531]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qYUli-0002KM-J6 for qemu-devel@nongnu.org; Tue, 22 Aug 2023 13:02:17 -0400 Received: by mail-pg1-x531.google.com with SMTP id 41be03b00d2f7-56b2e689968so1412523a12.0 for ; Tue, 22 Aug 2023 10:02:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1692723733; x=1693328533; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=dyMnZPF0lJjltNxI1ShT7iDXd4Rf74ljeip+pJOFsn0=; b=dit81IQtr9lfNtbpySaog6AF/9oRIkx9V7RygsWQidvLYVLi9fnigzpNP4lu1CUD5Y vjDm3cjTQAMzrUCjLSTSKKWpMq46MPpAWAWzhAChI0MB3f/V5nJRivZh2ys2VI2HC66S UTr6ugff/0eDFDDJlFhflP1fYGfGr4/DmOYirn2X7Js8cpHI9FoqJGhdpuxU1gp3mm3m by2BueWZPZjweDmjYAytIG6BRaUEfO7YgWJydE8CZKaMv9DUBx+qbe7FjnuqHKZkqquc yA6n/HWAXWLfbolW674rVaE6eRPB4TRn/eWvqREfKZOgTvkCySG7Dq8Q6UNAMFghVRx2 zicg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692723733; x=1693328533; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dyMnZPF0lJjltNxI1ShT7iDXd4Rf74ljeip+pJOFsn0=; b=fh3Caxbx48hppg27p1jl0I39npd+GtORQ79k5EjYOsFOImYS+Gb9jDPbeskiYFmGat CWf0+t3X7EpjX3ke+oLAuX32ZOD2/rGQvJ8bLLA6Oq7295frzHbyaenRiRvfRMBaUMSY cavGHiUR8ZY7Iaw5zrVhE2Z/L1wExzrgf+Vxj3ANvg/+MdqEyN7hppmVyJHSUY6miqaX fMBI0hUcwYzwKU+EZJp7y0y3mbPp/6xJLPXHg4YaXI3W6s0+78GnkFhpGz7HWijncbz8 v7Q+KxX8+M6tqMI/AR3vsr/VkDYupSd1t5DaoZv6vObYkcXhDlXhpTphHe9v/62OqgGC oQgQ== X-Gm-Message-State: AOJu0Ywut+Z5twE9GUG/HiP8B8W1iBpUSN+9NiQI+EtsH+TQHWgNBEGC Xvo+FfmMsOHGJO+89SGadb2EBkunA0e6BIW/PWk= X-Google-Smtp-Source: AGHT+IFwVWd2NXKc1hR0xqNWZZxnWw5etzjFJtVofHOFj9Rq2qxmfi32s5+e6DXxwfliywQwRqjUxQ== X-Received: by 2002:a17:90b:1d06:b0:26d:b12:8383 with SMTP id on6-20020a17090b1d0600b0026d0b128383mr7476481pjb.8.1692723732847; Tue, 22 Aug 2023 10:02:12 -0700 (PDT) Received: from stoup.. ([2602:47:d483:7301:4e3c:f4a4:b92a:b5ab]) by smtp.gmail.com with ESMTPSA id 27-20020a17090a031b00b00264040322desm8761121pje.40.2023.08.22.10.02.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Aug 2023 10:02:12 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH 2/3] linux-user/aarch64: Fix normal SIGILL si_code Date: Tue, 22 Aug 2023 10:02:08 -0700 Message-Id: <20230822170209.1130173-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230822170209.1130173-1-richard.henderson@linaro.org> References: <20230822170209.1130173-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::531; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x531.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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Most illegal instructions use ILL_ILLOPC. Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- linux-user/aarch64/cpu_loop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-user/aarch64/cpu_loop.c b/linux-user/aarch64/cpu_loop.c index 2e2f7cf218..22c9789326 100644 --- a/linux-user/aarch64/cpu_loop.c +++ b/linux-user/aarch64/cpu_loop.c @@ -110,7 +110,7 @@ void cpu_loop(CPUARMState *env) /* just indicate that signals should be handled asap */ break; case EXCP_UDEF: - force_sig_fault(TARGET_SIGILL, TARGET_ILL_ILLOPN, env->pc); + force_sig_fault(TARGET_SIGILL, TARGET_ILL_ILLOPC, env->pc); break; case EXCP_PREFETCH_ABORT: case EXCP_DATA_ABORT: From patchwork Tue Aug 22 17:02:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 1824284 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=pxAWm1bh; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RVbJ616gdz1ybW for ; Wed, 23 Aug 2023 03:02:46 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qYUls-00008s-NV; Tue, 22 Aug 2023 13:02:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qYUlo-0008Oe-8F for qemu-devel@nongnu.org; Tue, 22 Aug 2023 13:02:20 -0400 Received: from mail-pf1-x434.google.com ([2607:f8b0:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qYUlk-0002Kq-1O for qemu-devel@nongnu.org; Tue, 22 Aug 2023 13:02:20 -0400 Received: by mail-pf1-x434.google.com with SMTP id d2e1a72fcca58-68a1af910e0so2182574b3a.2 for ; Tue, 22 Aug 2023 10:02:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1692723734; x=1693328534; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=WtbxWpkqRs8uhBP9ntrNj0PDPLSc0E50BaiAIV/fKrE=; b=pxAWm1bhjnUv47l+4NiL/g0E8FPIh8B7RFTGlGDQAOLjCP0Cvv8IBPmduyHQJC3vn1 bKgjUHx0n/J+Q3BJabLrwvezQPUm3yF7c1WcPagV6d7r250tqNW5eCc37dFretT8O2Wx JLlTIzvkI5qWBYgb4GiBBRXiQZwwY18On3PYSkFgtJAW//xR+jFBxXU3HBQkbWWn61Hm MO9UYwf4NBaHWsHxU0R8pzmsjXtZAWS9ALwFiVzdH501Auur+lrs0MbnRk4sBQeP9DBd Y1fEXHdnHavYJrp1vw46jI1ugMQ+mTnPR6bnGn1DHzFtywBtOZRkms5vhWoXNOZvmLnU c4hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692723734; x=1693328534; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WtbxWpkqRs8uhBP9ntrNj0PDPLSc0E50BaiAIV/fKrE=; b=QaVCph3ExmkmX5rIJkYQ50gfVfEHSLYwKMaBD6z1hcxFZZat7ombRn16tHFa/nCm7k BovE0J9GjbUMN4yNGiTbgC4dVdgaIWj42+x4HOe0Ks8pz7Z+/OZXUFM+6BsE6iQHGZSZ 5Gny9oNcVpG7gv98y8ti8tC6dqTjhHrR0ckEsYzlIgjQ5jgfeoPE+AdvjdsCPE5DHM5I N7rV8ThOv/+rdsbAG0nfidIWk7kq17Av6umXtfjNShNROH2EQki7GqFAz3MLpZsG6D2v fYOgsrPUtxMhI6F+P5U/jVA0bBc1jH/PCGpiglwNiymvAQvkl3MdCmNZqyUuq2YqHk1T E96w== X-Gm-Message-State: AOJu0YytxXswwTw9bv/MIF0vFkwzg40N4yy5QdlAleeeAcASK97im6Fy unCU84A70q+1F1b/PyRCmjFK44nT0DuaR1o/rpw= X-Google-Smtp-Source: AGHT+IHeJBztbYQIrkoB+uCz6JDrez/Cyin6MKp5CkcMoXU+chQ8sgo9jTWo99VSLHuwF4o3mn0BIQ== X-Received: by 2002:a17:90a:854c:b0:26d:1201:a8c4 with SMTP id a12-20020a17090a854c00b0026d1201a8c4mr7659567pjw.13.1692723733890; Tue, 22 Aug 2023 10:02:13 -0700 (PDT) Received: from stoup.. ([2602:47:d483:7301:4e3c:f4a4:b92a:b5ab]) by smtp.gmail.com with ESMTPSA id 27-20020a17090a031b00b00264040322desm8761121pje.40.2023.08.22.10.02.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Aug 2023 10:02:13 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH 3/3] linux-user/aarch64: Add ESR signal frame for PACFAIL Date: Tue, 22 Aug 2023 10:02:09 -0700 Message-Id: <20230822170209.1130173-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230822170209.1130173-1-richard.henderson@linaro.org> References: <20230822170209.1130173-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::434; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x434.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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The PACFAIL fault uses ILL_ILLOPN and includes ESR. Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- linux-user/aarch64/cpu_loop.c | 7 ++++++- linux-user/aarch64/signal.c | 6 ++++++ tests/tcg/aarch64/pauth-2.c | 25 ++++++++++++++++++++++++- 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/linux-user/aarch64/cpu_loop.c b/linux-user/aarch64/cpu_loop.c index 22c9789326..5af17e8724 100644 --- a/linux-user/aarch64/cpu_loop.c +++ b/linux-user/aarch64/cpu_loop.c @@ -110,7 +110,12 @@ void cpu_loop(CPUARMState *env) /* just indicate that signals should be handled asap */ break; case EXCP_UDEF: - force_sig_fault(TARGET_SIGILL, TARGET_ILL_ILLOPC, env->pc); + /* See kernel's do_el0_fpac, and our need_save_esr(). */ + if (syn_get_ec(env->exception.syndrome) == EC_PACFAIL) { + force_sig_fault(TARGET_SIGILL, TARGET_ILL_ILLOPN, env->pc); + } else { + force_sig_fault(TARGET_SIGILL, TARGET_ILL_ILLOPC, env->pc); + } break; case EXCP_PREFETCH_ABORT: case EXCP_DATA_ABORT: diff --git a/linux-user/aarch64/signal.c b/linux-user/aarch64/signal.c index b2280fa9e3..bcdd796cc2 100644 --- a/linux-user/aarch64/signal.c +++ b/linux-user/aarch64/signal.c @@ -582,6 +582,7 @@ static bool need_save_esr(target_siginfo_t *info, CPUARMState *env) { int sig = info->si_signo; int type = info->si_code >> 16; + int code = info->si_code & 0xffff; if (type != QEMU_SI_FAULT) { return false; @@ -592,6 +593,11 @@ static bool need_save_esr(target_siginfo_t *info, CPUARMState *env) return true; } + /* See arch/arm64/kernel/traps.c, do_el0_fpac, and our cpu_loop(). */ + if (sig == TARGET_SIGILL && code == TARGET_ILL_ILLOPN) { + return true; + } + return false; } diff --git a/tests/tcg/aarch64/pauth-2.c b/tests/tcg/aarch64/pauth-2.c index d498d7dd8b..62b39af3d0 100644 --- a/tests/tcg/aarch64/pauth-2.c +++ b/tests/tcg/aarch64/pauth-2.c @@ -4,14 +4,37 @@ #include #include +static inline struct _aarch64_ctx *first_ctx(ucontext_t *uc) +{ + return (struct _aarch64_ctx *)&uc->uc_mcontext.__reserved; +} + +static inline struct _aarch64_ctx *next_ctx(struct _aarch64_ctx *hdr) +{ + return (struct _aarch64_ctx *)((char *)hdr + hdr->size); +} + static void sigill(int sig, siginfo_t *info, void *vuc) { ucontext_t *uc = vuc; - uint64_t test; + struct _aarch64_ctx *hdr; + struct esr_context *ec; + uint64_t test, esr; /* There is only one insn below that is allowed to fault. */ asm volatile("adr %0, auth2_insn" : "=r"(test)); assert(test == uc->uc_mcontext.pc); + + /* Find the esr_context. */ + for (hdr = first_ctx(uc); hdr->magic != ESR_MAGIC; hdr = next_ctx(hdr)) { + assert(hdr->magic != 0); + } + + ec = (struct esr_context *)hdr; + esr = ec->esr; + + assert((esr >> 26) == 0x1c); /* EC_PACFAIL */ + assert((esr & 3) == 2); /* AUTDA: data=1 key=0 */ exit(0); }