From nobody Fri Apr 26 19:02:34 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1617731172; cv=none; d=zohomail.com; s=zohoarc; b=KAelYEf8/z9mY/I5ojZ0qP51WVShULbfxj8oE21obor03dFi4GLLcV6+nk3FRWy+hYKqEC1NUiCy5TYkex9p3v/Pfkh1y+2su5Uh17tAt4ECM4ryjYkMlGMsw/PSnKbk/usujpbTjj27Q4Bugv7Za1xP/K3JEPrbjNVKhvgGJtk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617731172; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=N2mWsQLvcKb8vumKiyJlzF6R6pJ22LkeGfPO+NZbgZA=; b=EKkJZ36qmnwBoY7Zsq1CmXpQKPqLViR40fx945z8lMBGhNQoBJlVzvJCgRqXGRbKjtLQYPMqCmmw4QJ1S7FSjU3ydHW95eCc3XdIx9BdT4Pvwr9rt1hd/aYFUK6gSSapfC0v6hpYVjUKvlk1CJSWlWffsSpVN42Wt1cIyBF6pcI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 161773117209070.05335740299313; Tue, 6 Apr 2021 10:46:12 -0700 (PDT) Received: from localhost ([::1]:59348 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lTpmE-00082M-TP for importer@patchew.org; Tue, 06 Apr 2021 13:46:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45678) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lTpgt-0001ax-0B for qemu-devel@nongnu.org; Tue, 06 Apr 2021 13:40:39 -0400 Received: from mail-pj1-x1030.google.com ([2607:f8b0:4864:20::1030]:39523) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lTpgp-0006Hq-M7 for qemu-devel@nongnu.org; Tue, 06 Apr 2021 13:40:38 -0400 Received: by mail-pj1-x1030.google.com with SMTP id ot17-20020a17090b3b51b0290109c9ac3c34so10054094pjb.4 for ; Tue, 06 Apr 2021 10:40:35 -0700 (PDT) Received: from localhost.localdomain ([71.212.131.83]) by smtp.gmail.com with ESMTPSA id h15sm19148056pfo.20.2021.04.06.10.40.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Apr 2021 10:40:33 -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=N2mWsQLvcKb8vumKiyJlzF6R6pJ22LkeGfPO+NZbgZA=; b=IkKFB1mnYH976x7d57AqzXamfVgFP1B4L2ZY6qM8E+omyZNz4sYzq4hjt5kXWVZJzd 9dXNw2Z1NbYfOkoIjiFpIdr+jAfbMk3nCz9z8XIEJOKF+gmIp4bEswSjBSmAajHo8aik pWd3f2N+AUYqUJrTkV3Z5fBhRkNJ5SEAmTIeS6cp6/WGdxkADzqtFCZIAZ9iDQXEQhFj nZAL2gt+2DHHv+WpKMDmmmVJLdggLfF4S7trJTq6IFEZ/LgGwLfsw4tEhQe0IEr3C6LU /yHG08DPIC3JTxL2vIHswpQDX3kD2fuqTv1lt0qTQLkopaNceHhgVfEG4Wub0wbGc9xL wnlQ== 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=N2mWsQLvcKb8vumKiyJlzF6R6pJ22LkeGfPO+NZbgZA=; b=pdOk4gq782h/Fi9zNA8XsiXK6XAmpkxn6HJVkbufXcYMKleMguJ0dIBp2XKHhSZlI5 VKD+mxdsGXcYcYdd0DdGQ+R4toBREm5vrgSBZ+bw6AOiZW2sI4UdOhqhtVW6WY/+39o/ /jOshyMSadJFEjUAz4EtaTHo4nXrlFrA5aZVh1+7LYvWy5T29R6f5CnnJfVmrdr3scHX B3sawv0eFfHqhrjW0ezrDxpZEEQbZfu3hDU3ul6amWevgTGAOY2STvQsfEWyMlLD3tEk 5AsnduOh+99sCN0PpYECibvtLs2+Ygr+t9DqdIck9ohrE/VfXwnD6nmAkpwp/KhDBFM1 tT4A== X-Gm-Message-State: AOAM531rC1I+r0l9qvfOyhYp830ejkO/POe/wGUirXY42axEZ27qB6df TvUXYzeUsKyylwUFMa0pHbDrlcUuVQAiUQ== X-Google-Smtp-Source: ABdhPJypxI019TdjhUvRAZJcUdj4VzlMtCU+/YVgwvFEfW1zwCMRPlWxQ+fiMyEOH/LmV7gi9tE9mg== X-Received: by 2002:a17:90a:c28a:: with SMTP id f10mr5667383pjt.15.1617730834303; Tue, 06 Apr 2021 10:40:34 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v4 01/12] accel/tcg: Preserve PAGE_ANON when changing page permissions Date: Tue, 6 Apr 2021 10:40:20 -0700 Message-Id: <20210406174031.64299-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210406174031.64299-1-richard.henderson@linaro.org> References: <20210406174031.64299-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::1030; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1030.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=unavailable 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, Stephen Long Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" Using mprotect() to change PROT_* does not change the MAP_ANON previously set with mmap(). Our linux-user version of MTE only works with MAP_ANON pages, so losing PAGE_ANON caused MTE to stop working. Reported-by: Stephen Long Signed-off-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e Tested-by: Alex Benn=C3=A9e --- tests/tcg/aarch64/mte.h | 3 ++- accel/tcg/translate-all.c | 9 +++++-- tests/tcg/aarch64/mte-6.c | 43 +++++++++++++++++++++++++++++++ tests/tcg/aarch64/Makefile.target | 2 +- 4 files changed, 53 insertions(+), 4 deletions(-) create mode 100644 tests/tcg/aarch64/mte-6.c diff --git a/tests/tcg/aarch64/mte.h b/tests/tcg/aarch64/mte.h index 141cef522c..0805676b11 100644 --- a/tests/tcg/aarch64/mte.h +++ b/tests/tcg/aarch64/mte.h @@ -48,7 +48,8 @@ static void enable_mte(int tcf) } } =20 -static void *alloc_mte_mem(size_t size) +static void * alloc_mte_mem(size_t size) __attribute__((unused)); +static void * alloc_mte_mem(size_t size) { void *p =3D mmap(NULL, size, PROT_READ | PROT_WRITE | PROT_MTE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index f32df8b240..ba6ab09790 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -2714,6 +2714,8 @@ void page_set_flags(target_ulong start, target_ulong = end, int flags) a missing call to h2g_valid. */ assert(end - 1 <=3D GUEST_ADDR_MAX); assert(start < end); + /* Only set PAGE_ANON with new mappings. */ + assert(!(flags & PAGE_ANON) || (flags & PAGE_RESET)); assert_memory_lock(); =20 start =3D start & TARGET_PAGE_MASK; @@ -2737,11 +2739,14 @@ void page_set_flags(target_ulong start, target_ulon= g end, int flags) p->first_tb) { tb_invalidate_phys_page(addr, 0); } - if (reset_target_data && p->target_data) { + if (reset_target_data) { g_free(p->target_data); p->target_data =3D NULL; + p->flags =3D flags; + } else { + /* Using mprotect on a page does not change MAP_ANON. */ + p->flags =3D (p->flags & PAGE_ANON) | flags; } - p->flags =3D flags; } } =20 diff --git a/tests/tcg/aarch64/mte-6.c b/tests/tcg/aarch64/mte-6.c new file mode 100644 index 0000000000..60d51d18be --- /dev/null +++ b/tests/tcg/aarch64/mte-6.c @@ -0,0 +1,43 @@ +#include "mte.h" + +void pass(int sig, siginfo_t *info, void *uc) +{ + assert(info->si_code =3D=3D SEGV_MTESERR); + exit(0); +} + +int main(void) +{ + enable_mte(PR_MTE_TCF_SYNC); + + void *brk =3D sbrk(16); + if (brk =3D=3D (void *)-1) { + perror("sbrk"); + return 2; + } + + if (mprotect(brk, 16, PROT_READ | PROT_WRITE | PROT_MTE)) { + perror("mprotect"); + return 2; + } + + int *p1, *p2; + long excl =3D 1; + + asm("irg %0,%1,%2" : "=3Dr"(p1) : "r"(brk), "r"(excl)); + asm("gmi %0,%1,%0" : "+r"(excl) : "r"(p1)); + asm("irg %0,%1,%2" : "=3Dr"(p2) : "r"(brk), "r"(excl)); + asm("stg %0,[%0]" : : "r"(p1)); + + *p1 =3D 0; + + struct sigaction sa; + memset(&sa, 0, sizeof(sa)); + sa.sa_sigaction =3D pass; + sa.sa_flags =3D SA_SIGINFO; + sigaction(SIGSEGV, &sa, NULL); + + *p2 =3D 0; + + abort(); +} diff --git a/tests/tcg/aarch64/Makefile.target b/tests/tcg/aarch64/Makefile= .target index 56e48f4b34..05b2622bfc 100644 --- a/tests/tcg/aarch64/Makefile.target +++ b/tests/tcg/aarch64/Makefile.target @@ -37,7 +37,7 @@ AARCH64_TESTS +=3D bti-2 =20 # MTE Tests ifneq ($(DOCKER_IMAGE)$(CROSS_CC_HAS_ARMV8_MTE),) -AARCH64_TESTS +=3D mte-1 mte-2 mte-3 mte-4 +AARCH64_TESTS +=3D mte-1 mte-2 mte-3 mte-4 mte-6 mte-%: CFLAGS +=3D -march=3Darmv8.5-a+memtag endif =20 --=20 2.25.1 From nobody Fri Apr 26 19:02:34 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1617731041; cv=none; d=zohomail.com; s=zohoarc; b=SK2XRftj2OaKYcoAs2UM5fsVbmt/n2fJklawbuFS0g5afmGjdSNloSJrZv6TzcNPsZqqKYzALniJRTMXs5G4KDIIu43v5AV/gq4RzS+y2V847l1+XQTE18atEpET4LgOAGccJa7q2gtpDFzZJRA9QSFg8uu/m5KcLVxRwPBeH0w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617731041; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=fmCgzHtzk5qDGe2eGqNAc4vF9R/bc/UzkhnNYf8s1aw=; b=O6ZQ2VbH42Y7bMjTO0MU9XPQP1f6T/s0dG9PHqCC8X3v2bfH37KQfCUCzPCGP0/uS6k3RsgznBj1c5/GDMq8fh129I0z0JjhBAaSvJAo4NcCGaWbDU9ISXlQCNC2yrXREo+WrybIjCE+gGNpwmGybFR5Kr48+/8ASDEigu5O1To= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1617731041826732.0678670575136; Tue, 6 Apr 2021 10:44:01 -0700 (PDT) Received: from localhost ([::1]:54188 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lTpk8-0005sF-O8 for importer@patchew.org; Tue, 06 Apr 2021 13:44:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45770) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lTpgv-0001fe-H7 for qemu-devel@nongnu.org; Tue, 06 Apr 2021 13:40:41 -0400 Received: from mail-pg1-x534.google.com ([2607:f8b0:4864:20::534]:40958) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lTpgr-0006J2-0B for qemu-devel@nongnu.org; Tue, 06 Apr 2021 13:40:41 -0400 Received: by mail-pg1-x534.google.com with SMTP id b17so7244791pgh.7 for ; Tue, 06 Apr 2021 10:40:36 -0700 (PDT) Received: from localhost.localdomain ([71.212.131.83]) by smtp.gmail.com with ESMTPSA id h15sm19148056pfo.20.2021.04.06.10.40.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Apr 2021 10:40:34 -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=fmCgzHtzk5qDGe2eGqNAc4vF9R/bc/UzkhnNYf8s1aw=; b=X/xm6Ep5i+3WG9oCNPKExXqJNHZTZUZo9HQfDwtMnsP5WgJECs90FR9/S1r5qNNJBa lkmwpACXwZHh9u+8vihMS+7CrVNHX/AaEwNjowi0Ka3K0N/8zEgF9JodWqRqp12KziSe rNF9gmmvvvSWjTRAedBDLLZWSDK3icm836KQLBYAYikdK55udG92S1zlmdF65mu1B2yB wdbIUNN+XzcErvMdKLLq0cKb5Q6z1Hx0SiK49Vd7p1Ne9hdAKkUMo/1rVotRYO04Emnt NdIfpdAFmR3JKsveCZJKfN1ZrbAqD0wDgNzRwWtZK28mxQ4AgH7i92yWpDXDXwMYc1BV P4UA== 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=fmCgzHtzk5qDGe2eGqNAc4vF9R/bc/UzkhnNYf8s1aw=; b=EbmQLfehi78EnKp0QGf69eLEvthrs5ioGg3Qfa7bbMbHGEJEsW6dIi8VjZFdjneA+u jcWCekL1E1bTME9krQguIBiiuvg3zlVp3/4sdlmn+uHwEi6SbskPhKaP09K5RTmKVjkI nNZ3zoEGF2STuKF4LEYVxv7glHkZIUI2qAePRsVPwmTAWI2m8uhitA5NuzRkRBl0wKh+ 60tHdLyznatuBVuHl/bRqfh9ySElWyL810EdmK9fa37r8QDqvocmsNEobstHAhm7cZJG TSyM7qjrvd8Bn6pY6CL5KlB2LV3jQI+ePNa8sRuGL6fDf6VVeEazvFU9iEqAvY51v3V2 eaKQ== X-Gm-Message-State: AOAM531dUsAJxE2rcJLFJ1CMF9eqp9tOji+kOppEi2hxKu6W6sB5qsAs kpUX8RoCFY9KTlsCYfIGDmqUBZAupxTU6A== X-Google-Smtp-Source: ABdhPJy6cxIBE/w8EOlYTmnkt8DIhs4rRwdHbGRXEgxiI7Z26x1RIkd7hKoZzUUOSYg0mBB8Zw9k6g== X-Received: by 2002:a63:dc43:: with SMTP id f3mr20047475pgj.290.1617730835344; Tue, 06 Apr 2021 10:40:35 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v4 02/12] target/arm: Check PAGE_WRITE_ORG for MTE writeability Date: Tue, 6 Apr 2021 10:40:21 -0700 Message-Id: <20210406174031.64299-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210406174031.64299-1-richard.henderson@linaro.org> References: <20210406174031.64299-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::534; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x534.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=unavailable 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 Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" We can remove PAGE_WRITE when (internally) marking a page read-only because it contains translated code. This can be triggered by tests/tcg/aarch64/bti-2, after having serviced SIGILL trampolines on the stack. Signed-off-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e --- target/arm/mte_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/arm/mte_helper.c b/target/arm/mte_helper.c index 0bbb9ec346..8be17e1b70 100644 --- a/target/arm/mte_helper.c +++ b/target/arm/mte_helper.c @@ -83,7 +83,7 @@ static uint8_t *allocation_tag_mem(CPUARMState *env, int = ptr_mmu_idx, uint8_t *tags; uintptr_t index; =20 - if (!(flags & (ptr_access =3D=3D MMU_DATA_STORE ? PAGE_WRITE : PAGE_RE= AD))) { + if (!(flags & (ptr_access =3D=3D MMU_DATA_STORE ? PAGE_WRITE_ORG : PAG= E_READ))) { /* SIGSEGV */ arm_cpu_tlb_fill(env_cpu(env), ptr, ptr_size, ptr_access, ptr_mmu_idx, false, ra); --=20 2.25.1 From nobody Fri Apr 26 19:02:34 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1617731354; cv=none; d=zohomail.com; s=zohoarc; b=dmTKj0Zviar1rDa3vuHskJGpmLykinnrkE6CqP7aF8RCKTEGxv3NP+nT11ft5PyFGMTWeDxfb5ZQQz0SVU6yZg3FbKYj5EBFrVxTQWXYg6M+fAvLKLygVSI6cVMwyOD4U1gThYunmG07ZcYYZg1zBdSPKqJBcA6923/66EXq11U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617731354; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=3mgQ/AwHCdEqMYqaEDNteTClCiB0ojdl1YSqbUogses=; b=AZSRIsfKqpMFUj1qXgYa5BrKZkCYGKAQV+yCT4/QH8ZvlXgMXQRIk3A7++Frwu3WPxOziu1ED5qfGZ9w3/dIi7e51NitfBT16cLJTwjQ4nY71iEvdWUY/bikNjdnAu0RWWgQGTpLcy6NSs8oUayR5BFpatn/zdpnoXbpeY4lZaI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1617731354166686.943118607303; Tue, 6 Apr 2021 10:49:14 -0700 (PDT) Received: from localhost ([::1]:38818 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lTppB-0002kv-5e for importer@patchew.org; Tue, 06 Apr 2021 13:49:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45736) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lTpgu-0001dk-Je for qemu-devel@nongnu.org; Tue, 06 Apr 2021 13:40:40 -0400 Received: from mail-pj1-x102c.google.com ([2607:f8b0:4864:20::102c]:52792) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lTpgs-0006Jc-0a for qemu-devel@nongnu.org; Tue, 06 Apr 2021 13:40:40 -0400 Received: by mail-pj1-x102c.google.com with SMTP id ha17so8331443pjb.2 for ; Tue, 06 Apr 2021 10:40:37 -0700 (PDT) Received: from localhost.localdomain ([71.212.131.83]) by smtp.gmail.com with ESMTPSA id h15sm19148056pfo.20.2021.04.06.10.40.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Apr 2021 10:40:35 -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=3mgQ/AwHCdEqMYqaEDNteTClCiB0ojdl1YSqbUogses=; b=EFdail5Q39YUUjQu5flb2sWdqSnNPtN7VWpuZ3Ao31OyVEdtjKW5InWYnb/KHdW48h PfigFSl7c/1Q6TNHm7s6dDZh8hFaVMydS0LdIWOvNkkt7y5+G2J0lYvSbM70WlUpzvkD cV0uS31wZwF1s8IfUiULKhuIC86oYa8R4JtcLo0U+TNuTiE8m4/13gkH92x6Guv5JZQ6 WjHDtjTzF9fHSKccVlzik0TmqlcgwwFZP9nqcX4nn9A7Kh7P709zR1bqIvtFduv/BmiM v6jRYVBFmPmce4uVGKUFJWdi1qZ3a/FFiade46iINImsxyBBPO1Li4dkTil3HuV0q1a2 +5Wg== 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=3mgQ/AwHCdEqMYqaEDNteTClCiB0ojdl1YSqbUogses=; b=Zh2vzHT6Nh7IoVksVNpGy+HlwMPnDjkSMdwsli8btCji4vZd7H7cxqa+gK2gwnwxg6 jvUV225Tgd7gytfjtP/92a2y0Bz1aYLmTr6jPWXciYl/FfDXbb8BLOVlDep4whIR5ckk 9opSmPMu9Zt32na6MXJZEXqIh5EHRsDFfkx2Zlsl40TFluPnzRBOeKhGkypJjV9zpAmH ty+Zkga75gJLWQb8vccEWXhtmMv4EwnsiDlfNW8Reb5IbdqtGDiO6EOZ61rqf09lgKQ6 s/p8+EEyO5E7GWL/L16KA4CLpofVqPDHDykItmycVcwnEGB63amKRppKzZT+gbZhJr64 Bqqw== X-Gm-Message-State: AOAM531E2HR5eFlvTp++KxsiUL06hVhKDijNC1/5IvXfDfyRTmVHaXwm gAvSonyJEF+UgOHLLdAQZBXvnuceHz8QCg== X-Google-Smtp-Source: ABdhPJzJ4tzvWf5rRaGFEile1xB/jj5vM8EYxxXle2UfM+qsPpRZ+RZwOz+SnD10LysMoDGgkjHohw== X-Received: by 2002:a17:902:b908:b029:e9:4010:7fd3 with SMTP id bf8-20020a170902b908b02900e940107fd3mr3679881plb.55.1617730836381; Tue, 06 Apr 2021 10:40:36 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v4 03/12] target/arm: Fix mte_checkN Date: Tue, 6 Apr 2021 10:40:22 -0700 Message-Id: <20210406174031.64299-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210406174031.64299-1-richard.henderson@linaro.org> References: <20210406174031.64299-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::102c; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102c.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 Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" We were incorrectly assuming that only the first byte of an MTE access is checked against the tags. But per the ARM, unaligned accesses are pre-decomposed into single-byte accesses. So by the time we reach the actual MTE check in the ARM pseudocode, all accesses are aligned. Therefore, the first failure is always either the first byte of the access, or the first byte of the granule. In addition, some of the arithmetic is off for last-first -> count. This does not become directly visible until a later patch that passes single bytes into this function, so ptr =3D=3D ptr_last. Buglink: https://bugs.launchpad.net/bugs/1921948 Signed-off-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e --- target/arm/mte_helper.c | 38 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/target/arm/mte_helper.c b/target/arm/mte_helper.c index 8be17e1b70..c87717127c 100644 --- a/target/arm/mte_helper.c +++ b/target/arm/mte_helper.c @@ -757,10 +757,10 @@ uint64_t mte_checkN(CPUARMState *env, uint32_t desc, uint64_t ptr, uintptr_t ra) { int mmu_idx, ptr_tag, bit55; - uint64_t ptr_last, ptr_end, prev_page, next_page; - uint64_t tag_first, tag_end; - uint64_t tag_byte_first, tag_byte_end; - uint32_t esize, total, tag_count, tag_size, n, c; + uint64_t ptr_last, prev_page, next_page; + uint64_t tag_first, tag_last; + uint64_t tag_byte_first, tag_byte_last; + uint32_t total, tag_count, tag_size, n, c; uint8_t *mem1, *mem2; MMUAccessType type; =20 @@ -779,29 +779,27 @@ uint64_t mte_checkN(CPUARMState *env, uint32_t desc, =20 mmu_idx =3D FIELD_EX32(desc, MTEDESC, MIDX); type =3D FIELD_EX32(desc, MTEDESC, WRITE) ? MMU_DATA_STORE : MMU_DATA_= LOAD; - esize =3D FIELD_EX32(desc, MTEDESC, ESIZE); total =3D FIELD_EX32(desc, MTEDESC, TSIZE); =20 /* Find the addr of the end of the access, and of the last element. */ - ptr_end =3D ptr + total; - ptr_last =3D ptr_end - esize; + ptr_last =3D ptr + total - 1; =20 /* Round the bounds to the tag granule, and compute the number of tags= . */ tag_first =3D QEMU_ALIGN_DOWN(ptr, TAG_GRANULE); - tag_end =3D QEMU_ALIGN_UP(ptr_last, TAG_GRANULE); - tag_count =3D (tag_end - tag_first) / TAG_GRANULE; + tag_last =3D QEMU_ALIGN_DOWN(ptr_last, TAG_GRANULE); + tag_count =3D ((tag_last - tag_first) / TAG_GRANULE) + 1; =20 /* Round the bounds to twice the tag granule, and compute the bytes. */ tag_byte_first =3D QEMU_ALIGN_DOWN(ptr, 2 * TAG_GRANULE); - tag_byte_end =3D QEMU_ALIGN_UP(ptr_last, 2 * TAG_GRANULE); + tag_byte_last =3D QEMU_ALIGN_DOWN(ptr_last, 2 * TAG_GRANULE); =20 /* Locate the page boundaries. */ prev_page =3D ptr & TARGET_PAGE_MASK; next_page =3D prev_page + TARGET_PAGE_SIZE; =20 - if (likely(tag_end - prev_page <=3D TARGET_PAGE_SIZE)) { + if (likely(tag_last - prev_page <=3D TARGET_PAGE_SIZE)) { /* Memory access stays on one page. */ - tag_size =3D (tag_byte_end - tag_byte_first) / (2 * TAG_GRANULE); + tag_size =3D ((tag_byte_last - tag_byte_first) / (2 * TAG_GRANULE)= ) + 1; mem1 =3D allocation_tag_mem(env, mmu_idx, ptr, type, total, MMU_DATA_LOAD, tag_size, ra); if (!mem1) { @@ -815,9 +813,9 @@ uint64_t mte_checkN(CPUARMState *env, uint32_t desc, mem1 =3D allocation_tag_mem(env, mmu_idx, ptr, type, next_page - p= tr, MMU_DATA_LOAD, tag_size, ra); =20 - tag_size =3D (tag_byte_end - next_page) / (2 * TAG_GRANULE); + tag_size =3D ((tag_byte_last - next_page) / (2 * TAG_GRANULE)) + 1; mem2 =3D allocation_tag_mem(env, mmu_idx, next_page, type, - ptr_end - next_page, + ptr_last - next_page + 1, MMU_DATA_LOAD, tag_size, ra); =20 /* @@ -838,15 +836,13 @@ uint64_t mte_checkN(CPUARMState *env, uint32_t desc, } =20 /* - * If we failed, we know which granule. Compute the element that - * is first in that granule, and signal failure on that element. + * If we failed, we know which granule. For the first granule, the + * failure address is @ptr, the first byte accessed. Otherwise the + * failure address is the first byte of the nth granule. */ if (unlikely(n < tag_count)) { - uint64_t fail_ofs; - - fail_ofs =3D tag_first + n * TAG_GRANULE - ptr; - fail_ofs =3D ROUND_UP(fail_ofs, esize); - mte_check_fail(env, desc, ptr + fail_ofs, ra); + uint64_t fault =3D (n =3D=3D 0 ? ptr : tag_first + n * TAG_GRANULE= ); + mte_check_fail(env, desc, fault, ra); } =20 done: --=20 2.25.1 From nobody Fri Apr 26 19:02:34 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1617731098; cv=none; d=zohomail.com; s=zohoarc; b=gxpi8353/RkjQKk1GZbMpdVCPOlf/Guel4eFtJaoqE5MsvgQovRUWjscCV0judo6nXSXpA7tkWchS/uz+U5XhA5rReL9w6b993+OrTmXoMYfXcnlmPAk5xm5/41LxA13U5Jp0kQu+9OWGEmCQcNdSwT05KMFdJ6QGA4kYHCcO0g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617731098; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=YQ1L8vImC9BAqb2R2P9ZLLT4N7NCVNuCBmSGEW3fZ+M=; b=JZpReyl5XMmpK+K8SDdEPWHaqRCt5CSoYLbw6+d5TS6yP8kea1YmXbL3ffE3/6TM1rKjGuPYtQohmOBOQYYpad6OM7rn6jn8yMtRvQA+nmaRREJ0GvENbNfsXalNv7GKNQOtR1xc9Cb8/oaSojDZB/4nw2C8KnTvYp+AE6/P3eU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1617731098154300.89799594287103; Tue, 6 Apr 2021 10:44:58 -0700 (PDT) Received: from localhost ([::1]:57178 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lTpl2-00075F-U5 for importer@patchew.org; Tue, 06 Apr 2021 13:44:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45756) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lTpgv-0001eW-0a for qemu-devel@nongnu.org; Tue, 06 Apr 2021 13:40:41 -0400 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]:35500) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lTpgs-0006Kd-KC for qemu-devel@nongnu.org; Tue, 06 Apr 2021 13:40:40 -0400 Received: by mail-pl1-x636.google.com with SMTP id j7so3225748plx.2 for ; Tue, 06 Apr 2021 10:40:38 -0700 (PDT) Received: from localhost.localdomain ([71.212.131.83]) by smtp.gmail.com with ESMTPSA id h15sm19148056pfo.20.2021.04.06.10.40.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Apr 2021 10:40:36 -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=YQ1L8vImC9BAqb2R2P9ZLLT4N7NCVNuCBmSGEW3fZ+M=; b=prMx0V7Mceo2sC/+8iI3ycNrW7C7iFVkUBUp/S2D4ZdUDN50Zk+KU70H7RYj0xmNuF p80sptEnD5w1QSwb8/YE5fRiXRuaaxu4EUdhY97oBWx0QEkDUJyMo0NQix1Gcb7oTfOH p8DhJnYuSO2Wwv6ArOfdnloZz5nO4FcwAPMoWpw2K8AgEwT0p1MeE+WtDDSQ2H6EVjTz zQxMjLYV59vsFKAVNLpDQsO/tHKy2RcJ7Y/Qv4f+SrH5IkrvkhshZJdpfmWUmwt4HAYe o8Fq7k2AyxFw/Z6GhhWUrV07QfZrm4u/yvYFqrjskJD29YU8l+1jnkB43+H1xWdMlbJY dAcA== 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=YQ1L8vImC9BAqb2R2P9ZLLT4N7NCVNuCBmSGEW3fZ+M=; b=knsy4StLmAcFm9LhmRQYW1OTJwa6bYRJqqgBwwv7y+/TM+30/iIXR8AI5oAoIlk8o2 hs5MXIMfuN2/78dGdyP7M7dhya5okCTR4WZwhmACO6mohf1tXYTFN9HhoqoSrVA8qNNz gnzT0ztktsANX3j7L2bqwd7EZSfqHsDki7CkjwarcYa7GaNeJWi5XaLF9VrkLYgE4Xfv nq/yW9ctLcRJN2rIqvqwuRvUm5W6LYjCAPxhPIMJLGM7nAGNQt0o/U9CkZdqhr1Qd+m4 zvp/W9i5nKStPIsyT4qFob5cSM17HNvKSDxd5oV4XD/tpuO3Qw7AHczXGETneEAe+NbK ltAQ== X-Gm-Message-State: AOAM530Q6/c4cjsWS1b4bjndww+eEVi7KNM58a+FgEtrHLzbXDB9igip CxVHu/x1Oszq8Hl6RxDVor/85DKMgXDkgw== X-Google-Smtp-Source: ABdhPJwa3kpToFzf//hGp5f4NIvipds9hQKiU3gxWQqXIG2Ay36XHwHXeD3gIBw2/KjWWWj9/m8ZSg== X-Received: by 2002:a17:902:7401:b029:e8:e6e5:3240 with SMTP id g1-20020a1709027401b02900e8e6e53240mr14389236pll.62.1617730837238; Tue, 06 Apr 2021 10:40:37 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v4 04/12] target/arm: Split out mte_probe_int Date: Tue, 6 Apr 2021 10:40:23 -0700 Message-Id: <20210406174031.64299-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210406174031.64299-1-richard.henderson@linaro.org> References: <20210406174031.64299-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::636; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x636.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 Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" Split out a helper function from mte_checkN to perform all of the checking and address manpulation. So far, just use this in mte_checkN itself. Signed-off-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e --- target/arm/mte_helper.c | 52 +++++++++++++++++++++++++++++++---------- 1 file changed, 40 insertions(+), 12 deletions(-) diff --git a/target/arm/mte_helper.c b/target/arm/mte_helper.c index c87717127c..144bfa4a51 100644 --- a/target/arm/mte_helper.c +++ b/target/arm/mte_helper.c @@ -753,33 +753,45 @@ static int checkN(uint8_t *mem, int odd, int cmp, int= count) return n; } =20 -uint64_t mte_checkN(CPUARMState *env, uint32_t desc, - uint64_t ptr, uintptr_t ra) +/* + * mte_probe_int: + * @env: CPU environment + * @desc: MTEDESC descriptor + * @ptr: virtual address of the base of the access + * @fault: return virtual address of the first check failure + * + * Internal routine for both mte_probe and mte_check. + * Return zero on failure, filling in *fault. + * Return negative on trivial success for tbi disabled. + * Return positive on success with tbi enabled. + */ +static int mte_probe_int(CPUARMState *env, uint32_t desc, uint64_t ptr, + uintptr_t ra, uint32_t total, uint64_t *fault) { int mmu_idx, ptr_tag, bit55; uint64_t ptr_last, prev_page, next_page; uint64_t tag_first, tag_last; uint64_t tag_byte_first, tag_byte_last; - uint32_t total, tag_count, tag_size, n, c; + uint32_t tag_count, tag_size, n, c; uint8_t *mem1, *mem2; MMUAccessType type; =20 bit55 =3D extract64(ptr, 55, 1); + *fault =3D ptr; =20 /* If TBI is disabled, the access is unchecked, and ptr is not dirty. = */ if (unlikely(!tbi_check(desc, bit55))) { - return ptr; + return -1; } =20 ptr_tag =3D allocation_tag_from_addr(ptr); =20 if (tcma_check(desc, bit55, ptr_tag)) { - goto done; + return 1; } =20 mmu_idx =3D FIELD_EX32(desc, MTEDESC, MIDX); type =3D FIELD_EX32(desc, MTEDESC, WRITE) ? MMU_DATA_STORE : MMU_DATA_= LOAD; - total =3D FIELD_EX32(desc, MTEDESC, TSIZE); =20 /* Find the addr of the end of the access, and of the last element. */ ptr_last =3D ptr + total - 1; @@ -803,7 +815,7 @@ uint64_t mte_checkN(CPUARMState *env, uint32_t desc, mem1 =3D allocation_tag_mem(env, mmu_idx, ptr, type, total, MMU_DATA_LOAD, tag_size, ra); if (!mem1) { - goto done; + return 1; } /* Perform all of the comparisons. */ n =3D checkN(mem1, ptr & TAG_GRANULE, ptr_tag, tag_count); @@ -829,23 +841,39 @@ uint64_t mte_checkN(CPUARMState *env, uint32_t desc, } if (n =3D=3D c) { if (!mem2) { - goto done; + return 1; } n +=3D checkN(mem2, 0, ptr_tag, tag_count - c); } } =20 + if (likely(n =3D=3D tag_count)) { + return 1; + } + /* * If we failed, we know which granule. For the first granule, the * failure address is @ptr, the first byte accessed. Otherwise the * failure address is the first byte of the nth granule. */ - if (unlikely(n < tag_count)) { - uint64_t fault =3D (n =3D=3D 0 ? ptr : tag_first + n * TAG_GRANULE= ); - mte_check_fail(env, desc, fault, ra); + if (n > 0) { + *fault =3D tag_first + n * TAG_GRANULE; } + return 0; +} =20 - done: +uint64_t mte_checkN(CPUARMState *env, uint32_t desc, + uint64_t ptr, uintptr_t ra) +{ + uint64_t fault; + uint32_t total =3D FIELD_EX32(desc, MTEDESC, TSIZE); + int ret =3D mte_probe_int(env, desc, ptr, ra, total, &fault); + + if (unlikely(ret =3D=3D 0)) { + mte_check_fail(env, desc, fault, ra); + } else if (ret < 0) { + return ptr; + } return useronly_clean_ptr(ptr); } =20 --=20 2.25.1 From nobody Fri Apr 26 19:02:34 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1617731285; cv=none; d=zohomail.com; s=zohoarc; b=MNVPmo82BhRqKu4nQkP5CpPsBkp2ewRgizucohQuQchcGsdk2wwjbjrQu0ERJgakbIj3vkjjEP6MwxqIMYnlOAtsOLShP6+GjWye9ffX1/R+GaaObSLcSjZkaMsdOwulJwEUQySpRmBHqp0zkllGAF8dzQV+Oh68oKFJ4m/jHJ8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617731285; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=bmRgp+hz0GAy8sBEmRvnPYPMAtwbiJML48v1bJslbg4=; b=CyRnrWFHbXDW0ihtBHj3cU7CaUbrdrWz+tFLkYuNvSJ91IGHl38cZo/X97DZECyDMC7mBl+ovIldQfNjSbxxinpLAQeVQEqXdm28NFET5LIy8pM425f/A43XcSt3fx1X9rTT7ia0jCR/AGvKijSbuF5q9tNO/4u0PVZ78wCDrF8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1617731285845835.4309522650358; Tue, 6 Apr 2021 10:48:05 -0700 (PDT) Received: from localhost ([::1]:35720 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lTpo4-0001VE-QA for importer@patchew.org; Tue, 06 Apr 2021 13:48:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45824) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lTpgw-0001iB-UJ for qemu-devel@nongnu.org; Tue, 06 Apr 2021 13:40:42 -0400 Received: from mail-pj1-x102a.google.com ([2607:f8b0:4864:20::102a]:39518) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lTpgt-0006L4-W2 for qemu-devel@nongnu.org; Tue, 06 Apr 2021 13:40:42 -0400 Received: by mail-pj1-x102a.google.com with SMTP id ot17-20020a17090b3b51b0290109c9ac3c34so10054206pjb.4 for ; Tue, 06 Apr 2021 10:40:39 -0700 (PDT) Received: from localhost.localdomain ([71.212.131.83]) by smtp.gmail.com with ESMTPSA id h15sm19148056pfo.20.2021.04.06.10.40.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Apr 2021 10:40:37 -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=bmRgp+hz0GAy8sBEmRvnPYPMAtwbiJML48v1bJslbg4=; b=O9BipY2WU4pSGlOlhX/14k5F3S8mHtQQ7IXOFREecGcmHEoViXZCQNOueXwQH9FGWs MQF4gBLIYXgoWsM+BKYf1KGcpmewgOIQB74fn9dwh5sEo9ipr+mejKzzNqE2W2KJ3Yze sOA9swCnbSZIX/sk1VgGIAeQkdFLtMXi9h+7Nwr7RJDMGUO8KsK3jrLmU/qV70qlk/Nj RZCqvg55wrbXAKT2+5WXEYMuIyY6diFG07jpTklBpT+P3/M3iYyQehoWHLWhxhm1kR/L kek7dVAnbuLjkzdRa2xaSMWcDv0HdQdbKPOTn64cEAViuu8gtS3MKcb06ZoLpZG1mUPy vp5g== 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=bmRgp+hz0GAy8sBEmRvnPYPMAtwbiJML48v1bJslbg4=; b=EsoWjqw4o8NOoIGLwAf8AgVbYB7YVnumf5Z5iI3LZ4WKeiohHtT2gYLruMweWZBk4m tpph76MSvnMOPvzX9rtfrimlRalKerXxd1A4qfALe0EDXrmKNa8K595Wd2+sjnAicX2W uKtcwsDCjyddxaITNVeTnUoiWUQACvUIPM6ffYz4RGwd3WXRhO5/fu+WWqn5k8zETkZX llgOtuxY9f5CRiQhsIpluy4bJSNHFzSy93D49yK7lz48sLLpcAXTW9sWgWJXSE01R2zn 8P88kE2Y1xbaUkSPqUtFctDYfGDcM3W/1FfyKZjZuvHRaIE8KfrSt1f0eX0WIylYRA+s su9Q== X-Gm-Message-State: AOAM531b1VYbxkV7fn4986+kmLbIUf7BrjopviPyzrLUhmeJ9o8F2Mqa Efk8y2eg+jk/Tm3ir5/CXwUiK9p6kfdU4Q== X-Google-Smtp-Source: ABdhPJwLdnuorCsi+Xh4YkvL8Wq00v6d4WTiAOftfVj5CvC8Xs9Gzb1be660qeo3LZ+yzvMT0cz2xQ== X-Received: by 2002:a17:90b:e18:: with SMTP id ge24mr5479320pjb.199.1617730838218; Tue, 06 Apr 2021 10:40:38 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v4 05/12] target/arm: Fix unaligned checks for mte_check1, mte_probe1 Date: Tue, 6 Apr 2021 10:40:24 -0700 Message-Id: <20210406174031.64299-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210406174031.64299-1-richard.henderson@linaro.org> References: <20210406174031.64299-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::102a; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102a.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 Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" We were incorrectly assuming that only the first byte of an MTE access is checked against the tags. But per the ARM, unaligned accesses are pre-decomposed into single-byte accesses. So by the time we reach the actual MTE check in the ARM pseudocode, all accesses are aligned. We cannot tell a priori whether or not a given scalar access is aligned, therefore we must at least check. Use mte_probe_int, which is already set up for checking multiple granules. Buglink: https://bugs.launchpad.net/bugs/1921948 Signed-off-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e Tested-by: Alex Benn=C3=A9e --- target/arm/mte_helper.c | 109 +++++++++++++--------------------------- 1 file changed, 35 insertions(+), 74 deletions(-) diff --git a/target/arm/mte_helper.c b/target/arm/mte_helper.c index 144bfa4a51..619c4b9351 100644 --- a/target/arm/mte_helper.c +++ b/target/arm/mte_helper.c @@ -617,80 +617,6 @@ static void mte_check_fail(CPUARMState *env, uint32_t = desc, } } =20 -/* - * Perform an MTE checked access for a single logical or atomic access. - */ -static bool mte_probe1_int(CPUARMState *env, uint32_t desc, uint64_t ptr, - uintptr_t ra, int bit55) -{ - int mem_tag, mmu_idx, ptr_tag, size; - MMUAccessType type; - uint8_t *mem; - - ptr_tag =3D allocation_tag_from_addr(ptr); - - if (tcma_check(desc, bit55, ptr_tag)) { - return true; - } - - mmu_idx =3D FIELD_EX32(desc, MTEDESC, MIDX); - type =3D FIELD_EX32(desc, MTEDESC, WRITE) ? MMU_DATA_STORE : MMU_DATA_= LOAD; - size =3D FIELD_EX32(desc, MTEDESC, ESIZE); - - mem =3D allocation_tag_mem(env, mmu_idx, ptr, type, size, - MMU_DATA_LOAD, 1, ra); - if (!mem) { - return true; - } - - mem_tag =3D load_tag1(ptr, mem); - return ptr_tag =3D=3D mem_tag; -} - -/* - * No-fault version of mte_check1, 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) -{ - int bit55 =3D extract64(ptr, 55, 1); - - /* If TBI is disabled, the access is unchecked. */ - if (unlikely(!tbi_check(desc, bit55))) { - return true; - } - - return mte_probe1_int(env, desc, ptr, 0, bit55); -} - -uint64_t mte_check1(CPUARMState *env, uint32_t desc, - uint64_t ptr, uintptr_t ra) -{ - int bit55 =3D extract64(ptr, 55, 1); - - /* If TBI is disabled, the access is unchecked, and ptr is not dirty. = */ - if (unlikely(!tbi_check(desc, bit55))) { - return ptr; - } - - if (unlikely(!mte_probe1_int(env, desc, ptr, ra, bit55))) { - mte_check_fail(env, desc, ptr, ra); - } - - return useronly_clean_ptr(ptr); -} - -uint64_t HELPER(mte_check1)(CPUARMState *env, uint32_t desc, uint64_t ptr) -{ - return mte_check1(env, desc, ptr, GETPC()); -} - -/* - * Perform an MTE checked access for multiple logical accesses. - */ - /** * checkN: * @tag: tag memory to test @@ -882,6 +808,41 @@ uint64_t HELPER(mte_checkN)(CPUARMState *env, uint32_t= desc, uint64_t ptr) return mte_checkN(env, desc, ptr, GETPC()); } =20 +uint64_t mte_check1(CPUARMState *env, uint32_t desc, + uint64_t ptr, uintptr_t ra) +{ + uint64_t fault; + uint32_t total =3D FIELD_EX32(desc, MTEDESC, ESIZE); + int ret =3D mte_probe_int(env, desc, ptr, ra, total, &fault); + + if (unlikely(ret =3D=3D 0)) { + mte_check_fail(env, desc, fault, ra); + } else if (ret < 0) { + return ptr; + } + return useronly_clean_ptr(ptr); +} + +uint64_t HELPER(mte_check1)(CPUARMState *env, uint32_t desc, uint64_t ptr) +{ + return mte_check1(env, desc, ptr, GETPC()); +} + +/* + * No-fault version of mte_check1, 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) +{ + uint64_t fault; + uint32_t total =3D FIELD_EX32(desc, MTEDESC, ESIZE); + int ret =3D mte_probe_int(env, desc, ptr, 0, total, &fault); + + return ret !=3D 0; +} + /* * Perform an MTE checked access for DC_ZVA. */ --=20 2.25.1 From nobody Fri Apr 26 19:02:34 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1617731408; cv=none; d=zohomail.com; s=zohoarc; b=N/rMSvzbP9U4VRPX/uph6DApO6oZsRFvDTtE+qpkjupo4JHNEfBQGWH10F5eOJNcCz+nysl5f+8rhTNMIilSWA8klndXkJlIsxYILfyxj3/Y6LgyG3J9KZcLslmKyU5hO477wR4NNg5gZf0I0YgZATTOYgJ1g+886GmMJ6YSjWc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617731408; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=w7i6Gze7kec69WvQyswSUuzpscM5477tzDtA09nT/yo=; b=F4ANWhbnFEfseafFP8ehf+28Y1MPnge33NR/WnVdq4+GpdC7NUUGmA9rpKD9Xz/55IYl5rIhRUcGUO7ptVwIAHjPXx6bMEcYCp8YU0fqzgQiqUL12mwO2HMzUsNPSsUi59yg96VbpT32GRhZaYyIQ1tnLZtsxZ4IGw0oOfVNnUY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16177314088647.004971019321374; Tue, 6 Apr 2021 10:50:08 -0700 (PDT) Received: from localhost ([::1]:42236 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lTpq3-00047p-5r for importer@patchew.org; Tue, 06 Apr 2021 13:50:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45898) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lTpgz-0001nz-Cv for qemu-devel@nongnu.org; Tue, 06 Apr 2021 13:40:45 -0400 Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a]:35489) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lTpgu-0006Lz-R8 for qemu-devel@nongnu.org; Tue, 06 Apr 2021 13:40:44 -0400 Received: by mail-pl1-x62a.google.com with SMTP id j7so3225789plx.2 for ; Tue, 06 Apr 2021 10:40:40 -0700 (PDT) Received: from localhost.localdomain ([71.212.131.83]) by smtp.gmail.com with ESMTPSA id h15sm19148056pfo.20.2021.04.06.10.40.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Apr 2021 10:40:38 -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=w7i6Gze7kec69WvQyswSUuzpscM5477tzDtA09nT/yo=; b=K1mDPPAfmucysrMDj0Px1VNFU9cwfF7MwVGzzKLNnJsoEht4/nwtW+Bkmyf2DbI5CG Nr7qfXJhkb4ObX2MrMntkrBUR/Tz5LDdFFBzZfnvduCCiZJMzs4ygglDiuGUzjesr3i6 ZoBQi55gOnR2F/gwBxDy4JBn/Z3XXdk7TplFYpdsM1QaaNP7DbNdv7n4GvCfsACUhf8Y w+u4PnjqdCsL0FjsdACMuCwEJsz0RTteCXh/T4jELfZAJotA3vn2m4L68aVQZRBBU26B oH0jZ1/hE8zu8xmC+nGlm1V3kA0jbLE4m067IaoKrAx5YlLdtolc5vCYKlYBlyk9gEjx a2rw== 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=w7i6Gze7kec69WvQyswSUuzpscM5477tzDtA09nT/yo=; b=bWnUO2m+w765qX5qYIFXSVsF7YUcAo4w2EivyrzNvfXu0Hlt3TnvT/hvAhRsNaheOU dyBnv2tf/LYX1SzAORyqTaVHbonu3jVlVjbx9oxlIX0Nao+ySI9PYSPBPVBwldoFnXcB w/LN0OEZ3GAODmNywj4aEs2ZJUVLdtRhO1KnMXwzFKKaTA5oGuiyCY9Zh86eloq5IO4S MZvqmasH3m158v+TM0hSoZzAl/cljBpUxTtvAoY/TbaKDSkHiPpsWLU9pEblv3OMyypP i1kVq64KPda+CxxPORZhDNYWbRKhpswzKzOiGVPppS1n42mgKU5n3gnsYuAVeHApAwLa 4Naw== X-Gm-Message-State: AOAM533tQLPemfTFWPWVL3obsJL8Wk8jgWw7IY99SY2QOJ0uQNTJeMgg g8g3bZG894NxmQp/rKc0AfbfirzSn93IzA== X-Google-Smtp-Source: ABdhPJwl5Us6mrTsL8cBm1hLBh8seWBgkPmVKIZFJe0Kt3hcivlMIHzyn1IElcZN16gJy8XPUZfpJw== X-Received: by 2002:a17:90a:c08a:: with SMTP id o10mr5342090pjs.67.1617730839266; Tue, 06 Apr 2021 10:40:39 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v4 06/12] test/tcg/aarch64: Add mte-5 Date: Tue, 6 Apr 2021 10:40:25 -0700 Message-Id: <20210406174031.64299-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210406174031.64299-1-richard.henderson@linaro.org> References: <20210406174031.64299-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::62a; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62a.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=unavailable 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 Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" Buglink: https://bugs.launchpad.net/bugs/1921948 Signed-off-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e --- tests/tcg/aarch64/mte-5.c | 44 +++++++++++++++++++++++++++++++ tests/tcg/aarch64/Makefile.target | 2 +- 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 tests/tcg/aarch64/mte-5.c diff --git a/tests/tcg/aarch64/mte-5.c b/tests/tcg/aarch64/mte-5.c new file mode 100644 index 0000000000..6dbd6ab3ea --- /dev/null +++ b/tests/tcg/aarch64/mte-5.c @@ -0,0 +1,44 @@ +/* + * Memory tagging, faulting unaligned access. + * + * Copyright (c) 2021 Linaro Ltd + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "mte.h" + +void pass(int sig, siginfo_t *info, void *uc) +{ + assert(info->si_code =3D=3D SEGV_MTESERR); + exit(0); +} + +int main(int ac, char **av) +{ + struct sigaction sa; + void *p0, *p1, *p2; + long excl =3D 1; + + enable_mte(PR_MTE_TCF_SYNC); + p0 =3D alloc_mte_mem(sizeof(*p0)); + + /* Create two differently tagged pointers. */ + asm("irg %0,%1,%2" : "=3Dr"(p1) : "r"(p0), "r"(excl)); + asm("gmi %0,%1,%0" : "+r"(excl) : "r" (p1)); + assert(excl !=3D 1); + asm("irg %0,%1,%2" : "=3Dr"(p2) : "r"(p0), "r"(excl)); + assert(p1 !=3D p2); + + memset(&sa, 0, sizeof(sa)); + sa.sa_sigaction =3D pass; + sa.sa_flags =3D SA_SIGINFO; + sigaction(SIGSEGV, &sa, NULL); + + /* Store store two different tags in sequential granules. */ + asm("stg %0, [%0]" : : "r"(p1)); + asm("stg %0, [%0]" : : "r"(p2 + 16)); + + /* Perform an unaligned load crossing the granules. */ + asm volatile("ldr %0, [%1]" : "=3Dr"(p0) : "r"(p1 + 12)); + abort(); +} diff --git a/tests/tcg/aarch64/Makefile.target b/tests/tcg/aarch64/Makefile= .target index 05b2622bfc..928357b10a 100644 --- a/tests/tcg/aarch64/Makefile.target +++ b/tests/tcg/aarch64/Makefile.target @@ -37,7 +37,7 @@ AARCH64_TESTS +=3D bti-2 =20 # MTE Tests ifneq ($(DOCKER_IMAGE)$(CROSS_CC_HAS_ARMV8_MTE),) -AARCH64_TESTS +=3D mte-1 mte-2 mte-3 mte-4 mte-6 +AARCH64_TESTS +=3D mte-1 mte-2 mte-3 mte-4 mte-5 mte-6 mte-%: CFLAGS +=3D -march=3Darmv8.5-a+memtag endif =20 --=20 2.25.1 From nobody Fri Apr 26 19:02:34 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1617731274; cv=none; d=zohomail.com; s=zohoarc; b=C0Fg4TNQI3xJ5vfoVfSElCmVCTWK8i7Th/fMy/ZzlNfPeebCNE6d6KOfmLqBv7236wQ9smg8Bmam/Ibvzbz9e6GkntRK0DMI1QAW+VWjuaUnfZXBwYbHWd3GAFmEBU1pPzPZ7vtQRA+PApg26avde8ewBP3xNpgGjmZO2b4vwUQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617731274; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ZaA3NtLF5Ui7foJuQjgVLcu0S8y+Fhr8vfitmrcwFuI=; b=Mn1JEyVMH0KSMvXoDeebOY0wXSCG0UWIdPHEK1OWUDE65VCCrVo0+YVgBr2eW2VW4+SPXuw0ExzHM+q/u8B5C2M1e23IpcIsEKs3VjAB+32jdMBtyRT8JoewCLOuSEqMJywfu6+t49tVTZoOue5e8y2fcdHocN1CZtuSkekLHco= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1617731274040350.89342156234704; Tue, 6 Apr 2021 10:47:54 -0700 (PDT) Received: from localhost ([::1]:34762 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lTpns-00016h-9s for importer@patchew.org; Tue, 06 Apr 2021 13:47:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45896) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lTpgz-0001nN-44 for qemu-devel@nongnu.org; Tue, 06 Apr 2021 13:40:45 -0400 Received: from mail-pl1-x630.google.com ([2607:f8b0:4864:20::630]:40936) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lTpgv-0006My-Oa for qemu-devel@nongnu.org; Tue, 06 Apr 2021 13:40:44 -0400 Received: by mail-pl1-x630.google.com with SMTP id h8so7904425plt.7 for ; Tue, 06 Apr 2021 10:40:41 -0700 (PDT) Received: from localhost.localdomain ([71.212.131.83]) by smtp.gmail.com with ESMTPSA id h15sm19148056pfo.20.2021.04.06.10.40.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Apr 2021 10:40:39 -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=ZaA3NtLF5Ui7foJuQjgVLcu0S8y+Fhr8vfitmrcwFuI=; b=qvjFN2vpjrKFab1daG84wTGcDW0Xwkl7KxTDer267wj3SZebbxlRyYKGI7xvqDB5Cx xuBj8PTwoOksc2s/NnilR52lNijPe+CIX+Bw8/Pmh2LpxzEQrdQyPTqxZ3LPHvCvvEBE IHjOU08fD8ZFFY5GxqoWXcTRCnkddMwSzT8LMQry6S57qF5hVFDZ0Ny6lNUv+jmALMpN M0dUK60+dqKlccPj8lRYblKwoKxfWQgqXRGNjC9QpLdmEZhK66s2P8HVj0mSiu2H7+YA 0OPtpqe7FeSzT3iHgaBXfebJCbpXO9cYkoh9mBG7Jt09aZjnlm4xxYaeVBOXgGFK8cPD ZGVQ== 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=ZaA3NtLF5Ui7foJuQjgVLcu0S8y+Fhr8vfitmrcwFuI=; b=cNBs/5ADvoY+xXsKhf7015rlZTp2MaWIWnsqpY4GFPMqvvWe0QOAREgBtf0Zil7Whd Xs0NWFGL/BOAwqVvwiqUEidGOp76dh2Gk8uguT8uyT178sOAoCt5F6p5WrODLc8T3hEs yCw2IYkJ8XZKZ6XBIib/4Gmq5758FlVJ7WhcUMlufMHsZBpQCg1XCR0jkADtGgfh3SRA noKzYupUaClNPH4txROIyy/wSjYmcoxwc6s3gzyqIckpjewT6EFqIpzzxH7tpxEMFRiu vGxXNvsnefRvCZqWF9rrJLx+Zz+YL8pSfzB4m86kJk0GsWGgxrJzMDXNbdcyKyuWYHLY taGw== X-Gm-Message-State: AOAM5333xv36Jb27hopE5Z/C0mkVS3uHl0uQjLKc5v5qICDXIcR2YcCu 00biVNZXrJL0iRXvX6XiuOXQioaHNUPK1w== X-Google-Smtp-Source: ABdhPJzO0hOtejl4EjTcrMlDrPy8Wh1Q8lTzzemYJ8bhuEE7WWNQT7r8QTeoUAfBDE4/PaA+GyLi/w== X-Received: by 2002:a17:902:a587:b029:e7:347d:4872 with SMTP id az7-20020a170902a587b02900e7347d4872mr30396100plb.2.1617730840241; Tue, 06 Apr 2021 10:40:40 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v4 07/12] target/arm: Replace MTEDESC ESIZE+TSIZE with SIZEM1 Date: Tue, 6 Apr 2021 10:40:26 -0700 Message-Id: <20210406174031.64299-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210406174031.64299-1-richard.henderson@linaro.org> References: <20210406174031.64299-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::630; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x630.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 Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" After recent changes, mte_checkN does not use ESIZE, and mte_check1 never used TSIZE. We can combine the two into a single field: SIZEM1. Choose to pass size - 1 because size =3D=3D 0 is never used, our immediate need in mte_probe_int is for the address of the last byte (ptr + size - 1), and since almost all operations are powers of 2, this makes the immediate constant one bit smaller. Signed-off-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e --- target/arm/internals.h | 4 ++-- target/arm/mte_helper.c | 18 ++++++++---------- target/arm/translate-a64.c | 5 ++--- target/arm/translate-sve.c | 5 ++--- 4 files changed, 14 insertions(+), 18 deletions(-) diff --git a/target/arm/internals.h b/target/arm/internals.h index f11bd32696..2c77f2d50f 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -26,6 +26,7 @@ #define TARGET_ARM_INTERNALS_H =20 #include "hw/registerfields.h" +#include "tcg/tcg-gvec-desc.h" #include "syndrome.h" =20 /* register banks for CPU modes */ @@ -1142,8 +1143,7 @@ FIELD(MTEDESC, MIDX, 0, 4) FIELD(MTEDESC, TBI, 4, 2) FIELD(MTEDESC, TCMA, 6, 2) FIELD(MTEDESC, WRITE, 8, 1) -FIELD(MTEDESC, ESIZE, 9, 5) -FIELD(MTEDESC, TSIZE, 14, 10) /* mte_checkN only */ +FIELD(MTEDESC, SIZEM1, 9, SIMD_DATA_BITS - 9) /* size - 1 */ =20 bool mte_probe1(CPUARMState *env, uint32_t desc, uint64_t ptr); uint64_t mte_check1(CPUARMState *env, uint32_t desc, diff --git a/target/arm/mte_helper.c b/target/arm/mte_helper.c index 619c4b9351..9dfbb14358 100644 --- a/target/arm/mte_helper.c +++ b/target/arm/mte_helper.c @@ -692,13 +692,13 @@ static int checkN(uint8_t *mem, int odd, int cmp, int= count) * Return positive on success with tbi enabled. */ static int mte_probe_int(CPUARMState *env, uint32_t desc, uint64_t ptr, - uintptr_t ra, uint32_t total, uint64_t *fault) + uintptr_t ra, uint64_t *fault) { int mmu_idx, ptr_tag, bit55; uint64_t ptr_last, prev_page, next_page; uint64_t tag_first, tag_last; uint64_t tag_byte_first, tag_byte_last; - uint32_t tag_count, tag_size, n, c; + uint32_t sizem1, tag_count, tag_size, n, c; uint8_t *mem1, *mem2; MMUAccessType type; =20 @@ -718,9 +718,10 @@ static int mte_probe_int(CPUARMState *env, uint32_t de= sc, uint64_t ptr, =20 mmu_idx =3D FIELD_EX32(desc, MTEDESC, MIDX); type =3D FIELD_EX32(desc, MTEDESC, WRITE) ? MMU_DATA_STORE : MMU_DATA_= LOAD; + sizem1 =3D FIELD_EX32(desc, MTEDESC, SIZEM1); =20 /* Find the addr of the end of the access, and of the last element. */ - ptr_last =3D ptr + total - 1; + ptr_last =3D ptr + sizem1; =20 /* Round the bounds to the tag granule, and compute the number of tags= . */ tag_first =3D QEMU_ALIGN_DOWN(ptr, TAG_GRANULE); @@ -738,7 +739,7 @@ static int mte_probe_int(CPUARMState *env, uint32_t des= c, uint64_t ptr, if (likely(tag_last - prev_page <=3D TARGET_PAGE_SIZE)) { /* Memory access stays on one page. */ tag_size =3D ((tag_byte_last - tag_byte_first) / (2 * TAG_GRANULE)= ) + 1; - mem1 =3D allocation_tag_mem(env, mmu_idx, ptr, type, total, + mem1 =3D allocation_tag_mem(env, mmu_idx, ptr, type, sizem1 + 1, MMU_DATA_LOAD, tag_size, ra); if (!mem1) { return 1; @@ -792,8 +793,7 @@ uint64_t mte_checkN(CPUARMState *env, uint32_t desc, uint64_t ptr, uintptr_t ra) { uint64_t fault; - uint32_t total =3D FIELD_EX32(desc, MTEDESC, TSIZE); - int ret =3D mte_probe_int(env, desc, ptr, ra, total, &fault); + int ret =3D mte_probe_int(env, desc, ptr, ra, &fault); =20 if (unlikely(ret =3D=3D 0)) { mte_check_fail(env, desc, fault, ra); @@ -812,8 +812,7 @@ uint64_t mte_check1(CPUARMState *env, uint32_t desc, uint64_t ptr, uintptr_t ra) { uint64_t fault; - uint32_t total =3D FIELD_EX32(desc, MTEDESC, ESIZE); - int ret =3D mte_probe_int(env, desc, ptr, ra, total, &fault); + int ret =3D mte_probe_int(env, desc, ptr, ra, &fault); =20 if (unlikely(ret =3D=3D 0)) { mte_check_fail(env, desc, fault, ra); @@ -837,8 +836,7 @@ uint64_t HELPER(mte_check1)(CPUARMState *env, uint32_t = desc, uint64_t ptr) bool mte_probe1(CPUARMState *env, uint32_t desc, uint64_t ptr) { uint64_t fault; - uint32_t total =3D FIELD_EX32(desc, MTEDESC, ESIZE); - int ret =3D mte_probe_int(env, desc, ptr, 0, total, &fault); + int ret =3D mte_probe_int(env, desc, ptr, 0, &fault); =20 return ret !=3D 0; } diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index 0b42e53500..3af00ae90e 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -272,7 +272,7 @@ static TCGv_i64 gen_mte_check1_mmuidx(DisasContext *s, = TCGv_i64 addr, desc =3D FIELD_DP32(desc, MTEDESC, TBI, s->tbid); desc =3D FIELD_DP32(desc, MTEDESC, TCMA, s->tcma); desc =3D FIELD_DP32(desc, MTEDESC, WRITE, is_write); - desc =3D FIELD_DP32(desc, MTEDESC, ESIZE, 1 << log2_size); + desc =3D FIELD_DP32(desc, MTEDESC, SIZEM1, (1 << log2_size) - 1); tcg_desc =3D tcg_const_i32(desc); =20 ret =3D new_tmp_a64(s); @@ -306,8 +306,7 @@ TCGv_i64 gen_mte_checkN(DisasContext *s, TCGv_i64 addr,= bool is_write, desc =3D FIELD_DP32(desc, MTEDESC, TBI, s->tbid); desc =3D FIELD_DP32(desc, MTEDESC, TCMA, s->tcma); desc =3D FIELD_DP32(desc, MTEDESC, WRITE, is_write); - desc =3D FIELD_DP32(desc, MTEDESC, ESIZE, 1 << log2_esize); - desc =3D FIELD_DP32(desc, MTEDESC, TSIZE, total_size); + desc =3D FIELD_DP32(desc, MTEDESC, SIZEM1, total_size - 1); tcg_desc =3D tcg_const_i32(desc); =20 ret =3D new_tmp_a64(s); diff --git a/target/arm/translate-sve.c b/target/arm/translate-sve.c index 0eefb61214..5179c1f836 100644 --- a/target/arm/translate-sve.c +++ b/target/arm/translate-sve.c @@ -4509,8 +4509,7 @@ static void do_mem_zpa(DisasContext *s, int zt, int p= g, TCGv_i64 addr, desc =3D FIELD_DP32(desc, MTEDESC, TBI, s->tbid); desc =3D FIELD_DP32(desc, MTEDESC, TCMA, s->tcma); desc =3D FIELD_DP32(desc, MTEDESC, WRITE, is_write); - desc =3D FIELD_DP32(desc, MTEDESC, ESIZE, 1 << msz); - desc =3D FIELD_DP32(desc, MTEDESC, TSIZE, mte_n << msz); + desc =3D FIELD_DP32(desc, MTEDESC, SIZEM1, (mte_n << msz) - 1); desc <<=3D SVE_MTEDESC_SHIFT; } else { addr =3D clean_data_tbi(s, addr); @@ -5189,7 +5188,7 @@ static void do_mem_zpz(DisasContext *s, int zt, int p= g, int zm, desc =3D FIELD_DP32(desc, MTEDESC, TBI, s->tbid); desc =3D FIELD_DP32(desc, MTEDESC, TCMA, s->tcma); desc =3D FIELD_DP32(desc, MTEDESC, WRITE, is_write); - desc =3D FIELD_DP32(desc, MTEDESC, ESIZE, 1 << msz); + desc =3D FIELD_DP32(desc, MTEDESC, SIZEM1, (1 << msz) - 1); desc <<=3D SVE_MTEDESC_SHIFT; } desc =3D simd_desc(vsz, vsz, desc | scale); --=20 2.25.1 From nobody Fri Apr 26 19:02:34 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1617731524; cv=none; d=zohomail.com; s=zohoarc; b=hKJwk0OvP99oOj+maKYSsLCNJRZ1OkwdOWV7BqDe8LfS3FTlw8d6z7fxpoPQPJk1oqpYZknPWsUsNlTWun+wG5gjAS/ZBEZ77k0kMHcPAv5AhHQVtwYW0lIA5skyWdAWa8pfhADBtV6A/FwCK0eCvwca2lG+f+yTvdqn9YUCm1k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617731524; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=LL8587X7Os3xdf3l0BqHuyEB+e25QF1YaQmXQfCxQ2k=; b=GIhM+8L7xyx53BsGR6zIHTSKanmRj/wagYmzIXGi4NSUPYo15r/xjgpPVlCcSKle3crB7bZHPvlqUVpMRIZgcDoikVMZ1kug378PrUDM+px+CH7OGIjmN6SZqY/yiqyB4aAjRAO6aDrQ2tkf5b8NgtIzD95BxnfRLQR8F8AybLk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1617731524951345.0334585147757; Tue, 6 Apr 2021 10:52:04 -0700 (PDT) Received: from localhost ([::1]:46786 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lTprv-00064Z-Qp for importer@patchew.org; Tue, 06 Apr 2021 13:52:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45910) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lTpgz-0001pB-SF for qemu-devel@nongnu.org; Tue, 06 Apr 2021 13:40:46 -0400 Received: from mail-pl1-x635.google.com ([2607:f8b0:4864:20::635]:47016) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lTpgw-0006Ng-Dv for qemu-devel@nongnu.org; Tue, 06 Apr 2021 13:40:45 -0400 Received: by mail-pl1-x635.google.com with SMTP id t20so7889927plr.13 for ; Tue, 06 Apr 2021 10:40:41 -0700 (PDT) Received: from localhost.localdomain ([71.212.131.83]) by smtp.gmail.com with ESMTPSA id h15sm19148056pfo.20.2021.04.06.10.40.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Apr 2021 10:40:40 -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=LL8587X7Os3xdf3l0BqHuyEB+e25QF1YaQmXQfCxQ2k=; b=R47hCUDikZpySXSqs07cj4Vj/zq0/6ho/o0Tx3UZC+US8Qv5kQhiALz7ZTrK1uSX7N LL7/jo4fFcsH9EyppyW1uwic23TAOC34/NowW53f7n1rK1di7ch+/xrtXPtxFfb+lb6X gJdG6CsHiLyaFoDqTjuDXBlzYgfK4usilnB2c5pamFYNyqnQ+MoBAh+Jp2e+d2fYY9ar AxYN4OQgWzziiFlXJfelDXWvlU6TsvhSwrPhwtGhIq6yRydvzXT3w5ePcyVhsygHadg/ vkfXsfmolEgz2X7QpmkNJwkVvQeX7jmSF+9O27UA2nLeqPf9NdzMjoEOcf1McvG5dShU Gh2Q== 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=LL8587X7Os3xdf3l0BqHuyEB+e25QF1YaQmXQfCxQ2k=; b=sW45dnRqGFE79Ajrhq5F6ra0BQ1KJcG83oOcZ91LlVzI0IPcflenenw7hAI/URDQ0o yDayRMOZ+Pysz8Yat1XU7XNyPB7QmwYvodpwlBgFhc5uvHSvj+LLFznlQXfMF8gjRMtF +WU7nSFRuwQTecB1KBE5XtLjD4wMYN8u1Qb2tTxHv2FtGl2sNr29qlzNKdqUdF1xrU4E AvZgKwWhmEv85KKzyLiboXcQhooLSz4lOtrR70atypcN/yiIKyeUnJwojzpLERi/n1U+ 4HtA6KrHtEXwZZQbT1hycUraXApqIKuoHV8a8L7GUnZN1getnbQbe4Trcqsip9wACZXe FFIg== X-Gm-Message-State: AOAM531D6EToLbSQzS6Gt/a3num30UQ2iXFpXCwB34Xu03M9qr25tk4J ej25v4lJ369F0sMCyhsSZ1Japc1t9sNIbQ== X-Google-Smtp-Source: ABdhPJwbrvqQVAvn3ZYo/08UsQECElWDCoJKOIcB7WfvsXDdUY1PSA19P/+C14/ZCs+PXlirQsW10g== X-Received: by 2002:a17:902:8482:b029:e6:325b:5542 with SMTP id c2-20020a1709028482b02900e6325b5542mr29793314plo.70.1617730841090; Tue, 06 Apr 2021 10:40:41 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v4 08/12] target/arm: Merge mte_check1, mte_checkN Date: Tue, 6 Apr 2021 10:40:27 -0700 Message-Id: <20210406174031.64299-9-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210406174031.64299-1-richard.henderson@linaro.org> References: <20210406174031.64299-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::635; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x635.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 Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" The mte_check1 and mte_checkN functions are now identical. Drop mte_check1 and rename mte_checkN to mte_check. Signed-off-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e --- target/arm/helper-a64.h | 3 +-- target/arm/internals.h | 5 +---- target/arm/mte_helper.c | 26 +++----------------------- target/arm/sve_helper.c | 14 +++++++------- target/arm/translate-a64.c | 4 ++-- 5 files changed, 14 insertions(+), 38 deletions(-) diff --git a/target/arm/helper-a64.h b/target/arm/helper-a64.h index c139fa81f9..7b706571bb 100644 --- a/target/arm/helper-a64.h +++ b/target/arm/helper-a64.h @@ -104,8 +104,7 @@ DEF_HELPER_FLAGS_3(autdb, TCG_CALL_NO_WG, i64, env, i64= , i64) DEF_HELPER_FLAGS_2(xpaci, TCG_CALL_NO_RWG_SE, i64, env, i64) DEF_HELPER_FLAGS_2(xpacd, TCG_CALL_NO_RWG_SE, i64, env, i64) =20 -DEF_HELPER_FLAGS_3(mte_check1, TCG_CALL_NO_WG, i64, env, i32, i64) -DEF_HELPER_FLAGS_3(mte_checkN, TCG_CALL_NO_WG, i64, env, i32, i64) +DEF_HELPER_FLAGS_3(mte_check, TCG_CALL_NO_WG, i64, env, i32, i64) DEF_HELPER_FLAGS_3(mte_check_zva, TCG_CALL_NO_WG, i64, env, i32, i64) DEF_HELPER_FLAGS_3(irg, TCG_CALL_NO_RWG, i64, env, i64, i64) DEF_HELPER_FLAGS_4(addsubg, TCG_CALL_NO_RWG_SE, i64, env, i64, s32, i32) diff --git a/target/arm/internals.h b/target/arm/internals.h index 2c77f2d50f..af1db2cd9c 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -1146,10 +1146,7 @@ FIELD(MTEDESC, WRITE, 8, 1) FIELD(MTEDESC, SIZEM1, 9, SIMD_DATA_BITS - 9) /* size - 1 */ =20 bool mte_probe1(CPUARMState *env, uint32_t desc, uint64_t ptr); -uint64_t mte_check1(CPUARMState *env, uint32_t desc, - uint64_t ptr, uintptr_t ra); -uint64_t mte_checkN(CPUARMState *env, uint32_t desc, - uint64_t ptr, uintptr_t ra); +uint64_t mte_check(CPUARMState *env, uint32_t desc, uint64_t ptr, uintptr_= t ra); =20 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 9dfbb14358..04479f33a1 100644 --- a/target/arm/mte_helper.c +++ b/target/arm/mte_helper.c @@ -789,8 +789,7 @@ static int mte_probe_int(CPUARMState *env, uint32_t des= c, uint64_t ptr, return 0; } =20 -uint64_t mte_checkN(CPUARMState *env, uint32_t desc, - uint64_t ptr, uintptr_t ra) +uint64_t mte_check(CPUARMState *env, uint32_t desc, uint64_t ptr, uintptr_= t ra) { uint64_t fault; int ret =3D mte_probe_int(env, desc, ptr, ra, &fault); @@ -803,28 +802,9 @@ uint64_t mte_checkN(CPUARMState *env, uint32_t desc, return useronly_clean_ptr(ptr); } =20 -uint64_t HELPER(mte_checkN)(CPUARMState *env, uint32_t desc, uint64_t ptr) +uint64_t HELPER(mte_check)(CPUARMState *env, uint32_t desc, uint64_t ptr) { - return mte_checkN(env, desc, ptr, GETPC()); -} - -uint64_t mte_check1(CPUARMState *env, uint32_t desc, - uint64_t ptr, uintptr_t ra) -{ - uint64_t fault; - int ret =3D mte_probe_int(env, desc, ptr, ra, &fault); - - if (unlikely(ret =3D=3D 0)) { - mte_check_fail(env, desc, fault, ra); - } else if (ret < 0) { - return ptr; - } - return useronly_clean_ptr(ptr); -} - -uint64_t HELPER(mte_check1)(CPUARMState *env, uint32_t desc, uint64_t ptr) -{ - return mte_check1(env, desc, ptr, GETPC()); + return mte_check(env, desc, ptr, GETPC()); } =20 /* diff --git a/target/arm/sve_helper.c b/target/arm/sve_helper.c index fd6c58f96a..b63ddfc7f9 100644 --- a/target/arm/sve_helper.c +++ b/target/arm/sve_helper.c @@ -4442,7 +4442,7 @@ static void sve_cont_ldst_mte_check1(SVEContLdSt *inf= o, CPUARMState *env, uintptr_t ra) { sve_cont_ldst_mte_check_int(info, env, vg, addr, esize, msize, - mtedesc, ra, mte_check1); + mtedesc, ra, mte_check); } =20 static void sve_cont_ldst_mte_checkN(SVEContLdSt *info, CPUARMState *env, @@ -4451,7 +4451,7 @@ static void sve_cont_ldst_mte_checkN(SVEContLdSt *inf= o, CPUARMState *env, uintptr_t ra) { sve_cont_ldst_mte_check_int(info, env, vg, addr, esize, msize, - mtedesc, ra, mte_checkN); + mtedesc, ra, mte_check); } =20 =20 @@ -4826,7 +4826,7 @@ void sve_ldnfff1_r(CPUARMState *env, void *vg, const = target_ulong addr, if (fault =3D=3D FAULT_FIRST) { /* Trapping mte check for the first-fault element. */ if (mtedesc) { - mte_check1(env, mtedesc, addr + mem_off, retaddr); + mte_check(env, mtedesc, addr + mem_off, retaddr); } =20 /* @@ -5373,7 +5373,7 @@ void sve_ld1_z(CPUARMState *env, void *vd, uint64_t *= vg, void *vm, info.attrs, BP_MEM_READ, reta= ddr); } if (mtedesc && arm_tlb_mte_tagged(&info.attrs)) { - mte_check1(env, mtedesc, addr, retaddr); + mte_check(env, mtedesc, addr, retaddr); } host_fn(&scratch, reg_off, info.host); } else { @@ -5386,7 +5386,7 @@ void sve_ld1_z(CPUARMState *env, void *vd, uint64_t *= vg, void *vm, BP_MEM_READ, retaddr); } if (mtedesc && arm_tlb_mte_tagged(&info.attrs)) { - mte_check1(env, mtedesc, addr, retaddr); + mte_check(env, mtedesc, addr, retaddr); } tlb_fn(env, &scratch, reg_off, addr, retaddr); } @@ -5552,7 +5552,7 @@ void sve_ldff1_z(CPUARMState *env, void *vd, uint64_t= *vg, void *vm, */ addr =3D base + (off_fn(vm, reg_off) << scale); if (mtedesc) { - mte_check1(env, mtedesc, addr, retaddr); + mte_check(env, mtedesc, addr, retaddr); } tlb_fn(env, vd, reg_off, addr, retaddr); =20 @@ -5773,7 +5773,7 @@ void sve_st1_z(CPUARMState *env, void *vd, uint64_t *= vg, void *vm, } =20 if (mtedesc && arm_tlb_mte_tagged(&info.attrs)) { - mte_check1(env, mtedesc, addr, retaddr); + mte_check(env, mtedesc, addr, retaddr); } } i +=3D 1; diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index 3af00ae90e..a68d5dd5d1 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -276,7 +276,7 @@ static TCGv_i64 gen_mte_check1_mmuidx(DisasContext *s, = TCGv_i64 addr, tcg_desc =3D tcg_const_i32(desc); =20 ret =3D new_tmp_a64(s); - gen_helper_mte_check1(ret, cpu_env, tcg_desc, addr); + gen_helper_mte_check(ret, cpu_env, tcg_desc, addr); tcg_temp_free_i32(tcg_desc); =20 return ret; @@ -310,7 +310,7 @@ TCGv_i64 gen_mte_checkN(DisasContext *s, TCGv_i64 addr,= bool is_write, tcg_desc =3D tcg_const_i32(desc); =20 ret =3D new_tmp_a64(s); - gen_helper_mte_checkN(ret, cpu_env, tcg_desc, addr); + gen_helper_mte_check(ret, cpu_env, tcg_desc, addr); tcg_temp_free_i32(tcg_desc); =20 return ret; --=20 2.25.1 From nobody Fri Apr 26 19:02:34 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1617731393; cv=none; d=zohomail.com; s=zohoarc; b=kumPPep5A7kszoxYK+Idl4fvxG6m38mkn7mlF6dj3EB6Ce7xzKvB7qX/vvyhzJNDFramL6xRR7QZkBONHu87toUksu+Ee8+UllX6xrIXI6hCzJSlauuBmxWfmMoUsJ9zRtqOLE49mnWzkCUMa7KGSVd1us5HBNPrHx6HuMBt5Cs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617731393; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=P65R6awgu2+jcma22h8y387cCYyU3w5GvnO8K3vdbOs=; b=OwWXgTd58C/gsBtbasFdBeAvTxMiku0TNWfpKSKm8p7gsQ0NedKtvpc8ymDG+SGXPydM6qI8CRYVAlrPXqSFSJ4Q4g8pmwuNfQ4ZXrFyqnhWSxlliDgt8on9i1DwVYvWcNCpetoJSHc6B4rKx6SY68vJ6EGozvTcTUE5YvJoT38= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1617731393822573.8735365128346; Tue, 6 Apr 2021 10:49:53 -0700 (PDT) Received: from localhost ([::1]:41246 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lTppo-0003je-Lz for importer@patchew.org; Tue, 06 Apr 2021 13:49:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45964) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lTph1-0001sU-D4 for qemu-devel@nongnu.org; Tue, 06 Apr 2021 13:40:47 -0400 Received: from mail-pf1-x42f.google.com ([2607:f8b0:4864:20::42f]:47047) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lTpgx-0006OE-PU for qemu-devel@nongnu.org; Tue, 06 Apr 2021 13:40:47 -0400 Received: by mail-pf1-x42f.google.com with SMTP id d124so2116144pfa.13 for ; Tue, 06 Apr 2021 10:40:43 -0700 (PDT) Received: from localhost.localdomain ([71.212.131.83]) by smtp.gmail.com with ESMTPSA id h15sm19148056pfo.20.2021.04.06.10.40.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Apr 2021 10:40:41 -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=P65R6awgu2+jcma22h8y387cCYyU3w5GvnO8K3vdbOs=; b=XJxzJFhvQ+qKpRYv3+KlnCvl6Zoxf+3xYr/5Q8REfVGnjRYr2f+3LrY/3jYzk1odna bGljYDg5EMIOGXDb8S7bhmDJpNcXdvfsImjH1PdsHDkJYfzQB+CelDx5zvTYvT/Fmf3f B+swJwkbcu5OKUDIy1x7RTTK3YQz2jlqQobG+6yGelybSy0c96Fof7UKmrj6hruxPrRD VYWhqefi/uWBVZo6cg7QEbNFe8qa49N696VitbWU2X4Z2mCjDUFnIBmgKBAYEKpzI+Xl jT0ux+lHLjtGEaowpfP8CwpugHMGyIx0WO+N/AGOJ/BF/1F+WuHy4vNQ2cFKAZcpArMA czQg== 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=P65R6awgu2+jcma22h8y387cCYyU3w5GvnO8K3vdbOs=; b=grPlKO3FLoA5XNTswn1zI3Ha7lkupI5BoGhlGc8ntHp/S8FLdIvnObqqPGGiAAs97l 1EBvdH7Y1HfMTZrzv8BVTp8ZF0SPc9OZ1B/CEKq7VEfmrjG9OcCxvZDoKl1kJYKrFwV9 9HwwbA8befSyCuMh+cENsWanJOnvA2kIdycM5s6PB8Gfh6y0bCerGMJMOXeAOW1IlV50 ssIwVY450nM+DJVmeyH3WfANcMkjRj4hVB8w+eTXW0Ks41lbyiSfAc283WlaSiqXi7Le HsdCuefCp9lMOnA4L48vyuj/xbNtYr19qy3rEcvXarm7RQH3C4d460UJx+6KUJdqm3so 2SNg== X-Gm-Message-State: AOAM5310Pqlom0MC32ppBTdRQRiWbK45Y8lyjUb+vcePBHGi3m7zO8rN blB7comWl2hkfhXRcCHkdPhdi3xIFyJSoQ== X-Google-Smtp-Source: ABdhPJxK/sN0JLVKP/oVCy8abPT7BQFyAMUh6KyRWQkR+gCFaLwEbXcpvE2AqniEbFbAuOePoCErEQ== X-Received: by 2002:a63:703:: with SMTP id 3mr28597454pgh.253.1617730842113; Tue, 06 Apr 2021 10:40:42 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v4 09/12] target/arm: Rename mte_probe1 to mte_probe Date: Tue, 6 Apr 2021 10:40:28 -0700 Message-Id: <20210406174031.64299-10-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210406174031.64299-1-richard.henderson@linaro.org> References: <20210406174031.64299-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::42f; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42f.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 Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" For consistency with the mte_check1 + mte_checkN merge to mte_check, rename the probe function as well. Signed-off-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e --- target/arm/internals.h | 2 +- target/arm/mte_helper.c | 6 +++--- target/arm/sve_helper.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) 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 */ =20 -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); =20 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 04479f33a1..6ac1d21318 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, in= t ptr_mmu_idx, * exception for inaccessible pages, and resolves the virtual address * into the softmmu tlb. * - * When RA =3D=3D 0, this is for mte_probe1. The page is expected to = be + * When RA =3D=3D 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) } =20 /* - * 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 =3D 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; } =20 --=20 2.25.1 From nobody Fri Apr 26 19:02:34 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1617730966; cv=none; d=zohomail.com; s=zohoarc; b=MUcB0mtNvFq/oKT23cDuFUg+YB42LQwp/c6ngvFWl4o2bYhPrJEv6Vbu+FnXjpogGgzwN8llXcgSyDSPHPDT8jQmNYK6vc/zCbhi977MLFXY+ZGjfk5zUWKFl5iibnc99zjhm60+l7DRWzT7tpVNzBvdSwHHORn/0RpPLl4FGsE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617730966; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Xg0dHSSHbNndr4UE+t8eLAkBBwNMOnWRtx1WrZnfz3o=; b=KTt4MHT6o9z7o9hnjQ0eHXsOHMdJ8d9zJliQEgBKXJQ85hGsiydrFurhtVEj3CozB7sB0OQILnA5z8yNdy3DRobCsJGPJR/H32OkTCiho3qwJWOuTJQlU0+U7PkyyLioM9s4gk8Z77DUlJz6oinyGh0pYqFtsnPRtNBeWJtwtaY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1617730966342648.6415656284508; Tue, 6 Apr 2021 10:42:46 -0700 (PDT) Received: from localhost ([::1]:49898 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lTpiv-00048Q-8W for importer@patchew.org; Tue, 06 Apr 2021 13:42:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45992) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lTph2-0001uW-C0 for qemu-devel@nongnu.org; Tue, 06 Apr 2021 13:40:48 -0400 Received: from mail-pf1-x42f.google.com ([2607:f8b0:4864:20::42f]:35360) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lTpgy-0006PO-Jo for qemu-devel@nongnu.org; Tue, 06 Apr 2021 13:40:48 -0400 Received: by mail-pf1-x42f.google.com with SMTP id n38so1275311pfv.2 for ; Tue, 06 Apr 2021 10:40:44 -0700 (PDT) Received: from localhost.localdomain ([71.212.131.83]) by smtp.gmail.com with ESMTPSA id h15sm19148056pfo.20.2021.04.06.10.40.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Apr 2021 10:40:42 -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=Xg0dHSSHbNndr4UE+t8eLAkBBwNMOnWRtx1WrZnfz3o=; b=Chjr2TH7UcW+AjSWM5zYP92vosfnwv4GEcyBX47o7ce0ZWqrin/yMk13sinNARINus Sat3ubjCEg7Dt0j6FkXdHMFtY0Buwoc3IqI8j5tCEe0AD8TX7X1+/lekPTRHbEHefMsT 6JcSMwmowJvtrn3QkirQCglF+xifK7/VbdRRenxt9R3RQBjYdF8OyPdtiq9hTWuTvvGO K+yzyTOIIwUUAdd4OjTRi435JOTXpFVXSk1t+68jGrRy+RDlTnChw8U1UElgLFqkjAEj Fy9ahppWiTwT7PNzAGK4iA726I7djkE9eUnXcboABiowe7EzAObOMDVZwHK+viOcPjfE /RsQ== 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=Xg0dHSSHbNndr4UE+t8eLAkBBwNMOnWRtx1WrZnfz3o=; b=ijIyAZdPA6RuHT5chA3cmKSyBNfxvNw/r0GDfIfdOUxALwCfFluopkh2BCJ+er73zH JkBlitWgoaU7CyVL4Qle5dPO0btFmG5KJsjzQx25LKIpGUfcjwVFv6PKc5bgNT85dc9S 6Q2fy3bfYCNlwr6Gb4MRFS6qUTfJ6H48iFl7vnSqj2vwh6vZ7qhbLNhCIuiUTMcd789H h9P/eTp66GKOifZsz1dzYoqSl+IZtoRzHNzhJeluof/CipefuZbmteLZAre85O/lcjbb azRXu1VuiZVe+LJmZZm63kSMc9kAoHnAOZTd56VXO1Z1zdJSrX7pJqhlsoJwLtO5jnSS neVg== X-Gm-Message-State: AOAM531T4IWpzFs5jCB21O1IBkvIq52JYJcsV3fRbKVGqDryVbJ+prCm lEH/VRL2/M1x8uCt98c7ZY0LYbAN7jveaQ== X-Google-Smtp-Source: ABdhPJxTCM8e653b77eAfBqVjhTwxEGMWVQi1o7916u9OzXlJhe046FbTy3RRyCCnVMwIHFte0kkgQ== X-Received: by 2002:a65:4383:: with SMTP id m3mr12515986pgp.57.1617730843088; Tue, 06 Apr 2021 10:40:43 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v4 10/12] target/arm: Simplify sve mte checking Date: Tue, 6 Apr 2021 10:40:29 -0700 Message-Id: <20210406174031.64299-11-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210406174031.64299-1-richard.henderson@linaro.org> References: <20210406174031.64299-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::42f; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42f.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=unavailable 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 Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" Now that mte_check1 and mte_checkN have been merged, we can merge sve_cont_ldst_mte_check1 and sve_cont_ldst_mte_checkN. Which means that we can eliminate the function pointer into sve_ldN_r and sve_stN_r, calling sve_cont_ldst_mte_check directly. Signed-off-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e --- target/arm/sve_helper.c | 84 +++++++++++++---------------------------- 1 file changed, 26 insertions(+), 58 deletions(-) diff --git a/target/arm/sve_helper.c b/target/arm/sve_helper.c index 982240d104..c068dfa0d5 100644 --- a/target/arm/sve_helper.c +++ b/target/arm/sve_helper.c @@ -4382,13 +4382,9 @@ static void sve_cont_ldst_watchpoints(SVEContLdSt *i= nfo, CPUARMState *env, #endif } =20 -typedef uint64_t mte_check_fn(CPUARMState *, uint32_t, uint64_t, uintptr_t= ); - -static inline QEMU_ALWAYS_INLINE -void sve_cont_ldst_mte_check_int(SVEContLdSt *info, CPUARMState *env, - uint64_t *vg, target_ulong addr, int esiz= e, - int msize, uint32_t mtedesc, uintptr_t ra, - mte_check_fn *check) +static void sve_cont_ldst_mte_check(SVEContLdSt *info, CPUARMState *env, + uint64_t *vg, target_ulong addr, int e= size, + int msize, uint32_t mtedesc, uintptr_t= ra) { intptr_t mem_off, reg_off, reg_last; =20 @@ -4405,7 +4401,7 @@ void sve_cont_ldst_mte_check_int(SVEContLdSt *info, C= PUARMState *env, uint64_t pg =3D vg[reg_off >> 6]; do { if ((pg >> (reg_off & 63)) & 1) { - check(env, mtedesc, addr, ra); + mte_check(env, mtedesc, addr, ra); } reg_off +=3D esize; mem_off +=3D msize; @@ -4422,7 +4418,7 @@ void sve_cont_ldst_mte_check_int(SVEContLdSt *info, C= PUARMState *env, uint64_t pg =3D vg[reg_off >> 6]; do { if ((pg >> (reg_off & 63)) & 1) { - check(env, mtedesc, addr, ra); + mte_check(env, mtedesc, addr, ra); } reg_off +=3D esize; mem_off +=3D msize; @@ -4431,30 +4427,6 @@ void sve_cont_ldst_mte_check_int(SVEContLdSt *info, = CPUARMState *env, } } =20 -typedef void sve_cont_ldst_mte_check_fn(SVEContLdSt *info, CPUARMState *en= v, - uint64_t *vg, target_ulong addr, - int esize, int msize, uint32_t mte= desc, - uintptr_t ra); - -static void sve_cont_ldst_mte_check1(SVEContLdSt *info, CPUARMState *env, - uint64_t *vg, target_ulong addr, - int esize, int msize, uint32_t mtedes= c, - uintptr_t ra) -{ - sve_cont_ldst_mte_check_int(info, env, vg, addr, esize, msize, - mtedesc, ra, mte_check); -} - -static void sve_cont_ldst_mte_checkN(SVEContLdSt *info, CPUARMState *env, - uint64_t *vg, target_ulong addr, - int esize, int msize, uint32_t mtedes= c, - uintptr_t ra) -{ - sve_cont_ldst_mte_check_int(info, env, vg, addr, esize, msize, - mtedesc, ra, mte_check); -} - - /* * Common helper for all contiguous 1,2,3,4-register predicated stores. */ @@ -4463,8 +4435,7 @@ void sve_ldN_r(CPUARMState *env, uint64_t *vg, const = target_ulong addr, uint32_t desc, const uintptr_t retaddr, const int esz, const int msz, const int N, uint32_t mtedesc, sve_ldst1_host_fn *host_fn, - sve_ldst1_tlb_fn *tlb_fn, - sve_cont_ldst_mte_check_fn *mte_check_fn) + sve_ldst1_tlb_fn *tlb_fn) { const unsigned rd =3D simd_data(desc); const intptr_t reg_max =3D simd_oprsz(desc); @@ -4493,9 +4464,9 @@ void sve_ldN_r(CPUARMState *env, uint64_t *vg, const = target_ulong addr, * Handle mte checks for all active elements. * Since TBI must be set for MTE, !mtedesc =3D> !mte_active. */ - if (mte_check_fn && mtedesc) { - mte_check_fn(&info, env, vg, addr, 1 << esz, N << msz, - mtedesc, retaddr); + if (mtedesc) { + sve_cont_ldst_mte_check(&info, env, vg, addr, 1 << esz, N << msz, + mtedesc, retaddr); } =20 flags =3D info.page[0].flags | info.page[1].flags; @@ -4621,8 +4592,7 @@ void sve_ldN_r_mte(CPUARMState *env, uint64_t *vg, ta= rget_ulong addr, mtedesc =3D 0; } =20 - sve_ldN_r(env, vg, addr, desc, ra, esz, msz, N, mtedesc, host_fn, tlb_= fn, - N =3D=3D 1 ? sve_cont_ldst_mte_check1 : sve_cont_ldst_mte_ch= eckN); + sve_ldN_r(env, vg, addr, desc, ra, esz, msz, N, mtedesc, host_fn, tlb_= fn); } =20 #define DO_LD1_1(NAME, ESZ) \ @@ -4630,7 +4600,7 @@ void HELPER(sve_##NAME##_r)(CPUARMState *env, void *v= g, \ target_ulong addr, uint32_t desc) \ { \ sve_ldN_r(env, vg, addr, desc, GETPC(), ESZ, MO_8, 1, 0, \ - sve_##NAME##_host, sve_##NAME##_tlb, NULL); \ + sve_##NAME##_host, sve_##NAME##_tlb); \ } \ void HELPER(sve_##NAME##_r_mte)(CPUARMState *env, void *vg, \ target_ulong addr, uint32_t desc) \ @@ -4644,22 +4614,22 @@ void HELPER(sve_##NAME##_le_r)(CPUARMState *env, vo= id *vg, \ target_ulong addr, uint32_t desc) \ { \ sve_ldN_r(env, vg, addr, desc, GETPC(), ESZ, MSZ, 1, 0, \ - sve_##NAME##_le_host, sve_##NAME##_le_tlb, NULL); \ + sve_##NAME##_le_host, sve_##NAME##_le_tlb); \ } \ void HELPER(sve_##NAME##_be_r)(CPUARMState *env, void *vg, \ target_ulong addr, uint32_t desc) \ { \ sve_ldN_r(env, vg, addr, desc, GETPC(), ESZ, MSZ, 1, 0, \ - sve_##NAME##_be_host, sve_##NAME##_be_tlb, NULL); \ + sve_##NAME##_be_host, sve_##NAME##_be_tlb); \ } \ void HELPER(sve_##NAME##_le_r_mte)(CPUARMState *env, void *vg, \ - target_ulong addr, uint32_t desc) \ + target_ulong addr, uint32_t desc) \ { \ sve_ldN_r_mte(env, vg, addr, desc, GETPC(), ESZ, MSZ, 1, \ sve_##NAME##_le_host, sve_##NAME##_le_tlb); \ } \ void HELPER(sve_##NAME##_be_r_mte)(CPUARMState *env, void *vg, \ - target_ulong addr, uint32_t desc) \ + target_ulong addr, uint32_t desc) \ { \ sve_ldN_r_mte(env, vg, addr, desc, GETPC(), ESZ, MSZ, 1, \ sve_##NAME##_be_host, sve_##NAME##_be_tlb); \ @@ -4693,7 +4663,7 @@ void HELPER(sve_ld##N##bb_r)(CPUARMState *env, void *= vg, \ target_ulong addr, uint32_t desc) \ { \ sve_ldN_r(env, vg, addr, desc, GETPC(), MO_8, MO_8, N, 0, \ - sve_ld1bb_host, sve_ld1bb_tlb, NULL); \ + sve_ld1bb_host, sve_ld1bb_tlb); \ } \ void HELPER(sve_ld##N##bb_r_mte)(CPUARMState *env, void *vg, \ target_ulong addr, uint32_t desc) \ @@ -4707,13 +4677,13 @@ void HELPER(sve_ld##N##SUFF##_le_r)(CPUARMState *en= v, void *vg, \ target_ulong addr, uint32_t desc) \ { \ sve_ldN_r(env, vg, addr, desc, GETPC(), ESZ, ESZ, N, 0, \ - sve_ld1##SUFF##_le_host, sve_ld1##SUFF##_le_tlb, NULL); \ + sve_ld1##SUFF##_le_host, sve_ld1##SUFF##_le_tlb); \ } \ void HELPER(sve_ld##N##SUFF##_be_r)(CPUARMState *env, void *vg, \ target_ulong addr, uint32_t desc) \ { \ sve_ldN_r(env, vg, addr, desc, GETPC(), ESZ, ESZ, N, 0, \ - sve_ld1##SUFF##_be_host, sve_ld1##SUFF##_be_tlb, NULL); \ + sve_ld1##SUFF##_be_host, sve_ld1##SUFF##_be_tlb); \ } \ void HELPER(sve_ld##N##SUFF##_le_r_mte)(CPUARMState *env, void *vg, \ target_ulong addr, uint32_t desc) \ @@ -5090,8 +5060,7 @@ void sve_stN_r(CPUARMState *env, uint64_t *vg, target= _ulong addr, uint32_t desc, const uintptr_t retaddr, const int esz, const int msz, const int N, uint32_t mtedesc, sve_ldst1_host_fn *host_fn, - sve_ldst1_tlb_fn *tlb_fn, - sve_cont_ldst_mte_check_fn *mte_check_fn) + sve_ldst1_tlb_fn *tlb_fn) { const unsigned rd =3D simd_data(desc); const intptr_t reg_max =3D simd_oprsz(desc); @@ -5117,9 +5086,9 @@ void sve_stN_r(CPUARMState *env, uint64_t *vg, target= _ulong addr, * Handle mte checks for all active elements. * Since TBI must be set for MTE, !mtedesc =3D> !mte_active. */ - if (mte_check_fn && mtedesc) { - mte_check_fn(&info, env, vg, addr, 1 << esz, N << msz, - mtedesc, retaddr); + if (mtedesc) { + sve_cont_ldst_mte_check(&info, env, vg, addr, 1 << esz, N << msz, + mtedesc, retaddr); } =20 flags =3D info.page[0].flags | info.page[1].flags; @@ -5233,8 +5202,7 @@ void sve_stN_r_mte(CPUARMState *env, uint64_t *vg, ta= rget_ulong addr, mtedesc =3D 0; } =20 - sve_stN_r(env, vg, addr, desc, ra, esz, msz, N, mtedesc, host_fn, tlb_= fn, - N =3D=3D 1 ? sve_cont_ldst_mte_check1 : sve_cont_ldst_mte_ch= eckN); + sve_stN_r(env, vg, addr, desc, ra, esz, msz, N, mtedesc, host_fn, tlb_= fn); } =20 #define DO_STN_1(N, NAME, ESZ) \ @@ -5242,7 +5210,7 @@ void HELPER(sve_st##N##NAME##_r)(CPUARMState *env, vo= id *vg, \ target_ulong addr, uint32_t desc) \ { \ sve_stN_r(env, vg, addr, desc, GETPC(), ESZ, MO_8, N, 0, \ - sve_st1##NAME##_host, sve_st1##NAME##_tlb, NULL); \ + sve_st1##NAME##_host, sve_st1##NAME##_tlb); \ } \ void HELPER(sve_st##N##NAME##_r_mte)(CPUARMState *env, void *vg, \ target_ulong addr, uint32_t desc) \ @@ -5256,13 +5224,13 @@ void HELPER(sve_st##N##NAME##_le_r)(CPUARMState *en= v, void *vg, \ target_ulong addr, uint32_t desc) \ { \ sve_stN_r(env, vg, addr, desc, GETPC(), ESZ, MSZ, N, 0, \ - sve_st1##NAME##_le_host, sve_st1##NAME##_le_tlb, NULL); \ + sve_st1##NAME##_le_host, sve_st1##NAME##_le_tlb); \ } \ void HELPER(sve_st##N##NAME##_be_r)(CPUARMState *env, void *vg, \ target_ulong addr, uint32_t desc) \ { \ sve_stN_r(env, vg, addr, desc, GETPC(), ESZ, MSZ, N, 0, \ - sve_st1##NAME##_be_host, sve_st1##NAME##_be_tlb, NULL); \ + sve_st1##NAME##_be_host, sve_st1##NAME##_be_tlb); \ } \ void HELPER(sve_st##N##NAME##_le_r_mte)(CPUARMState *env, void *vg, \ target_ulong addr, uint32_t desc) \ --=20 2.25.1 From nobody Fri Apr 26 19:02:34 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1617731593; cv=none; d=zohomail.com; s=zohoarc; b=jU6o2+yaGdWhiKgxe78JQ354zbHk7MZgm18wT6MrjFDTHuHASjlSZVOGhVfbZEsQGjItxMTOtanOcOgkLmvQDlwDFPo5uGUPw0ICq/RGxohLyMhvxY9YfGG7Z0O0GEZwHzxb1lRM4r+bdN5Ld1d9Cb729WTSdIkIm6quqQdzgn8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617731593; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=h30NLvQUFSmWb89iN67sfFCqk9/Ie+AiL5gYJeDwQgI=; b=bRW9iKV+Lw2Q1qfrEtrTzRoyIqwz2k3VPQ/9VFu+7OaluLr3HZ5qRmmOXy+7LJ1sSgz4HTKmOueiguJ+eFfgN2DFSIzx0sdKCfjpAfS4BdBkjawOnkeKjujA6GFOs3v5UdHutPDBU84n9VkzjrRoB3XoC4XAmw4EsvFnvxpXsnc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1617731593184259.025669642549; Tue, 6 Apr 2021 10:53:13 -0700 (PDT) Received: from localhost ([::1]:49608 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lTpsx-0007Ez-Bl for importer@patchew.org; Tue, 06 Apr 2021 13:53:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46016) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lTph3-0001wM-0Y for qemu-devel@nongnu.org; Tue, 06 Apr 2021 13:40:49 -0400 Received: from mail-pg1-x536.google.com ([2607:f8b0:4864:20::536]:41951) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lTpgz-0006QC-O5 for qemu-devel@nongnu.org; Tue, 06 Apr 2021 13:40:48 -0400 Received: by mail-pg1-x536.google.com with SMTP id f29so8434480pgm.8 for ; Tue, 06 Apr 2021 10:40:44 -0700 (PDT) Received: from localhost.localdomain ([71.212.131.83]) by smtp.gmail.com with ESMTPSA id h15sm19148056pfo.20.2021.04.06.10.40.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Apr 2021 10:40:43 -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=h30NLvQUFSmWb89iN67sfFCqk9/Ie+AiL5gYJeDwQgI=; b=Y7siJFPq8qtozCvxgCYoT+kEVPjekeJ1JjIuCSAxQX22U6IQ8O5IHqMQ0jx7+vPBbA xoBDUdHOV6VTAs08BWneIztMxGy+wm1daTJZw8iNdPSatE12w8B2ntdmKTMAXwnMB4Gf qyXH7VOz6qLRlEQrwV2UhtT3/NXSpQHzsyGpwzA1XYS02X9xdpgANP9qGgRJxzZniLNv q4lK2hCOZJKZRPRWGoWxlKor/bDDGsZuMgMVRw0pyWLoDDEl/JEtsuyG/t7dHNopwFRI knxNb+snK3xek4SURYZ4zgVO8ocsk4MM4UgTbM6lS7quAYyPT+6nO3lkcfkIE0TVXh/E Duug== 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=h30NLvQUFSmWb89iN67sfFCqk9/Ie+AiL5gYJeDwQgI=; b=Ta5X86DWHsG32lIFbBXnStJ/ASdAnloZIJ3fYTQreA0JEQysNmsuKp2LgqN9DAYkfl 1E+xWDTT6HhW4Jx1AqCapZiMZ0L5XNRjyTOz8V+ZR/LpxwGjGG8V3/hwbXd3d5ZgoAup HaLQrzEQsf2U1YdGyxX78Q43XP8wYhnHAg7iJfSvRhbdJg00Z2+qFPpGb8vbVrGCiSGF N/HA3aiinprBo+jfOy/CegltIbrSG8ksdzPV/zxH1mF/qeQLWvJD6xrDiYBJE8joeERr RbBN7YjsEMb0kBeyHEGx9MWdj74SiRKdRLelq/JqRYhkXVTDEdVcLq8Zc6fbISktvvvk uViA== X-Gm-Message-State: AOAM530MSJAGGAL3w5OPnxqifrrQhigdElWUiyqisdX1aK+2+6x4iUAf nNRdXIkFhavmMkKLW+HTqYRFnIbfqy9/Tw== X-Google-Smtp-Source: ABdhPJxZf0IZlSs3PetinJfGVuSWDRryWyURX19XwrIfuj3NpW92s3aAJUCnIjNXLA+3PtDA7M3lvg== X-Received: by 2002:a63:d309:: with SMTP id b9mr27613922pgg.96.1617730843916; Tue, 06 Apr 2021 10:40:43 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v4 11/12] target/arm: Remove log2_esize parameter to gen_mte_checkN Date: Tue, 6 Apr 2021 10:40:30 -0700 Message-Id: <20210406174031.64299-12-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210406174031.64299-1-richard.henderson@linaro.org> References: <20210406174031.64299-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::536; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x536.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=unavailable 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 Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" The log2_esize parameter is not used except trivially. Drop the parameter and the deferral to gen_mte_check1. This fixes a bug in that the parameters as documented in the header file were the reverse from those in the implementation. Which meant that translate-sve.c was passing the parameters in the wrong order. Signed-off-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e --- target/arm/translate-a64.h | 2 +- target/arm/translate-a64.c | 15 +++++++-------- target/arm/translate-sve.c | 4 ++-- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/target/arm/translate-a64.h b/target/arm/translate-a64.h index 3668b671dd..868d355048 100644 --- a/target/arm/translate-a64.h +++ b/target/arm/translate-a64.h @@ -44,7 +44,7 @@ TCGv_i64 clean_data_tbi(DisasContext *s, TCGv_i64 addr); TCGv_i64 gen_mte_check1(DisasContext *s, TCGv_i64 addr, bool is_write, bool tag_checked, int log2_size); TCGv_i64 gen_mte_checkN(DisasContext *s, TCGv_i64 addr, bool is_write, - bool tag_checked, int count, int log2_esize); + bool tag_checked, int size); =20 /* We should have at some point before trying to access an FP register * done the necessary access check, so assert that diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index a68d5dd5d1..f35a5e8174 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -295,9 +295,9 @@ TCGv_i64 gen_mte_check1(DisasContext *s, TCGv_i64 addr,= bool is_write, * For MTE, check multiple logical sequential accesses. */ TCGv_i64 gen_mte_checkN(DisasContext *s, TCGv_i64 addr, bool is_write, - bool tag_checked, int log2_esize, int total_size) + bool tag_checked, int size) { - if (tag_checked && s->mte_active[0] && total_size !=3D (1 << log2_esiz= e)) { + if (tag_checked && s->mte_active[0]) { TCGv_i32 tcg_desc; TCGv_i64 ret; int desc =3D 0; @@ -306,7 +306,7 @@ TCGv_i64 gen_mte_checkN(DisasContext *s, TCGv_i64 addr,= bool is_write, desc =3D FIELD_DP32(desc, MTEDESC, TBI, s->tbid); desc =3D FIELD_DP32(desc, MTEDESC, TCMA, s->tcma); desc =3D FIELD_DP32(desc, MTEDESC, WRITE, is_write); - desc =3D FIELD_DP32(desc, MTEDESC, SIZEM1, total_size - 1); + desc =3D FIELD_DP32(desc, MTEDESC, SIZEM1, size - 1); tcg_desc =3D tcg_const_i32(desc); =20 ret =3D new_tmp_a64(s); @@ -315,7 +315,7 @@ TCGv_i64 gen_mte_checkN(DisasContext *s, TCGv_i64 addr,= bool is_write, =20 return ret; } - return gen_mte_check1(s, addr, is_write, tag_checked, log2_esize); + return clean_data_tbi(s, addr); } =20 typedef struct DisasCompare64 { @@ -2965,8 +2965,7 @@ static void disas_ldst_pair(DisasContext *s, uint32_t= insn) } =20 clean_addr =3D gen_mte_checkN(s, dirty_addr, !is_load, - (wback || rn !=3D 31) && !set_tag, - size, 2 << size); + (wback || rn !=3D 31) && !set_tag, 2 << si= ze); =20 if (is_vector) { if (is_load) { @@ -3713,7 +3712,7 @@ static void disas_ldst_multiple_struct(DisasContext *= s, uint32_t insn) * promote consecutive little-endian elements below. */ clean_addr =3D gen_mte_checkN(s, tcg_rn, is_store, is_postidx || rn != =3D 31, - size, total); + total); =20 /* * Consecutive little-endian elements from a single register @@ -3866,7 +3865,7 @@ static void disas_ldst_single_struct(DisasContext *s,= uint32_t insn) tcg_rn =3D cpu_reg_sp(s, rn); =20 clean_addr =3D gen_mte_checkN(s, tcg_rn, !is_load, is_postidx || rn != =3D 31, - scale, total); + total); =20 tcg_ebytes =3D tcg_const_i64(1 << scale); for (xs =3D 0; xs < selem; xs++) { diff --git a/target/arm/translate-sve.c b/target/arm/translate-sve.c index 5179c1f836..584c4d047c 100644 --- a/target/arm/translate-sve.c +++ b/target/arm/translate-sve.c @@ -4264,7 +4264,7 @@ static void do_ldr(DisasContext *s, uint32_t vofs, in= t len, int rn, int imm) =20 dirty_addr =3D tcg_temp_new_i64(); tcg_gen_addi_i64(dirty_addr, cpu_reg_sp(s, rn), imm); - clean_addr =3D gen_mte_checkN(s, dirty_addr, false, rn !=3D 31, len, M= O_8); + clean_addr =3D gen_mte_checkN(s, dirty_addr, false, rn !=3D 31, len); tcg_temp_free_i64(dirty_addr); =20 /* @@ -4352,7 +4352,7 @@ static void do_str(DisasContext *s, uint32_t vofs, in= t len, int rn, int imm) =20 dirty_addr =3D tcg_temp_new_i64(); tcg_gen_addi_i64(dirty_addr, cpu_reg_sp(s, rn), imm); - clean_addr =3D gen_mte_checkN(s, dirty_addr, false, rn !=3D 31, len, M= O_8); + clean_addr =3D gen_mte_checkN(s, dirty_addr, false, rn !=3D 31, len); tcg_temp_free_i64(dirty_addr); =20 /* Note that unpredicated load/store of vector/predicate registers --=20 2.25.1 From nobody Fri Apr 26 19:02:34 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1617731702; cv=none; d=zohomail.com; s=zohoarc; b=QbJ9ZkM1rz+bJjq2N3ahvPxGeoW6eftySMBfZhACcR6Fbv1+8YnQhMfwcHLd3U923pUz6PwrU9p5FRnThtJALpn3lKX0IO28FWJAJMsSVe8Yaam3rK06gZfCcR+dMMbFFSHFOVqxrCvtk1jnFttrEZkShbezJeVdQPkGBZKCpRI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617731702; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=KoBTGUZmyMctY5haXIfN8TiPwOcc2SyNXLP6NLjWLR4=; b=E+DCwUfGPI5jrtRJa6+Lj5z1CYH3fY3EEFd4pSU2tUJJPS/cNBzC0J8dm4Oq9zd+fzM8Xzx+RuSYEGFRYzJo2Ul1ebHiRjDReQz930LM8Dxft+3LPgA1BE/fvBkWFZh7lkh4bZgnRe6SgjWsZf3fm0HS46r/X0qZpWFXJdzKIWU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1617731702535257.652643211939; Tue, 6 Apr 2021 10:55:02 -0700 (PDT) Received: from localhost ([::1]:55454 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lTpun-0001CH-Iw for importer@patchew.org; Tue, 06 Apr 2021 13:55:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46040) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lTph4-0001z1-15 for qemu-devel@nongnu.org; Tue, 06 Apr 2021 13:40:50 -0400 Received: from mail-pj1-x1032.google.com ([2607:f8b0:4864:20::1032]:47096) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lTph0-0006Rf-NN for qemu-devel@nongnu.org; Tue, 06 Apr 2021 13:40:49 -0400 Received: by mail-pj1-x1032.google.com with SMTP id q6-20020a17090a4306b02900c42a012202so8031292pjg.5 for ; Tue, 06 Apr 2021 10:40:46 -0700 (PDT) Received: from localhost.localdomain ([71.212.131.83]) by smtp.gmail.com with ESMTPSA id h15sm19148056pfo.20.2021.04.06.10.40.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Apr 2021 10:40:44 -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=KoBTGUZmyMctY5haXIfN8TiPwOcc2SyNXLP6NLjWLR4=; b=ca6yD3KdlP5KFU0u/1D3iFM2QN7G3MjvEwrFRF8iha8PtBfAge2O/p93CLrpXj0eZk egGV14FHEq/Mkd4A8xss3iig3FBbSS+PURlN5U2fPFgUq6XzlVjhNZlwHlnARPhZURyG w3lDdmjnzIxS1Y39bPn0ILIqE7PXpmIyh6RISEgMJ1CHijW91Su/UxLAoY/Ij6pp7qRe HQ7eyEqa018XdG8x1fLe/nN2qlZ00zAJQMQguEfwit65bbW3bN5CyY4h8PKXGAwTK5ul yUqQ5LKIuNkYFQPjXF7uzBC2AwtYTUcMbcgoYhlMs2g9oJ8GRRv9Df027x95BpTzGPkR YLKA== 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=KoBTGUZmyMctY5haXIfN8TiPwOcc2SyNXLP6NLjWLR4=; b=ojRuPosPon49XucMgK0fKpDZk5ZgKP4FCkIru68LsgBsNvCtu/FOR8BWOGya+C9r5e NUuCMim/cavTMdaRTiVNK967tcE9e5TSMrHwO6+8WuORIzG5C7nIq2Pae8pxBw1m7diS uvOCk/lF1z7GaneZgyxcHEUCINxz44DGOOXtBOWANPTAYA27aNFc36hFtVQfMyzg0Ewx bDb2GF/YHXARAytHjMaKGAG7dHgE8BpVnOnJ84nRVIEwdTkXFC68wtl0uvKOy79hBzOk v+EbG3GVr13EqM3dG0Q8qlKqUDixhlfUW+OmT/hcfqwd8jZtS3mhLZvxlkKg1OXlmhn2 ZbVw== X-Gm-Message-State: AOAM531ppcX5oMlg67P1b2DlPYmJ03/a8snA3WEQtkoZBDISNv9en2mR uURpFfKKJT1EykgZdJ7ulCB9nos1m6D1kA== X-Google-Smtp-Source: ABdhPJwtu1+cU+MWe0K/CLaqal+QktIhFkgtONdrWzK7DVDw6muGRU6MzBsNldoYva80SqNtRgeoGQ== X-Received: by 2002:a17:903:2306:b029:e7:1c8d:63fc with SMTP id d6-20020a1709032306b02900e71c8d63fcmr30115307plh.35.1617730845171; Tue, 06 Apr 2021 10:40:45 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v4 12/12] exec: Fix overlap of PAGE_ANON and PAGE_TARGET_1 Date: Tue, 6 Apr 2021 10:40:31 -0700 Message-Id: <20210406174031.64299-13-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210406174031.64299-1-richard.henderson@linaro.org> References: <20210406174031.64299-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::1032; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1032.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, Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" Unfortuately, the elements of PAGE_* were not in numerical order and so PAGE_ANON was added to an "unused" bit. As an arbitrary choice, move PAGE_TARGET_{1,2} together. Cc: Laurent Vivier Fixes: 26bab757d41b ("linux-user: Introduce PAGE_ANON") Buglink: https://bugs.launchpad.net/bugs/1922617 Signed-off-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Laurent Vivier Tested-by: Laurent Vivier Tested-by: Nathan Chancellor --- include/exec/cpu-all.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index d76b0b9e02..32cfb634c6 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -268,8 +268,8 @@ extern intptr_t qemu_host_page_mask; #define PAGE_RESERVED 0x0100 #endif /* Target-specific bits that will be used via page_get_flags(). */ -#define PAGE_TARGET_1 0x0080 -#define PAGE_TARGET_2 0x0200 +#define PAGE_TARGET_1 0x0200 +#define PAGE_TARGET_2 0x0400 =20 #if defined(CONFIG_USER_ONLY) void page_dump(FILE *f); --=20 2.25.1