From patchwork Tue Jun 6 09:48:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 689730 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d8a:0:0:0:0:0 with SMTP id b10csp2541319wru; Tue, 6 Jun 2023 02:53:40 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5/8ywa+GU+Uhftc5unzN+yuKJ6VjeRrMY4n9cFkqLuQp5byocDZEUIRo4vPDCkxpWreZhk X-Received: by 2002:a05:620a:29d2:b0:75d:44cc:92c3 with SMTP id s18-20020a05620a29d200b0075d44cc92c3mr1743525qkp.40.1686045220486; Tue, 06 Jun 2023 02:53:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686045220; cv=none; d=google.com; s=arc-20160816; b=k7weNqszv7DPubE2jobrROGQ9BCIDcpGTyARVRQ2BYEVAd6GFotsiB4cTPeBiwbCyN LfevfAtDJmPytUFj/nKsA7GEo43W6p31s2v0gpG39YgTYyrW3V8leHHIwRLOmYShx11t pjL5H5fb4C297MRPookhgHvpgTKgGrfVThBPbq3FygylM+ADsZUkfpeObo6+TycRgmjE 5uAn5/qewb+zFoIkwLeagpuNmgfJYTJj0TSWDSIINLiO64FK37NFXJVwFiiaZSUV6Y7r 1uMF/KMWAzgRGHB/Tnd683qJr68wRWf2A1oQGL6rnk2mVuY+Nmt6Fy3FNjtCfY6tJ1Tr f+cQ== 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:to:from :dkim-signature; bh=y4vWb9Y1xxl2/v0t4z9da7Xxeb1mu3H8daoLBgX6KF8=; b=tDztjBHic8ng6IyPVJ4jFfA6swtOk41BD4U68RovtvWyL+Hp4EUm62vzd78PQ8GX/U sffWkfEydaejfh/J0ELeYOTZY5ozHpaln5e0jyw33h1bbvLWGLu/g3FhDchX9qI1FUwM Eolpd+IsZ1WlN4NICZggEKUWAjhFct9vKCsI1MGgb0UoFQzj/FOVFODnFugma/JX7aWB 4LTUNcnliLTpeGjOLIaXv6qv4eDy8pnNf7voyjFvJxNreBmCkouTzE0m8g15d7vjJIdD 7GZe9DS4Tw75RDQHR9+sok/ukDieHp+59DKgU9SgKDlfuqrz+5gxgmPbtYWTkxArcF7J 7sCQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=s1dWbefJ; 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 os48-20020a05620a813000b0075ca93fd907si5676000qkn.371.2023.06.06.02.53.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 Jun 2023 02:53:40 -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=s1dWbefJ; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q6TIt-0007nQ-SW; Tue, 06 Jun 2023 05:48:39 -0400 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 1q6TIq-0007kr-NG for qemu-devel@nongnu.org; Tue, 06 Jun 2023 05:48:37 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q6TIm-0004nL-Qt for qemu-devel@nongnu.org; Tue, 06 Jun 2023 05:48:36 -0400 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-30adc51b65cso5323815f8f.0 for ; Tue, 06 Jun 2023 02:48:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686044912; x=1688636912; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=y4vWb9Y1xxl2/v0t4z9da7Xxeb1mu3H8daoLBgX6KF8=; b=s1dWbefJdxCUMwRcJpSy9HLGQFcpFGDEfGqebTEAFub/C8tey1ar6HObxNwrzVrbSz uWv97seDztsc8oeBCyUvBHrSjNXSinHptQMnpHNVTistjEI4FcR45Y2nLi9dKK0xXfbg 6CAij20dQocEvqgvAD6vY62t0jFGLYHV2EzH7v13/IjU2hO/aT8yrmEFyfxuH1VzuUlE cwP1D891gr7LugKmEJ/vWIiWefBPp9Y+xE7zI2MvJuXWYjk4m6u4hRxWPIVzuNYSDfll aERcsgVQKO7mTevOy9F0cYJz0SVGsTgq2btYlS1gCl1QBvdX/1Q2DfqHC8kpDSt0mMX7 /cyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686044912; x=1688636912; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=y4vWb9Y1xxl2/v0t4z9da7Xxeb1mu3H8daoLBgX6KF8=; b=abf3hxhAWIMxXLlPtmpG0BwKmjuibi6cchy5xETmLk/M3xCAr+Nqe2VU1g5kGNWvjf cmapSC8BfNosU/GD1SZXWShSjkrwejFKQkjFuSEUw+UUMxx98hP3vFQ8Pn45a/3KwOQT 81anvVJqpGS+nvv+fAL03m/C1vTKQp1ffFL8MXgVMlDcM6ktMOlXVOETbFFBlhP68wb/ kZzaunxByd39NS2SYJJ0Eph5ozyYB3GZAvCveQTH9iW2sIdX7dMrW4etUFfyPmTuCQk1 H+sS8hppe0oJ+83/uClMNGd6zLv8YZHOXEK5+YqG4/yYhodkIhEC20BXNg8MrwvThP9L M2Cw== X-Gm-Message-State: AC+VfDzF4a9BjeEIjSiu0yDTXX1GrCRrbV8ZZ7b2Wfpcts+gcRQSSKiv 9hUqD7ndhrtCHiEcoKXNA+XT0W+sWazmOeiDi24= X-Received: by 2002:adf:f649:0:b0:306:2d32:8ec with SMTP id x9-20020adff649000000b003062d3208ecmr1542130wrp.6.1686044912084; Tue, 06 Jun 2023 02:48:32 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id v10-20020a5d4b0a000000b0030789698eebsm12134017wrq.89.2023.06.06.02.48.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jun 2023 02:48:31 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 33/42] target/arm: Check alignment in helper_mte_check Date: Tue, 6 Jun 2023 10:48:05 +0100 Message-Id: <20230606094814.3581397-34-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230606094814.3581397-1-peter.maydell@linaro.org> References: <20230606094814.3581397-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x429.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=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: Richard Henderson Fixes a bug in that with SCTLR.A set, we should raise any alignment fault before raising any MTE check fault. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-id: 20230530191438.411344-15-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/internals.h | 3 ++- target/arm/tcg/mte_helper.c | 18 ++++++++++++++++++ target/arm/tcg/translate-a64.c | 2 ++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/target/arm/internals.h b/target/arm/internals.h index ce26299f7f0..e3029bdc37a 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -1242,7 +1242,8 @@ FIELD(MTEDESC, MIDX, 0, 4) FIELD(MTEDESC, TBI, 4, 2) FIELD(MTEDESC, TCMA, 6, 2) FIELD(MTEDESC, WRITE, 8, 1) -FIELD(MTEDESC, SIZEM1, 9, SIMD_DATA_BITS - 9) /* size - 1 */ +FIELD(MTEDESC, ALIGN, 9, 3) +FIELD(MTEDESC, SIZEM1, 12, SIMD_DATA_BITS - 12) /* size - 1 */ bool mte_probe(CPUARMState *env, uint32_t desc, uint64_t ptr); uint64_t mte_check(CPUARMState *env, uint32_t desc, uint64_t ptr, uintptr_t ra); diff --git a/target/arm/tcg/mte_helper.c b/target/arm/tcg/mte_helper.c index a4f3f92bc02..9c64def0816 100644 --- a/target/arm/tcg/mte_helper.c +++ b/target/arm/tcg/mte_helper.c @@ -785,6 +785,24 @@ uint64_t mte_check(CPUARMState *env, uint32_t desc, uint64_t ptr, uintptr_t ra) uint64_t HELPER(mte_check)(CPUARMState *env, uint32_t desc, uint64_t ptr) { + /* + * R_XCHFJ: Alignment check not caused by memory type is priority 1, + * higher than any translation fault. When MTE is disabled, tcg + * performs the alignment check during the code generated for the + * memory access. With MTE enabled, we must check this here before + * raising any translation fault in allocation_tag_mem. + */ + unsigned align = FIELD_EX32(desc, MTEDESC, ALIGN); + if (unlikely(align)) { + align = (1u << align) - 1; + if (unlikely(ptr & align)) { + int idx = FIELD_EX32(desc, MTEDESC, MIDX); + bool w = FIELD_EX32(desc, MTEDESC, WRITE); + MMUAccessType type = w ? MMU_DATA_STORE : MMU_DATA_LOAD; + arm_cpu_do_unaligned_access(env_cpu(env), ptr, type, idx, GETPC()); + } + } + return mte_check(env, desc, ptr, GETPC()); } diff --git a/target/arm/tcg/translate-a64.c b/target/arm/tcg/translate-a64.c index 0b600695965..77073a9c1d8 100644 --- a/target/arm/tcg/translate-a64.c +++ b/target/arm/tcg/translate-a64.c @@ -264,6 +264,7 @@ static TCGv_i64 gen_mte_check1_mmuidx(DisasContext *s, TCGv_i64 addr, desc = FIELD_DP32(desc, MTEDESC, TBI, s->tbid); desc = FIELD_DP32(desc, MTEDESC, TCMA, s->tcma); desc = FIELD_DP32(desc, MTEDESC, WRITE, is_write); + desc = FIELD_DP32(desc, MTEDESC, ALIGN, get_alignment_bits(memop)); desc = FIELD_DP32(desc, MTEDESC, SIZEM1, memop_size(memop) - 1); ret = tcg_temp_new_i64(); @@ -295,6 +296,7 @@ TCGv_i64 gen_mte_checkN(DisasContext *s, TCGv_i64 addr, bool is_write, desc = FIELD_DP32(desc, MTEDESC, TBI, s->tbid); desc = FIELD_DP32(desc, MTEDESC, TCMA, s->tcma); desc = FIELD_DP32(desc, MTEDESC, WRITE, is_write); + desc = FIELD_DP32(desc, MTEDESC, ALIGN, get_alignment_bits(single_mop)); desc = FIELD_DP32(desc, MTEDESC, SIZEM1, total_size - 1); ret = tcg_temp_new_i64();