From patchwork Tue Mar 25 06:50:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 875992 Delivered-To: patch@linaro.org Received: by 2002:a5d:5f4c:0:b0:38f:210b:807b with SMTP id cm12csp2505075wrb; Mon, 24 Mar 2025 23:58:26 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW9MILi91TLDWcHVzgTKazw4SbnGhlpZeWXcidpVqfNUuzXvQFAo5xSWo4jDx4T+0c5xk0jyw==@linaro.org X-Google-Smtp-Source: AGHT+IHhTce+5qFLAtGKmT3EmzIYRJ8XCbdrvGU/jLTRnEwX/VZ5dLQ3b9/AYffck4kB7U+U2GU5 X-Received: by 2002:a5d:5f92:0:b0:391:98b:e5b3 with SMTP id ffacd0b85a97d-3997f90f66emr15236530f8f.14.1742885906591; Mon, 24 Mar 2025 23:58:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742885906; cv=none; d=google.com; s=arc-20240605; b=BT5bjP7yYyv4tutC6SinNK1k5vA59XIEb6x0T/f++WA3UZ9UU2OnFooYVad6cQaFdc aACxbFeXJLNq1c42yX/hhtPOzCZPJdwvULfCPRnT4Tgbo5PZi4e0gKI5ss8YhGtG024o mZss9OeQosGcfiYAm6ZqhihdlW7doMc8YHD5YzuAIl9nrm1aj2jkvh1E9HTa3gnXNq7o bu6FT+Kc/Eyd4bLM8ttysRKWfHLCsV8Pr3W4ksBDUCzdyJpIqVZ1zw5ub4d0/4yBhGMu h2bLkPALrzVNiq1PNcHKxkUxS/KiJ3HSKchpmDuXgyapDOxqKUZfkvXpGtFkEOTWlu0G zODQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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; bh=rkbbip6HCC/Lo5i4ywIWvmUOb+EFhtbFHt0Thryq+dc=; fh=NoJ7n5JVE2hviRF6uNBFRIJvWH7igafuy1AIwg26ToM=; b=bzk8eYtm0u8rk0bwhDcR/BkQ/RtANXWB5dZbA++3s5Y5a3D0D/RX8QSSHQ5xXbIpVa lNKltgZtYfB1r/74WJ+dEZw+jOTlXOq3brE46EkhPwsS9zTnm9PzRRneAAgWhdgFeTQD AP0kUI5TDZ/8TBA1u9T/b9g4nHn4XxE9OYIwvtKfhG3/JSzHAPigNt9LutAwhXqi8YK9 UVAhczbZT6J5xFWuZ6QeInWlHbIhCb2qDV4kOfjiuxZdsal7BHCs2krgkz+JLeRiEMej EbKl4SAVOigakVV6wlLdvx73mw5MUM03ADn+aA+GTMwSuGMPttfpFIpAcum+eCICB1AB xBwA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ffacd0b85a97d-3997f9da9c1si7255433f8f.447.2025.03.24.23.58.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Mar 2025 23:58: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; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1twyBD-0001Y1-1T; Tue, 25 Mar 2025 02:54:31 -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 1twy8y-0005Ys-B5; Tue, 25 Mar 2025 02:52:17 -0400 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1twy8t-0001vf-HR; Tue, 25 Mar 2025 02:52:12 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id D3007107D78; Tue, 25 Mar 2025 09:49:33 +0300 (MSK) Received: from gandalf.tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with ESMTP id 75BC11D5E83; Tue, 25 Mar 2025 09:50:43 +0300 (MSK) Received: by gandalf.tls.msk.ru (Postfix, from userid 1000) id 718945704E; Tue, 25 Mar 2025 09:50:43 +0300 (MSK) From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Richard Henderson , Peter Maydell , Michael Tokarev Subject: [Stable-9.2.3 53/69] target/arm: Simplify pstate_sm check in sve_access_check Date: Tue, 25 Mar 2025 09:50:27 +0300 Message-Id: <20250325065043.3263864-3-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.5 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Richard Henderson In StreamingMode, fp_access_checked is handled already. We cannot fall through to fp_access_check lest we fall foul of the double-check assertion. Cc: qemu-stable@nongnu.org Fixes: 285b1d5fcef ("target/arm: Handle SME in sve_access_check") Signed-off-by: Richard Henderson Message-id: 20250307190415.982049-3-richard.henderson@linaro.org Reviewed-by: Peter Maydell [PMM: move declaration of 'ret' to top of block] Signed-off-by: Peter Maydell (cherry picked from commit cc7abc35dfa790ba6c20473c03745428c1c626b6) Signed-off-by: Michael Tokarev diff --git a/target/arm/tcg/translate-a64.c b/target/arm/tcg/translate-a64.c index dc6af6ea25..422445aa1d 100644 --- a/target/arm/tcg/translate-a64.c +++ b/target/arm/tcg/translate-a64.c @@ -1247,23 +1247,23 @@ static bool fp_access_check(DisasContext *s) bool sve_access_check(DisasContext *s) { if (s->pstate_sm || !dc_isar_feature(aa64_sve, s)) { + bool ret; + assert(dc_isar_feature(aa64_sme, s)); - if (!sme_sm_enabled_check(s)) { - goto fail_exit; - } - } else if (s->sve_excp_el) { + ret = sme_sm_enabled_check(s); + s->sve_access_checked = (ret ? 1 : -1); + return ret; + } + if (s->sve_excp_el) { + /* Assert that we only raise one exception per instruction. */ + assert(!s->sve_access_checked); gen_exception_insn_el(s, 0, EXCP_UDEF, syn_sve_access_trap(), s->sve_excp_el); - goto fail_exit; + s->sve_access_checked = -1; + return false; } s->sve_access_checked = 1; return fp_access_check(s); - - fail_exit: - /* Assert that we only raise one exception per instruction. */ - assert(!s->sve_access_checked); - s->sve_access_checked = -1; - return false; } /*