From patchwork Wed Feb 21 08:20:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 774508 Delivered-To: patch@linaro.org Received: by 2002:a5d:6ac2:0:b0:33b:4db1:f5b3 with SMTP id u2csp321379wrw; Wed, 21 Feb 2024 07:56:18 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVXtPLswNvzAmPO85pYG35PJlPlGR/ZmoeEHxVjEusLdjBh7qjqNkDmxRpXYGKWF+cXt9WVH6DuwfqH25SA+NEa X-Google-Smtp-Source: AGHT+IHDWLXHm94xDaX7FJyEXEwnKkh6o+XZHPQgORniBX/vjcSU3CESjg6dL6bQv75bRYplxoXg X-Received: by 2002:a0c:e089:0:b0:68f:2a2b:c6e5 with SMTP id l9-20020a0ce089000000b0068f2a2bc6e5mr24603835qvk.31.1708530977879; Wed, 21 Feb 2024 07:56:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708530977; cv=none; d=google.com; s=arc-20160816; b=wGc6j9RZmZgN+SaYLafWiC8J5AaXobux4OCrRPXu47rq/LoOnyoViA3ua76e3WL7IR DZQYcQwrV52dsHjGq3yeDHWMqkXJGaKPvXlkgRKs5U/yUdZ4t+xFJTnnMzux9wZhMsaf /riqwq/iIsSP7pE+7iN1J+cdc1J5u3A+PEbDeSzcRclbuiMKhLVyARyll+OblJxqL/Xx pbPM2nbcZKWSnvQbw4UcpUowItnxuOAlzSpAj2hFysndIdXq54BkzYG2lc5DHe7H3sg8 Ty8w3ugWhMK/aiTYKmppjuTexnKQZrG0Hd2yVM5RwXqtKOyl6OfW8LHke1Ewc2FYjjIK 6gcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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=Rw3OCefk0AMcpgo0RS1LH2CnmFU2DuPt8vMIyh4nmOI=; fh=taStO74W/EZXcDvsT3Zoyq1h58w93JzpEc66fmdrq4s=; b=RzRvhqi2cdzeOIxUfkgMunVQe/9aw31XAg9iOfQyyMohJuXMpgSObxu2wbudQPjwGq n8HPoItg/UgdRmqCcu1GBxnf+9M7fe6PGGHHHcjbZYkSn4r9bze3/ATb3JtXJ0Bia/zN nLZi4s1TdhvhEA89YR9RYJuFwv+uwAL3yM2Ypc0h0E1L0OuGV+P2SNn3TBOlYqFE6CyI GC3MqazAu8vLOAbx7/hWDAE7epeicKd7qSYDBpSJ6BPo8HEZEWuKkyBI/GRUSPjossKx PL5v2PtUpFRWbDyK/ld/2PvTcf7Rw2SbYXVGHLYRsHlFx4bD8tko2uxVlwYYgBeygtmf r1qA==; 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 jr5-20020a0562142a8500b00683699d4df8si11026704qvb.139.2024.02.21.07.56.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 21 Feb 2024 07:56:17 -0800 (PST) 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 1rcoZm-00045J-M6; Wed, 21 Feb 2024 10:32:02 -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 1rcoP0-0004ab-Cp; Wed, 21 Feb 2024 10:20:54 -0500 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 1rchus-0002pk-N6; Wed, 21 Feb 2024 03:25:24 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 102D74F3EC; Wed, 21 Feb 2024 11:21:23 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id CF1B7860CB; Wed, 21 Feb 2024 11:21:01 +0300 (MSK) Received: (nullmailer pid 2142128 invoked by uid 1000); Wed, 21 Feb 2024 08:20:58 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Peter Maydell , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , Michael Tokarev Subject: [Stable-8.2.2 46/60] target/arm: Don't get MDCR_EL2 in pmu_counter_enabled() before checking ARM_FEATURE_PMU Date: Wed, 21 Feb 2024 11:20:34 +0300 Message-Id: <20240221082058.2141850-46-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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 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 Message-id: 20240208153346.970021-1-peter.maydell@linaro.org (cherry picked from commit ac1d88e9e7ca0bed83e91e07ce6d0597f10cc77d) Signed-off-by: Michael Tokarev diff --git a/target/arm/helper.c b/target/arm/helper.c index 6515c5e89c..df1646de3a 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -1169,13 +1169,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;