From nobody Sun Jul 26 11:50:59 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1782515877; cv=none; d=zohomail.com; s=zohoarc; b=gWIWRGo8GIf8traXXmmxyyp7SE/XGu7t0fZJB+3JzynlqiDCGZ8HRQDODijoDp6NYJQ5X1a7sq3GtesieEjBFwXgni1G6VhCa8sTbeGp5mImeTG5eo1pAhCUQ/u0zxgdQKDvTZpOfOtFed+LjJlKFQWES1sJQLF3mVo+3EpvJBM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782515877; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=i1NUVY84f7Rr82GMtdk8taZYkEfl01WWVwfsH9M7G5A=; b=ke2zlYdSP3q4QqyVe/aqelCQZRQ8NTrwyPzj/F4R1K7Y8BDEHsdHY+7hj4ep1UdaPuaO9Yt0PGqWlaQlK5k2kXsW6ciRdYfmbdmwYfethiytzXhF5p2Z9UyjsYVo2LJEqdVWMK0TYu7oYSpCHaRh1RlDFKTBMz1jcE82BR6HCwI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1782515877853267.5015947640105; Fri, 26 Jun 2026 16:17:57 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wdFnx-00082j-2u; Fri, 26 Jun 2026 19:17:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wdFns-000822-2f; Fri, 26 Jun 2026 19:17:44 -0400 Received: from tor.source.kernel.org ([2600:3c04:e001:324:0:1991:8:25]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wdFnq-0007Ho-KY; Fri, 26 Jun 2026 19:17:43 -0400 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) by tor.source.kernel.org (Postfix) with ESMTP id CD64D600AA; Fri, 26 Jun 2026 23:17:40 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5850A1F000E9; Fri, 26 Jun 2026 23:17:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1782515860; bh=i1NUVY84f7Rr82GMtdk8taZYkEfl01WWVwfsH9M7G5A=; h=From:To:Cc:Subject:Date; b=R/b5a+ZgAiV8o6mLb/lCXjgGiuTrwq6rsnUwJEQVu+oBcf911fx0CzXvaQ2d35Xqe 8JK19/Aiu8KACvIxKLAzFynVfPstYJstMGrB1hjCUusDLtQETRAYsf+Db8W9bo8d9X +nfLqbsaqAH8dUZL4VQOA80KXHVM2K2JZDlMxpRhcc+9Ru8mJ1kqG5+mJn7fyWQH2E Z+wRKk/uL//jdBhoI09QNZyYzU9cY7EKS4Zj53pYaRCVve/sYAUIWioKVmKpbujLJY PRrOQ5ph24Z5LbYmY9JaJ7yIrZxvB13wb50d805BUM9S3OzOD2OMT6Yo4dd9wYuueM TiqQhm0nePVUQ== From: Oliver Upton To: Peter Maydell Cc: Richard Henderson , qemu-arm@nongnu.org, qemu-devel@nongnu.org, Oliver Upton Subject: [PATCH v2] target/arm: Only evaluate SCR_EL3.PIEN if ARM_FEATURE_EL3 is present Date: Fri, 26 Jun 2026 16:17:38 -0700 Message-ID: <20260626231738.947317-1-oupton@kernel.org> X-Mailer: git-send-email 2.47.3 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2600:3c04:e001:324:0:1991:8:25; envelope-from=oupton@kernel.org; helo=tor.source.kernel.org X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @kernel.org) X-ZM-MESSAGEID: 1782515879613158500 Content-Type: text/plain; charset="utf-8" Running KVM with (as of writing, out-of-tree) support for FEAT_S2PIE on -cpu max gets stuck in an infinite loop of stage-2 permission faults due to the PTW incorrectly using an effective value of 0 for S2PIR_EL2. Similar to how S1PIE is handled, only use the IMPLEMENTATION SPECIFIC value of 0 for S2PIR_EL2 if EL3 is implemented and PIEN=3D0. Fixes: a811c5dafb ("target/arm: Implement get_S2prot_indirect") Reviewed-by: Richard Henderson Signed-off-by: Oliver Upton --- target/arm/ptw.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/target/arm/ptw.c b/target/arm/ptw.c index 1470de3010..51affba0bf 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -1414,9 +1414,14 @@ static int get_S2prot_indirect(CPUARMState *env, Get= PhysAddrResult *result, PAGE_READ | PAGE_WRITE }, }; =20 - uint64_t pir =3D (env->cp15.scr_el3 & SCR_PIEN ? env->cp15.s2pir_el2 := 0); - int s2pi =3D extract64(pir, pi_index * 4, 4); + uint64_t pir =3D env->cp15.s2pir_el2; + int s2pi; =20 + if (arm_feature(env, ARM_FEATURE_EL3) && !(env->cp15.scr_el3 & SCR_PIE= N)) { + pir =3D 0; + } + + s2pi =3D extract64(pir, pi_index * 4, 4); result->f.prot =3D perm_table[s2pi][2]; return perm_table[s2pi][s1_is_el0]; } base-commit: 8f1d3b586f1265023f75ea9c227c35d463321aef --=20 2.47.3