[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 18/43] accel/tcg: Support split-wx for linux with memfd
From: |
Richard Henderson |
Subject: |
[PATCH v5 18/43] accel/tcg: Support split-wx for linux with memfd |
Date: |
Tue, 5 Jan 2021 07:19:25 -1000 |
We cannot use a real temp file, because we would need to find
a filesystem that does not have noexec enabled. However, a
memfd is not associated with any filesystem.
Reviewed-by: Joelle van Dyne <j@getutm.app>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
accel/tcg/translate-all.c | 84 +++++++++++++++++++++++++++++++++++----
1 file changed, 76 insertions(+), 8 deletions(-)
diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c
index 0c1801b034..27c88527ea 100644
--- a/accel/tcg/translate-all.c
+++ b/accel/tcg/translate-all.c
@@ -1078,17 +1078,11 @@ static bool alloc_code_gen_buffer(size_t size, int
splitwx, Error **errp)
return true;
}
#else
-static bool alloc_code_gen_buffer(size_t size, int splitwx, Error **errp)
+static bool alloc_code_gen_buffer_anon(size_t size, int prot,
+ int flags, Error **errp)
{
- int prot = PROT_WRITE | PROT_READ | PROT_EXEC;
- int flags = MAP_PRIVATE | MAP_ANONYMOUS;
void *buf;
- if (splitwx > 0) {
- error_setg(errp, "jit split-wx not supported");
- return false;
- }
-
buf = mmap(NULL, size, prot, flags, -1, 0);
if (buf == MAP_FAILED) {
error_setg_errno(errp, errno,
@@ -1137,6 +1131,80 @@ static bool alloc_code_gen_buffer(size_t size, int
splitwx, Error **errp)
tcg_ctx->code_gen_buffer = buf;
return true;
}
+
+#ifdef CONFIG_POSIX
+#include "qemu/memfd.h"
+
+static bool alloc_code_gen_buffer_splitwx_memfd(size_t size, Error **errp)
+{
+ void *buf_rw, *buf_rx;
+ int fd = -1;
+
+ buf_rw = qemu_memfd_alloc("tcg-jit", size, 0, &fd, errp);
+ if (buf_rw == NULL) {
+ return false;
+ }
+
+ buf_rx = mmap(NULL, size, PROT_READ | PROT_EXEC, MAP_SHARED, fd, 0);
+ if (buf_rx == MAP_FAILED) {
+ error_setg_errno(errp, errno,
+ "failed to map shared memory for execute");
+ munmap(buf_rw, size);
+ close(fd);
+ return false;
+ }
+ close(fd);
+
+ tcg_ctx->code_gen_buffer = buf_rw;
+ tcg_ctx->code_gen_buffer_size = size;
+ tcg_splitwx_diff = buf_rx - buf_rw;
+
+ /* Request large pages for the buffer and the splitwx. */
+ qemu_madvise(buf_rw, size, QEMU_MADV_HUGEPAGE);
+ qemu_madvise(buf_rx, size, QEMU_MADV_HUGEPAGE);
+ return true;
+}
+#endif /* CONFIG_POSIX */
+
+static bool alloc_code_gen_buffer_splitwx(size_t size, Error **errp)
+{
+ if (TCG_TARGET_SUPPORT_MIRROR) {
+#ifdef CONFIG_POSIX
+ return alloc_code_gen_buffer_splitwx_memfd(size, errp);
+#endif
+ }
+ error_setg(errp, "jit split-wx not supported");
+ return false;
+}
+
+static bool alloc_code_gen_buffer(size_t size, int splitwx, Error **errp)
+{
+ ERRP_GUARD();
+ int prot, flags;
+
+ if (splitwx) {
+ if (alloc_code_gen_buffer_splitwx(size, errp)) {
+ return true;
+ }
+ /*
+ * If splitwx force-on (1), fail;
+ * if splitwx default-on (-1), fall through to splitwx off.
+ */
+ if (splitwx > 0) {
+ return false;
+ }
+ error_free_or_abort(errp);
+ }
+
+ prot = PROT_READ | PROT_WRITE | PROT_EXEC;
+ flags = MAP_PRIVATE | MAP_ANONYMOUS;
+#ifdef CONFIG_TCG_INTERPRETER
+ /* The tcg interpreter does not need execute permission. */
+ prot = PROT_READ | PROT_WRITE;
+#endif
+
+ return alloc_code_gen_buffer_anon(size, prot, flags, errp);
+}
#endif /* USE_STATIC_CODE_GEN_BUFFER, WIN32, POSIX */
static bool tb_cmp(const void *ap, const void *bp)
--
2.25.1
- [PATCH v5 16/43] tcg: Use Error with alloc_code_gen_buffer, (continued)
- [PATCH v5 16/43] tcg: Use Error with alloc_code_gen_buffer, Richard Henderson, 2021/01/05
- [PATCH v5 17/43] tcg: Add --accel tcg,split-wx property, Richard Henderson, 2021/01/05
- [PATCH v5 19/43] accel/tcg: Support split-wx for darwin/iOS with vm_remap, Richard Henderson, 2021/01/05
- [PATCH v5 24/43] disas: Push const down through host disassembly, Richard Henderson, 2021/01/05
- [PATCH v5 23/43] tcg/aarch64: Support split-wx code generation, Richard Henderson, 2021/01/05
- [PATCH v5 25/43] tcg/tci: Push const down through bytecode reading, Richard Henderson, 2021/01/05
- [PATCH v5 28/43] tcg/ppc: Use tcg_out_mem_long to reset TCG_REG_TB, Richard Henderson, 2021/01/05
- [PATCH v5 18/43] accel/tcg: Support split-wx for linux with memfd,
Richard Henderson <=
- [PATCH v5 22/43] tcg/aarch64: Use B not BL for tcg_out_goto_long, Richard Henderson, 2021/01/05
- [PATCH v5 26/43] tcg: Introduce tcg_tbrel_diff, Richard Henderson, 2021/01/05
- [PATCH v5 27/43] tcg/ppc: Use tcg_tbrel_diff, Richard Henderson, 2021/01/05
- [PATCH v5 29/43] tcg/ppc: Support split-wx code generation, Richard Henderson, 2021/01/05
- [PATCH v5 30/43] tcg/sparc: Use tcg_tbrel_diff, Richard Henderson, 2021/01/05
- [PATCH v5 33/43] tcg/s390: Support split-wx code generation, Richard Henderson, 2021/01/05
- [PATCH v5 34/43] tcg/riscv: Fix branch range checks, Richard Henderson, 2021/01/05
- [PATCH v5 37/43] accel/tcg: Add mips support to alloc_code_gen_buffer_splitwx_memfd, Richard Henderson, 2021/01/05
- [PATCH v5 35/43] tcg/riscv: Remove branch-over-branch fallback, Richard Henderson, 2021/01/05
- [PATCH v5 31/43] tcg/sparc: Support split-wx code generation, Richard Henderson, 2021/01/05