SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

accel/tcg: Take mmap lock in the whole cpu_memory_rw_debug() function

Browse Source 
Simplify user implementation of cpu_memory_rw_debug() by
taking the mmap lock globally. See commit 87ab2704296
("linux-user: Allow gdbstub to ignore page protection")
for why this lock is necessary.

Suggested-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20250217130610.18313-4-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2025-02-17 11:53:47 +01:00
parent a523b62c85
commit 964a4f2c29
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cpu-target.c
View File

@ -380,6 +380,8 @@ int cpu_memory_rw_debug(CPUState *cpu, vaddr addr,
int ret = -1; int ret = -1;
int fd = -1; int fd = -1;
mmap_lock();
while (len > 0) { while (len > 0) {
page = addr & TARGET_PAGE_MASK; page = addr & TARGET_PAGE_MASK;
l = (page + TARGET_PAGE_SIZE) - addr; l = (page + TARGET_PAGE_SIZE) - addr;
@ -414,11 +416,9 @@ int cpu_memory_rw_debug(CPUState *cpu, vaddr addr,
* be under mmap_lock() in order to prevent the creation of * be under mmap_lock() in order to prevent the creation of
* another TranslationBlock in between. * another TranslationBlock in between.
*/ */
mmap_lock();
tb_invalidate_phys_range(addr, addr + l - 1); tb_invalidate_phys_range(addr, addr + l - 1);
written = pwrite(fd, buf, l, written = pwrite(fd, buf, l,
(off_t)(uintptr_t)g2h_untagged(addr)); (off_t)(uintptr_t)g2h_untagged(addr));
mmap_unlock();
if (written != l) { if (written != l) {
goto out_close; goto out_close;
} }
@ -454,6 +454,8 @@ out_close:
close(fd); close(fd);
} }
out: out:
mmap_unlock();
return ret; return ret;
} }
#endif #endif