[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 44/52] tcg: Fix PAGE/PROT confusion
From: |
Richard Henderson |
Subject: |
[PULL 44/52] tcg: Fix PAGE/PROT confusion |
Date: |
Mon, 5 Jun 2023 13:15:40 -0700 |
The bug was hidden because they happen to have the same values.
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
tcg/region.c | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/tcg/region.c b/tcg/region.c
index bef4c4756f..f8410ba5db 100644
--- a/tcg/region.c
+++ b/tcg/region.c
@@ -505,6 +505,14 @@ static int alloc_code_gen_buffer(size_t tb_size, int
splitwx, Error **errp)
return PROT_READ | PROT_WRITE;
}
#elif defined(_WIN32)
+/*
+ * Local source-level compatibility with Unix.
+ * Used by tcg_region_init below.
+ */
+#define PROT_READ 1
+#define PROT_WRITE 2
+#define PROT_EXEC 4
+
static int alloc_code_gen_buffer(size_t size, int splitwx, Error **errp)
{
void *buf;
@@ -525,7 +533,7 @@ static int alloc_code_gen_buffer(size_t size, int splitwx,
Error **errp)
region.start_aligned = buf;
region.total_size = size;
- return PAGE_READ | PAGE_WRITE | PAGE_EXEC;
+ return PROT_READ | PROT_WRITE | PROT_EXEC;
}
#else
static int alloc_code_gen_buffer_anon(size_t size, int prot,
@@ -794,10 +802,10 @@ void tcg_region_init(size_t tb_size, int splitwx,
unsigned max_cpus)
* buffer -- let that one use hugepages throughout.
* Work with the page protections set up with the initial mapping.
*/
- need_prot = PAGE_READ | PAGE_WRITE;
+ need_prot = PROT_READ | PROT_WRITE;
#ifndef CONFIG_TCG_INTERPRETER
if (tcg_splitwx_diff == 0) {
- need_prot |= PAGE_EXEC;
+ need_prot |= PROT_EXEC;
}
#endif
for (size_t i = 0, n = region.n; i < n; i++) {
@@ -807,9 +815,9 @@ void tcg_region_init(size_t tb_size, int splitwx, unsigned
max_cpus)
if (have_prot != need_prot) {
int rc;
- if (need_prot == (PAGE_READ | PAGE_WRITE | PAGE_EXEC)) {
+ if (need_prot == (PROT_READ | PROT_WRITE | PROT_EXEC)) {
rc = qemu_mprotect_rwx(start, end - start);
- } else if (need_prot == (PAGE_READ | PAGE_WRITE)) {
+ } else if (need_prot == (PROT_READ | PROT_WRITE)) {
rc = qemu_mprotect_rw(start, end - start);
} else {
g_assert_not_reached();
--
2.34.1
- [PULL 23/52] tcg: Split helper-gen.h, (continued)
- [PULL 23/52] tcg: Split helper-gen.h, Richard Henderson, 2023/06/05
- [PULL 15/52] tcg: Split tcg/tcg-op-common.h from tcg/tcg-op.h, Richard Henderson, 2023/06/05
- [PULL 34/52] include/exec: Remove CODE_GEN_AVG_BLOCK_SIZE, Richard Henderson, 2023/06/05
- [PULL 39/52] target/arm: Tidy helpers for translation, Richard Henderson, 2023/06/05
- [PULL 38/52] accel/tcg: Move translator_fake_ldb out of line, Richard Henderson, 2023/06/05
- [PULL 20/52] tcg: Pass TCGHelperInfo to tcg_gen_callN, Richard Henderson, 2023/06/05
- [PULL 22/52] tcg: Split tcg_gen_callN, Richard Henderson, 2023/06/05
- [PULL 36/52] accel/tcg: Introduce translator_io_start, Richard Henderson, 2023/06/05
- [PULL 37/52] target/ppc: Inline gen_icount_io_start(), Richard Henderson, 2023/06/05
- [PULL 42/52] target/arm: Add missing include of exec/exec-all.h, Richard Henderson, 2023/06/05
- [PULL 44/52] tcg: Fix PAGE/PROT confusion,
Richard Henderson <=
- [PULL 45/52] tcg: Move env defines out of NEED_CPU_H in helper-head.h, Richard Henderson, 2023/06/05
- [PULL 40/52] target/mips: Tidy helpers for translation, Richard Henderson, 2023/06/05
- [PULL 41/52] target/*: Add missing includes of exec/translation-block.h, Richard Henderson, 2023/06/05
- [PULL 43/52] accel/tcg: Tidy includes for translator.[ch], Richard Henderson, 2023/06/05
- [PULL 46/52] tcg: Remove target-specific headers from tcg.[ch], Richard Henderson, 2023/06/05
- [PULL 47/52] plugins: Move plugin_insn_append to translator.c, Richard Henderson, 2023/06/05
- [PULL 49/52] exec/poison: Do not poison CONFIG_SOFTMMU, Richard Henderson, 2023/06/05
- [PULL 50/52] tcg: Build once for system and once for user-only, Richard Henderson, 2023/06/05