From patchwork Fri Apr 16 18:31:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 422553 Delivered-To: patch@linaro.org Received: by 2002:a02:6a6f:0:0:0:0:0 with SMTP id m47csp630803jaf; Fri, 16 Apr 2021 11:36:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzBTEOXP8VydUq4KWXextmV1yI13mPmYv0NNZRrimP1AmUHfBH/q1IYXPwg1WXNuMOCs4rR X-Received: by 2002:a05:6602:179e:: with SMTP id y30mr4686430iox.130.1618598191825; Fri, 16 Apr 2021 11:36:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618598191; cv=none; d=google.com; s=arc-20160816; b=z2JuIXIaxeAOOm8Z97nqua1QAvA4qOBEJ9wc0DWfMW85j6V8lVaYLPXRjli9Yz6m+x HmdRcolysPlolBBTD9GVfrtm80zK+MCj8Omv6txb5U0ABzF9dWB48umzbMv3rPMaAFZ+ fGvGEYtJIMKlLq7q6DMZBwXGt4f68qmsK/M42IUCxGsXWgbYaFGKATGBYLcx4E/3663Q iK+osaW8LZAh8QwuoRBNBu3cbyLXps00pL9EHOf/9GmQNtdUxsR05o0xKLJMVsuFykO7 ovrMRajNCKZQJ2Wcmy8pifeLwWXLOBtibhARkCKADQGldQEQn+NGiVYF8Fqx2UpIVcqR zLRw== 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:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=PozZ71039TN9LB2JM2brlhvpMPxTWKRovHdHzz5gXtI=; b=jbEAyFNHt5S4Il91Avd9O16B3bHUgbZMe0mjTsp9mwbJLV9Vb4scAiuKJO8eQAigEg Pck5MsLwtwvDooCCMsjCZaxj0lQfP4Q2qfiyiRYSTjnTGfUHYPhtQqOBFi5oDwSvbXoy W2BUwmhl06N+dCkU6Ggo9Y54lbBa1Eqwit3OzWZglvZNcRFPx7cuntjlQRgOuRymq+Qz 1w9ZCFL4CFbfSIyZAra4zjhNiQY7Ex2NTbtNiwaLG5L33UD5LlS+JwBUoLKw5v9VdvU0 CFrHBZ1RULtApC7E0rVbIwrHiaHTSuM+YARzSAc9woQaYmdqvpCQaHJ8kGPwB5s2ikdc SGvw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=IuTR88XR; 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 w25si3265699jal.57.2021.04.16.11.36.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 16 Apr 2021 11:36:31 -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=IuTR88XR; 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]:57074 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lXTKP-0005a2-J8 for patch@linaro.org; Fri, 16 Apr 2021 14:36:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43610) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lXTFQ-0000pD-I0 for qemu-devel@nongnu.org; Fri, 16 Apr 2021 14:31:21 -0400 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]:37788) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lXTFM-0003kP-Hj for qemu-devel@nongnu.org; Fri, 16 Apr 2021 14:31:20 -0400 Received: by mail-pl1-x62e.google.com with SMTP id h20so14445380plr.4 for ; Fri, 16 Apr 2021 11:31:15 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=PozZ71039TN9LB2JM2brlhvpMPxTWKRovHdHzz5gXtI=; b=IuTR88XR3vpftP4dIptq38W33dAQacYbX+HAk/7/I54jNYdV6yVJQScUYMVLBoJhFE o69k/wfZ5WOiRIUALLZlfrF6M9dTWAolkclGwmpqOKSrWfL/0p2t3T0sLH0zapGebjKk BXlNRUsDgGGL8LMW5FlTp3hNLSXCjJEIfNw7kDETAou5vzSWV7N4ixaeJW/7FL1TT1tp /5aAGfMEk1yNAXrkEzKjcqbqfsL0LtVUKI+hHVt/bw5JGBYoLQDmmLz/ABJcrGnD4gxU 70KfjeEOeuvzYL1Vu2FVL6isepwakW+KlsOYpleCCRLRe5SEyBxDWLifSMytO+/U7Kp6 pSvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=PozZ71039TN9LB2JM2brlhvpMPxTWKRovHdHzz5gXtI=; b=DknfaivgYbDKPYsUUgvsXhZKa+DRON6C2ym+UPKZJ8gMd8PFzjp+gL2sTyJqr/dXyo YmjuRyUNgU4dzX4aB6OebOsr0KiWbtk5+87XPv1jr0HTEfx9+fFikbHRICmD/58R3b0x RLg8hRR9UDzucyAZ3mZlPWo16TSqVFB+nl6sqoZGZgP0hpQjMHzsjlD6V+CNgDT++afJ zxsG7B+B3c0+himfvMrelRgaHzzHER2T8W2gMghplrFoWTyFvCFhg/nTGQRteTHG0V58 emC652EULqjCbfrbuaBk5Mg269Tu6QOyx3KdmJN6W1zohB7R4+Dz/1f3PD0gfrRDHMyi n7xQ== X-Gm-Message-State: AOAM531BYboUQbjGz4snsHhgs62NILskACPetrAo9Q0Vb8lRTbp0YTrI HfIykrK94vTBYAJAYsX7zdQVrPsaqddVhw== X-Received: by 2002:a17:902:7249:b029:e9:44dc:61a9 with SMTP id c9-20020a1709027249b02900e944dc61a9mr10765075pll.32.1618597874992; Fri, 16 Apr 2021 11:31:14 -0700 (PDT) Received: from localhost.localdomain ([71.212.131.83]) by smtp.gmail.com with ESMTPSA id p18sm3057307pju.3.2021.04.16.11.31.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Apr 2021 11:31:14 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v5 7/9] target/arm: Rename mte_probe1 to mte_probe Date: Fri, 16 Apr 2021 11:31:04 -0700 Message-Id: <20210416183106.1516563-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210416183106.1516563-1-richard.henderson@linaro.org> References: <20210416183106.1516563-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62e; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62e.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 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-arm@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" For consistency with the mte_check1 + mte_checkN merge to mte_check, rename the probe function as well. Reviewed-by: Alex Bennée Signed-off-by: Richard Henderson --- target/arm/internals.h | 2 +- target/arm/mte_helper.c | 6 +++--- target/arm/sve_helper.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) -- 2.25.1 diff --git a/target/arm/internals.h b/target/arm/internals.h index af1db2cd9c..886db56b58 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -1145,7 +1145,7 @@ FIELD(MTEDESC, TCMA, 6, 2) FIELD(MTEDESC, WRITE, 8, 1) FIELD(MTEDESC, SIZEM1, 9, SIMD_DATA_BITS - 9) /* size - 1 */ -bool mte_probe1(CPUARMState *env, uint32_t desc, uint64_t ptr); +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); static inline int allocation_tag_from_addr(uint64_t ptr) diff --git a/target/arm/mte_helper.c b/target/arm/mte_helper.c index 161425f208..011a1ffa46 100644 --- a/target/arm/mte_helper.c +++ b/target/arm/mte_helper.c @@ -121,7 +121,7 @@ static uint8_t *allocation_tag_mem(CPUARMState *env, int ptr_mmu_idx, * exception for inaccessible pages, and resolves the virtual address * into the softmmu tlb. * - * When RA == 0, this is for mte_probe1. The page is expected to be + * When RA == 0, this is for mte_probe. The page is expected to be * valid. Indicate to probe_access_flags no-fault, then assert that * we received a valid page. */ @@ -808,12 +808,12 @@ uint64_t HELPER(mte_check)(CPUARMState *env, uint32_t desc, uint64_t ptr) } /* - * No-fault version of mte_check1, to be used by SVE for MemSingleNF. + * No-fault version of mte_check, to be used by SVE for MemSingleNF. * Returns false if the access is Checked and the check failed. This * is only intended to probe the tag -- the validity of the page must * be checked beforehand. */ -bool mte_probe1(CPUARMState *env, uint32_t desc, uint64_t ptr) +bool mte_probe(CPUARMState *env, uint32_t desc, uint64_t ptr) { uint64_t fault; int ret = mte_probe_int(env, desc, ptr, 0, &fault); diff --git a/target/arm/sve_helper.c b/target/arm/sve_helper.c index b63ddfc7f9..982240d104 100644 --- a/target/arm/sve_helper.c +++ b/target/arm/sve_helper.c @@ -4869,7 +4869,7 @@ void sve_ldnfff1_r(CPUARMState *env, void *vg, const target_ulong addr, /* Watchpoint hit, see below. */ goto do_fault; } - if (mtedesc && !mte_probe1(env, mtedesc, addr + mem_off)) { + if (mtedesc && !mte_probe(env, mtedesc, addr + mem_off)) { goto do_fault; } /* @@ -4919,7 +4919,7 @@ void sve_ldnfff1_r(CPUARMState *env, void *vg, const target_ulong addr, & BP_MEM_READ)) { goto do_fault; } - if (mtedesc && !mte_probe1(env, mtedesc, addr + mem_off)) { + if (mtedesc && !mte_probe(env, mtedesc, addr + mem_off)) { goto do_fault; } host_fn(vd, reg_off, host + mem_off); @@ -5588,7 +5588,7 @@ void sve_ldff1_z(CPUARMState *env, void *vd, uint64_t *vg, void *vm, } if (mtedesc && arm_tlb_mte_tagged(&info.attrs) && - !mte_probe1(env, mtedesc, addr)) { + !mte_probe(env, mtedesc, addr)) { goto fault; }