From patchwork Sat Mar 15 07:42:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 873857 Delivered-To: patch@linaro.org Received: by 2002:a5d:4308:0:b0:38f:210b:807b with SMTP id h8csp1081045wrq; Sat, 15 Mar 2025 00:47:07 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUoeDI1LXcr4+QgJyHKvM2y0cvEAUixBj2H9VgVJdoTmSyxexZFybyO/pMLPTPLet7O31IeSw==@linaro.org X-Google-Smtp-Source: AGHT+IFewlzpehXMp6klmy5gxtvQgI65jH8f5RMHQgmPamPpp5rz+8W2/3qIfi7gYoIotAaYixRW X-Received: by 2002:a05:620a:3904:b0:7c5:5585:6c8b with SMTP id af79cd13be357-7c57c92850emr743644785a.50.1742024827627; Sat, 15 Mar 2025 00:47:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742024827; cv=none; d=google.com; s=arc-20240605; b=XQ+Stk0ei5JxK3kFpqFRSUCQSEymqEqypyOaz1CzWbLv6j/QpB8rnPhmfZnlpwCj72 I1ewwJlzBLTII7lUgjgyVyyObU1FLJAp6Nke1VtQANcDeveW3yRVcE2IZK1IF8xZSC58 k165SEMJKTHpxh37wJ2P0gjQG47zOIN5nQgbhATlI5h+gkpJAtDZeSxuCOVZ+owRNnzU 1FNrtZ76u3lEWzVQhJmeRvbr514L51/yFwZlWqG+brQYkFqwmCCXagxA9larzYAaDiIN Oi4Jhjzaq6kOPB1bcRgnZkAkJuTSDNrEGU441dCbTvkUTsaw/XSuyvvJaOsQGnBv5Sz8 y+cw== 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=DwppJ7u5C5fT/hfxQ0iHLfDkDUNC6PlStF5zhA5C3Uk=; fh=xJ1URYKcMN3TM0/XAv5v+aCN+5tIbzAdcfBx5UNgoLw=; b=gpw73aeMMJb3yAqDHbKJScuXCiM9H3sFhVpdjWH4P07DhM04dIiRkaUFsnfX5Wknps hRWmu+r3hPHr4UciFc/BkGCRa/0aMY24E9+km3ylXwi5ZJVsjx5QQbQiZc2g/57nDXCq tGEgrYhhQAulYgWI6RRgfRud7uhkuGekj1eayNDIiACOn1dWAh9fsLrC/2XQiWlrLdGB 88xn170f4SHu9lHR0aniktk5NqrRfspyM833IGAIt31DpyNXVceO3kow5ABPkijxzNAs TmYYnolVh9f8bVwsp8ELvPlQ6nudycTgrV9y7bSjI4gLlfb4nQqDEiqd6vTdd15reGqF iIUg==; 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 d75a77b69052e-476bb81f030si51376881cf.417.2025.03.15.00.47.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 15 Mar 2025 00:47:07 -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 1ttMAu-00027N-IT; Sat, 15 Mar 2025 03:43:16 -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 1ttMAr-00025r-RQ; Sat, 15 Mar 2025 03:43:13 -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 1ttMAq-0004p9-4u; Sat, 15 Mar 2025 03:43:13 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id A67E2FFAFE; Sat, 15 Mar 2025 10:41:55 +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 952981CACC8; Sat, 15 Mar 2025 10:42:49 +0300 (MSK) Received: by gandalf.tls.msk.ru (Postfix, from userid 1000) id 70037559E8; Sat, 15 Mar 2025 10:42:49 +0300 (MSK) From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Peter Maydell , Richard Henderson , Michael Tokarev Subject: [Stable-8.2.10 10/42] target/arm: Report correct syndrome for UNDEFINED AT ops with wrong NSE, NS Date: Sat, 15 Mar 2025 10:42:12 +0300 Message-Id: <20250315074249.634718-10-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 92d5ee95e6..5d7ab46c09 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -3680,7 +3680,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; }