From patchwork Thu Feb 8 15:33:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 1896643 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=baQ3JJD2; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TW1Hr51x7z23h2 for ; Fri, 9 Feb 2024 02:34:32 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rY6PR-00029V-Qm; Thu, 08 Feb 2024 10:33:53 -0500 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 1rY6PQ-00028u-Ay for qemu-devel@nongnu.org; Thu, 08 Feb 2024 10:33:52 -0500 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rY6PO-0003Cc-Gy for qemu-devel@nongnu.org; Thu, 08 Feb 2024 10:33:52 -0500 Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-3394b892691so685985f8f.1 for ; Thu, 08 Feb 2024 07:33:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1707406428; x=1708011228; darn=nongnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=0rPlltwQ8J1j/tv8D8hVqi9IU8hTllCxiImaZrOMGqA=; b=baQ3JJD2JnqW99d6mwVOp2hvjEdLZ6OuMm1UsIeD1i7nvWDsWWjtYl0NrMvnKOT3JB Esd0TiMilPGtTb3oWqjdtSsFlZMLCbSSzLMPa4KMSI8tf2fvUxto7AWr2Pxm1tRyLCM+ gn1D4lcZpJXjlQ1AaL+oZQyvTXaL6ozqnhy5cx+DS9ZwebEONqC7+dmJU8Dkax23MsDY DAaNjU+NlnabgqwimrjdCSKP4/1Doovg3pEz7ylRGOP5G/8ZT9XgsdhlkWBWd54OOhyW fnqx7evsCn/wILCPfTasqdAIDnEMOTUpcbZbJDEqErcUTsAySy1MEia4jjkfSInfNqNF adFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707406428; x=1708011228; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=0rPlltwQ8J1j/tv8D8hVqi9IU8hTllCxiImaZrOMGqA=; b=tSgonJAwDCk2txC+pOzi4OR+rf56kyTUJFSX3Sm6J+5vifvjGDltJh48ZqB0iBkt98 27xAlG9EhWIcBlHrZyOwvwtdfMA0z4WTwz3YBrRSn9EKoUSWUuvfhqDddCTPZrhd4XZt 8C/OgpsoYdol4kGzOiazFHn9t91rFSk9q6C0151ZCWazM1agKF2AihrYg8PTkpOddtdj +U11f+JnaVOxug9k9f0+V9glmNnSQLYRMP783kriUFhxm3U72wOKsZns9bTT/OBHOMXl 8vKqJIF6mowJA4UmQPXF3f+aLZvJHuq7qfchWuivNqQXs8cLaOtspQFpEeQp/ljYBVdz w3TA== X-Gm-Message-State: AOJu0Yx5I408PZSlkMTy1Wr4rynNzQDNjEz6ismDHmeCDiRL9giM5YoQ LupbRJbFFhe4IcQkA8kabDZqpS9GmP3szlK1/Z0miIOPst+wYAACwNdmVwFcnvRFcMJX1gT7FpB g X-Google-Smtp-Source: AGHT+IEXDwzQ3Hl7rdLRH5gIEJlnEn1g3IfERLTKzTe7XOTNB4ejY8NVKFvBk3SDKp7+/hQGzAYqEQ== X-Received: by 2002:a5d:58d6:0:b0:33b:5a40:d4c4 with SMTP id o22-20020a5d58d6000000b0033b5a40d4c4mr1719077wrf.17.1707406427851; Thu, 08 Feb 2024 07:33:47 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCUezog/jxPrkF0mCYLLQY8YqLV961TtNvZtdRdHbcpv5AFzesWBgWxssMbmuS0V1PIeNvVaQ4stACxRFZo16/BYPvoY2rI= Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id j8-20020a5d6e48000000b0033929310ae4sm3824570wrz.73.2024.02.08.07.33.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Feb 2024 07:33:47 -0800 (PST) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org Subject: [PATCH] target/arm: Don't get MDCR_EL2 in pmu_counter_enabled() before checking ARM_FEATURE_PMU Date: Thu, 8 Feb 2024 15:33:46 +0000 Message-Id: <20240208153346.970021-1-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x432.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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org It doesn't make sense to read the value of MDCR_EL2 on a non-A-profile CPU, and in fact if you try to do it we will assert: #6 0x00007ffff4b95e96 in __GI___assert_fail (assertion=0x5555565a8c70 "!arm_feature(env, ARM_FEATURE_M)", file=0x5555565a6e5c "../../target/arm/helper.c", line=12600, function=0x5555565a9560 <__PRETTY_FUNCTION__.0> "arm_security_space_below_el3") at ./assert/assert.c:101 #7 0x0000555555ebf412 in arm_security_space_below_el3 (env=0x555557bc8190) at ../../target/arm/helper.c:12600 #8 0x0000555555ea6f89 in arm_is_el2_enabled (env=0x555557bc8190) at ../../target/arm/cpu.h:2595 #9 0x0000555555ea942f in arm_mdcr_el2_eff (env=0x555557bc8190) at ../../target/arm/internals.h:1512 We might call pmu_counter_enabled() on an M-profile CPU (for example from the migration pre/post hooks in machine.c); this should always return false because these CPUs don't set ARM_FEATURE_PMU. Avoid the assertion by not calling arm_mdcr_el2_eff() before we have done the early return for "PMU not present". This fixes an assertion failure if you try to do a loadvm or savevm for an M-profile board. Cc: qemu-stable@nongnu.org Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2155 Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- target/arm/helper.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/target/arm/helper.c b/target/arm/helper.c index 8c1ff16f0d9..7c531ee9cff 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -1187,13 +1187,21 @@ static bool pmu_counter_enabled(CPUARMState *env, uint8_t counter) bool enabled, prohibited = false, filtered; bool secure = arm_is_secure(env); int el = arm_current_el(env); - uint64_t mdcr_el2 = arm_mdcr_el2_eff(env); - uint8_t hpmn = mdcr_el2 & MDCR_HPMN; + uint64_t mdcr_el2; + uint8_t hpmn; + /* + * We might be called for M-profile cores where MDCR_EL2 doesn't + * exist and arm_mdcr_el2_eff() will assert, so this early-exit check + * must be before we read that value. + */ if (!arm_feature(env, ARM_FEATURE_PMU)) { return false; } + mdcr_el2 = arm_mdcr_el2_eff(env); + hpmn = mdcr_el2 & MDCR_HPMN; + if (!arm_feature(env, ARM_FEATURE_EL2) || (counter < hpmn || counter == 31)) { e = env->cp15.c9_pmcr & PMCRE;