From: Alexander Graf Date: Thu, 16 Sep 2021 15:53:56 +0000 (+0200) Subject: hvf: Add execute to dirty log permission bitmap X-Git-Tag: nvme-fixes-for-6.2-pull-request~112^2~19 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5b3e7517246cbfdd7ea1f1b2a4637e308f1fdb83;p=qemu-nvme.git 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 Reviewed-by: Peter Maydell Message-id: 20210916155404.86958-3-agraf@csgraf.de Signed-off-by: Peter Maydell --- 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); } }