From patchwork Thu Jun 27 04:13:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Gustavo Romero X-Patchwork-Id: 807803 Delivered-To: patch@linaro.org Received: by 2002:adf:e842:0:b0:362:4979:7f74 with SMTP id d2csp612822wrn; Wed, 26 Jun 2024 21:15:36 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVif+/zTsnLFDp2JM8qEynq3d4LWMJyRpLg1ZxdasXPbcCZyvp2kjZZa6N064Bqx8Xc47ZMVK6MiSnLtmFnhtQU X-Google-Smtp-Source: AGHT+IHsUm1HX+3KQ4jLxec5RadanrGVRjNP+YLCL46vdvTdojmDHPegxzohToNJ0AFC+W4YJu0Z X-Received: by 2002:a05:6102:508e:b0:48f:5abc:8b93 with SMTP id ada2fe7eead31-48f5abc8d84mr13784744137.27.1719461736154; Wed, 26 Jun 2024 21:15:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719461736; cv=none; d=google.com; s=arc-20160816; b=hzN7SJa0ogc6vy83aeLCKpN7KeieVtm5g45RB7rxmUMd690qs/fTbzgmWr1ToFUlNg 1HAkgjRQh/FOx5G/IqCSlh6wrRY88lbkl8hlmDGIWxKc7fMslzTOY3bQT2Aja9JFkoYi dbNsc0suB1VVAeIXrX0unfLYp/uNveQhzJ+4s/jNubaaIVQb9XdbsjYn731Voy2M6sMK WMCtC6oeOewLSK6BvwF8esM2TEzNBmrZQdaQpGEzLswpsmCXsiZAODN+/F9FRdKjcICS GT6LPYnazn+aqcDv86hPPdWlvaXRZKsH3Xt2TPrZ5E1Ka0Iq/RqRICAIVbbiAOFp4tVm nUgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=LZM7VcD8LnwBva9sbq8nptV5aX4cNEygL8ebOywUDzU=; fh=fQSRkfw+DkTHa5KQssXieneufL+rl3wPoA2jkVIsZpk=; b=XIPQSg3UxRZoZszUGgiXAHg+HbZPPG326ViMJfgJ28saiTFWFkswKYmLA6j6NCmTDx 2FzVgWnxLWnZK9lCWuoaoyssoYDaBzyWHC+0hI7VKDb85q8pWjHCgnwvHc3lcgaItY9c p7766OLEhn6CIw34Fb+NIHDg7qUOxy2Gn/kikSW1ZiJ/XM2o6y7BNxWrhFXLhiml0KhC Gs6TDv0YNW9W/+Z9UZo8B38GcFTFsEPb8LJcch8AMrdevqtWCSESL2+rFStiDOv3zh2q E+qzQBePfqLjUPQbEOCY4YjHcq/6hN9C01KoXchkGkft5FKmq/TA0qfrNZEaB7eufP8F iORw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=zucxQFKh; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-44642216f9asi4701381cf.645.2024.06.26.21.15.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 26 Jun 2024 21:15:36 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=zucxQFKh; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sMgX8-0006cS-Ac; Thu, 27 Jun 2024 00:14:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sMgWf-0006Ej-PK for qemu-devel@nongnu.org; Thu, 27 Jun 2024 00:14:27 -0400 Received: from mail-pf1-x434.google.com ([2607:f8b0:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sMgWd-0000AU-4t for qemu-devel@nongnu.org; Thu, 27 Jun 2024 00:14:25 -0400 Received: by mail-pf1-x434.google.com with SMTP id d2e1a72fcca58-7066a3229f4so3890443b3a.2 for ; Wed, 26 Jun 2024 21:14:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1719461661; x=1720066461; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=LZM7VcD8LnwBva9sbq8nptV5aX4cNEygL8ebOywUDzU=; b=zucxQFKhXjSb/xGC4YbaxCGbi61KyIgnHknFZVfU5oZlaHNNugEGqZFg8NxxSlP8dM kymNHiWj/YRecHfv486/QWM4ftWOTyPzEiP+eDEV9G72bqxCVqPjFt7ueYGQi4YGUK7H UcrWsXNuKmalfxU7BVGvVV49IN7tQspIAP5c6NDl+nEcjul1JlNYzW3X6sQXjwp6KYdT D+dzTRmtprHv20+AsdlqjkeC+YazAIeKaYyo33bG4bQopkdqUaqVmqVV8olxLaWn1j6Q alOJdcceH82xYz15ChoFUDAY1L59rymPxtRbH3vOCQvW7KEpZoyBrKKVY8uEz127aRvM q+jg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719461661; x=1720066461; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LZM7VcD8LnwBva9sbq8nptV5aX4cNEygL8ebOywUDzU=; b=pwyYFUQnOBTFTNL0E/Fvja7AASYZ2T0MUcgGtqJYIgHyrWm2GxB+/+bSfYl0GHHaF9 FPWuB7jESHO65orRwXS0tVpJg30if3vdmBWyV2FgS5AAIkyn3yvVuFQMwfn/0Fiea1J2 MX9d0rYNA6BVHob4TdwJ/dFXOjo/fc347wM0Kepnz418dGNE/SQdYl28C0+7IFnp5h0G eCKNOXANfbOuUxrOjtLL4Ws2Jud8locAOqnIp6NMk4BCJVn32pVwVqkRylLW0Ie52OMe XelkCmSYdJPpiuMEhYzHYzlB6KF7lFgQosXeDZpYnEbTxkEeCw2q8UVojzZxBhJ+N952 Qe1Q== X-Gm-Message-State: AOJu0Yx/vuBskxafH21DovPHsn8VZJ1CTIc/faAjRYpQzB9JOXPnc6hO iHAljwEua2/1n6EDWOJ7swB59MCckgeOYes6R0f3FPv6/syU9M4boYMww4J+EyoYQpWqFgY9vFp QCWc= X-Received: by 2002:a05:6a00:1896:b0:704:2f65:49a0 with SMTP id d2e1a72fcca58-7067459c886mr13708664b3a.5.1719461661254; Wed, 26 Jun 2024 21:14:21 -0700 (PDT) Received: from amd.. ([2804:7f0:b401:391e:3e7c:3fff:fe7a:e83b]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-72748e8539fsm273045a12.66.2024.06.26.21.14.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Jun 2024 21:14:20 -0700 (PDT) From: Gustavo Romero To: qemu-devel@nongnu.org, philmd@linaro.org, alex.bennee@linaro.org, richard.henderson@linaro.org Cc: peter.maydell@linaro.org, gustavo.romero@linaro.org Subject: [PATCH v5 5/9] target/arm: Make some MTE helpers widely available Date: Thu, 27 Jun 2024 04:13:45 +0000 Message-Id: <20240627041349.356704-6-gustavo.romero@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240627041349.356704-1-gustavo.romero@linaro.org> References: <20240627041349.356704-1-gustavo.romero@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::434; envelope-from=gustavo.romero@linaro.org; helo=mail-pf1-x434.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Make the MTE helpers allocation_tag_mem_probe, load_tag1, and store_tag1 available to other subsystems. Signed-off-by: Gustavo Romero Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé --- target/arm/tcg/mte_helper.c | 45 ++++--------------------- target/arm/tcg/mte_helper.h | 66 +++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 38 deletions(-) create mode 100644 target/arm/tcg/mte_helper.h diff --git a/target/arm/tcg/mte_helper.c b/target/arm/tcg/mte_helper.c index a50d576294..9d2ba287ee 100644 --- a/target/arm/tcg/mte_helper.c +++ b/target/arm/tcg/mte_helper.c @@ -29,6 +29,7 @@ #include "hw/core/tcg-cpu-ops.h" #include "qapi/error.h" #include "qemu/guest-random.h" +#include "mte_helper.h" static int choose_nonexcluded_tag(int tag, int offset, uint16_t exclude) @@ -50,42 +51,10 @@ static int choose_nonexcluded_tag(int tag, int offset, uint16_t exclude) return tag; } -/** - * allocation_tag_mem_probe: - * @env: the cpu environment - * @ptr_mmu_idx: the addressing regime to use for the virtual address - * @ptr: the virtual address for which to look up tag memory - * @ptr_access: the access to use for the virtual address - * @ptr_size: the number of bytes in the normal memory access - * @tag_access: the access to use for the tag memory - * @probe: true to merely probe, never taking an exception - * @ra: the return address for exception handling - * - * Our tag memory is formatted as a sequence of little-endian nibbles. - * That is, the byte at (addr >> (LOG2_TAG_GRANULE + 1)) contains two - * tags, with the tag at [3:0] for the lower addr and the tag at [7:4] - * for the higher addr. - * - * Here, resolve the physical address from the virtual address, and return - * a pointer to the corresponding tag byte. - * - * If there is no tag storage corresponding to @ptr, return NULL. - * - * If the page is inaccessible for @ptr_access, or has a watchpoint, there are - * three options: - * (1) probe = true, ra = 0 : pure probe -- we return NULL if the page is not - * accessible, and do not take watchpoint traps. The calling code must - * handle those cases in the right priority compared to MTE traps. - * (2) probe = false, ra = 0 : probe, no fault expected -- the caller guarantees - * that the page is going to be accessible. We will take watchpoint traps. - * (3) probe = false, ra != 0 : non-probe -- we will take both memory access - * traps and watchpoint traps. - * (probe = true, ra != 0 is invalid and will assert.) - */ -static uint8_t *allocation_tag_mem_probe(CPUARMState *env, int ptr_mmu_idx, - uint64_t ptr, MMUAccessType ptr_access, - int ptr_size, MMUAccessType tag_access, - bool probe, uintptr_t ra) +uint8_t *allocation_tag_mem_probe(CPUARMState *env, int ptr_mmu_idx, + uint64_t ptr, MMUAccessType ptr_access, + int ptr_size, MMUAccessType tag_access, + bool probe, uintptr_t ra) { #ifdef CONFIG_USER_ONLY uint64_t clean_ptr = useronly_clean_ptr(ptr); @@ -287,7 +256,7 @@ uint64_t HELPER(addsubg)(CPUARMState *env, uint64_t ptr, return address_with_allocation_tag(ptr + offset, rtag); } -static int load_tag1(uint64_t ptr, uint8_t *mem) +int load_tag1(uint64_t ptr, uint8_t *mem) { int ofs = extract32(ptr, LOG2_TAG_GRANULE, 1) * 4; return extract32(*mem, ofs, 4); @@ -321,7 +290,7 @@ static void check_tag_aligned(CPUARMState *env, uint64_t ptr, uintptr_t ra) } /* For use in a non-parallel context, store to the given nibble. */ -static void store_tag1(uint64_t ptr, uint8_t *mem, int tag) +void store_tag1(uint64_t ptr, uint8_t *mem, int tag) { int ofs = extract32(ptr, LOG2_TAG_GRANULE, 1) * 4; *mem = deposit32(*mem, ofs, 4, tag); diff --git a/target/arm/tcg/mte_helper.h b/target/arm/tcg/mte_helper.h new file mode 100644 index 0000000000..1f471fb69b --- /dev/null +++ b/target/arm/tcg/mte_helper.h @@ -0,0 +1,66 @@ +/* + * ARM MemTag operation helpers. + * + * This code is licensed under the GNU GPL v2 or later. + * + * SPDX-License-Identifier: LGPL-2.1-or-later + */ + +#ifndef TARGET_ARM_MTE_H +#define TARGET_ARM_MTE_H + +#include "exec/mmu-access-type.h" + +/** + * allocation_tag_mem_probe: + * @env: the cpu environment + * @ptr_mmu_idx: the addressing regime to use for the virtual address + * @ptr: the virtual address for which to look up tag memory + * @ptr_access: the access to use for the virtual address + * @ptr_size: the number of bytes in the normal memory access + * @tag_access: the access to use for the tag memory + * @probe: true to merely probe, never taking an exception + * @ra: the return address for exception handling + * + * Our tag memory is formatted as a sequence of little-endian nibbles. + * That is, the byte at (addr >> (LOG2_TAG_GRANULE + 1)) contains two + * tags, with the tag at [3:0] for the lower addr and the tag at [7:4] + * for the higher addr. + * + * Here, resolve the physical address from the virtual address, and return + * a pointer to the corresponding tag byte. + * + * If there is no tag storage corresponding to @ptr, return NULL. + * + * If the page is inaccessible for @ptr_access, or has a watchpoint, there are + * three options: + * (1) probe = true, ra = 0 : pure probe -- we return NULL if the page is not + * accessible, and do not take watchpoint traps. The calling code must + * handle those cases in the right priority compared to MTE traps. + * (2) probe = false, ra = 0 : probe, no fault expected -- the caller guarantees + * that the page is going to be accessible. We will take watchpoint traps. + * (3) probe = false, ra != 0 : non-probe -- we will take both memory access + * traps and watchpoint traps. + * (probe = true, ra != 0 is invalid and will assert.) + */ +uint8_t *allocation_tag_mem_probe(CPUARMState *env, int ptr_mmu_idx, + uint64_t ptr, MMUAccessType ptr_access, + int ptr_size, MMUAccessType tag_access, + bool probe, uintptr_t ra); + +/** + * load_tag1 - Load 1 tag (nibble) from byte + * @ptr: The tagged address + * @mem: The tag address (packed, 2 tags in byte) + */ +int load_tag1(uint64_t ptr, uint8_t *mem); + +/** + * store_tag1 - Store 1 tag (nibble) into byte + * @ptr: The tagged address + * @mem: The tag address (packed, 2 tags in byte) + * @tag: The tag to be stored in the nibble + */ +void store_tag1(uint64_t ptr, uint8_t *mem, int tag); + +#endif /* TARGET_ARM_MTE_H */