From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 06BB1C433F5 for ; Mon, 28 Mar 2022 17:34:18 +0000 (UTC) Received: from localhost ([::1]:58096 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nYtFx-0005Ex-7O for qemu-devel@archiver.kernel.org; Mon, 28 Mar 2022 13:34:17 -0400 Received: from eggs.gnu.org ([209.51.188.92]:59714) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nYtEW-00039m-Eh; Mon, 28 Mar 2022 13:32:48 -0400 Received: from [2a00:1450:4864:20::32d] (port=56105 helo=mail-wm1-x32d.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nYtEU-0004Um-UE; Mon, 28 Mar 2022 13:32:48 -0400 Received: by mail-wm1-x32d.google.com with SMTP id n35so8817786wms.5; Mon, 28 Mar 2022 10:32:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=aUL8mAF1Nh9uul/Swmbhw4lkJFH0mCkW+RQxOWD9YQ8=; b=WGu83Qb2odTEAULHcvdOr577JfhQnArjAdaQwKCAcv3x07y8gRBdUb6N61muxrVoB/ qjKipDAGkqWFSujt8Wbo6TkeuvPrN6fKWepB10UrbUI4ORzbKjB8gU1sF7hKlZhKO3Jc odVQ4DYkyw1S6H8puBL96ETHBhMOHSnG/Otfkuw49oI+5IAp/YB80MaBQJXuFidKIAev /6WF2Eiq3Dq5qEuOephcaHEJa5k1ka7Sy15SHRiz2bXEoM272wXEgvJb7WaWGUxRUSv4 DVu6C/tXvQZqZ1A3k3T6pX4QzZM0BW9H4IGlLxTZamckiaHCQqPeaMfn8SHMSafMWzfO pOFA== 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=aUL8mAF1Nh9uul/Swmbhw4lkJFH0mCkW+RQxOWD9YQ8=; b=6Fno4KW5h0pprwYOEpRFp81g+fOfntU1SqGb9Jw4ZMcIa5w/Ykn1yJ3oM6L8a9tqkV Gno7ACKR7KytutbXlM7yi9+L5vXfb2OEI0E/pH8T6JOOmF6vuBS1gmsRjwU+zY7eudWG U+/CNDg0xmi/t8In4l04FDpB1ljE1KAHUC5NNSrqg8S0Dr1V97njf1SUuoyhSqusWMzg Kmt73Ts92sLF/jr5n0iZleKZJvURe62N0SEyJaBoILvLhG/Dp73l+QPqjMLxBZoglRnz zX0LtcbcEcpSRMnxlnZpTm3olP9660uO6gNaTzosl4/abZ3EzPApTpnOSbYIOwkB4c/Y jRwQ== X-Gm-Message-State: AOAM533XbqkRQmubfVZIzmQGRQurRYsj/0IQyNLzMc6Jb4HdiXxFa7OB j3W0cHlD6VD9+Rukt1mrIYX9+fG1JDMEqQ== X-Google-Smtp-Source: ABdhPJwiAjqspZ5ly40WJfj6SJ5f4xrc3QeUHO4Jjjy/fqHP2vsmTle7qxTpxkq1ZAptEm0ol4vkPg== X-Received: by 2002:a1c:3bd5:0:b0:38c:9b9f:1b24 with SMTP id i204-20020a1c3bd5000000b0038c9b9f1b24mr302966wma.129.1648488760693; Mon, 28 Mar 2022 10:32:40 -0700 (PDT) Received: from li-142ea8cc-3370-11b2-a85c-c55585c2aa0e.ibm.com.com (bzq-79-183-80-20.red.bezeqint.net. [79.183.80.20]) by smtp.gmail.com with ESMTPSA id c124-20020a1c3582000000b00384d42a9638sm136871wma.2.2022.03.28.10.32.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Mar 2022 10:32:40 -0700 (PDT) From: Idan Horowitz To: qemu-arm@nongnu.org Subject: [PATCH] target/arm: Fix MTE access checks for disabled SEL2 Date: Mon, 28 Mar 2022 20:31:08 +0300 Message-Id: <20220328173107.311267-1-idan.horowitz@gmail.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::32d (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=idan.horowitz@gmail.com; helo=mail-wm1-x32d.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, FREEMAIL_FROM=0.001, 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: Peter Maydell , Idan Horowitz , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" While not mentioned anywhere in the actual specification text, the HCR_EL2.ATA bit is treated as '1' when EL2 is disabled at the current security state. This can be observed in the psuedo-code implementation of AArch64.AllocationTagAccessIsEnabled(). Signed-off-by: Idan Horowitz --- target/arm/helper.c | 2 +- target/arm/internals.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/target/arm/helper.c b/target/arm/helper.c index 16c2628f8f..7d14650615 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -7176,7 +7176,7 @@ static CPAccessResult access_mte(CPUARMState *env, const ARMCPRegInfo *ri, { int el = arm_current_el(env); - 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); if (!(hcr & HCR_ATA) && (!(hcr & HCR_E2H) || !(hcr & HCR_TGE))) { return CP_ACCESS_TRAP_EL2; diff --git a/target/arm/internals.h b/target/arm/internals.h index a34be2e459..7f696cd36a 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -1094,7 +1094,7 @@ static inline bool allocation_tag_access_enabled(CPUARMState *env, int el, && !(env->cp15.scr_el3 & SCR_ATA)) { return false; } - 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); if (!(hcr & HCR_ATA) && (!(hcr & HCR_E2H) || !(hcr & HCR_TGE))) { return false; -- 2.35.1