From: Roman Bolshakov <r.bolshakov@yadro.com>
To: Richard Henderson <richard.henderson@linaro.org>
Cc: qemu-devel@nongnu.org, j@getutm.app
Subject: Re: [PATCH v3 for-6.0 1/2] tcg: Do not set guard pages on the rx portion of code_gen_buffer
Date: Mon, 22 Mar 2021 16:56:20 +0300 [thread overview]
Message-ID: <YFiiBAwESsbf2lOZ@SPB-NB-133.local> (raw)
In-Reply-To: <20210320165720.1813545-2-richard.henderson@linaro.org>
On Sat, Mar 20, 2021 at 10:57:19AM -0600, Richard Henderson wrote:
> The rw portion of the buffer is the only one in which overruns
> can be generated. Allow the rx portion to be more completely
> covered by huge pages.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> tcg/tcg.c | 12 +++++-------
> 1 file changed, 5 insertions(+), 7 deletions(-)
>
> diff --git a/tcg/tcg.c b/tcg/tcg.c
> index de91bb6e9e..88c9e6f8a4 100644
> --- a/tcg/tcg.c
> +++ b/tcg/tcg.c
> @@ -828,7 +828,6 @@ void tcg_region_init(void)
> size_t region_size;
> size_t n_regions;
> size_t i;
> - uintptr_t splitwx_diff;
>
> n_regions = tcg_n_regions();
>
> @@ -858,8 +857,11 @@ void tcg_region_init(void)
> /* account for that last guard page */
> region.end -= page_size;
>
> - /* set guard pages */
> - splitwx_diff = tcg_splitwx_diff;
> + /*
> + * Set guard pages in the rw buffer, as that's the one into which
> + * buffer overruns could occur. Do not set guard pages in the rx
> + * buffer -- let that one use hugepages throughout.
> + */
> for (i = 0; i < region.n; i++) {
> void *start, *end;
> int rc;
> @@ -867,10 +869,6 @@ void tcg_region_init(void)
> 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
>
Thanks for fixing the issue, Richard,
I have two questions:
- Should we keep guards pages for rx on all platforms except darwin?
(that would make it similar to what Philippe proposed in the comments
to patch 2).
- What does mean that rx might be covered by huge pages? (perhaps I'm
missing some context)
Otherwise,
Reviewed-by: Roman Bolshakov <r.bolshakov@yadro.com>
Tested-by: Roman Bolshakov <r.bolshakov@yadro.com>
BR,
Roman
next prev parent reply other threads:[~2021-03-22 14:15 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-20 16:57 [PATCH v3 for-6.0 0/2] tcg: Workaround macOS 11.2 mprotect bug Richard Henderson
2021-03-20 16:57 ` [PATCH v3 for-6.0 1/2] tcg: Do not set guard pages on the rx portion of code_gen_buffer Richard Henderson
2021-03-22 13:56 ` Roman Bolshakov [this message]
2021-03-22 15:13 ` Richard Henderson
2021-03-20 16:57 ` [PATCH v3 for-6.0 2/2] tcg: Workaround macOS 11.2 mprotect bug Richard Henderson
2021-03-22 10:03 ` Philippe Mathieu-Daudé
2021-03-22 13:47 ` Roman Bolshakov
2021-03-22 15:00 ` Richard Henderson
2021-03-22 15:39 ` Philippe Mathieu-Daudé
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=YFiiBAwESsbf2lOZ@SPB-NB-133.local \
--to=r.bolshakov@yadro.com \
--cc=j@getutm.app \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
/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).