From patchwork Thu May 1 21:21:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 886419 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp520628wrq; Thu, 1 May 2025 14:27:12 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWmYgTH//UhBM9UX8wrzCBd/q9NUCCnHrzh/F1zC5vGpBRNFBp4T28fZyy9Up+v9wWx9euj0g==@linaro.org X-Google-Smtp-Source: AGHT+IEtTRl0PSu30uzIfJ3nNONOmCBd4oPSYCBCWDVvuuUh7WCJDhmwgg8FJR6T1hbK2vKOjdXf X-Received: by 2002:a05:622a:4c07:b0:476:8296:17e5 with SMTP id d75a77b69052e-48c31353ea1mr6957731cf.17.1746134832075; Thu, 01 May 2025 14:27:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746134832; cv=none; d=google.com; s=arc-20240605; b=iR8BMgrJcdYBECioFIKol+tG91lqXhry0X13MECLZRMEwJ/rxnh2pd5abGVe3wGPML yEHsX3S/ftE8HDM7rnnWmY3Z5g5uBiAnSFPQQKQg8g8AXrCQc33hkRY313NUW7QXmdRR h4nP9f5FDi+h61ecNHigdkkmRJKLcHHYg+fu3ZuvkeT5pNWT0qebYWDDIsx6EUXPBPN3 UKriJ9AhpT3On5NgjFohX2oNRb1F8gIeU0S2FFbIQBfx2AuezmVuSuPEN/0aaWaccmcd fODEfvnd/OkGxmNhEa3z8Kzi05OVEr7r2swJaiR7EH4AGuDA0yFtqQf2F/BsU8PSJGEP Xafw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=M7zJ1IIf93+bko/Emk4HM+tkDtTMCkTvdeVlwV8Sclo=; fh=vm85eyWrvOAHduw3sqEA+cYBqvHB7M0MHFcRJg7VWOo=; b=RYTnEIHds/oWs4UD+y52TQ6ZQ4zSZG04uBL3BDAwEUVCYN02RiPQUN36NjHFSHvpM5 K9Ia29M2kfPN3E832wASfkZJeTqhswcRMKT2Q01l6Q94ZN8tN7DN4iWi/OBeLGMrre2u WExPEi1zzzhayKV4aEJUXXHM0jfCjk5lzItSYsvuWrYcIbBXbt0w9MgQ5sbi9QK1fguC iKisgy6naFtztI3GkCl3DWd5TpImgTzkfEQmqYiaDJ6LwZ5G1bCzBorrJ0DdeLC5k4k2 GJaO1o3JRFZa5NpDjdKHR1v23tRVNxQ5jB6VE2k8boJqGVgYM+qBW//o1HJqbBDbbPod pqQg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="p/d/X0G+"; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-48b9872450csi14038361cf.376.2025.05.01.14.27.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 May 2025 14:27:12 -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="p/d/X0G+"; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uAbPz-0000Yb-44; Thu, 01 May 2025 17:26:07 -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 1uAbOw-0005PJ-IH for qemu-devel@nongnu.org; Thu, 01 May 2025 17:25:03 -0400 Received: from mail-pg1-x533.google.com ([2607:f8b0:4864:20::533]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAbOt-0002Ep-Hm for qemu-devel@nongnu.org; Thu, 01 May 2025 17:25:02 -0400 Received: by mail-pg1-x533.google.com with SMTP id 41be03b00d2f7-af579e46b5dso992185a12.3 for ; Thu, 01 May 2025 14:24:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746134698; x=1746739498; 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=M7zJ1IIf93+bko/Emk4HM+tkDtTMCkTvdeVlwV8Sclo=; b=p/d/X0G+OhdgMhXNT0z5f5d9/uljfF4qPh2IApE6DohCGEwbpzC4r4HdhLx3ThCDVd Uu95fNxu3J73ueFYqCCAKojYVtitivjDLZHLNgqMynmVVb0IrXJRU1ERe1xg88cUq3yy TDLVrsGKQm+EQfU3YAGhZlnhbBmKyYIPH+ip0ja+7n0iUcNdDUJqGTUbEWupiDWM/C6v NCZ1W9o3owH4we6W5DuFCpi3DvFPhRYcpoFb6LrsSgoS6cig5rXI8ag8fR89iHCCbkFX 0m8h08DOC3AhbOhQ+enWeM8bECuJoXnekSdGbB9ogjGdi4gO+LeXNNhazQ6zc+9j6k1A CaPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746134698; x=1746739498; 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=M7zJ1IIf93+bko/Emk4HM+tkDtTMCkTvdeVlwV8Sclo=; b=Vm5etJnxzRFFJJvFDOOADiO2Xn0rg2qVqbII9YbmMXnGe0oat1acwjpBz0p3VejNsO +Odznf31H7cYxTEKNqE0gu4ZIsNjQuqitCJQmhj9YtcY7PLKGAKUtDENfkjNoBIbX5b0 Vur27CInx+r4a9Q/r4pnSUuAZTprSbhe+I+0T6WomMb4k4j3rEY7vYt5+cHJatkTgq4c /42EAAZ02CbeVt/FLNKyLP80Jb0g2uJBBDxlUxOlLydUINIoTeUMVRYaIejlGq9M9et7 eYXnHW1odmqXa1t3/2FcDSK1J1lJ+thuZBCFAB8vZ/hSCkN5ecHpBDL923gNQS6/e2un 69bA== X-Gm-Message-State: AOJu0YxMohgJFP8vsANIL+KytJBzvEi818ZPKDubS1UZIK8WbtxsPxl6 a7lJ7qVBL6sWtCkojYJ7rkszSfKqcsKCKecgZeaDUoUaorow13TIWXDxWdAHOTOfsVKW1dnkBo+ Q X-Gm-Gg: ASbGncs1tQOEBW+k9vNmS43/IOl+d2r6nguuiS99XZY6IZUPtxbLJZnHegVf/U0Ut4A hnbpoV8sPYjCeJfGAklb76d4VFj0Jtq9/ATkQqIHt51O/kSNlKrJa8CBZISSTw1T546SO7RC1cX VMPKMPWrCY5iuarg0F1rs+dseVNS69tdOjuAxfpUy2z35xRbQPAbDgdm4WueRcdt9VAqUlLHdXq mNEVIwSPE1SjqoGCY0xFrlGIgLdsb0CGLk7LQ35p+KTiDIN5Rb6+5dVGeX7J78rPbrhGaHxXxl3 NQoFjzJ5/ADzvNZIo5vjk1JZ2o55MfF0pRmQsEXJELUeHQEkkLLb42at30W5tes40hC4SX1tfWE = X-Received: by 2002:a05:6a21:7103:b0:204:4573:d855 with SMTP id adf61e73a8af0-20cde3746e9mr658743637.9.1746134698085; Thu, 01 May 2025 14:24:58 -0700 (PDT) Received: from stoup.. (71-212-47-143.tukw.qwest.net. [71.212.47.143]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-740590610desm135897b3a.146.2025.05.01.14.24.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 May 2025 14:24:57 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Pierrick Bouvier Subject: [PULL 57/59] accel/tcg: Remove TARGET_PAGE_DATA_SIZE Date: Thu, 1 May 2025 14:21:11 -0700 Message-ID: <20250501212113.2961531-58-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250501212113.2961531-1-richard.henderson@linaro.org> References: <20250501212113.2961531-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::533; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x533.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 This macro is used by only one target, and even then under unusual conditions -- AArch64 with mmap's PROT_MTE flag. Since page size for aarch64-linux-user is variable, the per-page data size is also variable. Since page_reset_target_data via target_munmap does not have ready access to CPUState, simply pass in the size from the first allocation and remember that. Reviewed-by: Pierrick Bouvier Signed-off-by: Richard Henderson --- include/user/page-protection.h | 8 +++++--- target/arm/cpu.h | 4 ---- accel/tcg/user-exec.c | 26 ++++++++++++++++---------- target/arm/tcg/mte_helper.c | 4 ++-- 4 files changed, 23 insertions(+), 19 deletions(-) diff --git a/include/user/page-protection.h b/include/user/page-protection.h index 86143212fd..4bde664e4a 100644 --- a/include/user/page-protection.h +++ b/include/user/page-protection.h @@ -73,18 +73,20 @@ bool page_check_range_empty(vaddr start, vaddr last); vaddr page_find_range_empty(vaddr min, vaddr max, vaddr len, vaddr align); /** - * page_get_target_data(address) + * page_get_target_data * @address: guest virtual address + * @size: per-page size * - * Return TARGET_PAGE_DATA_SIZE bytes of out-of-band data to associate + * Return @size bytes of out-of-band data to associate * with the guest page at @address, allocating it if necessary. The * caller should already have verified that the address is valid. + * The value of @size must be the same for every call. * * The memory will be freed when the guest page is deallocated, * e.g. with the munmap system call. */ __attribute__((returns_nonnull)) -void *page_get_target_data(vaddr address); +void *page_get_target_data(vaddr address, size_t size); typedef int (*walk_memory_regions_fn)(void *, vaddr, vaddr, int); int walk_memory_regions(void *, walk_memory_regions_fn); diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 23720b2b17..6ed6409cb7 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -3213,8 +3213,4 @@ extern const uint64_t pred_esz_masks[5]; #define LOG2_TAG_GRANULE 4 #define TAG_GRANULE (1 << LOG2_TAG_GRANULE) -#ifdef CONFIG_USER_ONLY -#define TARGET_PAGE_DATA_SIZE (TARGET_PAGE_SIZE >> (LOG2_TAG_GRANULE + 1)) -#endif /* CONFIG_USER_ONLY */ - #endif diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c index f674fd875e..46b1e97c30 100644 --- a/accel/tcg/user-exec.c +++ b/accel/tcg/user-exec.c @@ -870,7 +870,6 @@ tb_page_addr_t get_page_addr_code_hostp(CPUArchState *env, vaddr addr, return addr; } -#ifdef TARGET_PAGE_DATA_SIZE /* * Allocate chunks of target data together. For the only current user, * if we allocate one hunk per page, we have overhead of 40/128 or 40%. @@ -886,10 +885,16 @@ typedef struct TargetPageDataNode { } TargetPageDataNode; static IntervalTreeRoot targetdata_root; +static size_t target_page_data_size; void page_reset_target_data(vaddr start, vaddr last) { IntervalTreeNode *n, *next; + size_t size = target_page_data_size; + + if (likely(size == 0)) { + return; + } assert_memory_lock(); @@ -920,17 +925,22 @@ void page_reset_target_data(vaddr start, vaddr last) n_last = MIN(last, n->last); p_len = (n_last + 1 - n_start) >> TARGET_PAGE_BITS; - memset(t->data + p_ofs * TARGET_PAGE_DATA_SIZE, 0, - p_len * TARGET_PAGE_DATA_SIZE); + memset(t->data + p_ofs * size, 0, p_len * size); } } -void *page_get_target_data(vaddr address) +void *page_get_target_data(vaddr address, size_t size) { IntervalTreeNode *n; TargetPageDataNode *t; vaddr page, region, p_ofs; + /* Remember the size from the first call, and it should be constant. */ + if (unlikely(target_page_data_size != size)) { + assert(target_page_data_size == 0); + target_page_data_size = size; + } + page = address & TARGET_PAGE_MASK; region = address & TBD_MASK; @@ -945,8 +955,7 @@ void *page_get_target_data(vaddr address) mmap_lock(); n = interval_tree_iter_first(&targetdata_root, page, page); if (!n) { - t = g_malloc0(sizeof(TargetPageDataNode) - + TPD_PAGES * TARGET_PAGE_DATA_SIZE); + t = g_malloc0(sizeof(TargetPageDataNode) + TPD_PAGES * size); n = &t->itree; n->start = region; n->last = region | ~TBD_MASK; @@ -957,11 +966,8 @@ void *page_get_target_data(vaddr address) t = container_of(n, TargetPageDataNode, itree); p_ofs = (page - region) >> TARGET_PAGE_BITS; - return t->data + p_ofs * TARGET_PAGE_DATA_SIZE; + return t->data + p_ofs * size; } -#else -void page_reset_target_data(vaddr start, vaddr last) { } -#endif /* TARGET_PAGE_DATA_SIZE */ /* The system-mode versions of these helpers are in cputlb.c. */ diff --git a/target/arm/tcg/mte_helper.c b/target/arm/tcg/mte_helper.c index 13d7ac0097..0efc18a181 100644 --- a/target/arm/tcg/mte_helper.c +++ b/target/arm/tcg/mte_helper.c @@ -37,7 +37,6 @@ #include "qemu/guest-random.h" #include "mte_helper.h" - static int choose_nonexcluded_tag(int tag, int offset, uint16_t exclude) { if (exclude == 0xffff) { @@ -63,6 +62,7 @@ uint8_t *allocation_tag_mem_probe(CPUARMState *env, int ptr_mmu_idx, bool probe, uintptr_t ra) { #ifdef CONFIG_USER_ONLY + const size_t page_data_size = TARGET_PAGE_SIZE >> (LOG2_TAG_GRANULE + 1); uint64_t clean_ptr = useronly_clean_ptr(ptr); int flags = page_get_flags(clean_ptr); uint8_t *tags; @@ -83,7 +83,7 @@ uint8_t *allocation_tag_mem_probe(CPUARMState *env, int ptr_mmu_idx, return NULL; } - tags = page_get_target_data(clean_ptr); + tags = page_get_target_data(clean_ptr, page_data_size); index = extract32(ptr, LOG2_TAG_GRANULE + 1, TARGET_PAGE_BITS - LOG2_TAG_GRANULE - 1);