From patchwork Tue Jun 7 20:32:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 579385 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:5806:0:0:0:0 with SMTP id j6csp5541410max; Tue, 7 Jun 2022 14:51:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx3xiUyu/UwY3NM+4+/dBLI4QhtEEbfoWORKd97sqeH3vaTPtkpwD1Z5OYt+kDU5Kg91oYK X-Received: by 2002:a05:6214:20e6:b0:46b:c28b:c6f5 with SMTP id 6-20020a05621420e600b0046bc28bc6f5mr3284770qvk.76.1654638686981; Tue, 07 Jun 2022 14:51:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654638686; cv=none; d=google.com; s=arc-20160816; b=mincCcXol/BWAnqsl6kuBLd8s8BYWC6z+Cjw939fS7UzlpqKh8+f5++dVIq0lagbc4 affWCWO9X7Ra/wqLtUu5XkBjTfYuPXJqKKr2IDzptp0u23qRoS3JzSji+2Z9h6O86j7O G2IGDARsfVBazpCGRTlPnx8FoJ9n/uSo/3REWJfL5Ob7QkcGDyuUgf28OIprOqUlbpBm Xe/b5R634+LaKUHfG5p4YSIHcGm31MG4PyQnFFD2SauCBY5a35SFY4oIe4Yx9w7bwzwL X7OTdKDE61A6k6pKi3/spxhyTELWW5Ns0mCL6wtERi2gZS0F/FNcIGcYFRAn3UWTjOmF NSXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=xCRHyiBxfCdHSn9JLF03/2mnxPSf+jP5kgzcaj+4wgM=; b=jicVqsj9fSwKupm5K+jXkJML7XPE8P3fnbU2WgBTrBrZWOpnihKdoqCtzA/DyZZN+a /vg4l2hrt1wUnHpsY9W+Jc6ZlqxnVrVRYHzHp5+rjNKeeQ4RnUXfurg1g5/k60LDLw4y cuDtKIRF1Rwwo0nORpWajVLWKoXCnuF2n20ELvGgCh3D8EeeG9Y+MyAo9U8CbXCdBo27 V00e1RNOe8BThlRrMneFz3QPN1RqyoDIuVHba+tlSaJmqVChKFJS201IOPjHJt5JnKj6 qNQqup07kaNlyxLO131A9Iw5URCBVXlzwy3eABdpNmSYdcozYpL0okAhtv6SfxcMuwB/ dreg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=N04GvOk4; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id k7-20020ad45be7000000b00469920ad31fsi257019qvc.40.2022.06.07.14.51.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 07 Jun 2022 14:51:26 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=N04GvOk4; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:34166 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nyh6k-0003gt-Ho for patch@linaro.org; Tue, 07 Jun 2022 17:51:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36144) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nyfwr-000723-3w for qemu-devel@nongnu.org; Tue, 07 Jun 2022 16:37:09 -0400 Received: from mail-pj1-x1033.google.com ([2607:f8b0:4864:20::1033]:53060) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nyfwk-0008JM-7Q for qemu-devel@nongnu.org; Tue, 07 Jun 2022 16:37:08 -0400 Received: by mail-pj1-x1033.google.com with SMTP id gd1so16677769pjb.2 for ; Tue, 07 Jun 2022 13:37:01 -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=xCRHyiBxfCdHSn9JLF03/2mnxPSf+jP5kgzcaj+4wgM=; b=N04GvOk4K5p0AnqkIX0Wj0j2pIcvfpejB8Rc6S3RpcwrjhQnEbeejrAnxu4RrPo1Dr lzqUdonhPpnmb7DTPjL9PP093FVHPpoMz0A2ssO1eptyOvbuhX2e7Zx1Xpajwe+o8rGq w//43SYKUhR+0JQXd1ivERrH5NxtiP1RNzz9WyXBV9/G/258j8kBHpH9EHUp6YVtJmZr PDy1DHsCVzyYTFxBuwrMJjMWjTYVZ1/9dwQX1LaVE0ovKX5UHn6pDMLmOrlV6SfLFEp0 Rlde28i3NsYB62+8Ozks30hrtI2yCxgeavAWb9wtdZhixdUOQI3CqUSrWhazf2d6jHRA pq/A== 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=xCRHyiBxfCdHSn9JLF03/2mnxPSf+jP5kgzcaj+4wgM=; b=5XcYXjOfyKjFZPGcBNDgrSqHO7XklKvWtKEDYcqpAMLulDG4dfhXAVAgTgYhXBoogm YHbTz1lebyolhaoLuvl+Cdo1PWuJzmrSZcjAuGmg8sQSVrTNpr7v5x63ei8yZDoJLFNl xcrpefur8YQqJdjCXr/cOiTXGYA90mKUDt2ZhqkPtDlmxkTM7lQNtOG1RscaJXy8SiRP dC0bGUow6ZhULkpSsed8Ied6YhQD3+QDRZqrbNC4Xv/aKhaD9yLx6K/rMwbYDhH8mps3 GgJM0UypipNoAOmMP11AabRY7b6Pp7boIhvK2qjTGX4CAK/g93lqusHSvTb6w90jwkUA W37Q== X-Gm-Message-State: AOAM533bCJQVFYdJ2YYoEF2NjFJayjNMLCFqCcJ7WtBa4nLtANPkp/Hb B8YxTArdcvzZl/w2ySR+SqLx6RGC8H48BQ== X-Received: by 2002:a17:903:2310:b0:167:5310:9f03 with SMTP id d16-20020a170903231000b0016753109f03mr21484018plh.48.1654634220842; Tue, 07 Jun 2022 13:37:00 -0700 (PDT) Received: from stoup.. ([2602:ae:1547:e101:3cf2:c634:5b19:25f6]) by smtp.gmail.com with ESMTPSA id s18-20020aa78d52000000b0050dc76281fdsm13235645pfe.215.2022.06.07.13.36.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jun 2022 13:37:00 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, qemu-arm@nongnu.org Subject: [PATCH v2 57/71] target/arm: Reset streaming sve state on exception boundaries Date: Tue, 7 Jun 2022 13:32:52 -0700 Message-Id: <20220607203306.657998-58-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220607203306.657998-1-richard.henderson@linaro.org> References: <20220607203306.657998-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1033; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1033.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, T_SCC_BODY_TEXT_LINE=-0.01 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We can handle both exception entry and exception return by hooking into aarch64_sve_change_el. Signed-off-by: Richard Henderson --- target/arm/helper.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/target/arm/helper.c b/target/arm/helper.c index 3e0326af58..205fbbbe42 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -14276,6 +14276,19 @@ void aarch64_sve_change_el(CPUARMState *env, int old_el, return; } + old_a64 = old_el ? arm_el_is_aa64(env, old_el) : el0_a64; + new_a64 = new_el ? arm_el_is_aa64(env, new_el) : el0_a64; + + /* + * Both AArch64.TakeException and AArch64.ExceptionReturn + * invoke ResetSVEState when taking an exception from, or + * returning to, AArch32 state when PSTATE.SM is enabled. + */ + if (old_a64 != new_a64 && FIELD_EX64(env->svcr, SVCR, SM)) { + arm_reset_sve_state(env); + return; + } + /* * DDI0584A.d sec 3.2: "If SVE instructions are disabled or trapped * at ELx, or not available because the EL is in AArch32 state, then @@ -14288,10 +14301,8 @@ void aarch64_sve_change_el(CPUARMState *env, int old_el, * we already have the correct register contents when encountering the * vq0->vq0 transition between EL0->EL1. */ - old_a64 = old_el ? arm_el_is_aa64(env, old_el) : el0_a64; old_len = (old_a64 && !sve_exception_el(env, old_el) ? sve_vqm1_for_el(env, old_el) : 0); - new_a64 = new_el ? arm_el_is_aa64(env, new_el) : el0_a64; new_len = (new_a64 && !sve_exception_el(env, new_el) ? sve_vqm1_for_el(env, new_el) : 0);