[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 28/33] accel/tcg: Disconnect TargetPageDataNode from page size
From: |
Richard Henderson |
Subject: |
[PATCH v2 28/33] accel/tcg: Disconnect TargetPageDataNode from page size |
Date: |
Thu, 31 Aug 2023 19:23:26 -0700 |
Dynamically size the node for the runtime target page size.
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
accel/tcg/user-exec.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c
index 4c1697500a..09dc85c851 100644
--- a/accel/tcg/user-exec.c
+++ b/accel/tcg/user-exec.c
@@ -863,7 +863,7 @@ tb_page_addr_t get_page_addr_code_hostp(CPUArchState *env,
vaddr addr,
typedef struct TargetPageDataNode {
struct rcu_head rcu;
IntervalTreeNode itree;
- char data[TPD_PAGES][TARGET_PAGE_DATA_SIZE] __attribute__((aligned));
+ char data[] __attribute__((aligned));
} TargetPageDataNode;
static IntervalTreeRoot targetdata_root;
@@ -901,7 +901,8 @@ void page_reset_target_data(target_ulong start,
target_ulong last)
n_last = MIN(last, n->last);
p_len = (n_last + 1 - n_start) >> TARGET_PAGE_BITS;
- memset(t->data[p_ofs], 0, p_len * TARGET_PAGE_DATA_SIZE);
+ memset(t->data + p_ofs * TARGET_PAGE_DATA_SIZE, 0,
+ p_len * TARGET_PAGE_DATA_SIZE);
}
}
@@ -909,7 +910,7 @@ void *page_get_target_data(target_ulong address)
{
IntervalTreeNode *n;
TargetPageDataNode *t;
- target_ulong page, region;
+ target_ulong page, region, p_ofs;
page = address & TARGET_PAGE_MASK;
region = address & TBD_MASK;
@@ -925,7 +926,8 @@ void *page_get_target_data(target_ulong address)
mmap_lock();
n = interval_tree_iter_first(&targetdata_root, page, page);
if (!n) {
- t = g_new0(TargetPageDataNode, 1);
+ t = g_malloc0(sizeof(TargetPageDataNode)
+ + TPD_PAGES * TARGET_PAGE_DATA_SIZE);
n = &t->itree;
n->start = region;
n->last = region | ~TBD_MASK;
@@ -935,7 +937,8 @@ void *page_get_target_data(target_ulong address)
}
t = container_of(n, TargetPageDataNode, itree);
- return t->data[(page - region) >> TARGET_PAGE_BITS];
+ p_ofs = (page - region) >> TARGET_PAGE_BITS;
+ return t->data + p_ofs * TARGET_PAGE_DATA_SIZE;
}
#else
void page_reset_target_data(target_ulong start, target_ulong last) { }
--
2.34.1
- [PATCH v2 23/33] linux-user: Split out mmap_h_gt_g, (continued)
- [PATCH v2 23/33] linux-user: Split out mmap_h_gt_g, Richard Henderson, 2023/08/31
- [PATCH v2 22/33] linux-user: Split out mmap_h_lt_g, Richard Henderson, 2023/08/31
- [PATCH v2 25/33] tests/tcg: Extend file in linux-madvise.c, Richard Henderson, 2023/08/31
- [PATCH v2 24/33] tests/tcg: Remove run-test-mmap-*, Richard Henderson, 2023/08/31
- [PATCH v2 26/33] *-user: Deprecate and disable -p pagesize, Richard Henderson, 2023/08/31
- [PATCH v2 31/33] linux-user: Bound mmap_min_addr by host page size, Richard Henderson, 2023/08/31
- [PATCH v2 32/33] target/ppc: Enable TARGET_PAGE_BITS_VARY for user-only, Richard Henderson, 2023/08/31
- [PATCH v2 27/33] cpu: Remove page_size_init, Richard Henderson, 2023/08/31
- [PATCH v2 28/33] accel/tcg: Disconnect TargetPageDataNode from page size,
Richard Henderson <=
- [PATCH v2 29/33] linux-user: Allow TARGET_PAGE_BITS_VARY, Richard Henderson, 2023/08/31
- [PATCH v2 30/33] target/arm: Enable TARGET_PAGE_BITS_VARY for AArch64 user-only, Richard Henderson, 2023/08/31
- [PATCH v2 33/33] target/alpha: Enable TARGET_PAGE_BITS_VARY for user-only, Richard Henderson, 2023/08/31