From patchwork Sat Mar 15 06:17:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 873826 Delivered-To: patch@linaro.org Received: by 2002:a5d:4308:0:b0:38f:210b:807b with SMTP id h8csp1060797wrq; Fri, 14 Mar 2025 23:19:23 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW9C9qfd8eBJG1H5nGpSIi+0r0l807vF1E3QN3P0RFu3jyTFBheWz34cQcY/gpwdLonP2v+mw==@linaro.org X-Google-Smtp-Source: AGHT+IEdXF7TATeV105aRmgvaCaRMPgBv0mqv7iVSlM3Shmew/w82qlDPmwNXqUsj496jJuqkTYs X-Received: by 2002:a05:620a:600d:b0:7c5:5756:298b with SMTP id af79cd13be357-7c57c832030mr642713585a.29.1742019562915; Fri, 14 Mar 2025 23:19:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742019562; cv=none; d=google.com; s=arc-20240605; b=WE9pvWQtECZfa9uflxaJm3JI8PaJMXk+EqBvcsIXARLzDIicXDzM1kEMRJ7+Z3hcP0 ZSxK87A7Scd/YfQq0fBe7NLMSH7Lu4yr2nYr74ETyDoUH5LHo1WanLHo0wqdTmhDUDb5 jzMHdzOl/02h/0mNvRLpmhURMqk2Qay6pKnAhcdip6R7m0A/R/JmAiK2f2ASyVsWDsH6 /jrRnuCDsmVWg+1YyWhVYizhN0XDPn8+Xz4kIpyszSH5KM4hAxLBycfXMiOY6aDPUMtg T2HLL6MU4V0dHZ7A+C5RYkldiD3nBvCtw+mMW1wXEVTOwv5kCXZtOZ7bszdZuvjov2Hp 6aWA== 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=tUljbdrUoa6DVY3jQVF9kAUSE+VPiwmpPvX/64Bm/ic=; fh=xJ1URYKcMN3TM0/XAv5v+aCN+5tIbzAdcfBx5UNgoLw=; b=R1InW+WRWiCOErxoLFpAFqgvoTm1syeP4UtjiZPoFhsBQl0ckjwMIyzGl6F4aiyiSs 5Bq+iJ/UqyuP80GDO6CuvKcNBcfzqq/ovfOZUraOCe32s7ZnCXWQiyrqxHKi1HOoBZZI caxKBrlp5nBB0TSVh4BYtTFRw/spsjLZlHXp7/BzhUEXDCIjvVsv6LL0+oe5OSJ5p2F/ NaAdjtzmCEctMAUjljPGrhCFyqYid1H/l2BNo6vqN8wbfEbn7fUv4+z0POAFLwpYVapm VgtaKly0skVMuxOqWkyX7umdOLxAup4vBQksORTGKkyny4TlgOMtdAkDT2pP1sLWP5jF CPXQ==; 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 af79cd13be357-7c573cf003fsi521945985a.449.2025.03.14.23.19.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 14 Mar 2025 23:19:22 -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 1ttKr8-000330-3U; Sat, 15 Mar 2025 02:18:46 -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 1ttKqu-0002va-Rn; Sat, 15 Mar 2025 02:18:39 -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 1ttKqr-0003Bb-CQ; Sat, 15 Mar 2025 02:18:31 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 6CCBBFF9CE; Sat, 15 Mar 2025 09:17:07 +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 444B81CAC37; Sat, 15 Mar 2025 09:18:01 +0300 (MSK) Received: by gandalf.tls.msk.ru (Postfix, from userid 1000) id 2FCF3558B3; Sat, 15 Mar 2025 09:18:01 +0300 (MSK) From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Peter Maydell , Richard Henderson , Michael Tokarev Subject: [Stable-9.2.3 02/51] target/arm: Report correct syndrome for UNDEFINED AT ops with wrong NSE, NS Date: Sat, 15 Mar 2025 09:17:08 +0300 Message-Id: <20250315061801.622606-2-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: Peter Maydell R_NYXTL says that these AT insns should be UNDEFINED if they would operate on an EL lower than EL3 and SCR_EL3.{NSE,NS} is set to the Reserved {1, 0}. We were incorrectly reporting them with the wrong syndrome; use CP_ACCESS_TRAP_UNCATEGORIZED so they are reported as UNDEFINED. Cc: qemu-stable@nongnu.org Fixes: 1acd00ef1410 ("target/arm/helper: Check SCR_EL3.{NSE, NS} encoding for AT instructions") Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Message-id: 20250130182309.717346-3-peter.maydell@linaro.org (cherry picked from commit 1960d9701ef7ed8d24e98def767bbf05d63e6992) Signed-off-by: Michael Tokarev diff --git a/target/arm/helper.c b/target/arm/helper.c index 8a0065ef60..32cf6039e3 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -3868,7 +3868,7 @@ static CPAccessResult at_e012_access(CPUARMState *env, const ARMCPRegInfo *ri, * scr_write() ensures that the NSE bit is not set otherwise. */ if ((env->cp15.scr_el3 & (SCR_NSE | SCR_NS)) == SCR_NSE) { - return CP_ACCESS_TRAP; + return CP_ACCESS_TRAP_UNCATEGORIZED; } return CP_ACCESS_OK; }