[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 05/15] accel/tcg: Pass last not end to page_reset_target_data
From: |
Richard Henderson |
Subject: |
[PULL 05/15] accel/tcg: Pass last not end to page_reset_target_data |
Date: |
Tue, 28 Mar 2023 15:57:56 -0700 |
Pass the address of the last byte to be changed, rather than
the first address past the last byte. This avoids overflow
when the last page of the address space is involved.
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/exec/cpu-all.h | 2 +-
accel/tcg/user-exec.c | 11 +++++------
linux-user/mmap.c | 2 +-
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h
index a2662b1e83..64cb62dc54 100644
--- a/include/exec/cpu-all.h
+++ b/include/exec/cpu-all.h
@@ -277,7 +277,7 @@ int walk_memory_regions(void *, walk_memory_regions_fn);
int page_get_flags(target_ulong address);
void page_set_flags(target_ulong start, target_ulong last, int flags);
-void page_reset_target_data(target_ulong start, target_ulong end);
+void page_reset_target_data(target_ulong start, target_ulong last);
int page_check_range(target_ulong start, target_ulong len, int flags);
/**
diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c
index 035f8096b2..20b6fc2f6e 100644
--- a/accel/tcg/user-exec.c
+++ b/accel/tcg/user-exec.c
@@ -508,7 +508,7 @@ void page_set_flags(target_ulong start, target_ulong last,
int flags)
}
if (!flags || reset) {
- page_reset_target_data(start, last + 1);
+ page_reset_target_data(start, last);
inval_tb |= pageflags_unset(start, last);
}
if (flags) {
@@ -814,15 +814,14 @@ typedef struct TargetPageDataNode {
static IntervalTreeRoot targetdata_root;
-void page_reset_target_data(target_ulong start, target_ulong end)
+void page_reset_target_data(target_ulong start, target_ulong last)
{
IntervalTreeNode *n, *next;
- target_ulong last;
assert_memory_lock();
- start = start & TARGET_PAGE_MASK;
- last = TARGET_PAGE_ALIGN(end) - 1;
+ start &= TARGET_PAGE_MASK;
+ last |= ~TARGET_PAGE_MASK;
for (n = interval_tree_iter_first(&targetdata_root, start, last),
next = n ? interval_tree_iter_next(n, start, last) : NULL;
@@ -885,7 +884,7 @@ void *page_get_target_data(target_ulong address)
return t->data[(page - region) >> TARGET_PAGE_BITS];
}
#else
-void page_reset_target_data(target_ulong start, target_ulong end) { }
+void page_reset_target_data(target_ulong start, target_ulong last) { }
#endif /* TARGET_PAGE_DATA_SIZE */
/* The softmmu versions of these helpers are in cputlb.c. */
diff --git a/linux-user/mmap.c b/linux-user/mmap.c
index 1d07ff5d2c..995146f60d 100644
--- a/linux-user/mmap.c
+++ b/linux-user/mmap.c
@@ -946,7 +946,7 @@ abi_long target_madvise(abi_ulong start, abi_ulong len_in,
int advice)
if (can_passthrough_madvise(start, end)) {
ret = get_errno(madvise(g2h_untagged(start), len, advice));
if ((advice == MADV_DONTNEED) && (ret == 0)) {
- page_reset_target_data(start, start + len);
+ page_reset_target_data(start, start + len - 1);
}
}
}
--
2.34.1
- [PULL 00/15] tcg patch queue, Richard Henderson, 2023/03/28
- [PULL 02/15] tcg: use QTree instead of GTree, Richard Henderson, 2023/03/28
- [PULL 03/15] linux-user: Diagnose misaligned -R size, Richard Henderson, 2023/03/28
- [PULL 06/15] accel/tcg: Pass last not end to PAGE_FOR_EACH_TB, Richard Henderson, 2023/03/28
- [PULL 01/15] util: import GTree as QTree, Richard Henderson, 2023/03/28
- [PULL 04/15] accel/tcg: Pass last not end to page_set_flags, Richard Henderson, 2023/03/28
- [PULL 05/15] accel/tcg: Pass last not end to page_reset_target_data,
Richard Henderson <=
- [PULL 07/15] accel/tcg: Pass last not end to page_collection_lock, Richard Henderson, 2023/03/28
- [PULL 08/15] accel/tcg: Pass last not end to tb_invalidate_phys_page_range__locked, Richard Henderson, 2023/03/28
- [PULL 10/15] linux-user: Pass last not end to probe_guest_base, Richard Henderson, 2023/03/28
- [PULL 09/15] accel/tcg: Pass last not end to tb_invalidate_phys_range, Richard Henderson, 2023/03/28
- [PULL 11/15] include/exec: Change reserved_va semantics to last byte, Richard Henderson, 2023/03/28
- [PULL 13/15] softmmu: Restrict cpu_check_watchpoint / address_matches to TCG accel, Richard Henderson, 2023/03/28
- [PULL 15/15] softmmu: Restore use of CPU watchpoint for all accelerators, Richard Henderson, 2023/03/28
- [PULL 12/15] linux-user/arm: Take more care allocating commpage, Richard Henderson, 2023/03/28
- [PULL 14/15] softmmu/watchpoint: Add missing 'qemu/error-report.h' include, Richard Henderson, 2023/03/28
- Re: [PULL 00/15] tcg patch queue, Peter Maydell, 2023/03/29