From patchwork Tue Mar 15 02:12:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 551425 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:6713:0:0:0:0 with SMTP id u19csp3082345mag; Mon, 14 Mar 2022 19:12:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw1+Y9odKubEND9OIpnW3AjXRW0SPk67ciQ1z83SCbGiNeqpEM3316xfFSBOkh3LfdFxFCL X-Received: by 2002:a05:6902:1541:b0:628:a0ed:ad49 with SMTP id r1-20020a056902154100b00628a0edad49mr20788587ybu.419.1647310369163; Mon, 14 Mar 2022 19:12:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647310369; cv=none; d=google.com; s=arc-20160816; b=J+2GQrDp/ZjN1mZXOI9YLF2nu/hApqvUev5Hjw+pVqdqLKG2lKtlStiWFqrXXApzSM Mi7rguQb5P98Lg3sgGbibCY+tCOGs56jzzbSQ6cDgDAIrEHV17OrxgmLCw5q1IYJS444 K/HBe5m7Hz8aWVaxPD2fPr82guzJ2Rf4VMQb+oUIzJoG2PyTzVqpm/VTd/0XTla6qQa8 P8cQvSWJardLS7AsGVR5Sa460SPP++ngqR2eth/gbDx+/uRIfiIhxvKYxO27xXwQ1dK3 5EAb+QYP8MfKnp0Q39/cd4EZ2M7vzMzJ4MP0uYxNQDhRR6uearAEA5K9xfaSc95WDdaV 48ZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:to:from:dkim-signature; bh=nPCyHm7z8svGYiIpoMfMBWpG43kIvw3IKZt4zZOcxVM=; b=dvt/CDCO/dSfGeCJK+fgVvUoywupk2OEhbBGPM2vyIHM7NhZOsH8sg3Xdf2e5+7y0n fjWeTMIXPF0p3OGebZ/5IbUWkpnQVTqHND7M7oCzsCUwxIPuSFlxsyoAxsLx9ePwYK9q yhA263wJ0F3C9JR3s9VaY460rq2IkBNFUZe1uQotgpbX1L9KT1XOxdezceP5p8Xf1Tp7 LEz+SBHnwKKeWNaNmRrmEB3emV2YmyPKerRz2u3Jg4EycgtC/TQ9UU2y4uUcC37p5+bu htR93wQ9kift7+szGfniy7pJuF95GUnO8XFYH5SEqe10ZbuJdOgYCrHrmqPUx7ELGKSG kYrg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=esMDmjzB; 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"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id y130-20020a253288000000b00628966751a6si10707330yby.470.2022.03.14.19.12.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Mar 2022 19:12:49 -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; dkim=pass header.i=@linaro.org header.s=google header.b=esMDmjzB; 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"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:38120 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nTwg4-0007pW-NI for patch@linaro.org; Mon, 14 Mar 2022 22:12:48 -0400 Received: from eggs.gnu.org ([209.51.188.92]:53580) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nTwfS-0007od-4G for qemu-devel@nongnu.org; Mon, 14 Mar 2022 22:12:10 -0400 Received: from [2607:f8b0:4864:20::433] (port=45659 helo=mail-pf1-x433.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nTwfQ-0001Vw-Dd for qemu-devel@nongnu.org; Mon, 14 Mar 2022 22:12:09 -0400 Received: by mail-pf1-x433.google.com with SMTP id s8so17175288pfk.12 for ; Mon, 14 Mar 2022 19:12:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=nPCyHm7z8svGYiIpoMfMBWpG43kIvw3IKZt4zZOcxVM=; b=esMDmjzBs04dA7xZCyR2KqjXxrFbluzpRqqBgIWk85c6wQdIIfSHirInLMmPOHVpD1 SVBL9awRcugYYkU1KIKLJb0PgWy2Tt1sK0pVMPGkDQ/ppTTsLpDv2hxq9qKDVzZ24FO6 N6AZLf+ICLSHY9KV1vN7BrY72q9QrsUjhWa15UynRjNXa/iFmtztnMSzGqaA8JMSEX5k UF0y9FwEyZuDdRNNAQ6ci/xLUMaV+VkWguj0yb9AZ00UndzaSegYHLYN7JCvjhMRSqfv 45oQ/jqHTKwO/SxEVTy7j8RBtxY3o0igf5fDJHBYFfcCT6MWSx9vlMDanu8iioq/uFL3 4Ouw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=nPCyHm7z8svGYiIpoMfMBWpG43kIvw3IKZt4zZOcxVM=; b=ft5f8VaOXVHM8U0mx2gNifSGdzPWUQVxnvWwLIyPYaQ62FtaIzaOlbdrkIc8ijZhw6 cn6kVoaunAM3MnScQTPBUKragI/xykd7DHFsvcuc0V2qUMy5u1CEn22hkcRJZn/qFMzq k7MM1idXDYoXC4S/b9AlDHDi+7IBrvA/JqmknbLZ3H3/PQXPPy+dT9+cXL9Mg9JKJIxn BWkx+1Dozzv7pKWZlZXepPOydexnYb/CSzNA2AdpjXwXUF9xwNVe0dzSybuGolbtLWR/ A9EjTN9R0hC2GeA9n10ZR+3gIMITbSqRpCYWIZA1Qy+C0f+kfDH9U6VFxjdr2jtGKCN/ Uixw== X-Gm-Message-State: AOAM532iMJLJgFCnfHov4pnFHjXLzNroZSoceCDTSZrAOxTb74lU88Yv JmMZRh+8a+tcD72pTj8d6pvrdygO31HbzQ== X-Received: by 2002:a05:6a00:309c:b0:4f7:a5ca:4e20 with SMTP id bh28-20020a056a00309c00b004f7a5ca4e20mr14817106pfb.26.1647310326480; Mon, 14 Mar 2022 19:12:06 -0700 (PDT) Received: from localhost.localdomain (174-21-142-130.tukw.qwest.net. [174.21.142.130]) by smtp.gmail.com with ESMTPSA id 10-20020a17090a004a00b001c44ffccebdsm802627pjb.43.2022.03.14.19.12.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Mar 2022 19:12:06 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH] target/arm: Fix pauth_check_trap vs SEL2 Date: Mon, 14 Mar 2022 19:12:05 -0700 Message-Id: <20220315021205.342768-1-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::433 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::433; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x433.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: qemu-arm@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" When arm_is_el2_enabled was introduced, we missed updating pauth_check_trap. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/788 Fixes: e6ef0169264b ("target/arm: use arm_is_el2_enabled() where applicable") Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé --- target/arm/pauth_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/arm/pauth_helper.c b/target/arm/pauth_helper.c index cd6df18150..739aa520dd 100644 --- a/target/arm/pauth_helper.c +++ b/target/arm/pauth_helper.c @@ -390,7 +390,7 @@ static void QEMU_NORETURN pauth_trap(CPUARMState *env, int target_el, static void pauth_check_trap(CPUARMState *env, int el, uintptr_t ra) { - if (el < 2 && arm_feature(env, ARM_FEATURE_EL2)) { + if (el < 2 && arm_is_el2_enabled(env)) { uint64_t hcr = arm_hcr_el2_eff(env); bool trap = !(hcr & HCR_API); if (el == 0) {