summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAlexander Graf <agraf@csgraf.de>2021-09-16 17:53:56 +0200
committerPeter Maydell <peter.maydell@linaro.org>2021-09-20 09:57:03 +0100
commit5b3e7517246cbfdd7ea1f1b2a4637e308f1fdb83 (patch)
tree26a8c22c56dafe842dd57aaf9d49936f32472faa
parent0130895ddf63d8ebdc6e20e86054794fac60d1d8 (diff)
downloadfocaccia-qemu-5b3e7517246cbfdd7ea1f1b2a4637e308f1fdb83.tar.gz
focaccia-qemu-5b3e7517246cbfdd7ea1f1b2a4637e308f1fdb83.zip
hvf: Add execute to dirty log permission bitmap
Hvf's permission bitmap during and after dirty logging does not include
the HV_MEMORY_EXEC permission. At least on Apple Silicon, this leads to
instruction faults once dirty logging was enabled.

Add the bit to make it work properly.

Signed-off-by: Alexander Graf <agraf@csgraf.de>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 20210916155404.86958-3-agraf@csgraf.de
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r--accel/hvf/hvf-accel-ops.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/accel/hvf/hvf-accel-ops.c b/accel/hvf/hvf-accel-ops.c
index d1691be989..71cc2fa70f 100644
--- a/accel/hvf/hvf-accel-ops.c
+++ b/accel/hvf/hvf-accel-ops.c
@@ -239,12 +239,12 @@ static void hvf_set_dirty_tracking(MemoryRegionSection *section, bool on)
     if (on) {
         slot->flags |= HVF_SLOT_LOG;
         hv_vm_protect((uintptr_t)slot->start, (size_t)slot->size,
-                      HV_MEMORY_READ);
+                      HV_MEMORY_READ | HV_MEMORY_EXEC);
     /* stop tracking region*/
     } else {
         slot->flags &= ~HVF_SLOT_LOG;
         hv_vm_protect((uintptr_t)slot->start, (size_t)slot->size,
-                      HV_MEMORY_READ | HV_MEMORY_WRITE);
+                      HV_MEMORY_READ | HV_MEMORY_WRITE | HV_MEMORY_EXEC);
     }
 }