From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: r.bolshakov@yadro.com, j@getutm.app
Subject: [PATCH 23/26] tcg: Do not set guard pages in the rx buffer
Date: Wed, 10 Mar 2021 18:21:53 -0600 [thread overview]
Message-ID: <20210311002156.253711-24-richard.henderson@linaro.org> (raw)
In-Reply-To: <20210311002156.253711-1-richard.henderson@linaro.org>
We only need guard pages in the rw buffer to avoid buffer overruns.
Let the rx buffer keep large pages all the way through.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
tcg/region.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/tcg/region.c b/tcg/region.c
index 7640aac243..93d03076d1 100644
--- a/tcg/region.c
+++ b/tcg/region.c
@@ -803,7 +803,6 @@ void tcg_region_init(size_t tb_size, int splitwx, unsigned max_cpus)
size_t page_size;
size_t region_size;
size_t i;
- uintptr_t splitwx_diff;
int have_prot;
have_prot = alloc_code_gen_buffer(size_code_gen_buffer(tb_size),
@@ -845,8 +844,7 @@ void tcg_region_init(size_t tb_size, int splitwx, unsigned max_cpus)
/* init the region struct */
qemu_mutex_init(®ion.lock);
- /* set guard pages */
- splitwx_diff = tcg_splitwx_diff;
+ /* Set guard pages. No need to do this for the rx_buf, only the rw_buf. */
for (i = 0; i < region.n; i++) {
void *start, *end;
int rc;
@@ -854,10 +852,6 @@ void tcg_region_init(size_t tb_size, int splitwx, unsigned max_cpus)
tcg_region_bounds(i, &start, &end);
rc = qemu_mprotect_none(end, page_size);
g_assert(!rc);
- if (splitwx_diff) {
- rc = qemu_mprotect_none(end + splitwx_diff, page_size);
- g_assert(!rc);
- }
}
tcg_region_trees_init();
--
2.25.1
next prev parent reply other threads:[~2021-03-11 0:37 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-11 0:21 [PATCH 00/26] tcg: Workaround macOS 11.2 mprotect bug Richard Henderson
2021-03-11 0:21 ` [PATCH 01/26] meson: Split out tcg/meson.build Richard Henderson
2021-03-13 17:36 ` Philippe Mathieu-Daudé
2021-03-11 0:21 ` [PATCH 02/26] meson: Move disas/tci.c to disas/meson.build Richard Henderson
2021-03-13 17:36 ` Philippe Mathieu-Daudé
2021-03-13 18:46 ` Richard Henderson
2021-03-11 0:21 ` [PATCH 03/26] meson: Split out fpu/meson.build Richard Henderson
2021-03-13 17:37 ` Philippe Mathieu-Daudé
2021-03-11 0:21 ` [PATCH 04/26] tcg: Re-order tcg_region_init vs tcg_prologue_init Richard Henderson
2021-03-11 0:21 ` [PATCH 05/26] tcg: Remove error return from tcg_region_initial_alloc__locked Richard Henderson
2021-03-13 17:37 ` Philippe Mathieu-Daudé
2021-03-11 0:21 ` [PATCH 06/26] tcg: Split out tcg_region_initial_alloc Richard Henderson
2021-03-11 0:21 ` [PATCH 07/26] tcg: Split out tcg_region_prologue_set Richard Henderson
2021-03-11 0:21 ` [PATCH 08/26] tcg: Split out region.c Richard Henderson
2021-03-11 0:21 ` [PATCH 09/26] accel/tcg: Inline cpu_gen_init Richard Henderson
2021-03-13 17:38 ` Philippe Mathieu-Daudé
2021-03-11 0:21 ` [PATCH 10/26] accel/tcg: Move alloc_code_gen_buffer to tcg/region.c Richard Henderson
2021-03-13 18:48 ` Richard Henderson
2021-03-11 0:21 ` [PATCH 11/26] accel/tcg: Rename tcg_init to tcg_init_machine Richard Henderson
2021-03-13 17:39 ` Philippe Mathieu-Daudé
2021-03-11 0:21 ` [PATCH 12/26] tcg: Create tcg_init Richard Henderson
2021-03-13 19:27 ` Philippe Mathieu-Daudé
2021-03-13 19:28 ` Richard Henderson
2021-03-11 0:21 ` [PATCH 13/26] accel/tcg: Merge tcg_exec_init into tcg_init_machine Richard Henderson
2021-03-11 0:21 ` [PATCH 14/26] accel/tcg: Pass down max_cpus to tcg_init Richard Henderson
2021-03-13 17:45 ` Philippe Mathieu-Daudé
2021-03-11 0:21 ` [PATCH 15/26] tcg: Introduce tcg_max_ctxs Richard Henderson
2021-03-13 17:48 ` Philippe Mathieu-Daudé
2021-03-11 0:21 ` [PATCH 16/26] tcg: Move MAX_CODE_GEN_BUFFER_SIZE to tcg-target.h Richard Henderson
2021-03-11 0:42 ` BALATON Zoltan
2021-03-13 16:00 ` Richard Henderson
2021-03-11 0:21 ` [PATCH 17/26] tcg: Replace region.end with region.total_size Richard Henderson
2021-03-11 0:21 ` [PATCH 18/26] tcg: Tidy tcg_n_regions Richard Henderson
2021-03-11 0:21 ` [PATCH 19/26] tcg: Tidy split_cross_256mb Richard Henderson
2021-03-11 0:21 ` [PATCH 20/26] tcg: Allocate code_gen_buffer into struct tcg_region_state Richard Henderson
2021-03-11 0:21 ` [PATCH 21/26] tcg: Return the map protection from alloc_code_gen_buffer Richard Henderson
2021-03-11 0:21 ` [PATCH 22/26] tcg: Sink qemu_madvise call to common code Richard Henderson
2021-03-11 0:21 ` Richard Henderson [this message]
2021-03-11 0:21 ` [PATCH 24/26] util/osdep: Add qemu_mprotect_rw Richard Henderson
2021-03-13 17:51 ` Philippe Mathieu-Daudé
2021-03-11 0:21 ` [PATCH 25/26] tcg: Merge buffer protection and guard page protection Richard Henderson
2021-03-11 0:21 ` [PATCH 26/26] tcg: When allocating for !splitwx, begin with PROT_NONE Richard Henderson
2021-03-11 0:52 ` [PATCH 00/26] tcg: Workaround macOS 11.2 mprotect bug no-reply
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210311002156.253711-24-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=j@getutm.app \
--cc=qemu-devel@nongnu.org \
--cc=r.bolshakov@yadro.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).